diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-12-17 09:45:44 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@qt.io> | 2016-06-28 10:18:23 +0000 |
commit | ef4db5a347c6ad1ddb75027c8449ade64b731d08 (patch) | |
tree | 3c6583ff7e666ff51c777bd34fff6a6e2a371dd8 /src/plugins/platforms/vnc/qvncscreen.cpp | |
parent | a1dbf346e6f1dc6c539d43bfa40b1aa78772ecdd (diff) |
cleanups in the VNC plugin
Change-Id: Iac930d3c7036b285ff5003691bfecf6071795d54
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/plugins/platforms/vnc/qvncscreen.cpp')
-rw-r--r-- | src/plugins/platforms/vnc/qvncscreen.cpp | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp index b8bf08259a..29b5dda77d 100644 --- a/src/plugins/platforms/vnc/qvncscreen.cpp +++ b/src/plugins/platforms/vnc/qvncscreen.cpp @@ -70,41 +70,15 @@ bool QVncScreen::initialize() mCursor = new QFbCursor(this); switch (depth()) { -#if 1//def QT_QWS_DEPTH_32 case 32: dirty = new QVncDirtyMapOptimized<quint32>(this); break; -#endif -//#if 1//def QT_QWS_DEPTH_24 -// case 24: -// dirty = new QVncDirtyMapOptimized<qrgb888>(this); -// break; -//#endif -//#if 1//def QT_QWS_DEPTH_24 -// case 18: -// dirty = new QVncDirtyMapOptimized<qrgb666>(this); -// break; -//#endif -#if 1//def QT_QWS_DEPTH_24 case 16: dirty = new QVncDirtyMapOptimized<quint16>(this); break; -#endif -//#if 1//def QT_QWS_DEPTH_24 -// case 15: -// dirty = new QVncDirtyMapOptimized<qrgb555>(this); -// break; -//#endif -//#if 1//def QT_QWS_DEPTH_24 -// case 12: -// dirty = new QVncDirtyMapOptimized<qrgb444>(this); -// break; -//#endif -#if 1//def QT_QWS_DEPTH_24 case 8: dirty = new QVncDirtyMapOptimized<quint8>(this); break; -#endif default: qWarning("QVNCScreen::initDevice: No support for screen depth %d", depth()); @@ -112,17 +86,7 @@ bool QVncScreen::initialize() return false; } - -// const bool ok = QProxyScreen::initDevice(); -//#ifndef QT_NO_QWS_CURSOR -// qt_screencursor = new QVNCCursor(this); -//#endif -// if (QProxyScreen::screen()) -// return ok; - -// // Disable painting if there is only 1 display and nothing is attached to the VNC server -// if (!d_ptr->noDisablePainting) -// QWSServer::instance()->enablePainting(false); + setPowerState(PowerStateOff); return true; } @@ -136,10 +100,6 @@ QRegion QVncScreen::doRedraw() return touched; dirtyRegion += touched; - QVector<QRect> rects = touched.rects(); - for (int i = 0; i < rects.size(); i++) { - // ### send to client - } vncServer->setDirty(); return touched; } |