diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-25 15:35:01 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-25 15:42:18 +0000 |
| commit | 51dcf7c46170b272ed7a63f9dfe1169e90041be8 (patch) | |
| tree | 8f8d55fb7f14c2b8216a218dd466c5f29c0dfc32 | |
| parent | 2c1606d13eb04ab9058cfaed2296628fe1ce4ebd (diff) | |
Compile with a namespaced build
Change-Id: I839b3bc2f4fbf67bd381bd82fdaf19f7eb096454
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
6 files changed, 18 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h index 2032b9a26..1019fdc15 100644 --- a/src/compositor/compositor_api/qwaylandpointer.h +++ b/src/compositor/compositor_api/qwaylandpointer.h @@ -39,6 +39,8 @@ #include <QtWaylandCompositor/QWaylandCompositorExtension> +struct wl_resource; + QT_BEGIN_NAMESPACE class QWaylandPointer; @@ -75,7 +77,7 @@ public: virtual void addClient(QWaylandClient *client, uint32_t id, uint32_t version); - struct wl_resource *focusResource() const; + wl_resource *focusResource() const; static uint32_t toWaylandButton(Qt::MouseButton button); void sendButton(struct wl_resource *resource, uint32_t time, Qt::MouseButton button, uint32_t state); diff --git a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp index 4e61e7f8a..0eb85b0c6 100644 --- a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp +++ b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp @@ -113,3 +113,5 @@ void QWaylandSurfaceGrabber::grab() d->surface->compositor()->grabSurface(this, buf); } + +QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h index b93b6d21d..06a484de0 100644 --- a/src/compositor/compositor_api/qwaylandtouch.h +++ b/src/compositor/compositor_api/qwaylandtouch.h @@ -42,6 +42,8 @@ #include <QtCore/QObject> #include <QtGui/QTouchEvent> +struct wl_resource; + QT_BEGIN_NAMESPACE class QWaylandTouch; @@ -68,7 +70,7 @@ public: virtual void addClient(QWaylandClient *client, uint32_t id, uint32_t version); - struct wl_resource *focusResource() const; + wl_resource *focusResource() const; QWaylandView *mouseFocus() const; private: diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h index 34771037c..b2d4780ab 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h @@ -78,4 +78,6 @@ public: virtual bool mouseReleaseEvent(QMouseEvent *) { return false; } }; +QT_END_NAMESPACE + #endif // QWAYLANDQUICKSHELLSURFACEITEM_P_H diff --git a/src/compositor/extensions/qwaylandwlshellintegration.cpp b/src/compositor/extensions/qwaylandwlshellintegration.cpp index 8eb0ba3be..ef4e1efc6 100644 --- a/src/compositor/extensions/qwaylandwlshellintegration.cpp +++ b/src/compositor/extensions/qwaylandwlshellintegration.cpp @@ -42,6 +42,8 @@ #include <QtWaylandCompositor/QWaylandInputDevice> #include <QGuiApplication> +QT_BEGIN_NAMESPACE + namespace QtWayland { WlShellIntegration::WlShellIntegration(QWaylandQuickShellSurfaceItem *item) @@ -247,3 +249,5 @@ void WlShellIntegration::setFilterEnabled(bool enabled) } } + +QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp index 3a22cce08..f77f69273 100644 --- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp @@ -41,6 +41,8 @@ #include <QtWaylandCompositor/QWaylandInputDevice> #include <QMouseEvent> +QT_BEGIN_NAMESPACE + namespace QtWayland { XdgShellIntegration::XdgShellIntegration(QWaylandQuickShellSurfaceItem *item) @@ -167,3 +169,5 @@ void XdgShellIntegration::handleSurfaceSizeChanged() } } + +QT_END_NAMESPACE |