From 90b66d4c46bdd49387a72fed0475fdcbd86fcbf7 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Date: Thu, 19 May 2016 11:45:28 +0200
Subject: [PATCH] Move QWaylandClientExtension out of namespace

The class name already has a QWaylandClient prefix. We don't need
QtWaylandClient:: in addition.

Change-Id: I42f16d43fe414e3388dfdb924e96d9fc2b0b4ba9
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
---
 .../platforms/wayland/global/qwaylandclientextension.cpp  | 8 ++------
 .../platforms/wayland/global/qwaylandclientextension.h    | 7 +++----
 .../platforms/wayland/global/qwaylandclientextension_p.h  | 6 +-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
index 95616f7e8f1..04aca8c2e12 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
@@ -43,8 +43,6 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWaylandClient {
-
 QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
     : QObjectPrivate()
     , waylandIntegration(NULL)
@@ -57,7 +55,7 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
     if (QGuiApplication::platformNativeInterface()) {
         waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display"));
     } else {
-        waylandIntegration = new QWaylandIntegration();
+        waylandIntegration = new QtWaylandClient::QWaylandIntegration();
         waylandDisplay = waylandIntegration->display()->wl_display();
     }
 
@@ -84,7 +82,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
     d->version = ver;
 }
 
-QWaylandIntegration *QWaylandClientExtension::integration() const
+QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
 {
     Q_D(const QWaylandClientExtension);
     return d->waylandIntegration;
@@ -111,6 +109,4 @@ bool QWaylandClientExtension::isActive() const
     return d->active;
 }
 
-}
-
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.h b/src/plugins/platforms/wayland/global/qwaylandclientextension.h
index 7fd1132cc88..a3de0aa4b8c 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension.h
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.h
@@ -44,8 +44,9 @@
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
-
 class QWaylandIntegration;
+}
+
 class QWaylandClientExtensionPrivate;
 class QWaylandClientExtensionTemplatePrivate;
 
@@ -58,7 +59,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
 public:
     QWaylandClientExtension(const int version);
 
-    QWaylandIntegration *integration() const;
+    QtWaylandClient::QWaylandIntegration *integration() const;
     int version() const;
     bool isActive() const;
 
@@ -101,8 +102,6 @@ public:
     }
 };
 
-}
-
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTEXTENSION_H
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
index 9287ee95a50..70cf36c3da9 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
@@ -55,15 +55,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWaylandClient {
-
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate, public QtWayland::wl_registry
 {
     Q_DECLARE_PUBLIC(QWaylandClientExtension)
 public:
     QWaylandClientExtensionPrivate();
 
-    QWaylandIntegration *waylandIntegration;
+    QtWaylandClient::QWaylandIntegration *waylandIntegration;
     int version;
     bool active;
 
@@ -79,8 +77,6 @@ public:
     { }
 };
 
-}
-
 QT_END_NAMESPACE
 
 #endif  /*QWAYLANDCLIENTEXTENSION_P_H*/