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/opengl/gl2paintengineex/qglengineshadermanager.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/opengl/gl2paintengineex/qglengineshadermanager.cpp')

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 05a612c311..aebdce6e01 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -44,7 +44,7 @@
 #include "qpaintengineex_opengl2_p.h"
 #include "qglshadercache_p.h"
 
-#include <QtGui/private/qguiglcontext_qpa_p.h>
+#include <QtGui/private/qopenglcontext_p.h>
 
 #if defined(QT_DEBUG)
 #include <QMetaEnum>
@@ -54,12 +54,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QGLEngineSharedShadersResource : public QGLSharedResource
+class QGLEngineSharedShadersResource : public QOpenGLSharedResource
 {
 public:
-    QGLEngineSharedShadersResource(QGuiGLContext *ctx)
-        : QGLSharedResource(ctx->shareGroup())
-        , m_shaders(new QGLEngineSharedShaders(QGLContext::fromGuiGLContext(ctx)))
+    QGLEngineSharedShadersResource(QOpenGLContext *ctx)
+        : QOpenGLSharedResource(ctx->shareGroup())
+        , m_shaders(new QGLEngineSharedShaders(QGLContext::fromOpenGLContext(ctx)))
     {
     }
 
@@ -74,7 +74,7 @@ public:
         m_shaders = 0;
     }
 
-    void freeResource(QGuiGLContext *)
+    void freeResource(QOpenGLContext *)
     {
     }
 
@@ -88,16 +88,16 @@ class QGLShaderStorage
 {
 public:
     QGLEngineSharedShaders *shadersForThread(const QGLContext *context) {
-        QGLMultiGroupSharedResource *&shaders = m_storage.localData();
+        QOpenGLMultiGroupSharedResource *&shaders = m_storage.localData();
         if (!shaders)
-            shaders = new QGLMultiGroupSharedResource;
+            shaders = new QOpenGLMultiGroupSharedResource;
         QGLEngineSharedShadersResource *resource =
             shaders->value<QGLEngineSharedShadersResource>(context->contextHandle());
         return resource ? resource->shaders() : 0;
     }
 
 private:
-    QThreadStorage<QGLMultiGroupSharedResource *> m_storage;
+    QThreadStorage<QOpenGLMultiGroupSharedResource *> m_storage;
 };
 
 Q_GLOBAL_STATIC(QGLShaderStorage, qt_shader_storage);
-- 
cgit v1.2.3