make qvfb plugin compile - QApplicationPrivate -> QWindowSystemInterface

2 files changed, 5 insertions, 7 deletions

diff --git a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp b/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp
index 77942c9..19058a6 100644
--- a/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp
+++ b/src/plugins/graphicssystems/qvfb/qgraphicssystem_qvfb.cpp
@@ -59,7 +59,8 @@
 #include <QMouseEvent>
 
 #include <qsocketnotifier.h>
-#include <private/qapplication_p.h>
+#include <QApplication>
+#include <QWindowSystemInterface>
 
 QT_BEGIN_NAMESPACE
 
@@ -147,8 +148,7 @@ void QVFbGraphicsSystemScreenKeyboardHandler::readKeyboardData()
 
 //        qDebug() << "readKeyboardData" << type << hex << kd->keycode << kd->modifiers << text;
 
-        QKeyEvent ke(type, kd->keycode, kd->modifiers, text, kd->repeat, int(text.length()));
-        QApplicationPrivate::handleKeyEvent(0, &ke);
+        QWindowSystemInterface::handleKeyEvent(0, type, kd->keycode, kd->modifiers, text, kd->repeat, int(text.length()));
         idx += sizeof(QVFbKeyData);
     }
 
@@ -237,9 +237,7 @@ void QVFbGraphicsSystemScreenMouseHandler::readMouseData()
         if (button) {
             type = (button & bstate) ? QEvent::MouseButtonPress : QEvent::MouseButtonRelease;
         }
-        QMouseEvent me(type, mousePos, mousePos,
-                       Qt::MouseButton(button), Qt::MouseButtons(bstate), Qt::NoModifier);
-        QApplicationPrivate::handleMouseEvent(0, me);
+        QWindowSystemInterface::handleMouseEvent(0, mousePos, mousePos, Qt::MouseButtons(bstate));
 
 //        qDebug() << "readMouseData" << mousePos << button << bstate << oldButtonState << type;
 
diff --git a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp b/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp
index c49f082..0aafe28 100644
--- a/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp
+++ b/src/plugins/graphicssystems/qvfb/qwindowsurface_qvfb.cpp
@@ -81,7 +81,7 @@ void QVFbWindowSurface::setGeometry(const QRect &)
 // any size you like as long as it's full-screen...
 
     QRect rect(mScreen->availableGeometry());
-    QApplicationPrivate::handleGeometryChange(this->window(), rect);
+    QWindowSystemInterface::handleGeometryChange(this->window(), rect);
 
     QWindowSurface::setGeometry(rect);
 }