diff options
Diffstat (limited to 'src/plugins/hardwareintegration')
16 files changed, 41 insertions, 141 deletions
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json index 48611c6ab..3a659a87b 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-brcm" ] + "Keys": [ "brcm" ] } diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp index f77b41ef0..c023332eb 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp @@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "brcm-egl.json") + Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json") public: - QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandBrcmEglClientBufferPlugin::keys() const -{ - QStringList list; - list << "wayland-brcm"; - return list; -} - QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-brcm") - return new QWaylandBrcmEglIntegration(); - - return 0; + Q_UNUSED(system); + return new QWaylandBrcmEglIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp index 33b8b4b29..6a3df4431 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp @@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.3" FILE "drm-egl-server.json") + Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json") public: - QStringList keys() const; - QWaylandServerBufferIntegration *create(const QString&, const QStringList&); + QWaylandServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList DrmEglServerBufferPlugin::keys() const -{ - QStringList list; - list << "drm-egl-server"; - return list; -} - QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "drm-egl-server") - return new DrmEglServerBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new DrmEglServerBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp index 50e956644..e4cd8c1f0 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp @@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "wayland-egl.json") + Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json") public: - QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandEglClientBufferPlugin::keys() const -{ - QStringList list; - list << "wayland-egl"; - return list; -} - QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-egl") - return new QWaylandEglClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new QWaylandEglClientBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp index 46e3eda4e..4b9835f1d 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp @@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-egl.json") + Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json") public: - QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandXCompositeEglClientBufferIntegrationPlugin::keys() const -{ - QStringList list; - list << "xcomposite" << "xcomposite-egl"; - return list; -} - QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "xcomposite" || system.toLower() == "xcomposite-egl") - return new QWaylandXCompositeEGLClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new QWaylandXCompositeEGLClientBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json index 8ccd5b46b..0d119ff85 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-xcomposite" ] + "Keys": [ "xcomposite-egl" ] } diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp index 2d402194e..2c6f0fde8 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp @@ -47,26 +47,16 @@ QT_BEGIN_NAMESPACE class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-glx.json") + Q_PLUGIN_METADATA(IID QWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json") public: - QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QWaylandClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandXCompositeGlxClientBufferIntegrationPlugin::keys() const -{ - QStringList list; - list << "wayland-xcomposite-glx"; - return list; -} - QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-xcomposite-glx") - return new QWaylandXCompositeGLXIntegration(); - - return 0; + Q_UNUSED(system); + return new QWaylandXCompositeGLXIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json index 0f4a3bf69..e2c4cecd6 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-xcomposite-glx" ] + "Keys": [ "xcomposite-glx" ] } diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.json b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.json index 48611c6ab..3a659a87b 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.json +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-brcm" ] + "Keys": [ "brcm" ] } diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index 53a3f3c3e..f6bb717bc 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -49,24 +49,14 @@ class QWaylandBrcmClientBufferIntegration : public QtWayland::ClientBufferIntegr Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json") public: - QStringList keys() const; - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandBrcmClientBufferIntegration::keys() const -{ - QStringList list; - list << "wayland-brcm"; - return list; -} - QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-brcm") - return new BrcmEglIntegration(); - - return 0; + Q_UNUSED(system); + return new BrcmEglIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp index 4bfc1b483..e85f93009 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp @@ -49,24 +49,14 @@ class DrmEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegr Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json") public: - QStringList keys() const; - QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList DrmEglServerBufferIntegrationPlugin::keys() const -{ - QStringList list; - list << "drm-egl-server"; - return list; -} - QtWayland::ServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "drm-egl-server") - return new DrmEglServerBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new DrmEglServerBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 274dff1e6..3a7984f0a 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -50,24 +50,14 @@ class QWaylandIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugi Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json") public: - QStringList keys() const; - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandIntegrationPlugin::keys() const -{ - QStringList list; - list << "wayland-egl"; - return list; -} - QtWayland::ClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-egl") - return new WaylandEglClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new WaylandEglClientBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index 4ae206fa2..f0bbedaa7 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -49,24 +49,14 @@ class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBuffer Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json") public: - QStringList keys() const; - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandXCompositeClientBufferIntegration::keys() const -{ - QStringList list; - list << "wayland-xcomposite"; - return list; -} - QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-xcomposite") - return new XCompositeEglClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new XCompositeEglClientBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json index 8ccd5b46b..0d119ff85 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-xcomposite" ] + "Keys": [ "xcomposite-egl" ] } diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp index 4dcd9136f..37602bcc9 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp @@ -49,24 +49,14 @@ class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBuffer Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json") public: - QStringList keys() const; - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandXCompositeClientBufferIntegration::keys() const -{ - QStringList list; - list << "wayland-xcomposite-glx"; - return list; -} - QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-xcomposite-glx") - return new XCompositeGLXClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new XCompositeGLXClientBufferIntegration(); } QT_END_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json index 0f4a3bf69..e2c4cecd6 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-xcomposite-glx" ] + "Keys": [ "xcomposite-glx" ] } |