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 /examples | |
| 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 'examples')
3 files changed, 0 insertions, 11 deletions
diff --git a/examples/wayland/custom-extension/client/customextension.cpp b/examples/wayland/custom-extension/client/customextension.cpp index 68a1d4b81..050b0d5c2 100644 --- a/examples/wayland/custom-extension/client/customextension.cpp +++ b/examples/wayland/custom-extension/client/customextension.cpp @@ -46,8 +46,6 @@ QT_BEGIN_NAMESPACE -namespace QtWaylandClient { - CustomExtension::CustomExtension() : QWaylandClientExtensionTemplate(/* Supported protocol version */ 1 ) { @@ -68,6 +66,5 @@ void CustomExtension::example_extension_qtevent(struct wl_surface *surface, emit eventReceived(text, value); } -} QT_END_NAMESPACE diff --git a/examples/wayland/custom-extension/client/customextension.h b/examples/wayland/custom-extension/client/customextension.h index 16ace4bfd..a041d5a7e 100644 --- a/examples/wayland/custom-extension/client/customextension.h +++ b/examples/wayland/custom-extension/client/customextension.h @@ -48,8 +48,6 @@ QT_BEGIN_NAMESPACE -namespace QtWaylandClient { - class CustomExtension : public QWaylandClientExtensionTemplate<CustomExtension>, public QtWayland::qt_example_extension { Q_OBJECT @@ -70,8 +68,6 @@ private: }; -} - QT_END_NAMESPACE #endif // CUSTOMEXTENSION_H diff --git a/examples/wayland/custom-extension/client/main.cpp b/examples/wayland/custom-extension/client/main.cpp index fe8ec59a8..8c27fa77d 100644 --- a/examples/wayland/custom-extension/client/main.cpp +++ b/examples/wayland/custom-extension/client/main.cpp @@ -47,8 +47,6 @@ QT_BEGIN_NAMESPACE -namespace QtWaylandClient { - static CustomExtension * extension_global; class CustomIntegrationPlugin : public QPlatformIntegrationPlugin @@ -78,8 +76,6 @@ public: return extension_global->integration(); } -} - QT_END_NAMESPACE #include "main.moc" |