diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:19:42 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
| commit | fb84a2bfd5ac4d4574df63d0f29d7904e043f123 (patch) | |
| tree | 6e9f3f5d652da07d82a3bc1be70228f525740f25 /src/compositor/compositor_api/qwaylandclient.h | |
| parent | 0dcca22ab39096b60446225f51689df06a6f98e9 (diff) | |
Remove the static instance of a compositor.
All classes that needs to access the compositor instance needs to keep
a reference to it
Change-Id: Ia0d4b04b460200ad3c7907b94c032afe90c18771
Diffstat (limited to 'src/compositor/compositor_api/qwaylandclient.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandclient.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h index d2710d5f5..dde36f79d 100644 --- a/src/compositor/compositor_api/qwaylandclient.h +++ b/src/compositor/compositor_api/qwaylandclient.h @@ -48,6 +48,7 @@ struct wl_client; QT_BEGIN_NAMESPACE class QWaylandClientPrivate; +class QWaylandCompositor; class Q_COMPOSITOR_EXPORT QWaylandClient : public QObject { @@ -60,7 +61,7 @@ class Q_COMPOSITOR_EXPORT QWaylandClient : public QObject public: ~QWaylandClient(); - static QWaylandClient *fromWlClient(wl_client *wlClient); + static QWaylandClient *fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient); wl_client *client() const; @@ -75,7 +76,7 @@ public Q_SLOTS: void close(); private: - explicit QWaylandClient(wl_client *client); + explicit QWaylandClient(QWaylandCompositor *compositor, wl_client *client); }; QT_END_NAMESPACE |