← Back to branch summary

~gerboland/qtubuntu/enable-debug-mode

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/window.h

  • Committer: Gerry Boland
  • Date: 2016-06-24 12:36:24 UTC
  • Revision ID: gerry.boland@canonical.com-20160624123624-bdm13kd840xyyezz
Fix up some bad merge decisions, and bump copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/window.h
28
28
#include <EGL/egl.h>
29
29
 
30
30
class UbuntuClipboard;
31
 
class UbuntuClientIntegration;
32
31
class UbuntuNativeInterface;
33
32
class UbuntuInput;
34
33
class UbuntuScreen;
78
77
    mutable QMutex mMutex;
79
78
    const WId mId;
80
79
    const QSharedPointer<UbuntuClipboard> mClipboard;
81
 
    const UbuntuClientIntegration *mIntegration;
82
80
    Qt::WindowState mWindowState;
83
81
    Qt::WindowFlags mWindowFlags;
84
82
    bool mWindowVisible;