Fix namespaced build

Change-Id: Id73f8ddffe00359f38c634fc88b1f81ac5638653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

8 files changed, 23 insertions, 8 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 7c6451ee..740f2553 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -47,6 +47,8 @@
 #include <QImage>
 #include <QRect>
 
+struct wl_display;
+
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
@@ -86,7 +88,7 @@ public:
 
     void addGlobalInterface(QWaylandGlobalInterface *interface);
     void addDefaultShell();
-    struct wl_display *waylandDisplay() const;
+    ::wl_display *waylandDisplay() const;
 
     void frameStarted();
     void sendFrameCallbacks(QList<QWaylandSurface *> visibleSurfaces);
diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h
index c97d7c17..2c0b9ee7 100644
--- a/src/compositor/compositor_api/qwaylandinput.h
+++ b/src/compositor/compositor_api/qwaylandinput.h
@@ -47,14 +47,14 @@
 
 #include <QtCompositor/qwaylandexport.h>
 
+QT_BEGIN_NAMESPACE
+
 class QWaylandCompositor;
 class QWaylandSurface;
 class QKeyEvent;
 class QTouchEvent;
 class QWaylandSurfaceView;
 
-QT_BEGIN_NAMESPACE
-
 namespace QtWayland {
 class InputDevice;
 }
diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.h b/src/compositor/compositor_api/qwaylandsurfaceitem.h
index 1764c024..716f1d68 100644
--- a/src/compositor/compositor_api/qwaylandsurfaceitem.h
+++ b/src/compositor/compositor_api/qwaylandsurfaceitem.h
@@ -51,13 +51,13 @@
 #include <QtCompositor/qwaylandsurfaceview.h>
 #include <QtCompositor/qwaylandquicksurface.h>
 
+Q_DECLARE_METATYPE(QWaylandQuickSurface*)
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandSurfaceTextureProvider;
 class QMutex;
 
-Q_DECLARE_METATYPE(QWaylandQuickSurface*)
-
 class Q_COMPOSITOR_EXPORT QWaylandSurfaceItem : public QQuickItem, public QWaylandSurfaceView
 {
     Q_OBJECT
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
index 6fd7276a..7f08315a 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
@@ -47,12 +47,13 @@
 
 #include <QtCompositor/qwaylandexport.h>
 
+struct wl_client;
+struct wl_resource;
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandCompositor;
 class QOpenGLContext;
-struct wl_client;
-struct wl_resource;
 
 namespace QtWayland {
 class Display;
diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h
index 922c7f10..599f79b6 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor_p.h
+++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h
@@ -217,7 +217,7 @@ protected:
 
     bool m_retainSelection;
 
-    friend class ::QWaylandCompositor;
+    friend class QT_PREPEND_NAMESPACE(QWaylandCompositor);
 };
 
 }
diff --git a/src/compositor/wayland_wrapper/qwlkeyboard.cpp b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
index 2642480f..67ad3b72 100644
--- a/src/compositor/wayland_wrapper/qwlkeyboard.cpp
+++ b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
@@ -54,6 +54,8 @@
 #include <sys/types.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 namespace QtWayland {
 
 Keyboard::Keyboard(Compositor *compositor, InputDevice *seat)
@@ -355,3 +357,5 @@ void Keyboard::createXKBKeymap()
 #endif
 
 } // namespace QtWayland
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwlpointer.cpp b/src/compositor/wayland_wrapper/qwlpointer.cpp
index 4c3cc3b4..4363ed0f 100644
--- a/src/compositor/wayland_wrapper/qwlpointer.cpp
+++ b/src/compositor/wayland_wrapper/qwlpointer.cpp
@@ -48,6 +48,8 @@
 #include "qwaylandcompositor.h"
 #include "qwaylandsurfaceview.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace QtWayland {
 
 using QtWaylandServer::wl_keyboard;
@@ -325,3 +327,5 @@ PointerGrabber::~PointerGrabber()
 }
 
 } // namespace QtWayland
+
+QT_END_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp
index 8824cd09..85f065b5 100644
--- a/src/compositor/wayland_wrapper/qwltouch.cpp
+++ b/src/compositor/wayland_wrapper/qwltouch.cpp
@@ -45,6 +45,8 @@
 #include "qwlsurface_p.h"
 #include "qwaylandsurfaceview.h"
 
+QT_BEGIN_NAMESPACE
+
 namespace QtWayland {
 
 Touch::Touch(Compositor *compositor)
@@ -170,3 +172,5 @@ void TouchGrabber::setTouch(Touch *touch)
 }
 
 } // namespace QtWayland
+
+QT_END_NAMESPACE