← Back to branch summary

~aacid/qtmir/fix_leaks_application_manager_test

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/mirsurfacemanager.h

  • Committer: CI Train Bot
  • Author(s): Alan Griffiths
  • Date: 2016-05-20 08:41:29 UTC
  • mfrom: (484.2.11 qtmir0)
  • Revision ID: ci-train-bot@canonical.com-20160520084129-co95olzpjkt1z4lh
Reduce coupling to MirServer - it has  been misused as a context object.
Approved by: Alan Griffiths, Unity8 CI Bot, Daniel d'Andrada

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfacemanager.h
41
41
    namespace shell { class Shell; }
42
42
}
43
43
 
44
 
class MirServer;
45
44
class SurfaceObserver;
46
45
 
47
46
namespace qtmir {
57
56
    Q_PROPERTY(MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
58
57
public:
59
58
    explicit MirSurfaceManager(
60
 
        const QSharedPointer<MirServer>& mirServer,
61
 
        mir::shell::Shell *shell,
 
59
        mir::shell::Shell* shell,
62
60
        SessionManager* sessionManager,
63
 
        QObject *parent = 0
 
61
        QObject* parent = nullptr
64
62
    );
65
63
    ~MirSurfaceManager();
66
64
 
85
83
    QMutex m_mutex;
86
84
 
87
85
private:
88
 
    QSharedPointer<MirServer> m_mirServer;
89
86
    mir::shell::Shell *const m_shell;
90
87
    SessionManager* m_sessionManager;
91
88
    static MirSurfaceManager *instance;