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/hardware_integration | |
| 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/hardware_integration')
| -rw-r--r-- | src/compositor/hardware_integration/qwlhwintegration.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/hardware_integration/qwlhwintegration_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp index a163d4c26..7fb2c8b58 100644 --- a/src/compositor/hardware_integration/qwlhwintegration.cpp +++ b/src/compositor/hardware_integration/qwlhwintegration.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace QtWayland { HardwareIntegration::HardwareIntegration(QWaylandCompositor *compositor) - : QWaylandExtensionTemplate<HardwareIntegration>(compositor) + : QWaylandCompositorExtensionTemplate<HardwareIntegration>(compositor) , qt_hardware_integration(compositor->display(), 1) { } diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h index 2cc11a87e..2cd368bc2 100644 --- a/src/compositor/hardware_integration/qwlhwintegration_p.h +++ b/src/compositor/hardware_integration/qwlhwintegration_p.h @@ -50,7 +50,7 @@ #include <QtWaylandCompositor/private/qwayland-server-hardware-integration.h> -#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/QWaylandCompositorExtension> #include <QtCore/QString> @@ -60,7 +60,7 @@ class QWaylandCompositor; namespace QtWayland { -class HardwareIntegration : public QWaylandExtensionTemplate<HardwareIntegration>, public QtWaylandServer::qt_hardware_integration +class HardwareIntegration : public QWaylandCompositorExtensionTemplate<HardwareIntegration>, public QtWaylandServer::qt_hardware_integration { public: HardwareIntegration(QWaylandCompositor *compositor); |