Rename QWindowSurface -> QBackingStore and split into platform / public.

Also get rid of GL window surface and related classes.

5 files changed, 8 insertions, 25 deletions

diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index d3944ab1fe..5db0366707 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -156,19 +156,17 @@ QPlatformNativeInterface * QPlatformIntegration::nativeInterface() const
     created.
 
     \sa QPlatformWindow, QPlatformWindowFormat
-    \sa createWindowSurface(QWindow *window, WId winId) const
+    \sa createPlatformBackingStore(QWindow *window) const
 */
 
 /*!
-    \fn QWindowSurface *QPlatformIntegration::createWindowSurface(QWindow *window, WId winId) const
+    \fn QPlatformBackingStore *QPlatformIntegration::createPlatformBackingStore(QWindow *window) const
 
-    Factory function for QWindowSurface. The QWindow parameter is a pointer to the
+    Factory function for QPlatformBackingStore. The QWindow parameter is a pointer to the
     top level widget(tlw) the window surface is created for. A QPlatformWindow is always created
-    before the QWindowSurface for tlw where the widget also requires a WindowSurface. It is
-    possible to create top level QWindow without a QWindowSurface by specifying
-    QPlatformWindowFormat::setWindowSurface(false) for the tlw QPlatformWindowFormat.
+    before the QPlatformBackingStore for tlw where the widget also requires a backing store.
 
-    \sa QWindowSurface
+    \sa QBackingStore
     \sa createPlatformWindow(QWindow *window, WId winId = 0) const
 */
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index d9953abcc9..8263999b2d 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -43,7 +43,6 @@
 #define QPLATFORMINTEGRATION_H
 
 #include <QtGui/qwindowdefs.h>
-#include <QtGui/private/qwindowsurface_p.h>
 #include <QtGui/private/qpixmapdata_p.h>
 #include <QtGui/qplatformscreen_qpa.h>
 
@@ -55,7 +54,7 @@ QT_MODULE(Gui)
 
 class QPlatformWindow;
 class QWindow;
-class QBlittable;
+class QPlatformBackingStore;
 class QPlatformFontDatabase;
 class QPlatformClipboard;
 class QPlatformNativeInterface;
@@ -79,7 +78,7 @@ public:
 // GraphicsSystem functions
     virtual QPixmapData *createPixmapData(QPixmapData::PixelType type) const = 0;
     virtual QPlatformWindow *createPlatformWindow(QWindow *window) const = 0;
-    virtual QWindowSurface *createWindowSurface(QWindow *window, WId winId) const = 0;
+    virtual QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const = 0;
     virtual QPlatformGLContext *createPlatformGLContext(const QGuiGLFormat &glFormat, QPlatformGLContext *share) const;
 
 // Window System functions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 2996c00391..c29bc7002d 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -426,11 +426,6 @@ QPlatformWindow *QWindow::handle() const
     return d->platformWindow;
 }
 
-QWindowSurface *QWindow::surface() const
-{
-    Q_D(const QWindow);
-    return d->surface;
-}
 
 bool QWindow::setKeyboardGrabEnabled(bool grab)
 {
@@ -531,11 +526,6 @@ bool QWindow::event(QEvent *event)
         destroy();
         break;
 
-    case QEvent::Expose:
-        if (d->surface)
-            d->surface->flush(this, static_cast<QExposeEvent *>(event)->region, QPoint());
-        break;
-
     default:
         return QObject::event(event);
     }
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 7910c3884c..cfd251fff0 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -69,7 +69,7 @@ class QWheelEvent;
 
 class QPlatformGLSurface;
 class QPlatformWindow;
-class QWindowSurface;
+class QBackingStore;
 
 class Q_GUI_EXPORT QWindow : public QObject
 {
@@ -146,7 +146,6 @@ public:
     void destroy();
 
     QPlatformWindow *handle() const;
-    QWindowSurface *surface() const;
 
     bool setKeyboardGrabEnabled(bool grab);
     bool setMouseGrabEnabled(bool grab);
@@ -192,7 +191,6 @@ private:
 
     friend class QGuiApplication;
     friend class QGuiApplicationPrivate;
-    friend class QWindowSurface;
     friend Q_GUI_EXPORT QWindowPrivate *qt_window_private(QWindow *window);
 };
 
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 2f33629ccf..1c4c4bffad 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -65,7 +65,6 @@ public:
         , platformWindow(0)
         , visible(false)
         , glSurface(0)
-        , surface(0)
         , windowState(Qt::WindowNoState)
         , maximumSize(QWINDOWSIZE_MAX, QWINDOWSIZE_MAX)
         , modality(Qt::NonModal)
@@ -87,7 +86,6 @@ public:
     QString windowTitle;
     QRect geometry;
     QPlatformGLSurface *glSurface;
-    QWindowSurface *surface;
     Qt::WindowState windowState;
 
     QSize minimumSize;