Merge lp:~alan-griffiths/miral/encapsulate-mir-PromptSession into lp:miral

[Alan Griffiths]

[miral-qt] Encapsulate mir::scene::PromptSession

[miral-qt] Encapsulate mir::scene::PromptSession

(Almost) there's something with the signal/slot mechanism that still requires the complete type for mir::scene::PromptSession.

But this is another step towards isolating the prompt session requirements so they can be supported my libmiral

[Gerry Boland (gerboland)]

> (Almost) there's something with the signal/slot mechanism that still
> requires the complete type for mir::scene::PromptSession.

It's not ideal, but Qt refuses to let signal/slot connections work with types that are forward declared. Qt wants to check if the type is registered with the metatype system at compile time. Can't avoid it.

General change looks ok, however I'd prefer if you adopted the Qt style in PromptSession, e.g.
std::shared_ptr<mir::scene::PromptSession> const& promptSession
  -> const std::shared_ptr<mir::scene::PromptSession> &promptSession
and not use the newer C++ style "auto foo() -> bool"

review: Needs Fixing

[lp:~alan-griffiths/miral/encapsulate-mir-PromptSession]

398. By Alan Griffiths on 2016-10-07

Adopt local fashion

399. By Alan Griffiths on 2016-10-07

merge :parent

[Alan Griffiths (alan-griffiths)]

> General change looks ok, however I'd prefer if you adopted the Qt style in
> PromptSession, e.g.
> std::shared_ptr<mir::scene::PromptSession> const& promptSession
> -> const std::shared_ptr<mir::scene::PromptSession> &promptSession
> and not use the newer C++ style "auto foo() -> bool"

Done

[Gerry Boland (gerboland)]

> > General change looks ok, however I'd prefer if you adopted the Qt style in
> > PromptSession, e.g.
> > std::shared_ptr<mir::scene::PromptSession> const& promptSession
> > -> const std::shared_ptr<mir::scene::PromptSession> &promptSession
> > and not use the newer C++ style "auto foo() -> bool"
>
> Done

Not quite, please put the const qualifier before the type, not after. * and & are attached to the variable name too, not the type.

> std::shared_ptr<mir::scene::PromptSession> const& promptSession
> -> const std::shared_ptr<mir::scene::PromptSession> &promptSession

[lp:~alan-griffiths/miral/encapsulate-mir-PromptSession]

400. By Alan Griffiths on 2016-10-10

Adopt local fashion

401. By Alan Griffiths on 2016-10-10

Adopt local fashion

[Gerry Boland (gerboland)]

Looks good, thank you

review: Approve

=== modified file 'miral-qt/src/common/mirqtconversion.h'
--- miral-qt/src/common/mirqtconversion.h	2016-10-06 11:27:59 +0000
+++ miral-qt/src/common/mirqtconversion.h	2016-10-10 13:04:19 +0000
@@ -93,8 +93,8 @@
         return mir_surface_state_restored;
 
     case Mir::HiddenState:          return mir_surface_state_hidden;
+    default: Q_UNREACHABLE();
     }
-    Q_UNREACHABLE();
 }
 
 } // namespace qtmir

=== modified file 'miral-qt/src/modules/Unity/Application/application.h'
--- miral-qt/src/modules/Unity/Application/application.h	2016-08-16 14:21:14 +0000
+++ miral-qt/src/modules/Unity/Application/application.h	2016-10-10 13:04:19 +0000
@@ -31,12 +31,6 @@
 #include "mirsurfacelistmodel.h"
 #include "session_interface.h"
 
-namespace mir {
-    namespace scene {
-        class Session;
-    }
-}
-
 namespace qtmir
 {
 

=== modified file 'miral-qt/src/modules/Unity/Application/session.cpp'
--- miral-qt/src/modules/Unity/Application/session.cpp	2016-10-06 15:36:43 +0000
+++ miral-qt/src/modules/Unity/Application/session.cpp	2016-10-10 13:04:19 +0000
@@ -20,13 +20,13 @@
 #include "session.h"
 #include "mirsurfaceinterface.h"
 #include "mirsurfaceitem.h"
+#include "promptsession.h"
 
 // mirserver
 #include "logging.h"
 
 // mir
 #include <mir/scene/session.h>
-#include <mir/scene/prompt_session.h>
 
 // Qt
 #include <QPainter>
@@ -294,7 +294,7 @@
         session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
         m_suspendTimer->start();
 
-        foreachPromptSession([this](const std::shared_ptr<ms::PromptSession>& promptSession) {
+        foreachPromptSession([this](const qtmir::PromptSession &promptSession) {
             m_promptSessionManager->suspendPromptSession(promptSession);
         });
 
@@ -326,7 +326,7 @@
 
     session()->set_lifecycle_state(mir_lifecycle_state_resumed);
 
-    foreachPromptSession([this](const std::shared_ptr<ms::PromptSession>& promptSession) {
+    foreachPromptSession([this](const qtmir::PromptSession &promptSession) {
         m_promptSessionManager->resumePromptSession(promptSession);
     });
 
@@ -453,16 +453,16 @@
     return m_children;
 }
 
-void Session::appendPromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
+void Session::appendPromptSession(const qtmir::PromptSession &promptSession)
 {
-    DEBUG_MSG << "(promptSession=" << (promptSession ? promptSession.get() : nullptr) << ")";
+    DEBUG_MSG << "(promptSession=" << promptSession.get() << ")";
 
     m_promptSessions.append(promptSession);
 }
 
-void Session::removePromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
+void Session::removePromptSession(const qtmir::PromptSession &promptSession)
 {
-    DEBUG_MSG << "(promptSession=" << (promptSession ? promptSession.get() : nullptr) << ")";
+    DEBUG_MSG << "(promptSession=" << promptSession.get() << ")";
 
     m_promptSessions.removeAll(promptSession);
 }
@@ -474,26 +474,26 @@
         static_cast<Session*>(child)->stopPromptSessions();
     }
 
-    QVector<std::shared_ptr<ms::PromptSession>> copy(m_promptSessions);
-    QVectorIterator<std::shared_ptr<ms::PromptSession>> it(copy);
+    QVector<qtmir::PromptSession> copy(m_promptSessions);
+    QVectorIterator<qtmir::PromptSession> it(copy);
     for ( it.toBack(); it.hasPrevious(); ) {
-        std::shared_ptr<ms::PromptSession> promptSession = it.previous();
+        qtmir::PromptSession promptSession = it.previous();
         DEBUG_MSG << " - promptSession=" << promptSession.get();
 
         m_promptSessionManager->stopPromptSession(promptSession);
     }
 }
 
-std::shared_ptr<ms::PromptSession> Session::activePromptSession() const
+qtmir::PromptSession Session::activePromptSession() const
 {
     if (m_promptSessions.count() > 0)
         return m_promptSessions.back();
-    return nullptr;
+    return {};
 }
 
-void Session::foreachPromptSession(const std::function<void(const std::shared_ptr<ms::PromptSession>&)>& f) const
+void Session::foreachPromptSession(const std::function<void(const qtmir::PromptSession&)>& f) const
 {
-    Q_FOREACH (std::shared_ptr<ms::PromptSession> promptSession, m_promptSessions) {
+    Q_FOREACH (qtmir::PromptSession promptSession, m_promptSessions) {
         f(promptSession);
     }
 }

=== modified file 'miral-qt/src/modules/Unity/Application/session.h'
--- miral-qt/src/modules/Unity/Application/session.h	2016-10-05 15:31:59 +0000
+++ miral-qt/src/modules/Unity/Application/session.h	2016-10-10 13:04:19 +0000
@@ -77,15 +77,15 @@
 
     std::shared_ptr<mir::scene::Session> session() const override;
 
-    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
-    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f) const override;
+    PromptSession activePromptSession() const override;
+    void foreachPromptSession(const std::function<void(const PromptSession&)> &f) const override;
 
     SessionModel* childSessions() const override;
 
     void setFullscreen(bool fullscreen) override;
     void setLive(const bool) override;
-    void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>& session) override;
-    void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>& session) override;
+    void appendPromptSession(const PromptSession& session) override;
+    void removePromptSession(const PromptSession& session) override;
 
     // useful for tests
     void setSuspendTimer(AbstractTimer *timer);
@@ -118,7 +118,7 @@
     State m_state;
     bool m_live;
     AbstractTimer* m_suspendTimer{nullptr};
-    QVector<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
+    QVector<PromptSession> m_promptSessions;
     std::shared_ptr<PromptSessionManager> const m_promptSessionManager;
     QList<MirSurfaceInterface*> m_closingSurfaces;
     bool m_hadSurface{false};

=== modified file 'miral-qt/src/modules/Unity/Application/session_interface.h'
--- miral-qt/src/modules/Unity/Application/session_interface.h	2016-09-30 14:04:24 +0000
+++ miral-qt/src/modules/Unity/Application/session_interface.h	2016-10-10 13:04:19 +0000
@@ -33,7 +33,6 @@
 namespace mir {
     namespace scene {
         class Session;
-        class PromptSession;
     }
 }
 
@@ -41,6 +40,7 @@
 
 class MirSurfaceInterface;
 class MirSurfaceListModel;
+class PromptSession;
 
 class SessionInterface : public QObject {
     Q_OBJECT
@@ -106,13 +106,13 @@
     virtual void removeChildSession(SessionInterface* session) = 0;
     virtual void foreachChildSession(const std::function<void(SessionInterface* session)>& f) const = 0;
 
-    virtual std::shared_ptr<mir::scene::PromptSession> activePromptSession() const = 0;
-    virtual void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>& f) const = 0;
+    virtual PromptSession activePromptSession() const = 0;
+    virtual void foreachPromptSession(const std::function<void(const PromptSession&)>& f) const = 0;
 
     virtual void setFullscreen(bool fullscreen) = 0;
     virtual void setLive(const bool) = 0;
-    virtual void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>& session) = 0;
-    virtual void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>& session) = 0;
+    virtual void appendPromptSession(const PromptSession& session) = 0;
+    virtual void removePromptSession(const PromptSession& session) = 0;
 
 Q_SIGNALS:
     void applicationChanged(unity::shell::application::ApplicationInfoInterface* application);

=== modified file 'miral-qt/src/modules/Unity/Application/sessionmanager.cpp'
--- miral-qt/src/modules/Unity/Application/sessionmanager.cpp	2016-10-05 16:08:44 +0000
+++ miral-qt/src/modules/Unity/Application/sessionmanager.cpp	2016-10-10 13:04:19 +0000
@@ -27,6 +27,7 @@
 #include "logging.h"
 #include "nativeinterface.h"
 #include "promptsessionlistener.h"
+#include "promptsession.h"
 
 // mir
 #include <mir/scene/prompt_session.h>
@@ -155,7 +156,7 @@
     Q_EMIT sessionStopping(qmlSession);
 }
 
-void SessionManager::onPromptSessionStarting(const std::shared_ptr<ms::PromptSession>& promptSession)
+void SessionManager::onPromptSessionStarting(const qtmir::PromptSession &promptSession)
 {
     qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStarting - promptSession=" << promptSession.get();
 
@@ -169,7 +170,7 @@
     }
 }
 
-void SessionManager::onPromptSessionStopping(const std::shared_ptr<ms::PromptSession>& promptSession)
+void SessionManager::onPromptSessionStopping(const qtmir::PromptSession &promptSession)
 {
     qCDebug(QTMIR_SESSIONS) << "SessionManager::onPromptSessionStopping - promptSession=" << promptSession.get();
 

=== modified file 'miral-qt/src/modules/Unity/Application/sessionmanager.h'
--- miral-qt/src/modules/Unity/Application/sessionmanager.h	2016-10-05 15:31:59 +0000
+++ miral-qt/src/modules/Unity/Application/sessionmanager.h	2016-10-10 13:04:19 +0000
@@ -70,8 +70,8 @@
     void onSessionStarting(const miral::ApplicationInfo &appInfo);
     void onSessionStopping(const miral::ApplicationInfo &appInfo);
 
-    void onPromptSessionStarting(const std::shared_ptr<mir::scene::PromptSession>& promptSession);
-    void onPromptSessionStopping(const std::shared_ptr<mir::scene::PromptSession>& promptSession);
+    void onPromptSessionStarting(const PromptSession& promptSession);
+    void onPromptSessionStopping(const PromptSession& promptSession);
     void onPromptProviderAdded(const mir::scene::PromptSession *, const std::shared_ptr<mir::scene::Session> &);
     void onPromptProviderRemoved(const mir::scene::PromptSession *, const std::shared_ptr<mir::scene::Session> &);
 

=== modified file 'miral-qt/src/platforms/mirserver/CMakeLists.txt'
--- miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-05 16:59:28 +0000
+++ miral-qt/src/platforms/mirserver/CMakeLists.txt	2016-10-10 13:04:19 +0000
@@ -87,7 +87,7 @@
     tracepoints.c
     mirserverhooks.cpp mirserverhooks.h
     openglcontextfactory.cpp openglcontextfactory.h
-    promptsessionmanager.cpp promptsessionmanager.h
+    promptsessionmanager.cpp promptsessionmanager.h promptsession.h
     setqtcompositor.cpp setqtcompositor.h
 # We need to run moc on these headers
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

=== added file 'miral-qt/src/platforms/mirserver/promptsession.h'
--- miral-qt/src/platforms/mirserver/promptsession.h	1970-01-01 00:00:00 +0000
+++ miral-qt/src/platforms/mirserver/promptsession.h	2016-10-10 13:04:19 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef QTMIR_PROMPTSESSION_H
+#define QTMIR_PROMPTSESSION_H
+
+#include <memory>
+
+namespace mir {
+namespace scene {
+class PromptSession;
+}
+}
+
+namespace qtmir {
+class PromptSession
+{
+public:
+    // Intentionally promiscuous converting constructor
+    PromptSession(const std::shared_ptr<mir::scene::PromptSession> &promptSession) :
+        m_promptSession{promptSession} {}
+
+    PromptSession() = default;
+    PromptSession(const PromptSession &that) = default;
+    PromptSession& operator=(const PromptSession &rhs) = default;
+    ~PromptSession() = default;
+
+    mir::scene::PromptSession* get() const { return m_promptSession.get(); }
+
+    friend bool operator==(const PromptSession &lhs, const PromptSession &rhs)
+        { return lhs.m_promptSession == rhs.m_promptSession; }
+
+    friend bool operator==(const PromptSession &lhs, mir::scene::PromptSession *rhs)
+        { return lhs.m_promptSession.get() == rhs; }
+
+    friend bool operator==(mir::scene::PromptSession *lhs, const PromptSession &rhs)
+        { return lhs == rhs.m_promptSession.get(); }
+
+    // Intentionally promiscuous converting operator
+    operator std::shared_ptr<mir::scene::PromptSession> const&() const { return m_promptSession; }
+
+private:
+    std::shared_ptr<mir::scene::PromptSession> m_promptSession;
+};
+}
+
+#endif //QTMIR_PROMPTSESSION_H

=== modified file 'miral-qt/src/platforms/mirserver/promptsessionmanager.cpp'
--- miral-qt/src/platforms/mirserver/promptsessionmanager.cpp	2016-10-05 16:08:44 +0000
+++ miral-qt/src/platforms/mirserver/promptsessionmanager.cpp	2016-10-10 13:04:19 +0000
@@ -15,33 +15,33 @@
  */
 
 #include "promptsessionmanager.h"
+#include "promptsession.h"
 
 #include <mir/scene/prompt_session_manager.h>
 
-qtmir::PromptSessionManager::PromptSessionManager(std::shared_ptr<mir::scene::PromptSessionManager> const& promptSessionManager) :
+qtmir::PromptSessionManager::PromptSessionManager(std::shared_ptr<mir::scene::PromptSessionManager> const &promptSessionManager) :
     m_promptSessionManager{promptSessionManager}
 {
 }
 
 qtmir::PromptSessionManager::~PromptSessionManager() = default;
 
-miral::Application qtmir::PromptSessionManager::applicationFor(
-    std::shared_ptr<mir::scene::PromptSession> const& promptSession) const
+miral::Application qtmir::PromptSessionManager::applicationFor(const PromptSession &promptSession) const
 {
     return m_promptSessionManager->application_for(promptSession);
 }
 
-void qtmir::PromptSessionManager::stopPromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const
+void qtmir::PromptSessionManager::stopPromptSession(const PromptSession &promptSession) const
 {
     m_promptSessionManager->stop_prompt_session(promptSession);
 }
 
-void qtmir::PromptSessionManager::suspendPromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const
+void qtmir::PromptSessionManager::suspendPromptSession(const PromptSession &promptSession) const
 {
     m_promptSessionManager->suspend_prompt_session(promptSession);
 }
 
-void qtmir::PromptSessionManager::resumePromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const
+void qtmir::PromptSessionManager::resumePromptSession(const PromptSession &promptSession) const
 {
     m_promptSessionManager->resume_prompt_session(promptSession);
 }

=== modified file 'miral-qt/src/platforms/mirserver/promptsessionmanager.h'
--- miral-qt/src/platforms/mirserver/promptsessionmanager.h	2016-10-05 16:08:44 +0000
+++ miral-qt/src/platforms/mirserver/promptsessionmanager.h	2016-10-10 13:04:19 +0000
@@ -23,23 +23,23 @@
 
 namespace mir {
 namespace scene {
-class PromptSession;
 class PromptSessionManager;
 }
 }
 
 namespace qtmir {
+class PromptSession;
 class PromptSessionManager
 {
 public:
-    explicit PromptSessionManager(std::shared_ptr<mir::scene::PromptSessionManager> const& promptSessionManager);
+    explicit PromptSessionManager(const std::shared_ptr<mir::scene::PromptSessionManager> &promptSessionManager);
     virtual ~PromptSessionManager();
 
-    miral::Application applicationFor(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const;
+    miral::Application applicationFor(qtmir::PromptSession const &promptSession) const;
 
-    void stopPromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const;
-    void suspendPromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const;
-    void resumePromptSession(std::shared_ptr<mir::scene::PromptSession> const& promptSession) const;
+    void stopPromptSession(qtmir::PromptSession const &promptSession) const;
+    void suspendPromptSession(qtmir::PromptSession const &promptSession) const;
+    void resumePromptSession(qtmir::PromptSession const &promptSession) const;
 
 private:
     std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;

=== modified file 'miral-qt/tests/framework/fake_session.cpp'
--- miral-qt/tests/framework/fake_session.cpp	2016-08-16 14:15:26 +0000
+++ miral-qt/tests/framework/fake_session.cpp	2016-10-10 13:04:19 +0000
@@ -16,6 +16,8 @@
 
 #include "fake_session.h"
 
+#include "promptsession.h"
+
 namespace qtmir
 {
 
@@ -94,20 +96,20 @@
 
 void FakeSession::foreachChildSession(const std::function<void (SessionInterface *)> &) const {}
 
-std::shared_ptr<mir::scene::PromptSession> FakeSession::activePromptSession() const
+qtmir::PromptSession FakeSession::activePromptSession() const
 {
-    return std::shared_ptr<mir::scene::PromptSession>();
+    return {};
 }
 
-void FakeSession::foreachPromptSession(const std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)> &) const {}
+void FakeSession::foreachPromptSession(const std::function<void (const qtmir::PromptSession &)> &) const {}
 
 void FakeSession::setFullscreen(bool) {}
 
 void FakeSession::setLive(const bool) {}
 
-void FakeSession::appendPromptSession(const std::shared_ptr<mir::scene::PromptSession> &) {}
+void FakeSession::appendPromptSession(const qtmir::PromptSession &) {}
 
-void FakeSession::removePromptSession(const std::shared_ptr<mir::scene::PromptSession> &) {}
+void FakeSession::removePromptSession(const qtmir::PromptSession &) {}
 
 void FakeSession::setState(SessionInterface::State state)
 {

=== modified file 'miral-qt/tests/framework/fake_session.h'
--- miral-qt/tests/framework/fake_session.h	2016-09-30 19:28:12 +0000
+++ miral-qt/tests/framework/fake_session.h	2016-10-10 13:04:19 +0000
@@ -70,13 +70,13 @@
     void removeChildSession(SessionInterface*) override;
     void foreachChildSession(const std::function<void(SessionInterface* session)> &) const override;
 
-    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
-    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &) const override;
+    PromptSession activePromptSession() const override;
+    void foreachPromptSession(const std::function<void(const PromptSession&)> &) const override;
 
     void setFullscreen(bool) override;
     void setLive(const bool) override;
-    void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override;
-    void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>&) override;
+    void appendPromptSession(const PromptSession&) override;
+    void removePromptSession(const PromptSession&) override;
 
     // For tests
 

=== modified file 'miral-qt/tests/framework/mock_session.h'
--- miral-qt/tests/framework/mock_session.h	2016-08-16 14:15:26 +0000
+++ miral-qt/tests/framework/mock_session.h	2016-10-10 13:04:19 +0000
@@ -18,6 +18,7 @@
 #define MOCK_QTMIR_SESSION_H
 
 #include <Unity/Application/session_interface.h>
+#include "promptsession.h"
 #include <gmock/gmock.h>
 
 namespace qtmir {
@@ -59,8 +60,8 @@
     MOCK_METHOD1(removeChildSession, void(SessionInterface* session));
     MOCK_CONST_METHOD1(foreachChildSession, void(const std::function<void(SessionInterface* session)> &f));
 
-    MOCK_CONST_METHOD0(activePromptSession, std::shared_ptr<mir::scene::PromptSession>());
-    MOCK_CONST_METHOD1(foreachPromptSession, void(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f));
+    MOCK_CONST_METHOD0(activePromptSession, qtmir::PromptSession());
+    MOCK_CONST_METHOD1(foreachPromptSession, void(const std::function<void(const qtmir::PromptSession&)> &f));
 
     void setState(State state);
 
@@ -72,8 +73,8 @@
 protected:
     MOCK_METHOD1(setFullscreen, void(bool fullscreen));
     MOCK_METHOD1(setLive, void(const bool));
-    MOCK_METHOD1(appendPromptSession, void(const std::shared_ptr<mir::scene::PromptSession>& session));
-    MOCK_METHOD1(removePromptSession, void(const std::shared_ptr<mir::scene::PromptSession>& session));
+    MOCK_METHOD1(appendPromptSession, void(const qtmir::PromptSession& session));
+    MOCK_METHOD1(removePromptSession, void(const qtmir::PromptSession& session));
 
 private:
     State m_state;

=== modified file 'miral-qt/tests/modules/SessionManager/session_manager_test.cpp'
--- miral-qt/tests/modules/SessionManager/session_manager_test.cpp	2016-10-05 15:31:59 +0000
+++ miral-qt/tests/modules/SessionManager/session_manager_test.cpp	2016-10-10 13:04:19 +0000
@@ -18,6 +18,7 @@
 #include <condition_variable>
 #include <QSignalSpy>
 
+#include "promptsession.h"
 #include <Unity/Application/session.h>
 
 #include "qtmir_test.h"
@@ -33,9 +34,9 @@
     SessionManagerTests()
     {}
 
-    QList<std::shared_ptr<ms::PromptSession>> listPromptSessions(SessionInterface* session) {
-        QList<std::shared_ptr<ms::PromptSession>> promptSessions;
-        session->foreachPromptSession([&promptSessions](const std::shared_ptr<ms::PromptSession>& promptSession) {
+    QList<qtmir::PromptSession> listPromptSessions(SessionInterface* session) {
+        QList<qtmir::PromptSession> promptSessions;
+        session->foreachPromptSession([&promptSessions](const qtmir::PromptSession &promptSession) {
             promptSessions << promptSession;
         });
         return promptSessions;
@@ -61,7 +62,7 @@
     SessionInterface* qtmirAppSession = sessionManager.findSession(mirAppSession.get());
     EXPECT_TRUE(qtmirAppSession != nullptr);
 
-    auto promptSession = std::make_shared<ms::MockPromptSession>();
+    qtmir::PromptSession promptSession{std::make_shared<ms::MockPromptSession>()};
     ON_CALL(*stubPromptSessionManager, application_for(_)).WillByDefault(Return(mirAppSession));
 
     sessionManager.onPromptSessionStarting(promptSession);

=== modified file 'miral-qt/tests/modules/SessionManager/session_test.cpp'
--- miral-qt/tests/modules/SessionManager/session_test.cpp	2016-10-06 13:57:18 +0000
+++ miral-qt/tests/modules/SessionManager/session_test.cpp	2016-10-10 13:04:19 +0000
@@ -17,6 +17,7 @@
 #include <qtmir_test.h>
 #include <fake_mirsurface.h>
 
+#include "promptsession.h"
 #include <Unity/Application/application.h>
 #include <Unity/Application/mirsurfaceitem.h>
 
@@ -226,8 +227,8 @@
     }
     EXPECT_EQ(Session::Running, session->state());
 
-    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
-    session->appendPromptSession(mirPromptSession);
+    qtmir::PromptSession promptSession{std::make_shared<ms::MockPromptSession>()};
+    session->appendPromptSession(promptSession);
 
     EXPECT_CALL(*stubPromptSessionManager, suspend_prompt_session(_)).Times(1);
 
@@ -264,8 +265,8 @@
     session->doSuspend();
     EXPECT_EQ(Session::Suspended, session->state());
 
-    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
-    session->appendPromptSession(mirPromptSession);
+    qtmir::PromptSession promptSession{std::make_shared<ms::MockPromptSession>()};
+    session->appendPromptSession(promptSession);
 
     EXPECT_CALL(*stubPromptSessionManager, resume_prompt_session(_)).Times(1);