1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QWaylandClientExtension out of namespace

Browse Source 
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>
This commit is contained in:
Paul Olav Tvete 2016-05-19 11:45:28 +02:00
parent 7f97e7116d
commit 90b66d4c46
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
View File

@ -43,8 +43,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate() QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
: QObjectPrivate() : QObjectPrivate()
, waylandIntegration(NULL) , waylandIntegration(NULL)
@ -57,7 +55,7 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
if (QGuiApplication::platformNativeInterface()) { if (QGuiApplication::platformNativeInterface()) {
waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display")); waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display"));
} else { } else {
waylandIntegration = new QWaylandIntegration(); waylandIntegration = new QtWaylandClient::QWaylandIntegration();
waylandDisplay = waylandIntegration->display()->wl_display(); waylandDisplay = waylandIntegration->display()->wl_display();
} }
@ -84,7 +82,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
d->version = ver; d->version = ver;
} }
QWaylandIntegration *QWaylandClientExtension::integration() const QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
{ {
Q_D(const QWaylandClientExtension); Q_D(const QWaylandClientExtension);
return d->waylandIntegration; return d->waylandIntegration;
@ -111,6 +109,4 @@ bool QWaylandClientExtension::isActive() const
return d->active; return d->active;
} }
}
QT_END_NAMESPACE QT_END_NAMESPACE

7
src/plugins/platforms/wayland/global/qwaylandclientextension.h
View File

@ -44,8 +44,9 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtWaylandClient { namespace QtWaylandClient {
class QWaylandIntegration; class QWaylandIntegration;
}
class QWaylandClientExtensionPrivate; class QWaylandClientExtensionPrivate;
class QWaylandClientExtensionTemplatePrivate; class QWaylandClientExtensionTemplatePrivate;
@ -58,7 +59,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
public: public:
QWaylandClientExtension(const int version); QWaylandClientExtension(const int version);
QWaylandIntegration *integration() const; QtWaylandClient::QWaylandIntegration *integration() const;
int version() const; int version() const;
bool isActive() const; bool isActive() const;
@ -101,8 +102,6 @@ public:
} }
}; };
}
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QWAYLANDCLIENTEXTENSION_H #endif // QWAYLANDCLIENTEXTENSION_H

6
src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
View File

@ -55,15 +55,13 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate, public QtWayland::wl_registry class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate, public QtWayland::wl_registry
{ {
Q_DECLARE_PUBLIC(QWaylandClientExtension) Q_DECLARE_PUBLIC(QWaylandClientExtension)
public: public:
QWaylandClientExtensionPrivate(); QWaylandClientExtensionPrivate();
QWaylandIntegration *waylandIntegration; QtWaylandClient::QWaylandIntegration *waylandIntegration;
int version; int version;
bool active; bool active;
@ -79,8 +77,6 @@ public:
{ } { }
}; };
}
QT_END_NAMESPACE QT_END_NAMESPACE
#endif /*QWAYLANDCLIENTEXTENSION_P_H*/ #endif /*QWAYLANDCLIENTEXTENSION_P_H*/