diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-05-18 15:02:48 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-05-19 08:24:10 +0000 |
commit | 8959ccf51ddd61f89ba96f4abf64b5fd41e0d93e (patch) | |
tree | 0d3f584859f75d6bc78ba8d1a493a5859d32aa4b | |
parent | 0f4e9514006799244c896c2d1506811b5f23fcb9 (diff) | |
download | qtwayland-8959ccf51ddd61f89ba96f4abf64b5fd41e0d93e.tar.gz |
Remove empty private class QWaylandExtensionTemplatePrivate
Previous subclasses are now inheriting directly from
QWaylandExtensionPrivate instead.
Change-Id: I33ef88867fcf216a7b1441f69b7025bc2a4367dc
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
12 files changed, 16 insertions, 26 deletions
diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index 8243cfb4..973308f2 100644 --- a/src/compositor/extensions/qwaylandtextinput.cpp +++ b/src/compositor/extensions/qwaylandtextinput.cpp @@ -118,7 +118,7 @@ Qt::InputMethodQueries QWaylandTextInputClientState::mergeChanged(const QWayland } QWaylandTextInputPrivate::QWaylandTextInputPrivate(QWaylandCompositor *compositor) - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , QtWaylandServer::zwp_text_input_v2() , compositor(compositor) , focus(nullptr) diff --git a/src/compositor/extensions/qwaylandtextinput_p.h b/src/compositor/extensions/qwaylandtextinput_p.h index aeba77b0..da90cc90 100644 --- a/src/compositor/extensions/qwaylandtextinput_p.h +++ b/src/compositor/extensions/qwaylandtextinput_p.h @@ -83,7 +83,7 @@ public: Qt::InputMethodQueries changedState; }; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputPrivate : public QWaylandCompositorExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_v2 +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputPrivate : public QWaylandCompositorExtensionPrivate, public QtWaylandServer::zwp_text_input_v2 { Q_DECLARE_PUBLIC(QWaylandTextInput) public: diff --git a/src/compositor/extensions/qwaylandtextinputmanager.cpp b/src/compositor/extensions/qwaylandtextinputmanager.cpp index 61cd28fc..9dd7ace8 100644 --- a/src/compositor/extensions/qwaylandtextinputmanager.cpp +++ b/src/compositor/extensions/qwaylandtextinputmanager.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE QWaylandTextInputManagerPrivate::QWaylandTextInputManagerPrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , QtWaylandServer::zwp_text_input_manager_v2() { } diff --git a/src/compositor/extensions/qwaylandtextinputmanager_p.h b/src/compositor/extensions/qwaylandtextinputmanager_p.h index 7d7171eb..4af71709 100644 --- a/src/compositor/extensions/qwaylandtextinputmanager_p.h +++ b/src/compositor/extensions/qwaylandtextinputmanager_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManagerPrivate : public QWaylandCompositorExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_manager_v2 +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManagerPrivate : public QWaylandCompositorExtensionPrivate, public QtWaylandServer::zwp_text_input_manager_v2 { Q_DECLARE_PUBLIC(QWaylandTextInputManager) public: diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp index 2b80cac3..1e7ed289 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp +++ b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp @@ -55,7 +55,7 @@ QWaylandWindowManagerExtension::QWaylandWindowManagerExtension(QWaylandComposito } QWaylandWindowManagerExtensionPrivate::QWaylandWindowManagerExtensionPrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , QtWaylandServer::qt_windowmanager() , showIsFullScreen(false) { diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h index 5b4314f1..9573855d 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h +++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtensionPrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::qt_windowmanager { Q_DECLARE_PUBLIC(QWaylandWindowManagerExtension) diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index 2674f397..ecd206f8 100644 --- a/src/compositor/extensions/qwaylandwlshell.cpp +++ b/src/compositor/extensions/qwaylandwlshell.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QWaylandSurfaceRole QWaylandWlShellSurfacePrivate::s_role("wl_shell_surface"); QWaylandWlShellPrivate::QWaylandWlShellPrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , wl_shell() { } @@ -88,7 +88,7 @@ void QWaylandWlShellPrivate::shell_get_shell_surface(Resource *resource, uint32_ } QWaylandWlShellSurfacePrivate::QWaylandWlShellSurfacePrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , wl_shell_surface() , m_shell(Q_NULLPTR) , m_surface(Q_NULLPTR) diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h index c7c7cb8f..39ed645c 100644 --- a/src/compositor/extensions/qwaylandwlshell_p.h +++ b/src/compositor/extensions/qwaylandwlshell_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellPrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::wl_shell { Q_DECLARE_PUBLIC(QWaylandWlShell) @@ -77,7 +77,7 @@ protected: }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurfacePrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::wl_shell_surface { Q_DECLARE_PUBLIC(QWaylandWlShellSurface) diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 157e4d13..a392ef63 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -53,7 +53,7 @@ QWaylandSurfaceRole QWaylandXdgSurfacePrivate::s_role("xdg_surface"); QWaylandSurfaceRole QWaylandXdgPopupPrivate::s_role("xdg_popup"); QWaylandXdgShellPrivate::QWaylandXdgShellPrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , xdg_shell() { } @@ -216,7 +216,7 @@ void QWaylandXdgShellPrivate::xdg_shell_pong(Resource *resource, uint32_t serial } QWaylandXdgSurfacePrivate::QWaylandXdgSurfacePrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , xdg_surface() , m_surface(nullptr) , m_parentSurface(nullptr) @@ -439,7 +439,7 @@ void QWaylandXdgSurfacePrivate::xdg_surface_set_window_geometry(Resource *resour } QWaylandXdgPopupPrivate::QWaylandXdgPopupPrivate() - : QWaylandCompositorExtensionTemplatePrivate() + : QWaylandCompositorExtensionPrivate() , xdg_popup() , m_surface(nullptr) , m_parentSurface(nullptr) diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h index 6b732514..3165eb7c 100644 --- a/src/compositor/extensions/qwaylandxdgshell_p.h +++ b/src/compositor/extensions/qwaylandxdgshell_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShellPrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::xdg_shell { Q_DECLARE_PUBLIC(QWaylandXdgShell) @@ -91,7 +91,7 @@ private: }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurfacePrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::xdg_surface { Q_DECLARE_PUBLIC(QWaylandXdgSurface) @@ -148,7 +148,7 @@ private: }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupPrivate - : public QWaylandCompositorExtensionTemplatePrivate + : public QWaylandCompositorExtensionPrivate , public QtWaylandServer::xdg_popup { Q_DECLARE_PUBLIC(QWaylandXdgPopup) diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h index fd9cfad0..762df2e8 100644 --- a/src/compositor/global/qwaylandcompositorextension.h +++ b/src/compositor/global/qwaylandcompositorextension.h @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE class QWaylandCompositor; class QWaylandCompositorExtension; class QWaylandCompositorExtensionPrivate; -class QWaylandCompositorExtensionTemplatePrivate; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject { @@ -95,7 +94,6 @@ protected: template <typename T> class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplate : public QWaylandCompositorExtension { - Q_DECLARE_PRIVATE(QWaylandCompositorExtensionTemplate) public: QWaylandCompositorExtensionTemplate() : QWaylandCompositorExtension() diff --git a/src/compositor/global/qwaylandcompositorextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h index 5548da94..a9a670d6 100644 --- a/src/compositor/global/qwaylandcompositorextension_p.h +++ b/src/compositor/global/qwaylandcompositorextension_p.h @@ -71,14 +71,6 @@ public: bool initialized; }; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplatePrivate : public QWaylandCompositorExtensionPrivate -{ -public: - QWaylandCompositorExtensionTemplatePrivate() - : QWaylandCompositorExtensionPrivate() - { } -}; - QT_END_NAMESPACE #endif /*QWAYLANDEXTENSION_P_H*/ |