From 434dcf63a5753c56bcc94185d1af381ae94efeb5 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Wed, 13 Nov 2013 10:35:02 +0100 Subject: Compositor: rename QWaylandGraphicsHardwareIntegration to QWaylandClientBufferIntegration. I have checked this with xcomposite-egl and wayland-egl, abd have tried to do a simple search and replace for brcm-egl and xcomposite-glx, but there will likely be some small fixup needed Change-Id: I48d284b8a5172273e0a26443074a87a8171b9e88 Reviewed-by: Andy Nichols --- .../hardwareintegration/compositor/brcm-egl/main.cpp | 12 ++++++------ .../hardwareintegration/compositor/wayland-egl/main.cpp | 15 ++++++++------- .../compositor/xcomposite-egl/main.cpp | 14 +++++++------- .../compositor/xcomposite-glx/main.cpp | 12 ++++++------ 4 files changed, 27 insertions(+), 26 deletions(-) (limited to 'src/plugins/hardwareintegration') diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index 0fecd2ec0..303b0049b 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -39,28 +39,28 @@ ** ****************************************************************************/ -#include +#include #include "brcmeglintegration.h" QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin +class QWaylandBrcmClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "brcm-egl.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "brcm-egl.json") public: QStringList keys() const; - QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); }; -QStringList QWaylandIntegrationPlugin::keys() const +QStringList QWaylandBrcmClientBufferIntegration::keys() const { QStringList list; list << "wayland-brcm"; return list; } -QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QWaylandClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-brcm") diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 75a9fba29..8c3f46ffc 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -39,18 +39,19 @@ ** ****************************************************************************/ -#include -#include "waylandeglintegration.h" +#include +#include +#include "waylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin +class QWaylandIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "wayland-egl.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "wayland-egl.json") public: QStringList keys() const; - QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); }; QStringList QWaylandIntegrationPlugin::keys() const @@ -60,11 +61,11 @@ QStringList QWaylandIntegrationPlugin::keys() const return list; } -QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QWaylandClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-egl") - return new WaylandEglIntegration(); + return new WaylandEglClientBufferIntegration(); return 0; } diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index 3540d3517..d96650544 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -39,32 +39,32 @@ ** ****************************************************************************/ -#include +#include #include "xcompositeeglintegration.h" QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin +class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json") public: QStringList keys() const; - QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); }; -QStringList QWaylandIntegrationPlugin::keys() const +QStringList QWaylandXCompositeClientBufferIntegration::keys() const { QStringList list; list << "wayland-xcomposite"; return list; } -QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-xcomposite") - return new XCompositeEglIntegration(); + return new XCompositeEglClientBufferIntegration(); return 0; } diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp index 3b6c9f9c1..df4b3bab6 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp @@ -44,27 +44,27 @@ QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin +class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json") public: QStringList keys() const; - QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); }; -QStringList QWaylandIntegrationPlugin::keys() const +QStringList QWaylandXCompositeClientBufferIntegration::keys() const { QStringList list; list << "wayland-xcomposite-glx"; return list; } -QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-xcomposite-glx") - return new XCompositeGLXIntegration(); + return new XCompositeGLXClientBufferIntegration(); return 0; } -- cgit v1.2.3