From 9c688e8f9e31f59d49c0a3ed7c0f6b15a6b9e5e5 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 30 Jul 2018 22:45:53 +0300
Subject: [PATCH] QbsProjectManager: Use member-initializers

Complements 11632bbeddb9a4a742eef0df37f7cf1aecebe9a2.

Change-Id: Id94f53ae1de871aa16257a043f4b95c971c11d6f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../qbsprojectmanager/qbsprofilessettingspage.cpp      |  1 -
 .../qbsprojectmanager/qbsprofilessettingspage.h        |  2 +-
 src/plugins/qbsprojectmanager/qbsproject.cpp           |  9 ++-------
 src/plugins/qbsprojectmanager/qbsproject.h             | 10 +++++-----
 src/plugins/qbsprojectmanager/qbsprojectparser.cpp     |  5 +----
 src/plugins/qbsprojectmanager/qbsprojectparser.h       |  8 ++++----
 6 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
index acfa11ce949..418f30e2117 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
@@ -66,7 +66,6 @@ private:
 
 QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent)
     : Core::IOptionsPage(parent)
-    , m_widget(nullptr)
     , m_useQtcSettingsDirPersistent(QbsProjectManagerSettings::useCreatorSettingsDirForQbs())
 
 {
diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h
index 25f10859bfa..f146b92c72d 100644
--- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h
+++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h
@@ -41,7 +41,7 @@ private:
     void apply() override;
     void finish() override;
 
-    QbsProfilesSettingsWidget *m_widget;
+    QbsProfilesSettingsWidget *m_widget = nullptr;
     bool m_useQtcSettingsDirPersistent;
 };
 
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 0de8a58fe94..5740483c270 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -120,13 +120,8 @@ private:
 // --------------------------------------------------------------------
 
 QbsProject::QbsProject(const FileName &fileName) :
-    Project(Constants::MIME_TYPE, fileName, [this]() { delayParsing(); }),
-    m_qbsProjectParser(nullptr),
-    m_qbsUpdateFutureInterface(nullptr),
-    m_parsingScheduled(false),
-    m_cancelStatus(CancelStatusNone),
-    m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)),
-    m_extraCompilersPending(false)
+    Project(Constants::MIME_TYPE, fileName, [this] { delayParsing(); }),
+    m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
 {
     m_parsingDelay.setInterval(1000); // delay parsing by 1s.
 
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index c373ee8b0fe..5d8c057a9cf 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -146,16 +146,16 @@ private:
     qbs::ProjectData m_projectData; // Cached m_qbsProject.projectData()
     QSet<Core::IDocument *> m_qbsDocuments;
 
-    QbsProjectParser *m_qbsProjectParser;
+    QbsProjectParser *m_qbsProjectParser = nullptr;
 
-    QFutureInterface<bool> *m_qbsUpdateFutureInterface;
-    bool m_parsingScheduled;
+    QFutureInterface<bool> *m_qbsUpdateFutureInterface = nullptr;
+    bool m_parsingScheduled = false;
 
     enum CancelStatus {
         CancelStatusNone,
         CancelStatusCancelingForReparse,
         CancelStatusCancelingAltoghether
-    } m_cancelStatus;
+    } m_cancelStatus = CancelStatusNone;
 
     CppTools::CppProjectUpdater *m_cppCodeModelUpdater = nullptr;
     CppTools::ProjectInfo m_cppCodeModelProjectInfo;
@@ -164,7 +164,7 @@ private:
 
     QTimer m_parsingDelay;
     QList<ProjectExplorer::ExtraCompiler *> m_extraCompilers;
-    bool m_extraCompilersPending;
+    bool m_extraCompilersPending = false;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
index 604b412b037..3d67a087e35 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
@@ -49,10 +49,7 @@ namespace Internal {
 // --------------------------------------------------------------------
 
 QbsProjectParser::QbsProjectParser(QbsProject *project, QFutureInterface<bool> *fi) :
-    m_qbsSetupProjectJob(nullptr),
-    m_ruleExecutionJob(nullptr),
-    m_fi(fi),
-    m_currentProgressBase(0)
+    m_fi(fi)
 {
     m_project = project->qbsProject();
     m_projectFilePath = project->projectFilePath().toString();
diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.h b/src/plugins/qbsprojectmanager/qbsprojectparser.h
index d1aed185246..4c54d08b3b9 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.h
@@ -70,14 +70,14 @@ private:
     void handleRuleExecutionDone();
 
     QString m_projectFilePath;
-    qbs::SetupProjectJob *m_qbsSetupProjectJob;
-    qbs::BuildJob *m_ruleExecutionJob;
+    qbs::SetupProjectJob *m_qbsSetupProjectJob = nullptr;
+    qbs::BuildJob *m_ruleExecutionJob = nullptr;
     qbs::ErrorInfo m_error;
     qbs::Project m_project;
     bool m_dryRun;
 
-    QFutureInterface<bool> *m_fi;
-    int m_currentProgressBase;
+    QFutureInterface<bool> *m_fi = nullptr;
+    int m_currentProgressBase = 0;
 };
 
 } // namespace Internal