Rename QWaylandGLIntegration to QWaylandClientBufferIntegration

also add a factory to load QWaylandClientBufferIntegrationPlugins

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

4 files changed, 13 insertions, 80 deletions

diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
index c9c288feb..a6c572466 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
@@ -44,7 +44,7 @@
 
 #include <QtWaylandClient/qwaylandintegration.h>
 
-#include "qwaylandeglintegration.h"
+#include "qwaylandeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -53,16 +53,16 @@ class QWaylandEglPlatformIntegration : public QWaylandIntegration
 public:
     QWaylandEglPlatformIntegration()
         : QWaylandIntegration()
-        , m_gl_integration(new QWaylandEglIntegration(display()))
+        , m_client_buffer_integration(new QWaylandEglClientBufferIntegration(display()))
     {
-        m_gl_integration->initialize();
+        m_client_buffer_integration->initialize();
     }
 
-    QWaylandGLIntegration *glIntegration() const
-    { return m_gl_integration; }
+    QWaylandEglClientBufferIntegration *clientBufferIntegration() const
+    { return m_client_buffer_integration; }
 
 private:
-    QWaylandGLIntegration *m_gl_integration;
+    QWaylandEglClientBufferIntegration *m_client_buffer_integration;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp
index 15a7a9f52..1b4028cd0 100644
--- a/src/plugins/platforms/qwayland-generic/main.cpp
+++ b/src/plugins/platforms/qwayland-generic/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qpa/qplatformintegrationplugin.h>
-#include "qwaylandgenericplatformintegration.h"
+#include <QtWaylandClient/qwaylandintegration.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,7 +64,7 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland")
-        return new QWaylandGenericPlatformIntegration();
+        return new QWaylandIntegration();
 
     return 0;
 }
diff --git a/src/plugins/platforms/qwayland-generic/qwaylandgenericplatformintegration.h b/src/plugins/platforms/qwayland-generic/qwaylandgenericplatformintegration.h
deleted file mode 100644
index 0d742e93a..000000000
--- a/src/plugins/platforms/qwayland-generic/qwaylandgenericplatformintegration.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWAYLANDEGLPLATFORMINTEGRATION_H
-#define QWAYLANDEGLPLATFORMINTEGRATION_H
-
-#include <QtWaylandClient/qwaylandintegration.h>
-
-QT_BEGIN_NAMESPACE
-
-class QWaylandGenericPlatformIntegration : public QWaylandIntegration
-{
-public:
-    QWaylandGenericPlatformIntegration()
-        : QWaylandIntegration()
-        , m_gl_integration(0)
-    {
-    }
-
-    QWaylandGLIntegration *glIntegration() const
-    { return m_gl_integration; }
-
-private:
-    QWaylandGLIntegration *m_gl_integration;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
index 0bcd128da..528a7d054 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
@@ -44,7 +44,7 @@
 
 #include <QtWaylandClient/qwaylandintegration.h>
 
-#include "qwaylandxcompositeeglintegration.h"
+#include "qwaylandxcompositeeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -53,14 +53,14 @@ class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration
 public:
     QWaylandXCompositeEglPlatformIntegration()
         : QWaylandIntegration()
-        , m_gl_integration(new QWaylandXCompositeEGLIntegration(display()))
+        , m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration(display()))
     { }
 
-    QWaylandGLIntegration *glIntegration() const Q_DECL_OVERRIDE
-    { return m_gl_integration; }
+    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
+    { return m_client_buffer_integration; }
 
 private:
-    QWaylandGLIntegration *m_gl_integration;
+    QWaylandClientBufferIntegration *m_client_buffer_integration;
 };
 
 QT_END_NAMESPACE