From 6e28e8441b698c3397c2c78125c877f2e9867cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 22 Aug 2011 10:49:28 +0200
Subject: Copy core GL functionality to QtGui with QGL -> QOpenGL naming.

Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 src/plugins/platforms/openwfd/qopenwfdglcontext.cpp       | 2 +-
 src/plugins/platforms/openwfd/qopenwfdglcontext.h         | 4 ++--
 src/plugins/platforms/openwfd/qopenwfdintegration.cpp     | 4 ++--
 src/plugins/platforms/openwfd/qopenwfdintegration.h       | 2 +-
 src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp | 4 ++--
 src/plugins/platforms/openwfd/qopenwfdnativeinterface.h   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins/platforms/openwfd')

diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.cpp b/src/plugins/platforms/openwfd/qopenwfdglcontext.cpp
index 87d7af4a02..0db717c4d6 100644
--- a/src/plugins/platforms/openwfd/qopenwfdglcontext.cpp
+++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.cpp
@@ -45,7 +45,7 @@
 #include "qopenwfdscreen.h"
 
 QOpenWFDGLContext::QOpenWFDGLContext(QOpenWFDDevice *device)
-    : QPlatformGLContext()
+    : QPlatformOpenGLContext()
     , mWfdDevice(device)
 {
 }
diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.h b/src/plugins/platforms/openwfd/qopenwfdglcontext.h
index 0f53b9653b..3287a853c7 100644
--- a/src/plugins/platforms/openwfd/qopenwfdglcontext.h
+++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.h
@@ -42,11 +42,11 @@
 #ifndef QOPENWFDGLCONTEXT_H
 #define QOPENWFDGLCONTEXT_H
 
-#include <QtGui/QPlatformGLContext>
+#include <QtGui/QPlatformOpenGLContext>
 
 #include "qopenwfddevice.h"
 
-class QOpenWFDGLContext : public QPlatformGLContext
+class QOpenWFDGLContext : public QPlatformOpenGLContext
 {
 public:
     QOpenWFDGLContext(QOpenWFDDevice *device);
diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
index 63d7b6a31f..3d57759183 100644
--- a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
+++ b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp
@@ -50,7 +50,7 @@
 #include <QtPlatformSupport/private/qgenericunixprintersupport_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QGuiGLContext>
+#include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
 
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
@@ -107,7 +107,7 @@ QPlatformWindow *QOpenWFDIntegration::createPlatformWindow(QWindow *window) cons
     return new QOpenWFDWindow(window);
 }
 
-QPlatformGLContext *QOpenWFDIntegration::createPlatformGLContext(QGuiGLContext *context) const
+QPlatformOpenGLContext *QOpenWFDIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
     QOpenWFDScreen *screen = static_cast<QOpenWFDScreen *>(context->screen()->handle());
 
diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h
index 18d87fd90e..b5315b31da 100644
--- a/src/plugins/platforms/openwfd/qopenwfdintegration.h
+++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h
@@ -59,7 +59,7 @@ public:
     bool hasCapability(Capability cap) const;
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
-    QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
 
     //This should not be a factory interface, but rather a accessor
     QAbstractEventDispatcher *guiThreadEventDispatcher() const;
diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp
index e46c0fbfa1..758e0c4398 100644
--- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp
+++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.cpp
@@ -68,7 +68,7 @@ public:
 
 Q_GLOBAL_STATIC(QOpenWFDResourceMap, qOpenWFDResourceMap)
 
-void *QOpenWFDNativeInterface::nativeResourceForContext(const QByteArray &resourceString, QGuiGLContext *context)
+void *QOpenWFDNativeInterface::nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context)
 {
     QByteArray lowerCaseResource = resourceString.toLower();
     ResourceType resource = qOpenWFDResourceMap()->value(lowerCaseResource);
@@ -134,7 +134,7 @@ void *QOpenWFDNativeInterface::eglDisplayForWindow(QWindow *window)
     return openWFDwindow->port()->device()->eglDisplay();
 }
 
-void * QOpenWFDNativeInterface::eglContextForContext(QGuiGLContext *context)
+void * QOpenWFDNativeInterface::eglContextForContext(QOpenGLContext *context)
 {
     QOpenWFDGLContext *openWFDContext = static_cast<QOpenWFDGLContext *>(context->handle());
     return openWFDContext->eglContext();
diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
index 8123bdfda1..cff49dc8b0 100644
--- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
+++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h
@@ -59,7 +59,7 @@ public:
         WFDPipeline
     };
 
-    void *nativeResourceForContext(const QByteArray &resourceString, QGuiGLContext *context);
+    void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context);
     void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window);
 
     WFDHandle wfdDeviceForWindow(QWindow *window);
@@ -67,7 +67,7 @@ public:
     WFDHandle wfdPortForWindow(QWindow *window);
     WFDHandle wfdPipelineForWindow(QWindow *window);
 
-    void *eglContextForContext(QGuiGLContext *context);
+    void *eglContextForContext(QOpenGLContext *context);
 
 private:
     static QOpenWFDScreen *qPlatformScreenForWindow(QWindow *window);
-- 
cgit v1.2.3