diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-19 11:45:28 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-19 12:00:35 +0000 |
| commit | 966af2d2d1b1cdaa9cc12ccbed5d3433612a35e6 (patch) | |
| tree | 8ccee37f8e732991510244c4e6d36a366bbd7ebd /src/client | |
| parent | ca7d95494ccac9bc26c1edee86fc5b9229fa5e3e (diff) | |
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>
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/global/qwaylandclientextension.cpp | 8 | ||||
| -rw-r--r-- | src/client/global/qwaylandclientextension.h | 7 | ||||
| -rw-r--r-- | src/client/global/qwaylandclientextension_p.h | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/client/global/qwaylandclientextension.cpp b/src/client/global/qwaylandclientextension.cpp index 95616f7e8..04aca8c2e 100644 --- a/src/client/global/qwaylandclientextension.cpp +++ b/src/client/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/client/global/qwaylandclientextension.h b/src/client/global/qwaylandclientextension.h index 7fd1132cc..a3de0aa4b 100644 --- a/src/client/global/qwaylandclientextension.h +++ b/src/client/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/client/global/qwaylandclientextension_p.h b/src/client/global/qwaylandclientextension_p.h index 9287ee95a..70cf36c3d 100644 --- a/src/client/global/qwaylandclientextension_p.h +++ b/src/client/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*/ |