Fix namespaced build

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

15 files changed, 45 insertions, 10 deletions

diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp
index 2cb1b3624..712beafa5 100644
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/qwindow-compositor/qwindowcompositor.cpp
@@ -55,6 +55,8 @@
 #include <QtCompositor/qwaylandbufferref.h>
 #include <QtCompositor/qwaylandsurfaceview.h>
 
+QT_BEGIN_NAMESPACE
+
 static GLuint textureFromImage(const QImage &image)
 {
     GLuint texture = 0;
@@ -464,3 +466,5 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event)
     }
     return false;
 }
+
+QT_END_NAMESPACE
diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h
index a366b8951..f075c151d 100644
--- a/examples/qwindow-compositor/qwindowcompositor.h
+++ b/examples/qwindow-compositor/qwindowcompositor.h
@@ -50,6 +50,8 @@
 #include <QObject>
 #include <QTimer>
 
+QT_BEGIN_NAMESPACE
+
 class QWaylandSurfaceView;
 
 class QWindowCompositor : public QObject, public QWaylandCompositor
@@ -109,4 +111,6 @@ private:
     Qt::KeyboardModifiers m_modifiers;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWINDOWCOMPOSITOR_H
diff --git a/examples/qwindow-compositor/textureblitter.cpp b/examples/qwindow-compositor/textureblitter.cpp
index fc002040c..d7d569e64 100644
--- a/examples/qwindow-compositor/textureblitter.cpp
+++ b/examples/qwindow-compositor/textureblitter.cpp
@@ -44,6 +44,8 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>
 
+QT_BEGIN_NAMESPACE
+
 TextureBlitter::TextureBlitter()
     : m_shaderProgram(new QOpenGLShaderProgram)
 {
@@ -160,3 +162,5 @@ void TextureBlitter::drawTexture(int textureId, const QRectF &targetRect, const
     currentContext->functions()->glDisableVertexAttribArray(m_vertexCoordEntry);
     currentContext->functions()->glDisableVertexAttribArray(m_textureCoordEntry);
 }
+
+QT_END_NAMESPACE
diff --git a/examples/qwindow-compositor/textureblitter.h b/examples/qwindow-compositor/textureblitter.h
index 8d4e2803c..7426c6f29 100644
--- a/examples/qwindow-compositor/textureblitter.h
+++ b/examples/qwindow-compositor/textureblitter.h
@@ -43,6 +43,8 @@
 
 #include <QtGui/QMatrix4x4>
 
+QT_BEGIN_NAMESPACE
+
 class QOpenGLShaderProgram;
 class TextureBlitter
 {
@@ -64,4 +66,6 @@ private:
     int m_textureCoordEntry;
 };
 
+QT_END_NAMESPACE
+
 #endif // TEXTUREBLITTER_H
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index 867258ade..23e1fc740 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -61,6 +61,8 @@ struct xkb_keymap;
 struct xkb_state;
 #endif
 
+struct wl_cursor_image;
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandWindow;
@@ -81,7 +83,7 @@ public:
     struct ::wl_seat *wl_seat() { return QtWayland::wl_seat::object(); }
 
     void setCursor(Qt::CursorShape cursor, QWaylandScreen *screen);
-    void setCursor(struct wl_buffer *buffer, struct wl_cursor_image *image);
+    void setCursor(struct wl_buffer *buffer, struct ::wl_cursor_image *image);
     void handleWindowDestroyed(QWaylandWindow *window);
 
     void setDataDevice(QWaylandDataDevice *device);
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 7c6451eed..740f2553d 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 c97d7c175..2c0b9ee7c 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 1764c024e..716f1d687 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 6fd7276af..7f08315ae 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 922c7f102..599f79b6d 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 2642480f5..67ad3b727 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 4c3cc3b41..4363ed0f4 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 8824cd09c..85f065b59 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
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
index cce0e91bf..ff6ac51cc 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -65,6 +65,7 @@
 #endif
 
 struct qt_xcomposite;
+struct qt_xcomposite_listener;
 
 QT_BEGIN_NAMESPACE
 
@@ -101,7 +102,7 @@ private:
     static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id,
                                       const QString &interface, uint32_t version);
 
-    static const struct qt_xcomposite_listener xcomposite_listener;
+    static const struct ::qt_xcomposite_listener xcomposite_listener;
     static void rootInformation(void *data,
                  struct qt_xcomposite *xcomposite,
                  const char *display_name,
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
index 1751f775f..638b27741 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -60,6 +60,7 @@
 #endif
 
 struct qt_xcomposite;
+struct qt_xcomposite_listener;
 
 QT_BEGIN_NAMESPACE