← 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/mirsurfaceitem.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/mirsurfaceitem.h
33
33
 
34
34
#include "session_interface.h"
35
35
 
 
36
namespace mir { namespace shell { class Shell; } }
 
37
 
36
38
class SurfaceObserver;
37
 
class MirShell;
38
39
 
39
40
namespace qtmir {
40
41
 
58
59
public:
59
60
    explicit MirSurfaceItem(std::shared_ptr<mir::scene::Surface> surface,
60
61
                            SessionInterface* session,
61
 
                            MirShell *shell,
 
62
                            mir::shell::Shell *shell,
62
63
                            std::shared_ptr<SurfaceObserver> observer,
63
64
                            QQuickItem *parent = 0);
64
65
    ~MirSurfaceItem();
179
180
 
180
181
    std::shared_ptr<mir::scene::Surface> m_surface;
181
182
    QPointer<SessionInterface> m_session;
182
 
    MirShell *const m_shell;
 
183
    mir::shell::Shell *const m_shell;
183
184
    bool m_firstFrameDrawn;
184
185
    bool m_live;
185
186
    Qt::ScreenOrientation m_orientation; //FIXME -  have to save the state as Mir has no getter for it (bug:1357429)