1 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
index ef50230..cbc8bbd 100644
--- a/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
+++ b/src/plugins/platforms/vnc/qgraphicssystem_vnc.cpp
@@ -51,8 +51,8 @@
 #include <QtCore/QTimer>
 
 
-QVNCGraphicsSystemScreen::QVNCGraphicsSystemScreen()
-        : QGraphicsSystemFbScreen::QGraphicsSystemFbScreen()
+QVNCScreen::QVNCScreen()
+        : QFbScreen::QFbScreen()
 {
     int w = 800;
     int h = 600;
@@ -69,21 +69,21 @@ QVNCGraphicsSystemScreen::QVNCGraphicsSystemScreen()
     setPhysicalSize((geometry().size()*254)/720);
 
 
-    d_ptr = new QVNCGraphicsSystemScreenPrivate(this);
+    d_ptr = new QVNCScreenPrivate(this);
 
     cursor = new QVNCCursor(d_ptr->vncServer, this);
     d_ptr->vncServer->setCursor(static_cast<QVNCCursor *>(cursor));
 }
 
-QVNCDirtyMap *QVNCGraphicsSystemScreen::dirtyMap()
+QVNCDirtyMap *QVNCScreen::dirtyMap()
 {
     return d_ptr->dirty;
 }
 
-QRegion QVNCGraphicsSystemScreen::doRedraw()
+QRegion QVNCScreen::doRedraw()
 {
     QRegion touched;
-    touched = QGraphicsSystemFbScreen::doRedraw();
+    touched = QFbScreen::doRedraw();
 
     QVector<QRect> rects = touched.rects();
     for (int i = 0; i < rects.size(); i++)
@@ -92,39 +92,39 @@ QRegion QVNCGraphicsSystemScreen::doRedraw()
 }
 
 
-QVNCGraphicsSystem::QVNCGraphicsSystem()
+QVNCIntegration::QVNCIntegration()
 {
-    mPrimaryScreen = new QVNCGraphicsSystemScreen();
+    mPrimaryScreen = new QVNCScreen();
 
     mScreens.append(mPrimaryScreen);
 }
 
-QPixmapData *QVNCGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
+QPixmapData *QVNCIntegration::createPixmapData(QPixmapData::PixelType type) const
 {
     return new QRasterPixmapData(type);
 }
 
-// QWindowSurface *QVNCGraphicsSystem::createWindowSurface(QWidget *widget) const
+// QWindowSurface *QVNCIntegration::createWindowSurface(QWidget *widget) const
 // {
 //     if (widget->windowType() == Qt::Desktop)
 //         return 0;   // Don't create an explicit window surface for the destkop.
-//     QGraphicsSystemFbWindowSurface * surface;
-//     surface = new QGraphicsSystemFbWindowSurface(mPrimaryScreen, widget);
+//     QFbWindowSurface * surface;
+//     surface = new QFbWindowSurface(mPrimaryScreen, widget);
 //     mPrimaryScreen->addWindowSurface(surface);
 //     return surface;
 // }
 
-QWindowSurface *QVNCGraphicsSystem::createWindowSurfaceForWindow(QWidget *widget, WId) const
+QWindowSurface *QVNCIntegration::createWindowSurfaceForWindow(QWidget *widget, WId) const
 {
     if (widget->windowType() == Qt::Desktop)
         return 0;   // Don't create an explicit window surface for the destkop.
-    QGraphicsSystemFbWindowSurface * surface;
-    surface = new QGraphicsSystemFbWindowSurface(mPrimaryScreen, widget);
+    QFbWindowSurface * surface;
+    surface = new QFbWindowSurface(mPrimaryScreen, widget);
     return surface;
 }
 
 
-QPlatformWindow *QVNCGraphicsSystem::createPlatformWindow(QWidget *widget, WId /*winId*/) const
+QPlatformWindow *QVNCIntegration::createPlatformWindow(QWidget *widget, WId /*winId*/) const
 {
     QFbWindow *w = new QFbWindow(mPrimaryScreen, widget);
     mPrimaryScreen->addWindow(w);