← Back to branch summary

~mir-team/qtmir/compatibility-with-mir-API-changes

« back to all changes in this revision

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

  • Committer: Alan Griffiths
  • Date: 2015-04-01 13:14:52 UTC
  • mfrom: (266.1.74 qtmir1)
  • Revision ID: alan@octopull.co.uk-20150401131452-hvgkeh0rzxzp8731
merge lp:~alan-griffiths/qtmir/spike-using-WindowManager

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/mirsurfacemanager.h
37
37
        class Session;
38
38
        class PromptSession;
39
39
    }
 
40
    namespace shell {
 
41
        class Shell;
 
42
    }
40
43
}
41
44
 
42
45
class MirServer;
43
 
class MirShell;
44
46
 
45
47
namespace qtmir {
46
48
 
54
56
 
55
57
public:
56
58
    explicit MirSurfaceManager(
57
 
        const QSharedPointer<MirServer>& mirServer,
58
 
        MirShell *shell,
 
59
        mir::shell::Shell *shell,
59
60
        SessionManager* sessionManager,
60
61
        QObject *parent = 0
61
62
    );
81
82
    QMutex m_mutex;
82
83
 
83
84
private:
84
 
    QSharedPointer<MirServer> m_mirServer;
85
 
    MirShell *const m_shell;
 
85
    mir::shell::Shell *const m_shell;
86
86
    SessionManager* m_sessionManager;
87
87
    static MirSurfaceManager *the_surface_manager;
88
88
};