From e0b0c307486d56e2cb3152bb7fade9a06ddf4dd3 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Wed, 31 Oct 2018 13:09:29 +0100
Subject: [PATCH] winrt: Code cleanup

Replace 0 with nullptr where applicable
Initialize members in declaration

Change-Id: I3d8bae845be01e27db2c591f8037d3823f25f67d
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
---
 src/plugins/winrt/winrtdevice.cpp           | 4 ++--
 src/plugins/winrt/winrtdevice.h             | 2 +-
 src/plugins/winrt/winrtdevicefactory.cpp    | 2 --
 src/plugins/winrt/winrtdevicefactory.h      | 4 ++--
 src/plugins/winrt/winrtqtversionfactory.cpp | 8 ++++----
 src/plugins/winrt/winrtqtversionfactory.h   | 2 +-
 src/plugins/winrt/winrtruncontrol.cpp       | 2 +-
 src/plugins/winrt/winrtrunnerhelper.cpp     | 6 +++---
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp
index f6519bf94ab..eeb0927d814 100644
--- a/src/plugins/winrt/winrtdevice.cpp
+++ b/src/plugins/winrt/winrtdevice.cpp
@@ -42,7 +42,7 @@ using namespace ProjectExplorer;
 namespace WinRt {
 namespace Internal {
 
-WinRtDevice::WinRtDevice() : m_deviceId(-1)
+WinRtDevice::WinRtDevice()
 {
     initFreePorts();
 }
@@ -74,7 +74,7 @@ QString WinRtDevice::displayType() const
 
 IDeviceWidget *WinRtDevice::createWidget()
 {
-    return 0;
+    return nullptr;
 }
 
 QList<Core::Id> WinRtDevice::actionIds() const
diff --git a/src/plugins/winrt/winrtdevice.h b/src/plugins/winrt/winrtdevice.h
index 694badf32a8..32548b219cb 100644
--- a/src/plugins/winrt/winrtdevice.h
+++ b/src/plugins/winrt/winrtdevice.h
@@ -60,7 +60,7 @@ private:
     void initFreePorts();
 
 private:
-    int m_deviceId;
+    int m_deviceId = -1;
 };
 
 } // Internal
diff --git a/src/plugins/winrt/winrtdevicefactory.cpp b/src/plugins/winrt/winrtdevicefactory.cpp
index c3d04447a0e..34681ecf483 100644
--- a/src/plugins/winrt/winrtdevicefactory.cpp
+++ b/src/plugins/winrt/winrtdevicefactory.cpp
@@ -48,8 +48,6 @@ namespace WinRt {
 namespace Internal {
 
 WinRtDeviceFactory::WinRtDeviceFactory()
-    : m_process(0)
-    , m_initialized(false)
 {
     if (allPrerequisitesLoaded()) {
         onPrerequisitesLoaded();
diff --git a/src/plugins/winrt/winrtdevicefactory.h b/src/plugins/winrt/winrtdevicefactory.h
index ab2b8a64091..0eac4acdff4 100644
--- a/src/plugins/winrt/winrtdevicefactory.h
+++ b/src/plugins/winrt/winrtdevicefactory.h
@@ -55,8 +55,8 @@ private:
     QString findRunnerFilePath() const;
     void parseRunnerOutput(const QByteArray &output) const;
 
-    Utils::QtcProcess *m_process;
-    bool m_initialized;
+    Utils::QtcProcess *m_process = nullptr;
+    bool m_initialized = false;
 };
 
 } // Internal
diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp
index 386a919739c..2daf2e36121 100644
--- a/src/plugins/winrt/winrtqtversionfactory.cpp
+++ b/src/plugins/winrt/winrtqtversionfactory.cpp
@@ -54,8 +54,8 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::restore(const QString &type,
         const QVariantMap &data)
 {
     if (!canRestore(type))
-        return 0;
-    WinRtQtVersion *v = 0;
+        return nullptr;
+    WinRtQtVersion *v = nullptr;
     if (type == QLatin1String(Constants::WINRT_WINPHONEQT))
         v = new WinRtPhoneQtVersion;
     else
@@ -74,7 +74,7 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &q
 {
     QFileInfo fi = qmakePath.toFileInfo();
     if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
-        return 0;
+        return nullptr;
 
     bool isWinRt = false;
     bool isPhone = false;
@@ -89,7 +89,7 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &q
     }
 
     if (!isWinRt)
-        return 0;
+        return nullptr;
 
     return isPhone ? new WinRtPhoneQtVersion(qmakePath, isAutoDetected, autoDetectionSource)
                    : new WinRtQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h
index bc099372c91..4a88ce40fa4 100644
--- a/src/plugins/winrt/winrtqtversionfactory.h
+++ b/src/plugins/winrt/winrtqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
 class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
 {
 public:
-    explicit WinRtQtVersionFactory(QObject *parent = 0);
+    explicit WinRtQtVersionFactory(QObject *parent = nullptr);
     ~WinRtQtVersionFactory();
 
     bool canRestore(const QString &type);
diff --git a/src/plugins/winrt/winrtruncontrol.cpp b/src/plugins/winrt/winrtruncontrol.cpp
index 786d19f8696..d8faa0ab48a 100644
--- a/src/plugins/winrt/winrtruncontrol.cpp
+++ b/src/plugins/winrt/winrtruncontrol.cpp
@@ -101,7 +101,7 @@ void WinRtRunner::onProcessError()
     QTC_ASSERT(m_runner, return);
     m_runner->disconnect();
     m_runner->deleteLater();
-    m_runner = 0;
+    m_runner = nullptr;
     m_state = StoppedState;
     reportStopped();
 }
diff --git a/src/plugins/winrt/winrtrunnerhelper.cpp b/src/plugins/winrt/winrtrunnerhelper.cpp
index efd0e62506b..47083a168f0 100644
--- a/src/plugins/winrt/winrtrunnerhelper.cpp
+++ b/src/plugins/winrt/winrtrunnerhelper.cpp
@@ -152,7 +152,7 @@ void WinRtRunnerHelper::onProcessFinished(int exitCode, QProcess::ExitStatus exi
     QTC_ASSERT(m_process, return);
     m_process->disconnect();
     m_process->deleteLater();
-    m_process = 0;
+    m_process = nullptr;
     emit finished(exitCode, exitStatus);
 }
 
@@ -163,7 +163,7 @@ void WinRtRunnerHelper::onProcessError(QProcess::ProcessError processError)
                       m_process->errorString()), Utils::ErrorMessageFormat);
     m_process->disconnect();
     m_process->deleteLater();
-    m_process = 0;
+    m_process = nullptr;
     emit error(processError);
 }
 
@@ -176,7 +176,7 @@ void WinRtRunnerHelper::startWinRtRunner(const RunConf &conf)
         QtcProcess::addArg(&runnerArgs, QString::number(m_device->deviceId()));
     }
 
-    QtcProcess *process = 0;
+    QtcProcess *process = nullptr;
     bool connectProcess = false;
 
     switch (conf) {