move QSurface into its own file.

also move QPlatformSurface to its own file

Change-Id: I29fb6c70ede18a0ac5e0f6bfb97a33293633e668
Reviewed-on: http://codereview.qt.nokia.com/4309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 1 insertions, 22 deletions

diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 76e0efb6fb..a6604aa951 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -47,6 +47,7 @@
 #include <QtCore/QMargins>
 #include <QtCore/QRect>
 
+#include <QtGui/qsurface.h>
 #include <QtGui/qsurfaceformat.h>
 #include <QtGui/qwindowdefs.h>
 
@@ -74,28 +75,6 @@ class QPlatformWindow;
 class QBackingStore;
 class QScreen;
 
-class Q_GUI_EXPORT QSurface
-{
-public:
-    enum SurfaceType {
-        Window
-    };
-
-    virtual ~QSurface();
-
-    SurfaceType surfaceType() const { return m_type; }
-
-    virtual QSurfaceFormat format() const = 0;
-    virtual QPlatformSurface *surfaceHandle() const = 0;
-
-private:
-    QSurface(SurfaceType type) : m_type(type) {}
-
-    SurfaceType m_type;
-
-    friend class QWindow;
-};
-
 class Q_GUI_EXPORT QWindow : public QObject, public QSurface
 {
     Q_OBJECT