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>

5 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp
index c3090428de..1d27be7fb3 100644
--- a/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.cpp
@@ -43,7 +43,7 @@
 
 #include "qeglfsbackingstore.h"
 
-#include <QtGui/QPlatformGLContext>
+#include <QtGui/QPlatformOpenGLContext>
 #include <QtGui/QScreen>
 
 #include <QtOpenGL/private/qglpaintdevice_p.h>
@@ -62,7 +62,7 @@ public:
     }
 
     QSize size() const { return m_screen->geometry().size(); }
-    QGLContext* context() const { return QGLContext::fromGuiGLContext(m_screen->platformContext()->context()); }
+    QGLContext* context() const { return QGLContext::fromOpenGLContext(m_screen->platformContext()->context()); }
 
     QPaintEngine *paintEngine() const { return qt_qgl_paint_engine(); }
 
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
index 8b2346b5fd..3d3e05d351 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp
@@ -49,7 +49,7 @@
 
 #include <QtGui/QPlatformWindow>
 #include <QtGui/QSurfaceFormat>
-#include <QtGui/QGuiGLContext>
+#include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
 
 #include <EGL/egl.h>
@@ -93,7 +93,7 @@ QPlatformBackingStore *QEglFSIntegration::createPlatformBackingStore(QWindow *wi
     return new QEglFSBackingStore(window);
 }
 
-QPlatformGLContext *QEglFSIntegration::createPlatformGLContext(QGuiGLContext *context) const
+QPlatformOpenGLContext *QEglFSIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
     return static_cast<QEglFSScreen *>(context->screen()->handle())->platformContext();
 }
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h
index 66fda9c673..9538850faf 100644
--- a/src/plugins/platforms/eglfs/qeglfsintegration.h
+++ b/src/plugins/platforms/eglfs/qeglfsintegration.h
@@ -60,7 +60,7 @@ public:
 
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
-    QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
 
     QPlatformFontDatabase *fontDatabase() const;
 
diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
index 953ae704dc..6f317a375f 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp
@@ -90,7 +90,7 @@ static struct AttrInfo attrs[] = {
 class QEglFSContext : public QEGLPlatformContext
 {
 public:
-    QEglFSContext(const QSurfaceFormat &format, QPlatformGLContext *share, EGLDisplay display,
+    QEglFSContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
                   EGLint eglClientVersion = 2, EGLenum eglApi = EGL_OPENGL_ES_API)
         : QEGLPlatformContext(format, share, display, eglClientVersion, eglApi)
     {
@@ -238,7 +238,7 @@ QImage::Format QEglFSScreen::format() const
         createAndSetPlatformContext();
     return m_format;
 }
-QPlatformGLContext *QEglFSScreen::platformContext() const
+QPlatformOpenGLContext *QEglFSScreen::platformContext() const
 {
     if (!m_platformContext) {
         QEglFSScreen *that = const_cast<QEglFSScreen *>(this);
diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h
index 230acf3a4b..41465d871c 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.h
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QPlatformGLContext;
+class QPlatformOpenGLContext;
 
 class QEglFSScreen : public QPlatformScreen //huh: FullScreenScreen ;) just to follow namespace
 {
@@ -62,7 +62,7 @@ public:
     int depth() const;
     QImage::Format format() const;
 
-    QPlatformGLContext *platformContext() const;
+    QPlatformOpenGLContext *platformContext() const;
 
     EGLSurface surface() const { return m_surface; }
 
@@ -73,7 +73,7 @@ private:
     QRect m_geometry;
     int m_depth;
     QImage::Format m_format;
-    QPlatformGLContext *m_platformContext;
+    QPlatformOpenGLContext *m_platformContext;
     EGLDisplay m_dpy;
     EGLSurface m_surface;
 };