diff options
35 files changed, 221 insertions, 174 deletions
diff --git a/examples/server-buffer/compositor/main.cpp b/examples/server-buffer/compositor/main.cpp index 24e9e7fb8..68aaea67e 100644 --- a/examples/server-buffer/compositor/main.cpp +++ b/examples/server-buffer/compositor/main.cpp @@ -55,7 +55,7 @@ #include "qwayland-server-share-buffer.h" #include <QtCompositor/private/qwlcompositor_p.h> -#include <QtCompositor/qwaylandserverbufferintegration.h> +#include <QtCompositor/private/qwlserverbufferintegration_p.h> #include "serverbufferitem.h" @@ -138,12 +138,12 @@ private slots: openglContext()->makeCurrent(this); - QWaylandServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration(); + QtWayland::ServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration(); if (!sbi) { qWarning("Could not find a Server Buffer Integration"); return; } - if (sbi->supportsFormat(QWaylandServerBuffer::RGBA32)) { + if (sbi->supportsFormat(QtWayland::ServerBuffer::RGBA32)) { QImage image(100,100,QImage::Format_ARGB32_Premultiplied); image.fill(QColor(0x55,0x0,0x55,0x01)); { @@ -162,7 +162,7 @@ private slots: } image = image.convertToFormat(QImage::Format_RGBA8888); - m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QWaylandServerBuffer::RGBA32); + m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QtWayland::ServerBuffer::RGBA32); GLuint texture_32_bit; glGenTextures(1, &texture_32_bit); @@ -176,13 +176,13 @@ private slots: } - if (sbi->supportsFormat(QWaylandServerBuffer::A8)) { + if (sbi->supportsFormat(QtWayland::ServerBuffer::A8)) { QRawFont defaultRaw = QRawFont::fromFont(QFont(), QFontDatabase::Latin); QVector<quint32> index = defaultRaw.glyphIndexesForString(QStringLiteral("R")); QDistanceField distanceField(defaultRaw, index.front(), true); QImage img = distanceField.toImage(QImage::Format_Indexed8); - m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QWaylandServerBuffer::A8); + m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QtWayland::ServerBuffer::A8); GLuint texture_8_bit; glGenTextures(1, &texture_8_bit); glBindTexture(GL_TEXTURE_2D, texture_8_bit); @@ -240,9 +240,9 @@ protected: } private: - QWaylandServerBuffer *m_server_buffer_32_bit; + QtWayland::ServerBuffer *m_server_buffer_32_bit; ServerBufferItem *m_server_buffer_item_32_bit; - QWaylandServerBuffer *m_server_buffer_8_bit; + QtWayland::ServerBuffer *m_server_buffer_8_bit; ServerBufferItem *m_server_buffer_item_8_bit; }; diff --git a/examples/server-buffer/compositor/serverbufferitem.cpp b/examples/server-buffer/compositor/serverbufferitem.cpp index 8227b8716..4a47c279d 100644 --- a/examples/server-buffer/compositor/serverbufferitem.cpp +++ b/examples/server-buffer/compositor/serverbufferitem.cpp @@ -45,11 +45,11 @@ #include <QtQuick/QSGSimpleTextureNode> #include <QtQuick/QQuickWindow> -#include <QtCompositor/qwaylandserverbufferintegration.h> +#include <QtCompositor/private/qwlserverbufferintegration_p.h> QT_BEGIN_NAMESPACE -ServerBufferItem::ServerBufferItem(QWaylandServerBuffer *serverBuffer, QQuickItem *parent) +ServerBufferItem::ServerBufferItem(QtWayland::ServerBuffer *serverBuffer, QQuickItem *parent) : QQuickItem(parent) , m_server_buffer(serverBuffer) , m_provider(new ServerBufferTextureProvider) @@ -72,7 +72,7 @@ bool ServerBufferItem::isYInverted() const int ServerBufferItem::depth() const { - return m_server_buffer->format() == QWaylandServerBuffer::RGBA32 ? 32 : 8; + return m_server_buffer->format() == QtWayland::ServerBuffer::RGBA32 ? 32 : 8; } QSGTextureProvider *ServerBufferItem::textureProvider() const diff --git a/examples/server-buffer/compositor/serverbufferitem.h b/examples/server-buffer/compositor/serverbufferitem.h index 9391cb942..31fad4e86 100644 --- a/examples/server-buffer/compositor/serverbufferitem.h +++ b/examples/server-buffer/compositor/serverbufferitem.h @@ -49,21 +49,24 @@ QT_BEGIN_NAMESPACE class ServerBufferTextureProvider; -class QWaylandServerBuffer; + +namespace QtWayland { +class ServerBuffer; +} class ServerBufferItem : public QQuickItem { Q_OBJECT - Q_PROPERTY(QWaylandServerBuffer *serverBuffer READ serverBuffer CONSTANT) + Q_PROPERTY(QtWayland::ServerBuffer *serverBuffer READ serverBuffer CONSTANT) Q_PROPERTY(bool useTextureAlpha READ useTextureAlpha WRITE setUseTextureAlpha NOTIFY useTextureAlphaChanged) Q_PROPERTY(bool isYInverted READ isYInverted NOTIFY yInvertedChanged) Q_PROPERTY(int depth READ depth CONSTANT) public: - ServerBufferItem(QWaylandServerBuffer *serverBuffer, QQuickItem *parent = 0); + ServerBufferItem(QtWayland::ServerBuffer *serverBuffer, QQuickItem *parent = 0); ~ServerBufferItem(); - QWaylandServerBuffer *serverBuffer() const { return m_server_buffer; } + QtWayland::ServerBuffer *serverBuffer() const { return m_server_buffer; } bool isYInverted() const; int depth() const; @@ -86,7 +89,7 @@ protected: private: void updateTexture(); - QWaylandServerBuffer *m_server_buffer; + QtWayland::ServerBuffer *m_server_buffer; ServerBufferTextureProvider *m_provider; bool m_useTextureAlpha; }; diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri index 999434d93..39843b3f5 100644 --- a/src/compositor/hardware_integration/hardware_integration.pri +++ b/src/compositor/hardware_integration/hardware_integration.pri @@ -7,21 +7,21 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) ../extensions/hardware-integration.xml HEADERS += \ - hardware_integration/qwaylandclientbufferintegration.h \ - hardware_integration/qwaylandclientbufferintegrationfactory.h \ - hardware_integration/qwaylandclientbufferintegrationplugin.h \ - hardware_integration/qwaylandserverbufferintegration.h \ - hardware_integration/qwaylandserverbufferintegrationfactory.h \ - hardware_integration/qwaylandserverbufferintegrationplugin.h \ + hardware_integration/qwlclientbufferintegration_p.h \ + hardware_integration/qwlclientbufferintegrationfactory_p.h \ + hardware_integration/qwlclientbufferintegrationplugin_p.h \ + hardware_integration/qwlserverbufferintegration_p.h \ + hardware_integration/qwlserverbufferintegrationfactory_p.h \ + hardware_integration/qwlserverbufferintegrationplugin_p.h \ hardware_integration/qwlhwintegration_p.h SOURCES += \ - hardware_integration/qwaylandclientbufferintegration.cpp \ - hardware_integration/qwaylandclientbufferintegrationfactory.cpp \ - hardware_integration/qwaylandclientbufferintegrationplugin.cpp \ - hardware_integration/qwaylandserverbufferintegration.cpp \ - hardware_integration/qwaylandserverbufferintegrationfactory.cpp \ - hardware_integration/qwaylandserverbufferintegrationplugin.cpp \ + hardware_integration/qwlclientbufferintegration.cpp \ + hardware_integration/qwlclientbufferintegrationfactory.cpp \ + hardware_integration/qwlclientbufferintegrationplugin.cpp \ + hardware_integration/qwlserverbufferintegration.cpp \ + hardware_integration/qwlserverbufferintegrationfactory.cpp \ + hardware_integration/qwlserverbufferintegrationplugin.cpp \ hardware_integration/qwlhwintegration.cpp DEFINES += QT_COMPOSITOR_WAYLAND_GL diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegration.cpp b/src/compositor/hardware_integration/qwlclientbufferintegration.cpp index ff463429f..ee3bdeb84 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegration.cpp +++ b/src/compositor/hardware_integration/qwlclientbufferintegration.cpp @@ -38,13 +38,17 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegration.h" +#include "qwlclientbufferintegration_p.h" QT_BEGIN_NAMESPACE -QWaylandClientBufferIntegration::QWaylandClientBufferIntegration() +namespace QtWayland { + +ClientBufferIntegration::ClientBufferIntegration() : m_compositor(0) { } +} + QT_END_NAMESPACE diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegration.h b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h index 5d9902fad..c9d514078 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegration.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegration_p.h @@ -41,23 +41,24 @@ #ifndef QWAYLANDCLIENTBUFFERINTEGRATION_H #define QWAYLANDCLIENTBUFFERINTEGRATION_H +#include <QtCompositor/qwaylandexport.h> +#include <QtCore/QSize> #include <QtGui/qopengl.h> #include <QtGui/QOpenGLContext> #include <wayland-server.h> -#include <QtCompositor/qwaylandcompositor.h> - QT_BEGIN_NAMESPACE +class QWaylandCompositor; + namespace QtWayland { - class Display; -} +class Display; -class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegration +class Q_COMPOSITOR_EXPORT ClientBufferIntegration { public: - QWaylandClientBufferIntegration(); - virtual ~QWaylandClientBufferIntegration() { } + ClientBufferIntegration(); + virtual ~ClientBufferIntegration() { } void setCompositor(QWaylandCompositor *compositor) { m_compositor = compositor; } @@ -82,6 +83,8 @@ protected: QWaylandCompositor *m_compositor; }; +} + QT_END_NAMESPACE #endif // QWAYLANDCLIENTBUFFERINTEGRATION_H diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp index 2a99bda98..1a4dbac4c 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp @@ -39,23 +39,25 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegrationfactory.h" -#include "qwaylandserverbufferintegrationplugin.h" -#include "qwaylandserverbufferintegration.h" +#include "qwlclientbufferintegrationfactory_p.h" +#include "qwlclientbufferintegrationplugin_p.h" +#include "qwlclientbufferintegration_p.h" #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/QCoreApplication> #include <QtCore/QDir> QT_BEGIN_NAMESPACE +namespace QtWayland { + #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) + (QtWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, - (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) + (QtWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif -QStringList QWaylandServerBufferIntegrationFactory::keys(const QString &pluginPath) +QStringList ClientBufferIntegrationFactory::keys(const QString &pluginPath) { #ifndef QT_NO_LIBRARY QStringList list; @@ -78,19 +80,21 @@ QStringList QWaylandServerBufferIntegrationFactory::keys(const QString &pluginPa #endif } -QWaylandServerBufferIntegration *QWaylandServerBufferIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) +ClientBufferIntegration *ClientBufferIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) { #ifndef QT_NO_LIBRARY // Try loading the plugin from platformPluginPath first: if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (QWaylandServerBufferIntegration *ret = qLoadPlugin1<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(directLoader(), name, args)) + if (ClientBufferIntegration *ret = qLoadPlugin1<ClientBufferIntegration, ClientBufferIntegrationPlugin>(directLoader(), name, args)) return ret; } - if (QWaylandServerBufferIntegration *ret = qLoadPlugin1<QWaylandServerBufferIntegration, QWaylandServerBufferIntegrationPlugin>(loader(), name, args)) + if (ClientBufferIntegration *ret = qLoadPlugin1<ClientBufferIntegration, ClientBufferIntegrationPlugin>(loader(), name, args)) return ret; #endif return 0; } +} + QT_END_NAMESPACE diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.h b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h index c9d95f8f7..ccefba426 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h @@ -47,15 +47,19 @@ QT_BEGIN_NAMESPACE -class QWaylandClientBufferIntegration; +namespace QtWayland { -class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegrationFactory +class ClientBufferIntegration; + +class Q_COMPOSITOR_EXPORT ClientBufferIntegrationFactory { public: static QStringList keys(const QString &pluginPath = QString()); - static QWaylandClientBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString()); + static ClientBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString()); }; +} + QT_END_NAMESPACE #endif // QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.cpp b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin.cpp index ebe860b4d..1f3f2d116 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.cpp +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin.cpp @@ -39,18 +39,21 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegrationplugin.h" +#include "qwlclientbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE -QWaylandServerBufferIntegrationPlugin::QWaylandServerBufferIntegrationPlugin(QObject *parent) : +namespace QtWayland { + +ClientBufferIntegrationPlugin::ClientBufferIntegrationPlugin(QObject *parent) : QObject(parent) { } -QWaylandServerBufferIntegrationPlugin::~QWaylandServerBufferIntegrationPlugin() +ClientBufferIntegrationPlugin::~ClientBufferIntegrationPlugin() { } -QT_END_NAMESPACE +} +QT_END_NAMESPACE diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h index 2296b9df6..3ff26cd92 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h @@ -49,20 +49,24 @@ QT_BEGIN_NAMESPACE -class QWaylandClientBufferIntegration; +namespace QtWayland { -#define QWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" +class ClientBufferIntegration; -class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegrationPlugin : public QObject +#define QtWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QtWaylandClientBufferIntegrationFactoryInterface.5.3" + +class Q_COMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject { Q_OBJECT public: - explicit QWaylandClientBufferIntegrationPlugin(QObject *parent = 0); - ~QWaylandClientBufferIntegrationPlugin(); + explicit ClientBufferIntegrationPlugin(QObject *parent = 0); + ~ClientBufferIntegrationPlugin(); - virtual QWaylandClientBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; + virtual ClientBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; +} + QT_END_NAMESPACE #endif // QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegration.cpp b/src/compositor/hardware_integration/qwlserverbufferintegration.cpp index 520f9307b..3c9ceb645 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegration.cpp +++ b/src/compositor/hardware_integration/qwlserverbufferintegration.cpp @@ -38,38 +38,42 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegration.h" +#include "qwlserverbufferintegration_p.h" QT_BEGIN_NAMESPACE -QWaylandServerBuffer::QWaylandServerBuffer(const QSize &size, QWaylandServerBuffer::Format format) +namespace QtWayland { + +ServerBuffer::ServerBuffer(const QSize &size, ServerBuffer::Format format) : m_size(size) , m_format(format) { } -QWaylandServerBuffer::~QWaylandServerBuffer() +ServerBuffer::~ServerBuffer() { } -bool QWaylandServerBuffer::isYInverted() const +bool ServerBuffer::isYInverted() const { return false; } -QSize QWaylandServerBuffer::size() const +QSize ServerBuffer::size() const { return m_size; } -QWaylandServerBuffer::Format QWaylandServerBuffer::format() const +ServerBuffer::Format ServerBuffer::format() const { return m_format; } -QWaylandServerBufferIntegration::QWaylandServerBufferIntegration() +ServerBufferIntegration::ServerBufferIntegration() { } -QWaylandServerBufferIntegration::~QWaylandServerBufferIntegration() +ServerBufferIntegration::~ServerBufferIntegration() { } -void QWaylandServerBufferIntegration::initializeHardware(QWaylandCompositor *compositor) +void ServerBufferIntegration::initializeHardware(QWaylandCompositor *compositor) { Q_UNUSED(compositor); } +} + QT_END_NAMESPACE diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegration.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h index 7033cd753..6fd7276af 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegration.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h @@ -55,10 +55,9 @@ struct wl_client; struct wl_resource; namespace QtWayland { - class Display; -} +class Display; -class Q_COMPOSITOR_EXPORT QWaylandServerBuffer +class Q_COMPOSITOR_EXPORT ServerBuffer { public: enum Format { @@ -66,8 +65,8 @@ public: A8 }; - QWaylandServerBuffer(const QSize &size, QWaylandServerBuffer::Format format); - virtual ~QWaylandServerBuffer(); + ServerBuffer(const QSize &size, ServerBuffer::Format format); + virtual ~ServerBuffer(); virtual struct ::wl_resource *resourceForClient(struct ::wl_client *) = 0; @@ -82,18 +81,20 @@ protected: Format m_format; }; -class Q_COMPOSITOR_EXPORT QWaylandServerBufferIntegration +class Q_COMPOSITOR_EXPORT ServerBufferIntegration { public: - QWaylandServerBufferIntegration(); - virtual ~QWaylandServerBufferIntegration(); + ServerBufferIntegration(); + virtual ~ServerBufferIntegration(); virtual void initializeHardware(QWaylandCompositor *); - virtual bool supportsFormat(QWaylandServerBuffer::Format format) const = 0; - virtual QWaylandServerBuffer *createServerBuffer(const QSize &size, QWaylandServerBuffer::Format format) = 0; + virtual bool supportsFormat(ServerBuffer::Format format) const = 0; + virtual ServerBuffer *createServerBuffer(const QSize &size, ServerBuffer::Format format) = 0; }; +} + QT_END_NAMESPACE #endif //QWAYLANDSERVERBUFFERINTEGRATION_H diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp index 71ea9ec4d..6652d25a0 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp @@ -39,23 +39,25 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegrationfactory.h" -#include "qwaylandclientbufferintegrationplugin.h" -#include "qwaylandclientbufferintegration.h" +#include "qwlserverbufferintegrationfactory_p.h" +#include "qwlserverbufferintegrationplugin_p.h" +#include "qwlserverbufferintegration_p.h" #include <QtCore/private/qfactoryloader_p.h> #include <QtCore/QCoreApplication> #include <QtCore/QDir> QT_BEGIN_NAMESPACE +namespace QtWayland { + #ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) + (QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration/server"), Qt::CaseInsensitive)) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, - (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) + (QtWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif -QStringList QWaylandClientBufferIntegrationFactory::keys(const QString &pluginPath) +QStringList ServerBufferIntegrationFactory::keys(const QString &pluginPath) { #ifndef QT_NO_LIBRARY QStringList list; @@ -78,19 +80,21 @@ QStringList QWaylandClientBufferIntegrationFactory::keys(const QString &pluginPa #endif } -QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) +ServerBufferIntegration *ServerBufferIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) { #ifndef QT_NO_LIBRARY // Try loading the plugin from platformPluginPath first: if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(directLoader(), name, args)) + if (ServerBufferIntegration *ret = qLoadPlugin1<ServerBufferIntegration, ServerBufferIntegrationPlugin>(directLoader(), name, args)) return ret; } - if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(loader(), name, args)) + if (ServerBufferIntegration *ret = qLoadPlugin1<ServerBufferIntegration, ServerBufferIntegrationPlugin>(loader(), name, args)) return ret; #endif return 0; } +} + QT_END_NAMESPACE diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegrationfactory.h b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h index c7fe384cd..1fc81c950 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegrationfactory.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h @@ -47,15 +47,19 @@ QT_BEGIN_NAMESPACE -class QWaylandServerBufferIntegration; +namespace QtWayland { -class Q_COMPOSITOR_EXPORT QWaylandServerBufferIntegrationFactory +class ServerBufferIntegration; + +class Q_COMPOSITOR_EXPORT ServerBufferIntegrationFactory { public: static QStringList keys(const QString &pluginPath = QString()); - static QWaylandServerBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString()); + static ServerBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString()); }; +} + QT_END_NAMESPACE #endif //QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H diff --git a/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin.cpp index 58bb26d19..def78391e 100644 --- a/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.cpp +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin.cpp @@ -39,17 +39,22 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegrationplugin.h" +#include "qwlserverbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE -QWaylandClientBufferIntegrationPlugin::QWaylandClientBufferIntegrationPlugin(QObject *parent) : +namespace QtWayland { + +ServerBufferIntegrationPlugin::ServerBufferIntegrationPlugin(QObject *parent) : QObject(parent) { } -QWaylandClientBufferIntegrationPlugin::~QWaylandClientBufferIntegrationPlugin() +ServerBufferIntegrationPlugin::~ServerBufferIntegrationPlugin() { } +} + QT_END_NAMESPACE + diff --git a/src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.h b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h index 0de631035..cb18b34df 100644 --- a/src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.h +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h @@ -49,20 +49,24 @@ QT_BEGIN_NAMESPACE -class QWaylandServerBufferIntegration; +namespace QtWayland { -#define QWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandServerBufferIntegrationFactoryInterface.5.3" +class ServerBufferIntegration; -class Q_COMPOSITOR_EXPORT QWaylandServerBufferIntegrationPlugin : public QObject +#define QtWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QtWaylandServerBufferIntegrationFactoryInterface.5.3" + +class Q_COMPOSITOR_EXPORT ServerBufferIntegrationPlugin : public QObject { Q_OBJECT public: - explicit QWaylandServerBufferIntegrationPlugin(QObject *parent = 0); - ~QWaylandServerBufferIntegrationPlugin(); + explicit ServerBufferIntegrationPlugin(QObject *parent = 0); + ~ServerBufferIntegrationPlugin(); - virtual QWaylandServerBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; + virtual ServerBufferIntegration *create(const QString &key, const QStringList ¶mList) = 0; }; +} + QT_END_NAMESPACE #endif // QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp index 36b5bc366..1e0823971 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor.cpp +++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp @@ -88,12 +88,12 @@ #include <wayland-server.h> #include "hardware_integration/qwlhwintegration_p.h" -#include "hardware_integration/qwaylandclientbufferintegration.h" -#include "hardware_integration/qwaylandserverbufferintegration.h" +#include "hardware_integration/qwlclientbufferintegration_p.h" +#include "hardware_integration/qwlserverbufferintegration_p.h" #include "waylandwindowmanagerintegration.h" -#include "hardware_integration/qwaylandclientbufferintegrationfactory.h" -#include "hardware_integration/qwaylandserverbufferintegrationfactory.h" +#include "hardware_integration/qwlclientbufferintegrationfactory_p.h" +#include "hardware_integration/qwlserverbufferintegrationfactory_p.h" QT_BEGIN_NAMESPACE @@ -315,7 +315,7 @@ QWindow *Compositor::window() const return m_qt_compositor->window(); } -QWaylandClientBufferIntegration * Compositor::clientBufferIntegration() const +ClientBufferIntegration * Compositor::clientBufferIntegration() const { #ifdef QT_COMPOSITOR_WAYLAND_GL return m_client_buffer_integration.data(); @@ -324,7 +324,7 @@ QWaylandClientBufferIntegration * Compositor::clientBufferIntegration() const #endif } -QWaylandServerBufferIntegration * Compositor::serverBufferIntegration() const +ServerBufferIntegration * Compositor::serverBufferIntegration() const { #ifdef QT_COMPOSITOR_WAYLAND_GL return m_server_buffer_integration.data(); @@ -540,7 +540,7 @@ void Compositor::sendDragEndEvent() void Compositor::loadClientBufferIntegration() { - QStringList keys = QWaylandClientBufferIntegrationFactory::keys(); + QStringList keys = ClientBufferIntegrationFactory::keys(); QString targetKey; QByteArray clientBufferIntegration = qgetenv("QT_WAYLAND_HARDWARE_INTEGRATION"); if (clientBufferIntegration.isEmpty()) @@ -554,7 +554,7 @@ void Compositor::loadClientBufferIntegration() } if (!targetKey.isEmpty()) { - m_client_buffer_integration.reset(QWaylandClientBufferIntegrationFactory::create(targetKey, QStringList())); + m_client_buffer_integration.reset(ClientBufferIntegrationFactory::create(targetKey, QStringList())); if (m_client_buffer_integration) { m_client_buffer_integration->setCompositor(m_qt_compositor); if (m_hw_integration) @@ -566,14 +566,14 @@ void Compositor::loadClientBufferIntegration() void Compositor::loadServerBufferIntegration() { - QStringList keys = QWaylandServerBufferIntegrationFactory::keys(); + QStringList keys = ServerBufferIntegrationFactory::keys(); QString targetKey; QByteArray serverBufferIntegration = qgetenv("QT_WAYLAND_SERVER_BUFFER_INTEGRATION"); if (keys.contains(QString::fromLocal8Bit(serverBufferIntegration.constData()))) { targetKey = QString::fromLocal8Bit(serverBufferIntegration.constData()); } if (!targetKey.isEmpty()) { - m_server_buffer_integration.reset(QWaylandServerBufferIntegrationFactory::create(targetKey, QStringList())); + m_server_buffer_integration.reset(ServerBufferIntegrationFactory::create(targetKey, QStringList())); if (m_hw_integration) m_hw_integration->setServerBufferIntegration(targetKey); } diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h index 9709efff7..6993660d6 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor_p.h +++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h @@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE class QWaylandCompositor; class QWaylandInputDevice; -class QWaylandClientBufferIntegration; -class QWaylandServerBufferIntegration; class WindowManagerServerIntegration; class QMimeData; class QPlatformScreenBuffer; @@ -79,6 +77,8 @@ class QtKeyExtensionGlobal; class TextInputManager; class InputPanel; class HardwareIntegration; +class ClientBufferIntegration; +class ServerBufferIntegration; class Q_COMPOSITOR_EXPORT Compositor : public QObject { @@ -102,8 +102,8 @@ public: QWindow *window() const; - QWaylandClientBufferIntegration *clientBufferIntegration() const; - QWaylandServerBufferIntegration *serverBufferIntegration() const; + ClientBufferIntegration *clientBufferIntegration() const; + ServerBufferIntegration *serverBufferIntegration() const; void initializeHardwareIntegration(); void initializeExtensions(); void initializeDefaultInputDevice(); @@ -198,8 +198,8 @@ private: #ifdef QT_COMPOSITOR_WAYLAND_GL QScopedPointer<HardwareIntegration> m_hw_integration; - QScopedPointer<QWaylandClientBufferIntegration> m_client_buffer_integration; - QScopedPointer<QWaylandServerBufferIntegration> m_server_buffer_integration; + QScopedPointer<ClientBufferIntegration> m_client_buffer_integration; + QScopedPointer<ServerBufferIntegration> m_server_buffer_integration; #endif //extensions diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index 8237bc05d..b8e079f18 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -59,7 +59,7 @@ #include <wayland-server.h> #ifdef QT_COMPOSITOR_WAYLAND_GL -#include "hardware_integration/qwaylandclientbufferintegration.h" +#include "hardware_integration/qwlclientbufferintegration_p.h" #include <qpa/qplatformopenglcontext.h> #endif @@ -129,7 +129,7 @@ bool Surface::isYInverted() const { bool ret = false; static bool negateReturn = qgetenv("QT_COMPOSITOR_NEGATE_INVERTED_Y").toInt(); - QWaylandClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); #ifdef QT_COMPOSITOR_WAYLAND_GL SurfaceBuffer *surfacebuffer = currentSurfaceBuffer(); diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp index f877631b7..1d919cdfb 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp @@ -44,7 +44,7 @@ #include "qwlcompositor_p.h" #ifdef QT_COMPOSITOR_WAYLAND_GL -#include "hardware_integration/qwaylandclientbufferintegration.h" +#include "hardware_integration/qwlclientbufferintegration_p.h" #include <qpa/qplatformopenglcontext.h> #endif @@ -111,7 +111,7 @@ void SurfaceBuffer::destructBufferState() delete static_cast<QImage *>(m_handle); #ifdef QT_COMPOSITOR_WAYLAND_GL } else { - QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); hwIntegration->unlockNativeBuffer(m_handle, 0); #endif } @@ -133,7 +133,7 @@ QSize SurfaceBuffer::size() const m_size = QSize(wl_shm_buffer_get_width(m_shmBuffer), wl_shm_buffer_get_height(m_shmBuffer)); #ifdef QT_COMPOSITOR_WAYLAND_GL } else { - QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); m_size = hwIntegration->bufferSize(m_buffer); #endif } @@ -190,7 +190,7 @@ void SurfaceBuffer::destroyTexture() #ifdef QT_COMPOSITOR_WAYLAND_GL if (m_texture) { Q_ASSERT(QOpenGLContext::currentContext()); - QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); if (hwIntegration->textureForBuffer(m_buffer) == 0) glDeleteTextures(1, &m_texture); else @@ -226,7 +226,7 @@ void *SurfaceBuffer::handle() const that->m_handle = image; #ifdef QT_COMPOSITOR_WAYLAND_GL } else { - QWaylandClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); that->m_handle = clientBufferIntegration->lockNativeBuffer(m_buffer, 0); #endif } @@ -270,7 +270,7 @@ void SurfaceBuffer::destroy_listener_callback(wl_listener *listener, void *data) void SurfaceBuffer::createTexture() { - QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration(); #ifdef QT_COMPOSITOR_WAYLAND_GL if (!m_texture) m_texture = hwIntegration->textureForBuffer(m_buffer); diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp index a0be625dd..66533fecb 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp @@ -76,7 +76,7 @@ public: }; BrcmEglIntegration::BrcmEglIntegration() - : QWaylandClientBufferIntegration() + : QtWayland::ClientBufferIntegration() , QtWaylandServer::qt_brcm() , d_ptr(new BrcmEglIntegrationPrivate) { diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h index 25c5ab71e..dca3fb667 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -41,7 +41,7 @@ #ifndef BRCMEGLINTEGRATION_H #define BRCMEGLINTEGRATION_H -#include <QtCompositor/qwaylandclientbufferintegration.h> +#include <QtCompositor/private/qwlclientbufferintegration_p.h> #include "qwayland-server-brcm.h" #include <QtCore/QScopedPointer> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class BrcmEglIntegrationPrivate; -class BrcmEglIntegration : public QWaylandClientBufferIntegration, public QtWaylandServer::qt_brcm +class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtWaylandServer::qt_brcm { Q_DECLARE_PRIVATE(BrcmEglIntegration) public: diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp index 9c7440dc6..09588f6ff 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp @@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE -DrmEglServerBuffer::DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QWaylandServerBuffer::Format format) - : QWaylandServerBuffer(size,format) +DrmEglServerBuffer::DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format) + : QtWayland::ServerBuffer(size,format) , m_integration(integration) { m_format = format; @@ -169,12 +169,12 @@ void DrmEglServerBufferIntegration::initializeHardware(QWaylandCompositor *compo QtWaylandServer::qt_drm_egl_server_buffer::init(compositor->waylandDisplay()); } -bool DrmEglServerBufferIntegration::supportsFormat(QWaylandServerBuffer::Format format) const +bool DrmEglServerBufferIntegration::supportsFormat(QtWayland::ServerBuffer::Format format) const { switch (format) { - case QWaylandServerBuffer::RGBA32: + case QtWayland::ServerBuffer::RGBA32: return true; - case QWaylandServerBuffer::A8: + case QtWayland::ServerBuffer::A8: #ifdef EGL_DRM_BUFFER_FORMAT_A8_MESA return true; #else @@ -185,7 +185,7 @@ bool DrmEglServerBufferIntegration::supportsFormat(QWaylandServerBuffer::Format } } -QWaylandServerBuffer *DrmEglServerBufferIntegration::createServerBuffer(const QSize &size, QWaylandServerBuffer::Format format) +QtWayland::ServerBuffer *DrmEglServerBufferIntegration::createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) { return new DrmEglServerBuffer(this, size, format); } diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index 659b261e0..501f21d4e 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -41,7 +41,7 @@ #ifndef DRMEGLSERVERBUFFERINTEGRATION_H #define DRMEGLSERVERBUFFERINTEGRATION_H -#include <QtCompositor/qwaylandserverbufferintegration.h> +#include <QtCompositor/private/qwlserverbufferintegration_p.h> #include "qwayland-server-drm-egl-server-buffer.h" @@ -74,10 +74,10 @@ QT_BEGIN_NAMESPACE class DrmEglServerBufferIntegration; -class DrmEglServerBuffer : public QWaylandServerBuffer, public QtWaylandServer::qt_server_buffer +class DrmEglServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServer::qt_server_buffer { public: - DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QWaylandServerBuffer::Format format); + DrmEglServerBuffer(DrmEglServerBufferIntegration *integration, const QSize &size, QtWayland::ServerBuffer::Format format); struct ::wl_resource *resourceForClient(struct ::wl_client *) Q_DECL_OVERRIDE; void bindTextureToBuffer() Q_DECL_OVERRIDE; @@ -93,7 +93,7 @@ private: }; class DrmEglServerBufferIntegration : - public QWaylandServerBufferIntegration, + public QtWayland::ServerBufferIntegration, public QtWaylandServer::qt_drm_egl_server_buffer { public: @@ -102,8 +102,8 @@ public: void initializeHardware(QWaylandCompositor *); - bool supportsFormat(QWaylandServerBuffer::Format format) const Q_DECL_OVERRIDE; - QWaylandServerBuffer *createServerBuffer(const QSize &size, QWaylandServerBuffer::Format format) Q_DECL_OVERRIDE; + bool supportsFormat(QtWayland::ServerBuffer::Format format) const Q_DECL_OVERRIDE; + QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) Q_DECL_OVERRIDE; EGLDisplay display() const { return m_egl_display; } diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index ede8a9abf..caff5df12 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -102,7 +102,7 @@ public: }; WaylandEglClientBufferIntegration::WaylandEglClientBufferIntegration() - : QWaylandClientBufferIntegration() + : QtWayland::ClientBufferIntegration() , d_ptr(new WaylandEglClientBufferIntegrationPrivate) { } @@ -208,7 +208,7 @@ bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer return true; #endif - return QWaylandClientBufferIntegration::isYInverted(buffer); + return QtWayland::ClientBufferIntegration::isYInverted(buffer); } diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h index 94d31fc80..322911892 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h @@ -41,14 +41,14 @@ #ifndef WAYLANDEGLINTEGRATION_H #define WAYLANDEGLINTEGRATION_H -#include <QtCompositor/qwaylandclientbufferintegration.h> +#include <QtCompositor/private/qwlclientbufferintegration_p.h> #include <QtCore/QScopedPointer> QT_BEGIN_NAMESPACE class WaylandEglClientBufferIntegrationPrivate; -class WaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration +class WaylandEglClientBufferIntegration : public QtWayland::ClientBufferIntegration { Q_DECLARE_PRIVATE(WaylandEglClientBufferIntegration) public: diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp index c645b997f..2401d6710 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp @@ -68,7 +68,7 @@ QVector<EGLint> eglbuildSpec() } XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration() - : QWaylandClientBufferIntegration() + : QtWayland::ClientBufferIntegration() , mDisplay(0) { diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h index 5497daed4..cf5acdd34 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h @@ -41,7 +41,7 @@ #ifndef XCOMPOSITEEGLINTEGRATION_H #define XCOMPOSITEEGLINTEGRATION_H -#include <QtCompositor/qwaylandclientbufferintegration.h> +#include <QtCompositor/private/qwlclientbufferintegration_p.h> #include "xlibinclude.h" @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class XCompositeEglClientBufferIntegration : public QWaylandClientBufferIntegration +class XCompositeEglClientBufferIntegration : public QtWayland::ClientBufferIntegration { public: XCompositeEglClientBufferIntegration(); diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp index a58827cee..dce1fdc31 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp @@ -72,7 +72,7 @@ QVector<int> qglx_buildSpec() XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration() - : QWaylandClientBufferIntegration() + : QtWayland::ClientBufferIntegration() , mDisplay(0) , mHandler(0) { diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 5a724eedf..6d28a3de4 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -41,7 +41,7 @@ #ifndef XCOMPOSITEGLXINTEGRATION_H #define XCOMPOSITEGLXINTEGRATION_H -#include <QtCompositor/qwaylandclientbufferintegration.h> +#include <QtCompositor/private/qwlclientbufferintegration_p.h> #include "xlibinclude.h" @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class XCompositeHandler; -class XCompositeGLXClientBufferIntegration : public QWaylandClientBufferIntegration +class XCompositeGLXClientBufferIntegration : public QtWayland::ClientBufferIntegration { public: XCompositeGLXClientBufferIntegration(); diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index bfdfa6432..53a3f3c3e 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include <QtCompositor/qwaylandclientbufferintegrationplugin.h> +#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "brcmeglintegration.h" QT_BEGIN_NAMESPACE -class QWaylandBrcmClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin +class QWaylandBrcmClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "brcm-egl.json") + Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "brcm-egl.json") public: QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); }; QStringList QWaylandBrcmClientBufferIntegration::keys() const @@ -60,7 +60,7 @@ QStringList QWaylandBrcmClientBufferIntegration::keys() const return list; } -QWaylandClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-brcm") diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp index 17079cec7..4bfc1b483 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include <QtCompositor/qwaylandserverbufferintegrationplugin.h> +#include <QtCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "drmeglserverbufferintegration.h" QT_BEGIN_NAMESPACE -class DrmEglServerBufferIntegrationPlugin : public QWaylandServerBufferIntegrationPlugin +class DrmEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandServerBufferIntegrationFactoryInterface.5.3" FILE "drm-egl-server.json") + Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json") public: QStringList keys() const; - QWaylandServerBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&); }; QStringList DrmEglServerBufferIntegrationPlugin::keys() const @@ -60,7 +60,7 @@ QStringList DrmEglServerBufferIntegrationPlugin::keys() const return list; } -QWaylandServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QtWayland::ServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "drm-egl-server") diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 8a2225894..274dff1e6 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -39,19 +39,19 @@ ** ****************************************************************************/ -#include <QtCompositor/qwaylandclientbufferintegrationfactory.h> -#include <QtCompositor/qwaylandclientbufferintegrationplugin.h> +#include <QtCompositor/private/qwlclientbufferintegrationfactory_p.h> +#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "waylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE -class QWaylandIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin +class QWaylandIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "wayland-egl.json") + Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json") public: QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); }; QStringList QWaylandIntegrationPlugin::keys() const @@ -61,7 +61,7 @@ QStringList QWaylandIntegrationPlugin::keys() const return list; } -QWaylandClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-egl") diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp index 8dd43e915..4ae206fa2 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include <QtCompositor/qwaylandclientbufferintegrationplugin.h> +#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "xcompositeeglintegration.h" QT_BEGIN_NAMESPACE -class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin +class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-egl.json") + Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json") public: QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); }; QStringList QWaylandXCompositeClientBufferIntegration::keys() const @@ -60,7 +60,7 @@ QStringList QWaylandXCompositeClientBufferIntegration::keys() const return list; } -QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-xcomposite") diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp index b7673893e..4dcd9136f 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include <QtCompositor/qwaylandclientbufferintegrationplugin.h> +#include <QtCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "xcompositeglxintegration.h" QT_BEGIN_NAMESPACE -class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin +class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBufferIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.3" FILE "xcomposite-glx.json") + Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json") public: QStringList keys() const; - QWaylandClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); }; QStringList QWaylandXCompositeClientBufferIntegration::keys() const @@ -60,7 +60,7 @@ QStringList QWaylandXCompositeClientBufferIntegration::keys() const return list; } -QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) +QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); if (system.toLower() == "wayland-xcomposite-glx") |