Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

5 files changed, 12 insertions, 13 deletions

diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index ffe00de2b1..32114c6443 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -600,7 +600,7 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
         cursor = *platformImage.image();
         hotspot = platformImage.hotspot();
     }
-    for (auto client : clients)
+    for (auto client : qAsConst(clients))
         client->setDirtyCursor();
 }
 
@@ -638,16 +638,14 @@ void QVncServer::init()
 
 QVncServer::~QVncServer()
 {
-    for (auto client : clients) {
-        delete client;
-    }
+    qDeleteAll(clients);
 }
 
 void QVncServer::setDirty()
 {
-    for (auto client : clients) {
+    for (auto client : qAsConst(clients))
         client->setDirty(qvnc_screen->dirtyRegion);
-    }
+
     qvnc_screen->clearDirty();
 }
 
diff --git a/src/plugins/platforms/vnc/qvnc_p.h b/src/plugins/platforms/vnc/qvnc_p.h
index 338fae9f87..f7f2f74ddb 100644
--- a/src/plugins/platforms/vnc/qvnc_p.h
+++ b/src/plugins/platforms/vnc/qvnc_p.h
@@ -139,7 +139,7 @@ public:
 class QRfbServerInit
 {
 public:
-    QRfbServerInit() { name = 0; }
+    QRfbServerInit() { name = nullptr; }
     ~QRfbServerInit() { delete[] name; }
 
     int size() const { return QRfbPixelFormat::size() + 8 + strlen(name); }
diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp
index 1e2cf6292c..c7a796464a 100644
--- a/src/plugins/platforms/vnc/qvncintegration.cpp
+++ b/src/plugins/platforms/vnc/qvncintegration.cpp
@@ -52,6 +52,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <private/qinputdevicemanager_p_p.h>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <QtCore/QRegularExpression>
 
@@ -77,13 +78,13 @@ QVncIntegration::QVncIntegration(const QStringList &paramList)
 QVncIntegration::~QVncIntegration()
 {
     delete m_server;
-    destroyScreen(m_primaryScreen);
+    QWindowSystemInterface::handleScreenRemoved(m_primaryScreen);
 }
 
 void QVncIntegration::initialize()
 {
     if (m_primaryScreen->initialize())
-        screenAdded(m_primaryScreen);
+        QWindowSystemInterface::handleScreenAdded(m_primaryScreen);
     else
         qWarning("vnc: Failed to initialize screen");
 
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index 67d33de2f0..2eca18fb4d 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -75,7 +75,7 @@ bool QVncScreen::initialize()
     mDepth = 32;
     mPhysicalSize = QSizeF(mGeometry.width()/96.*25.4, mGeometry.height()/96.*25.4);
 
-    for (const QString &arg : mArgs) {
+    for (const QString &arg : qAsConst(mArgs)) {
         QRegularExpressionMatch match;
         if (arg.contains(mmSizeRx, &match)) {
             mPhysicalSize = QSizeF(match.captured("width").toDouble(), match.captured("height").toDouble());
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
index e69aa90d41..db658d4ecc 100644
--- a/src/plugins/platforms/vnc/qvncscreen.h
+++ b/src/plugins/platforms/vnc/qvncscreen.h
@@ -82,12 +82,12 @@ public:
 
     qreal dpiX = 96;
     qreal dpiY = 96;
-    QVncDirtyMap *dirty = 0;
+    QVncDirtyMap *dirty = nullptr;
     QRegion dirtyRegion;
     int refreshRate = 30;
-    QVncServer *vncServer = 0;
+    QVncServer *vncServer = nullptr;
 #if QT_CONFIG(cursor)
-    QVncClientCursor *clientCursor = 0;
+    QVncClientCursor *clientCursor = nullptr;
 #endif
 };