Refactored directfb plugin

10 files changed, 16 insertions, 18 deletions

diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index ec5f0f1..f81ec31 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -13,16 +13,16 @@ INCLUDEPATH += $$DIRECTFB_INCLUDEPATH
 LIBS += $$DIRECTFB_LIBS
 
 SOURCES = main.cpp \
-    qplatformintegration_directfb.cpp \
-    qwindowsurface_directfb.cpp \
-    qblitter_directfb.cpp \
+    qdirectfbintegration.cpp \
+    qdirectfbwindowsurface.cpp \
+    qdirectfbblitter.cpp \
     qdirectfbconvenience.cpp \
     qdirectfbinput.cpp \
     qdirectfbcursor.cpp \
     qdirectfbwindow.cpp
-HEADERS = qplatformintegration_directfb.h \
-    qwindowsurface_directfb.h \
-    qblitter_directfb.h \
+HEADERS = qdirectfbintegration.h \
+    qdirectfbwindowsurface.h \
+    qdirectfbblitter.h \
     qdirectfbconvenience.h \
     qdirectfbinput.h \
     qdirectfbcursor.h \
diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp
index 1f0f081..9c7bcf6 100644
--- a/src/plugins/platforms/directfb/main.cpp
+++ b/src/plugins/platforms/directfb/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QPlatformIntegrationPlugin>
-#include "qplatformintegration_directfb.h"
+#include "qdirectfbintegration.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/directfb/qblitter_directfb.cpp b/src/plugins/platforms/directfb/qdirectfbblitter.cpp
index 20f8741..15bb18b 100644
--- a/src/plugins/platforms/directfb/qblitter_directfb.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbblitter.cpp
@@ -1,4 +1,4 @@
-#include "qblitter_directfb.h"
+#include "qdirectfbblitter.h"
 #include "qdirectfbconvenience.h"
 
 #include <QtGui/private/qpixmap_blitter_p.h>
diff --git a/src/plugins/platforms/directfb/qblitter_directfb.h b/src/plugins/platforms/directfb/qdirectfbblitter.h
index 85a303a..85a303a 100644
--- a/src/plugins/platforms/directfb/qblitter_directfb.h
+++ b/src/plugins/platforms/directfb/qdirectfbblitter.h
diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
index 8594c09..adf9687 100644
--- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp
@@ -1,5 +1,5 @@
 #include "qdirectfbconvenience.h"
-#include "qblitter_directfb.h"
+#include "qdirectfbblitter.h"
 
 #include <private/qpixmap_blitter_p.h>
 
diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.cpp b/src/plugins/platforms/directfb/qdirectfbcursor.cpp
index bb7088f..2edae45 100644
--- a/src/plugins/platforms/directfb/qdirectfbcursor.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbcursor.cpp
@@ -1,9 +1,6 @@
 #include "qdirectfbcursor.h"
-#include "qblitter_directfb.h"
-#include "qplatformintegration_directfb.h"
 #include "qdirectfbconvenience.h"
 
-#include <private/qpixmap_blitter_p.h>
 
 QDirectFBCursor::QDirectFBCursor(QPlatformScreen* screen) :
         QGraphicsSystemCursor(screen), surface(0)
diff --git a/src/plugins/platforms/directfb/qplatformintegration_directfb.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 5f428ef..b096081 100644
--- a/src/plugins/platforms/directfb/qplatformintegration_directfb.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegration_directfb.h"
-#include "qwindowsurface_directfb.h"
-#include "qblitter_directfb.h"
+#include "qdirectfbintegration.h"
+#include "qdirectfbwindowsurface.h"
+#include "qdirectfbblitter.h"
 #include "qdirectfbconvenience.h"
 #include "qdirectfbcursor.h"
 #include "qdirectfbwindow.h"
diff --git a/src/plugins/platforms/directfb/qplatformintegration_directfb.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index a8489c0..808bc9d 100644
--- a/src/plugins/platforms/directfb/qplatformintegration_directfb.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -54,6 +54,7 @@ class QDirectFBCursor;
 
 class QDirectFbScreen : public QPlatformScreen
 {
+Q_OBJECT
 public:
     QDirectFbScreen(int display);
     ~QDirectFbScreen();
diff --git a/src/plugins/platforms/directfb/qwindowsurface_directfb.cpp b/src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp
index e978cae..4ca9a72 100644
--- a/src/plugins/platforms/directfb/qwindowsurface_directfb.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwindowsurface_directfb.h"
-#include "qplatformintegration_directfb.h"
-#include "qblitter_directfb.h"
+#include "qdirectfbwindowsurface.h"
+#include "qdirectfbintegration.h"
+#include "qdirectfbblitter.h"
 #include "qdirectfbconvenience.h"
 #include <private/qpixmap_blitter_p.h>
 
diff --git a/src/plugins/platforms/directfb/qwindowsurface_directfb.h b/src/plugins/platforms/directfb/qdirectfbwindowsurface.h
index d48f534..d48f534 100644
--- a/src/plugins/platforms/directfb/qwindowsurface_directfb.h
+++ b/src/plugins/platforms/directfb/qdirectfbwindowsurface.h