27 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 2633a10..8d4b6d7 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -3,8 +3,8 @@ include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
-SOURCES = main.cpp qgraphicssystem_linuxfb.cpp
-HEADERS = qgraphicssystem_linuxfb.h
+SOURCES = main.cpp qlinuxfbintegration.cpp
+HEADERS = qlinuxfbintegration.h
 
 include(../fb_base/fb_base.pri)
 
diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp
index 1ee24b6..65569ac 100644
--- a/src/plugins/platforms/linuxfb/main.cpp
+++ b/src/plugins/platforms/linuxfb/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QPlatformIntegrationPlugin>
-#include "qgraphicssystem_linuxfb.h"
+#include "qlinuxfbintegration.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index 321e90f..391e105 100644
--- a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgraphicssystem_linuxfb.h"
+#include "qlinuxfbintegration.h"
 #include "../fb_base/fb_base.h"
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <private/qcore_unix_p.h> // overrides QT_OPEN
diff --git a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
index dc61df5..dc61df5 100644
--- a/src/plugins/platforms/linuxfb/qgraphicssystem_linuxfb.h
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp
index 44c274b..4958468 100644
--- a/src/plugins/platforms/minimal/main.cpp
+++ b/src/plugins/platforms/minimal/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QPlatformIntegrationPlugin>
-#include "qplatformintegration_minimal.h"
+#include "qminimalintegration.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 6c97f07..438a88e 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -4,10 +4,10 @@ include(../../qpluginbase.pri)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 SOURCES =   main.cpp \
-            qplatformintegration_minimal.cpp \
-            qwindowsurface_minimal.cpp
-HEADERS =   qplatformintegration_minimal.h \
-            qwindowsurface_minimal.h
+            qminimalintegration.cpp \
+            qminimalwindowsurface.cpp
+HEADERS =   qminimalintegration.h \
+            qminimalwindowsurface.h
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index 73e025c..e947bf1 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -1,5 +1,5 @@
-#include "qplatformintegration_minimal.h"
-#include "qwindowsurface_minimal.h"
+#include "qminimalintegration.h"
+#include "qminimalwindowsurface.h"
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/QPlatformWindow>
diff --git a/src/plugins/platforms/minimal/qplatformintegration_minimal.h b/src/plugins/platforms/minimal/qminimalintegration.h
index a2f7449..a2f7449 100644
--- a/src/plugins/platforms/minimal/qplatformintegration_minimal.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
diff --git a/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp b/src/plugins/platforms/minimal/qminimalwindowsurface.cpp
index 2f8b1f0..ad5997e 100644
--- a/src/plugins/platforms/minimal/qwindowsurface_minimal.cpp
+++ b/src/plugins/platforms/minimal/qminimalwindowsurface.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwindowsurface_minimal.h"
+#include "qminimalwindowsurface.h"
 #include <QtCore/qdebug.h>
 #include <QtGui/private/qapplication_p.h>
 
diff --git a/src/plugins/platforms/minimal/qwindowsurface_minimal.h b/src/plugins/platforms/minimal/qminimalwindowsurface.h
index 96f989d..96f989d 100644
--- a/src/plugins/platforms/minimal/qwindowsurface_minimal.h
+++ b/src/plugins/platforms/minimal/qminimalwindowsurface.h
diff --git a/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro
index 4dec274..a560755 100644
--- a/src/plugins/platforms/qvfb/qvfb.pro
+++ b/src/plugins/platforms/qvfb/qvfb.pro
@@ -4,8 +4,8 @@ include(../../qpluginbase.pri)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 
-SOURCES = main.cpp qvfbintegration.cpp qwindowsurface_qvfb.cpp
-HEADERS = qvfbintegration.h qwindowsurface_qvfb.h
+SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp
+HEADERS = qvfbintegration.h qvfbwindowsurface.h
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
diff --git a/src/plugins/platforms/qvfb/qvfbintegration.cpp b/src/plugins/platforms/qvfb/qvfbintegration.cpp
index e22c724..84ab9fb 100644
--- a/src/plugins/platforms/qvfb/qvfbintegration.cpp
+++ b/src/plugins/platforms/qvfb/qvfbintegration.cpp
@@ -53,7 +53,7 @@
 #include <qsocketnotifier.h>
 
 #include "qvfbintegration.h"
-#include "qwindowsurface_qvfb.h"
+#include "qvfbwindowsurface.h"
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtCore/qdebug.h>
 #include <QMouseEvent>
diff --git a/src/plugins/platforms/qvfb/qwindowsurface_qvfb.cpp b/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp
index b46d9c0..6699072 100644
--- a/src/plugins/platforms/qvfb/qwindowsurface_qvfb.cpp
+++ b/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include "qwindowsurface_qvfb.h"
+#include "qvfbwindowsurface.h"
 #include "qvfbintegration.h"
 #include <QtCore/qdebug.h>
 #include <QtGui/qpainter.h>
diff --git a/src/plugins/platforms/qvfb/qwindowsurface_qvfb.h b/src/plugins/platforms/qvfb/qvfbwindowsurface.h
index 9228189..9228189 100644
--- a/src/plugins/platforms/qvfb/qwindowsurface_qvfb.h
+++ b/src/plugins/platforms/qvfb/qvfbwindowsurface.h
diff --git a/src/plugins/platforms/testlite/main.cpp b/src/plugins/platforms/testlite/main.cpp
index c1759ef..29bbcea 100644
--- a/src/plugins/platforms/testlite/main.cpp
+++ b/src/plugins/platforms/testlite/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QPlatformIntegrationPlugin>
-#include "qplatformintegration_testlite.h"
+#include "qtestliteintegration.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp b/src/plugins/platforms/testlite/qtestliteintegration.cpp
index cc77bc7..6c07349 100644
--- a/src/plugins/platforms/testlite/qplatformintegration_testlite.cpp
+++ b/src/plugins/platforms/testlite/qtestliteintegration.cpp
@@ -41,8 +41,8 @@
 
 
 
-#include "qplatformintegration_testlite.h"
-#include "qwindowsurface_testlite.h"
+#include "qtestliteintegration.h"
+#include "qtestlitewindowsurface.h"
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/plugins/platforms/testlite/qplatformintegration_testlite.h b/src/plugins/platforms/testlite/qtestliteintegration.h
index 4260faa..4260faa 100644
--- a/src/plugins/platforms/testlite/qplatformintegration_testlite.h
+++ b/src/plugins/platforms/testlite/qtestliteintegration.h
diff --git a/src/plugins/platforms/testlite/qtestlitewindow.cpp b/src/plugins/platforms/testlite/qtestlitewindow.cpp
index 108f732..49b79ec 100644
--- a/src/plugins/platforms/testlite/qtestlitewindow.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindow.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwindowsurface_testlite.h"
-#include "qplatformintegration_testlite.h"
+#include "qtestlitewindowsurface.h"
+#include "qtestliteintegration.h"
 #include <QWindowSystemInterface>
 
 #include "qtestlitewindow.h"
diff --git a/src/plugins/platforms/testlite/qwindowsurface_testlite.cpp b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
index af10368..3567118 100644
--- a/src/plugins/platforms/testlite/qwindowsurface_testlite.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwindowsurface_testlite.h"
-#include "qplatformintegration_testlite.h"
+#include "qtestlitewindowsurface.h"
+#include "qtestliteintegration.h"
 
 #include <QtCore/qdebug.h>
 #include <QWindowSystemInterface>
diff --git a/src/plugins/platforms/testlite/qwindowsurface_testlite.h b/src/plugins/platforms/testlite/qtestlitewindowsurface.h
index 915e7fe..915e7fe 100644
--- a/src/plugins/platforms/testlite/qwindowsurface_testlite.h
+++ b/src/plugins/platforms/testlite/qtestlitewindowsurface.h
diff --git a/src/plugins/platforms/testlite/testlite.pro b/src/plugins/platforms/testlite/testlite.pro
index 8f108ae..454193d 100644
--- a/src/plugins/platforms/testlite/testlite.pro
+++ b/src/plugins/platforms/testlite/testlite.pro
@@ -3,8 +3,8 @@ include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
-SOURCES = main.cpp qplatformintegration_testlite.cpp qwindowsurface_testlite.cpp qtestlitewindow.cpp
-HEADERS = qplatformintegration_testlite.h qwindowsurface_testlite.h qtestlitewindow.h
+SOURCES = main.cpp qtestliteintegration.cpp qtestlitewindowsurface.cpp qtestlitewindow.cpp
+HEADERS = qtestliteintegration.h qtestlitewindowsurface.h qtestlitewindow.h
 
 LIBS += -lX11 -lXext
 
diff --git a/src/plugins/platforms/vnc/main.cpp b/src/plugins/platforms/vnc/main.cpp
index 23d78c1..775259b 100644
--- a/src/plugins/platforms/vnc/main.cpp
+++ b/src/plugins/platforms/vnc/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgraphicssystem_vnc.h"
+#include "qvncintegration.h"
 #include <qstringlist.h>
 #include <QtGui/QPlatformIntegrationPlugin>
 
diff --git a/src/plugins/platforms/vnc/qvnccursor.cpp b/src/plugins/platforms/vnc/qvnccursor.cpp
index 78da53b..8da06aa 100644
--- a/src/plugins/platforms/vnc/qvnccursor.cpp
+++ b/src/plugins/platforms/vnc/qvnccursor.cpp
@@ -49,7 +49,7 @@
 
 #include "qvnccursor.h"
 #include "qvncserver.h"
-#include "qgraphicssystem_vnc.h"
+#include "qvncintegration.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp
index a872991..7bdba35 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
+++ b/src/plugins/platforms/vnc/qvncintegration.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgraphicssystem_vnc.h"
+#include "qvncintegration.h"
 #include "../fb_base/fb_base.h"
 #include <private/qapplication_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h b/src/plugins/platforms/vnc/qvncintegration.h
index 524b888..524b888 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.h
+++ b/src/plugins/platforms/vnc/qvncintegration.h
diff --git a/src/plugins/platforms/vnc/qvncserver.h b/src/plugins/platforms/vnc/qvncserver.h
index 41cadab..b1a9797 100644
--- a/src/plugins/platforms/vnc/qvncserver.h
+++ b/src/plugins/platforms/vnc/qvncserver.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qgraphicssystem_vnc.h"
+#include "qvncintegration.h"
 #include "qvnccursor.h"
 #define QT_NO_QWS_CURSOR
 
diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro
index b1da572..65824a2 100644
--- a/src/plugins/platforms/vnc/vnc.pro
+++ b/src/plugins/platforms/vnc/vnc.pro
@@ -3,8 +3,8 @@ include(../../qpluginbase.pri)
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
-SOURCES = main.cpp qgraphicssystem_vnc.cpp
-HEADERS = qgraphicssystem_vnc.h
+SOURCES = main.cpp qvncintegration.cpp
+HEADERS = qvncintegration.h
 
 HEADERS += qvncserver.h
 SOURCES += qvncserver.cpp