From 91f5d6a99d5f22334e33624126e881b3228c5ce2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 6 Feb 2017 19:43:07 +0100
Subject: fix namespaced build - yet again

Change-Id: Ie68c4318237c44c81e6bd4b3e792f2af7bd52675
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
---
 src/compositor/extensions/qwaylandiviapplication.h | 4 ++--
 src/compositor/extensions/qwaylandivisurface.h     | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/compositor/extensions/qwaylandiviapplication.h b/src/compositor/extensions/qwaylandiviapplication.h
index c3497b96d..1db45416f 100644
--- a/src/compositor/extensions/qwaylandiviapplication.h
+++ b/src/compositor/extensions/qwaylandiviapplication.h
@@ -40,13 +40,13 @@
 #include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtCore/QSize>
 
+QT_BEGIN_NAMESPACE
+
 class QWaylandIviSurface;
 class QWaylandSurface;
 class QWaylandResource;
 class QWaylandIviApplicationPrivate;
 
-QT_BEGIN_NAMESPACE
-
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandIviApplication : public QWaylandCompositorExtensionTemplate<QWaylandIviApplication>
 {
     Q_OBJECT
diff --git a/src/compositor/extensions/qwaylandivisurface.h b/src/compositor/extensions/qwaylandivisurface.h
index 669a1e2de..e362eecb9 100644
--- a/src/compositor/extensions/qwaylandivisurface.h
+++ b/src/compositor/extensions/qwaylandivisurface.h
@@ -39,14 +39,15 @@
 
 #include <QtWaylandCompositor/QWaylandShellSurface>
 
+class wl_resource;
+
+QT_BEGIN_NAMESPACE
+
 class QWaylandIviSurfacePrivate;
 class QWaylandSurface;
 class QWaylandIviApplication;
 class QWaylandSurfaceRole;
 class QWaylandResource;
-class wl_resource;
-
-QT_BEGIN_NAMESPACE
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandIviSurface : public QWaylandShellSurfaceTemplate<QWaylandIviSurface>
 {
-- 
cgit v1.2.3