Remove windowSurface member from QTestLiteWindow

This makes QTestLiteWindow independent of the window surface, so
window surfaces other than QTestLiteWindowSurface can be used too.

Reviewed-By: Paul

3 files changed, 1 insertions, 7 deletions

diff --git a/src/plugins/platforms/testlite/qtestlitewindow.cpp b/src/plugins/platforms/testlite/qtestlitewindow.cpp
index 545912e..242f335 100644
--- a/src/plugins/platforms/testlite/qtestlitewindow.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindow.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "qtestlitewindowsurface.h"
 #include "qtestliteintegration.h"
 #include <QWindowSystemInterface>
 
@@ -184,7 +183,6 @@ QTestLiteWindow::QTestLiteWindow(const QTestLiteIntegration *platformIntegration
     setWindowTitle(QLatin1String("Qt Lighthouse"));
 
     currentCursor = -1;
-    windowSurface = 0;
 
     setWindowFlags(window->windowFlags()); //##### This should not be the plugin's responsibility
 
@@ -678,7 +676,7 @@ void QTestLiteWindow::paintEvent()
     qDebug() << "QTestLiteWindow::paintEvent" << shm_img.size() << painted;
 #endif
 
-    windowSurface->flush(windowSurface->window(), QRect(xpos,ypos,width, height), QPoint());
+    widget()->windowSurface()->flush(widget(), QRect(xpos,ypos,width, height), QPoint());
 }
 
 
diff --git a/src/plugins/platforms/testlite/qtestlitewindow.h b/src/plugins/platforms/testlite/qtestlitewindow.h
index 3624854..28e49be 100644
--- a/src/plugins/platforms/testlite/qtestlitewindow.h
+++ b/src/plugins/platforms/testlite/qtestlitewindow.h
@@ -94,8 +94,6 @@ public: //###
 
 struct MyShmImageInfo;
 
-class QWindowSurface;
-
 class QTestLiteWindow : public QPlatformWindow
 {
 public:
@@ -140,7 +138,6 @@ private:
 
     int currentCursor;
 
-    QWindowSurface *windowSurface;
     MyDisplay *xd;
 
     QTestLiteScreen *mScreen;
diff --git a/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
index a14a50e..53f4791 100644
--- a/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindowsurface.cpp
@@ -131,7 +131,6 @@ QTestLiteWindowSurface::QTestLiteWindowSurface (QTestLiteScreen */*screen*/, QWi
       painted(false), image_info(0)
 {
     xw = static_cast<QTestLiteWindow*>(window->platformWindow());
-    xw->windowSurface = this;
 //    qDebug() << "QTestLiteWindowSurface::QTestLiteWindowSurface:" << xw->window;
 }