diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-13 09:37:40 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-18 12:20:21 +0000 |
commit | 959d9d604da402e768ce329d43510d2b03756d89 (patch) | |
tree | 2308a6895b9b959fa0783d425bd3104902e1703c /src/compositor/extensions/qwaylandwlshell.cpp | |
parent | bc9c876939efbac4a62f9244cf2a7a15da15fb91 (diff) |
Rename QWaylandExtension to QWaylandCompositorExtension
Since we have QWaylandClientExtension
Change-Id: Ie8d60322c8e730bda651e06ed5db0fe1359d946e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/compositor/extensions/qwaylandwlshell.cpp')
-rw-r--r-- | src/compositor/extensions/qwaylandwlshell.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index 6953f72b6..2674f3979 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() - : QWaylandExtensionTemplatePrivate() + : QWaylandCompositorExtensionTemplatePrivate() , wl_shell() { } @@ -88,7 +88,7 @@ void QWaylandWlShellPrivate::shell_get_shell_surface(Resource *resource, uint32_ } QWaylandWlShellSurfacePrivate::QWaylandWlShellSurfacePrivate() - : QWaylandExtensionTemplatePrivate() + : QWaylandCompositorExtensionTemplatePrivate() , wl_shell_surface() , m_shell(Q_NULLPTR) , m_surface(Q_NULLPTR) @@ -280,14 +280,14 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource, * Constructs a QWaylandWlShell object. */ QWaylandWlShell::QWaylandWlShell() - : QWaylandExtensionTemplate<QWaylandWlShell>(*new QWaylandWlShellPrivate()) + : QWaylandCompositorExtensionTemplate<QWaylandWlShell>(*new QWaylandWlShellPrivate()) { } /*! * Constructs a QWaylandWlShell object for the provided \a compositor. */ QWaylandWlShell::QWaylandWlShell(QWaylandCompositor *compositor) - : QWaylandExtensionTemplate<QWaylandWlShell>(compositor, *new QWaylandWlShellPrivate()) + : QWaylandCompositorExtensionTemplate<QWaylandWlShell>(compositor, *new QWaylandWlShellPrivate()) { } @@ -297,7 +297,7 @@ QWaylandWlShell::QWaylandWlShell(QWaylandCompositor *compositor) void QWaylandWlShell::initialize() { Q_D(QWaylandWlShell); - QWaylandExtensionTemplate::initialize(); + QWaylandCompositorExtensionTemplate::initialize(); QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer()); if (!compositor) { qWarning() << "Failed to find QWaylandCompositor when initializing QWaylandWlShell"; @@ -370,7 +370,7 @@ QByteArray QWaylandWlShell::interfaceName() * Constructs a QWaylandWlShellSurface. */ QWaylandWlShellSurface::QWaylandWlShellSurface() - : QWaylandExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate) + : QWaylandCompositorExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate) { } @@ -378,7 +378,7 @@ QWaylandWlShellSurface::QWaylandWlShellSurface() * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and \a resource. */ QWaylandWlShellSurface::QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &res) - : QWaylandExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate) + : QWaylandCompositorExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate) { initialize(shell, surface, res); } @@ -400,7 +400,7 @@ void QWaylandWlShellSurface::initialize(QWaylandWlShell *shell, QWaylandSurface d->init(resource.resource()); setExtensionContainer(surface); emit surfaceChanged(); - QWaylandExtension::initialize(); + QWaylandCompositorExtension::initialize(); } /*! @@ -408,7 +408,7 @@ void QWaylandWlShellSurface::initialize(QWaylandWlShell *shell, QWaylandSurface */ void QWaylandWlShellSurface::initialize() { - QWaylandExtensionTemplate::initialize(); + QWaylandCompositorExtensionTemplate::initialize(); } const struct wl_interface *QWaylandWlShellSurface::interface() |