Rename remaining gui/opengl source files to avoid name clashing.

We don't want to have source files in the opengl module and gui with the
same name, at least not private headers.

Change-Id: I5f2bf629c943a67a405574fb148aa4c70e58ecbb
Reviewed-on: http://codereview.qt.nokia.com/3864
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

10 files changed, 27 insertions, 27 deletions

diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index 87b8d80d4b..ed715d9f35 100644
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@@ -16,16 +16,16 @@ HEADERS += opengl/qopengl.h \
            opengl/qopenglgradientcache_p.h \
            opengl/qopenglengineshadermanager_p.h \
            opengl/qopengl2pexvertexarray_p.h \
-           opengl/qpaintengineex_opengl2_p.h \
+           opengl/qopenglpaintengine_p.h \
            opengl/qopenglengineshadersource_p.h \
            opengl/qopenglcustomshaderstage_p.h \
-           opengl/qtriangulatingstroker_p.h \
-           opengl/qtriangulator_p.h \
-           opengl/qrbtree_p.h \
-           opengl/qtextureglyphcache_gl_p.h \
+           opengl/qopengltriangulatingstroker_p.h \
+           opengl/qopengltextureglyphcache_p.h \
            opengl/qopenglshadercache_p.h \
            opengl/qopenglshadercache_meego_p.h \
-           opengl/qopenglcolormap.h
+           opengl/qopenglcolormap.h \
+           opengl/qtriangulator_p.h \
+           opengl/qrbtree_p.h
 
 SOURCES += opengl/qopengl.cpp \
            opengl/qopenglfunctions.cpp \
@@ -36,11 +36,11 @@ SOURCES += opengl/qopengl.cpp \
            opengl/qopenglgradientcache.cpp \
            opengl/qopenglengineshadermanager.cpp \
            opengl/qopengl2pexvertexarray.cpp \
-           opengl/qpaintengineex_opengl2.cpp \
+           opengl/qopenglpaintengine.cpp \
            opengl/qopenglcustomshaderstage.cpp \
-           opengl/qtriangulatingstroker.cpp \
-           opengl/qtriangulator.cpp \
-           opengl/qtextureglyphcache_gl.cpp \
-           opengl/qopenglcolormap.cpp
+           opengl/qopengltriangulatingstroker.cpp \
+           opengl/qopengltextureglyphcache.cpp \
+           opengl/qopenglcolormap.cpp \
+           opengl/qtriangulator.cpp
 
 #INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/gui/opengl/qopenglcustomshaderstage.cpp b/src/gui/opengl/qopenglcustomshaderstage.cpp
index cbbf318249..6cedf66df1 100644
--- a/src/gui/opengl/qopenglcustomshaderstage.cpp
+++ b/src/gui/opengl/qopenglcustomshaderstage.cpp
@@ -41,7 +41,7 @@
 
 #include "qopenglcustomshaderstage_p.h"
 #include "qopenglengineshadermanager_p.h"
-#include "qpaintengineex_opengl2_p.h"
+#include "qopenglpaintengine_p.h"
 #include <private/qpainter_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp
index 91262dc1ce..aaca6ad89c 100644
--- a/src/gui/opengl/qopenglengineshadermanager.cpp
+++ b/src/gui/opengl/qopenglengineshadermanager.cpp
@@ -41,7 +41,7 @@
 
 #include "qopenglengineshadermanager_p.h"
 #include "qopenglengineshadersource_p.h"
-#include "qpaintengineex_opengl2_p.h"
+#include "qopenglpaintengine_p.h"
 #include "qopenglshadercache_p.h"
 
 #include <QtGui/private/qopenglcontext_p.h>
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index 3d236eaac6..2e9f3a1ab7 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -47,7 +47,7 @@
 #include <private/qopenglcontext_p.h>
 #include <private/qopenglextensions_p.h>
 #include <private/qfont_p.h>
-#include <private/qpaintengineex_opengl2_p.h>
+#include <private/qopenglpaintengine_p.h>
 
 #include <qwindow.h>
 #include <qlibrary.h>
diff --git a/src/gui/opengl/qpaintengineex_opengl2.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index 13d5ece2c8..6b9878edf3 100644
--- a/src/gui/opengl/qpaintengineex_opengl2.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -65,7 +65,7 @@
 // #define QT_OPENGL_CACHE_AS_VBOS
 
 #include "qopenglgradientcache_p.h"
-#include "qpaintengineex_opengl2_p.h"
+#include "qopenglpaintengine_p.h"
 
 #include <string.h> //for memcpy
 #include <qmath.h>
@@ -84,8 +84,8 @@
 
 #include "qopenglengineshadermanager_p.h"
 #include "qopengl2pexvertexarray_p.h"
-#include "qtriangulatingstroker_p.h"
-#include "qtextureglyphcache_gl_p.h"
+#include "qopengltriangulatingstroker_p.h"
+#include "qopengltextureglyphcache_p.h"
 
 #include <QDebug>
 
diff --git a/src/gui/opengl/qpaintengineex_opengl2_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index cea5cc1302..d38f2a8659 100644
--- a/src/gui/opengl/qpaintengineex_opengl2_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGRAPHICSCONTEXT_OPENGL2_P_H
-#define QGRAPHICSCONTEXT_OPENGL2_P_H
+#ifndef QOPENGLPAINTENGINE_P_H
+#define QOPENGLPAINTENGINE_P_H
 
 //
 //  W A R N I N G
@@ -61,7 +61,7 @@
 #include <private/qopenglpaintdevice_p.h>
 #include <private/qfontengine_p.h>
 #include <private/qdatabuffer_p.h>
-#include <private/qtriangulatingstroker_p.h>
+#include <private/qopengltriangulatingstroker_p.h>
 
 #include <private/qopenglextensions_p.h>
 
diff --git a/src/gui/opengl/qtextureglyphcache_gl.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
index 6da72d41ce..ffce6f55bb 100644
--- a/src/gui/opengl/qtextureglyphcache_gl.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qtextureglyphcache_gl_p.h"
-#include "qpaintengineex_opengl2_p.h"
+#include "qopengltextureglyphcache_p.h"
+#include "qopenglpaintengine_p.h"
 #include "private/qopenglengineshadersource_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/opengl/qtextureglyphcache_gl_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
index d8f10d12ba..97f9ac3c64 100644
--- a/src/gui/opengl/qtextureglyphcache_gl_p.h
+++ b/src/gui/opengl/qopengltextureglyphcache_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTEXTUREGLYPHCACHE_GL_P_H
-#define QTEXTUREGLYPHCACHE_GL_P_H
+#ifndef QOPENTEXTUREGLYPHCACHE_P_H
+#define QOPENTEXTUREGLYPHCACHE_P_H
 
 //
 //  W A R N I N G
diff --git a/src/gui/opengl/qtriangulatingstroker.cpp b/src/gui/opengl/qopengltriangulatingstroker.cpp
index 2bd01a4307..3dc3452b60 100644
--- a/src/gui/opengl/qtriangulatingstroker.cpp
+++ b/src/gui/opengl/qopengltriangulatingstroker.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtriangulatingstroker_p.h"
+#include "qopengltriangulatingstroker_p.h"
 #include <qmath.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/opengl/qtriangulatingstroker_p.h b/src/gui/opengl/qopengltriangulatingstroker_p.h
index 3716ea4e0f..abb10957c0 100644
--- a/src/gui/opengl/qtriangulatingstroker_p.h
+++ b/src/gui/opengl/qopengltriangulatingstroker_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTRIANGULATINGSTROKER_P_H
-#define QTRIANGULATINGSTROKER_P_H
+#ifndef QOPENGLTRIANGULATINGSTROKER_P_H
+#define QOPENGLTRIANGULATINGSTROKER_P_H
 
 #include <private/qdatabuffer_p.h>
 #include <qvarlengtharray.h>