Making the buffer intgrations private

Change-Id: Ifb6e2456c781e80f84e27e68c3e279ea993f9307
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

13 files changed, 127 insertions, 83 deletions

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 &paramList) = 0;
+    virtual ClientBufferIntegration *create(const QString &key, const QStringList &paramList) = 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 &paramList) = 0;
+    virtual ServerBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H