summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/qvfb
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/qvfb')
-rw-r--r--src/plugins/platforms/qvfb/main.cpp73
-rw-r--r--src/plugins/platforms/qvfb/qvfb.pro14
-rw-r--r--src/plugins/platforms/qvfb/qvfbintegration.cpp454
-rw-r--r--src/plugins/platforms/qvfb/qvfbintegration.h102
-rw-r--r--src/plugins/platforms/qvfb/qvfbwindowsurface.cpp108
-rw-r--r--src/plugins/platforms/qvfb/qvfbwindowsurface.h80
6 files changed, 0 insertions, 831 deletions
diff --git a/src/plugins/platforms/qvfb/main.cpp b/src/plugins/platforms/qvfb/main.cpp
deleted file mode 100644
index 3013b69daf..0000000000
--- a/src/plugins/platforms/qvfb/main.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QPlatformIntegrationPlugin>
-#include "qvfbintegration.h"
-#include <qstringlist.h>
-
-QT_BEGIN_NAMESPACE
-
-class QVFbIntegrationPlugin : public QPlatformIntegrationPlugin
-{
-public:
- QStringList keys() const;
- QPlatformIntegration *create(const QString&, const QStringList&);
-};
-
-QStringList QVFbIntegrationPlugin::keys() const
-{
- QStringList list;
- list << "QVFb";
- return list;
-}
-
-QPlatformIntegration* QVFbIntegrationPlugin::create(const QString& system, const QStringList& paramList)
-{
- Q_UNUSED(paramList);
- if (system.toLower() == "qvfb")
- return new QVFbIntegration(paramList);
-
- return 0;
-}
-
-Q_EXPORT_PLUGIN2(qvfb, QVFbIntegrationPlugin)
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro
deleted file mode 100644
index 8738b18bc6..0000000000
--- a/src/plugins/platforms/qvfb/qvfb.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = qvfbintegration
-load(qt_plugin)
-
-DESTDIR = $$QT.gui.plugins/platforms
-
-QT += core-private gui-private platformsupport-private
-
-SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp
-HEADERS = qvfbintegration.h qvfbwindowsurface.h
-
-CONFIG += qpa/genericunixfontdatabase
-
-target.path += $$[QT_INSTALL_PLUGINS]/platforms
-INSTALLS += target
diff --git a/src/plugins/platforms/qvfb/qvfbintegration.cpp b/src/plugins/platforms/qvfb/qvfbintegration.cpp
deleted file mode 100644
index 478733e96f..0000000000
--- a/src/plugins/platforms/qvfb/qvfbintegration.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <private/qcore_unix_p.h> // overrides QT_OPEN
-
-#include <qvfbhdr.h>
-#include <qsocketnotifier.h>
-
-#include "qvfbintegration.h"
-#include "qvfbwindowsurface.h"
-#include <QtGui/private/qpixmap_raster_p.h>
-#include <QtCore/qdebug.h>
-#include <QMouseEvent>
-
-#include <qsocketnotifier.h>
-#include <QApplication>
-#include <QWindowSystemInterface>
-
-#include "qgenericunixfontdatabase.h"
-#include "qgenericunixeventdispatcher.h"
-
-QT_BEGIN_NAMESPACE
-
-
-class QVFbScreenKeyboardHandler : public QObject
-{
- Q_OBJECT
-public:
- QVFbScreenKeyboardHandler(int displayId);
- ~QVFbScreenKeyboardHandler();
-
-private slots:
- void readKeyboardData();
-
-private:
- int kbdFD;
- int kbdIdx;
- int kbdBufferLen;
- unsigned char *kbdBuffer;
- QSocketNotifier *keyNotifier;
-};
-
-QVFbScreenKeyboardHandler::QVFbScreenKeyboardHandler(int displayId)
-{
- const QString keyboardDev = QT_VFB_KEYBOARD_PIPE(displayId);
-
-
- kbdFD = -1;
- kbdIdx = 0;
- kbdBufferLen = sizeof(QVFbKeyData) * 5;
- kbdBuffer = new unsigned char [kbdBufferLen];
-
- kbdFD = QT_OPEN(keyboardDev.toLatin1().constData(), O_RDWR | O_NDELAY);
-
- if (kbdFD == -1) {
- perror("QVFbScreenKeyboardHandler");
- qWarning("QVFbScreenKeyboardHandler: Unable to open device %s",
- qPrintable(keyboardDev));
- return;
- }
-
- // Clear pending input
- char buf[2];
- while (QT_READ(kbdFD, buf, 1) > 0) { }
-
- keyNotifier = new QSocketNotifier(kbdFD, QSocketNotifier::Read, this);
- connect(keyNotifier, SIGNAL(activated(int)),this, SLOT(readKeyboardData()));
-
-}
-
-QVFbScreenKeyboardHandler::~QVFbScreenKeyboardHandler()
-{
- if (kbdFD >= 0)
- QT_CLOSE(kbdFD);
- delete [] kbdBuffer;
-}
-
-
-void QVFbScreenKeyboardHandler::readKeyboardData()
-{
- int n;
- do {
- n = QT_READ(kbdFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx);
- if (n > 0)
- kbdIdx += n;
- } while (n > 0);
-
- int idx = 0;
- while (kbdIdx - idx >= (int)sizeof(QVFbKeyData)) {
- QVFbKeyData *kd = (QVFbKeyData *)(kbdBuffer + idx);
- if (kd->unicode == 0 && kd->keycode == 0 && kd->modifiers == 0 && kd->press) {
- // magic exit key
- qWarning("Instructed to quit by Virtual Keyboard");
- qApp->quit();
- }
-
- //QWSServer::processKeyEvent(kd->unicode ? kd->unicode : 0xffff, kd->keycode, kd->modifiers, kd->press, kd->repeat);
-
- QEvent::Type type = kd->press ? QEvent::KeyPress : QEvent::KeyRelease;
-
- QString text;
- if (kd->unicode && kd->unicode != 0xffff)
- text += QChar(kd->unicode);
-
-// qDebug() << "readKeyboardData" << type << hex << kd->keycode << kd->modifiers << text;
-
- QWindowSystemInterface::handleKeyEvent(0, type, kd->keycode, kd->modifiers, text, kd->repeat, int(text.length()));
- idx += sizeof(QVFbKeyData);
- }
-
- int surplus = kbdIdx - idx;
- for (int i = 0; i < surplus; i++)
- kbdBuffer[i] = kbdBuffer[idx+i];
- kbdIdx = surplus;
-}
-
-
-
-
-class QVFbScreenMouseHandler : public QObject
-{
- Q_OBJECT
-public:
- QVFbScreenMouseHandler(int displayId);
- ~QVFbScreenMouseHandler();
-
-private slots:
- void readMouseData();
-
-private:
- int mouseFD;
- int mouseIdx;
- enum {mouseBufSize = 128};
- uchar mouseBuf[mouseBufSize];
- QSocketNotifier *mouseNotifier;
-
- int oldButtonState;
-};
-
-QVFbScreenMouseHandler::QVFbScreenMouseHandler(int displayId)
-{
- QString mouseDev = QT_VFB_MOUSE_PIPE(displayId);
-
- mouseFD = QT_OPEN(mouseDev.toLatin1().constData(), O_RDWR | O_NDELAY);
-
- if (mouseFD == -1) {
- perror("QVFbMouseHandler::QVFbMouseHandler");
- qWarning("QVFbMouseHander: Unable to open device %s",
- qPrintable(mouseDev));
- return;
- }
-
- // Clear pending input
- char buf[2];
- while (QT_READ(mouseFD, buf, 1) > 0) { }
-
- mouseIdx = 0;
- oldButtonState = 0;
- mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, this);
- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
-}
-
-
-QVFbScreenMouseHandler::~QVFbScreenMouseHandler()
-{
- if (mouseFD >= 0)
- QT_CLOSE(mouseFD);
-}
-
-void QVFbScreenMouseHandler::readMouseData()
-{
- int n;
- do {
- n = QT_READ(mouseFD, mouseBuf+mouseIdx, mouseBufSize-mouseIdx);
- if (n > 0)
- mouseIdx += n;
- } while (n > 0);
-
- int idx = 0;
- static const int packetsize = sizeof(QPoint) + 2*sizeof(int);
- while (mouseIdx-idx >= packetsize) {
- uchar *mb = mouseBuf+idx;
- QPoint mousePos = *reinterpret_cast<QPoint *>(mb);
- mb += sizeof(QPoint);
- int bstate = *reinterpret_cast<int *>(mb);
- mb += sizeof(int);
- //int wheel = *reinterpret_cast<int *>(mb);
-
- int button = bstate ^ oldButtonState;
- QEvent::Type type = QEvent::MouseMove;
-
- if (button) {
- type = (button & bstate) ? QEvent::MouseButtonPress : QEvent::MouseButtonRelease;
- }
- QWindowSystemInterface::handleMouseEvent(0, mousePos, mousePos, Qt::MouseButtons(bstate));
-
-// qDebug() << "readMouseData" << mousePos << button << bstate << oldButtonState << type;
-
- oldButtonState = bstate;
-
- idx += packetsize;
- }
-
- int surplus = mouseIdx - idx;
- for (int i = 0; i < surplus; i++)
- mouseBuf[i] = mouseBuf[idx+i];
- mouseIdx = surplus;
-
-}
-
-
-class QVFbScreenPrivate
-{
-public:
- QVFbScreenPrivate(int id)
- : shmrgn(0), hdr(0), data(0), mouseHandler(0), keyboardHandler(0)
- {
- displayId = id;
- connect(displayId);
- }
-
- ~QVFbScreenPrivate() { disconnect(); }
- void setDirty(const QRect &r);
-
- bool connect(int displayId);
- void disconnect();
-
- QImage *screenImage() { return &img; }
- QSize screenSize() { return img.size(); }
-
- int depth() const { return img.depth(); }
- QImage::Format format() const { return img.format(); }
-
-private:
- unsigned char *shmrgn;
- QVFbHeader *hdr;
- uchar *data;
- QVFbScreenMouseHandler *mouseHandler;
- QVFbScreenKeyboardHandler *keyboardHandler;
- int displayId;
-
- QImage img;
-};
-
-
-void QVFbScreenPrivate::setDirty(const QRect &r)
-{
- hdr->dirty = true;
- hdr->update = hdr->update.united(r);
-}
-
-
-bool QVFbScreenPrivate::connect(int displayId)
-{
- qDebug() << "QVFbScreenPrivate::connect" << displayId;
- key_t key = ftok(QT_VFB_MOUSE_PIPE(displayId).toLatin1(), 'b');
-
- if (key == -1)
- return false;
-
-
- int shmId = shmget(key, 0, 0);
- if (shmId != -1)
- shmrgn = (unsigned char *)shmat(shmId, 0, 0);
- else
- return false;
-
- if ((long)shmrgn == -1 || shmrgn == 0) {
- qDebug("No shmrgn %ld", (long)shmrgn);
- return false;
- }
-
- hdr = (QVFbHeader *)shmrgn;
- data = shmrgn + hdr->dataoffset;
-
- int w = hdr->width;
- int h = hdr->height;
- int d = hdr->depth;
- int lstep = hdr->linestep;
-
- QImage::Format format = QImage::Format_Invalid;
- if (d == 32)
- format = QImage::Format_ARGB32_Premultiplied;
- else if (d == 16)
- format = QImage::Format_RGB16;
-
-
- if (format == QImage::Format_Invalid) {
- img = QImage();
- return false;
- }
-
- img = QImage(data, w, h, lstep, format);
-
- qDebug("connected %dx%d %d bpp", w, h, d);
-
-
- mouseHandler = new QVFbScreenMouseHandler(displayId);
- keyboardHandler = new QVFbScreenKeyboardHandler(displayId);
- return true;
-}
-
-void QVFbScreenPrivate::disconnect()
-{
- if ((long)shmrgn != -1 && shmrgn) {
- shmdt((char*)shmrgn);
- shmrgn = 0;
- }
- delete mouseHandler;
- mouseHandler = 0;
- delete keyboardHandler;
- keyboardHandler = 0;
-}
-
-
-QVFbScreen::QVFbScreen(int id)
-{
- d_ptr = new QVFbScreenPrivate(id);
-}
-
-
-QVFbScreen::~QVFbScreen()
-{
- delete d_ptr;
-}
-
-void QVFbScreen::setDirty(const QRect &rect)
-{
- d_ptr->setDirty(rect);
-}
-
-
-
-QRect QVFbScreen::geometry() const {
- return QRect(QPoint(), d_ptr->screenSize());
-}
-
-
-int QVFbScreen::depth() const
-{
- return d_ptr->depth();
-}
-
-QImage::Format QVFbScreen::format() const
-{
- return d_ptr->format();
-}
-
-QSizeF QVFbScreen::physicalSize() const {
- return (QSizeF(d_ptr->screenSize())*254)/720.;
-}
-
-#if 0
-int QVFbScreen::linestep() const {
- return d_ptr->screenImage() ? d_ptr->screenImage()->bytesPerLine() : 0;
-}
-
-uchar *QVFbScreen::base() const {
- return d_ptr->screenImage() ? d_ptr->screenImage()->bits() : 0;
-}
-#endif
-
-QImage *QVFbScreen::screenImage()
-{
- return d_ptr->screenImage();
-}
-
-QVFbIntegration::QVFbIntegration(const QStringList &paramList)
- : mFontDb(new QGenericUnixFontDatabase())
-{
- int displayId = 0;
- if (paramList.length() > 0)
- displayId = paramList.at(0).toInt();
-
- mPrimaryScreen = new QVFbScreen(displayId);
-
- mScreens.append(mPrimaryScreen);
-}
-
-QPlatformPixmap *QVFbIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
-{
- return new QRasterPlatformPixmap(type);
-}
-
-QWindowSurface *QVFbIntegration::createWindowSurface(QWidget *widget, WId) const
-{
- return new QVFbWindowSurface(mPrimaryScreen, widget);
-}
-
-
-QPlatformWindow *QVFbIntegration::createPlatformWindow(QWidget *widget, WId) const
-{
- return new QVFbWindow(mPrimaryScreen, widget);
-}
-
-QAbstractEventDispatcher *QVFbIntegration::createEventDispatcher() const
-{
- return createUnixEventDispatcher();
-}
-
-QPlatformFontDatabase *QVFbIntegration::fontDatabase() const
-{
- return mFontDb;
-}
-
-QT_END_NAMESPACE
-
-#include "qvfbintegration.moc"
diff --git a/src/plugins/platforms/qvfb/qvfbintegration.h b/src/plugins/platforms/qvfb/qvfbintegration.h
deleted file mode 100644
index 45f6b391f0..0000000000
--- a/src/plugins/platforms/qvfb/qvfbintegration.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGRAPHICSSYSTEM_QVFB_H
-#define QGRAPHICSSYSTEM_QVFB_H
-
-#include <QPlatformScreen>
-#include <QPlatformIntegration>
-
-QT_BEGIN_NAMESPACE
-
-
-class QVFbScreenPrivate;
-class QAbstractEventDispatcher;
-
-class QVFbScreen : public QPlatformScreen
-{
-public:
- QVFbScreen(int id);
- ~QVFbScreen();
-
- QRect geometry() const;
- int depth() const;
- QImage::Format format() const;
- QSizeF physicalSize() const;
-
- QImage *screenImage();
-
- void setDirty(const QRect &rect);
-
-public:
-
- QVFbScreenPrivate *d_ptr;
-};
-
-class QVFbIntegrationPrivate;
-
-
-class QVFbIntegration : public QPlatformIntegration
-{
-public:
- QVFbIntegration(const QStringList &paramList);
-
- QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
- QPlatformWindow *createPlatformWindow(QWidget *widget, WId winId) const;
- QWindowSurface *createWindowSurface(QWidget *widget, WId winId) const;
- QAbstractEventDispatcher *createEventDispatcher() const;
-
- QList<QPlatformScreen *> screens() const { return mScreens; }
-
- QPlatformFontDatabase *fontDatabase() const;
-
-private:
- QVFbScreen *mPrimaryScreen;
- QList<QPlatformScreen *> mScreens;
- QPlatformFontDatabase *mFontDb;
-};
-
-
-
-QT_END_NAMESPACE
-
-
-#endif
diff --git a/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp b/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp
deleted file mode 100644
index 6180836127..0000000000
--- a/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include "qvfbwindowsurface.h"
-#include "qvfbintegration.h"
-#include <QtCore/qdebug.h>
-#include <QtGui/qpainter.h>
-#include <private/qapplication_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QVFbWindowSurface::QVFbWindowSurface(//QVFbIntegration *graphicsSystem,
- QVFbScreen *screen, QWidget *window)
- : QWindowSurface(window),
- mScreen(screen)
-{
-}
-
-QVFbWindowSurface::~QVFbWindowSurface()
-{
-}
-
-QPaintDevice *QVFbWindowSurface::paintDevice()
-{
- return mScreen->screenImage();
-}
-
-void QVFbWindowSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
-{
- Q_UNUSED(widget);
- Q_UNUSED(offset);
-
-// QRect rect = geometry();
-// QPoint topLeft = rect.topLeft();
-
- mScreen->setDirty(region.boundingRect());
-}
-
-void QVFbWindowSurface::resize(const QSize&)
-{
-
-// any size you like as long as it's full-screen...
-
- QRect rect(mScreen->availableGeometry());
- QWindowSurface::resize(rect.size());
-}
-
-
-QVFbWindow::QVFbWindow(QVFbScreen *screen, QWidget *window)
- : QPlatformWindow(window),
- mScreen(screen)
-{
-}
-
-
-void QVFbWindow::setGeometry(const QRect &)
-{
-
-// any size you like as long as it's full-screen...
-
- QRect rect(mScreen->availableGeometry());
- QWindowSystemInterface::handleGeometryChange(this->widget(), rect);
-
- QPlatformWindow::setGeometry(rect);
-}
-
-
-
-QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qvfb/qvfbwindowsurface.h b/src/plugins/platforms/qvfb/qvfbwindowsurface.h
deleted file mode 100644
index 92fe6aea2d..0000000000
--- a/src/plugins/platforms/qvfb/qvfbwindowsurface.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWINDOWSURFACE_QVFB_H
-#define QWINDOWSURFACE_QVFB_H
-
-#include <QtGui/private/qwindowsurface_p.h>
-#include <QPlatformWindow>
-
-QT_BEGIN_NAMESPACE
-
-class QVFbIntegration;
-class QVFbScreen;
-
-class QVFbWindowSurface : public QWindowSurface
-{
-public:
- QVFbWindowSurface(QVFbScreen *screen, QWidget *window);
- ~QVFbWindowSurface();
-
- QPaintDevice *paintDevice();
- void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
- void resize(const QSize &size);
-
-private:
- QVFbScreen *mScreen;
-};
-
-class QVFbWindow : public QPlatformWindow
-{
-public:
- QVFbWindow(QVFbScreen *screen, QWidget *window);
- void setGeometry(const QRect &rect);
-
-private:
- QVFbScreen *mScreen;
-};
-
-
-QT_END_NAMESPACE
-
-#endif