QbsProjectManager: Use member-initializers

Complements 11632bbedd.

Change-Id: Id94f53ae1de871aa16257a043f4b95c971c11d6f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp

@@ -66,7 +66,6 @@ private:
 
 QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent)
     : Core::IOptionsPage(parent)
-    , m_widget(nullptr)
     , m_useQtcSettingsDirPersistent(QbsProjectManagerSettings::useCreatorSettingsDirForQbs())
 
 {

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;
 };
 

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -120,13 +120,8 @@ private:
 // --------------------------------------------------------------------
 
 QbsProject::QbsProject(const FileName &fileName) :
-    Project(Constants::MIME_TYPE, fileName, [this]() { delayParsing(); }),
+    Project(Constants::MIME_TYPE, fileName, [this] { delayParsing(); }),
-    m_qbsProjectParser(nullptr),
+    m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
-    m_qbsUpdateFutureInterface(nullptr),
-    m_parsingScheduled(false),
-    m_cancelStatus(CancelStatusNone),
-    m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)),
-    m_extraCompilersPending(false)
 {
     m_parsingDelay.setInterval(1000); // delay parsing by 1s.
 

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;
+    QFutureInterface<bool> *m_qbsUpdateFutureInterface = nullptr;
-    bool m_parsingScheduled;
+    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

src/plugins/qbsprojectmanager/qbsprojectparser.cpp

@@ -49,10 +49,7 @@ namespace Internal {
 // --------------------------------------------------------------------
 
 QbsProjectParser::QbsProjectParser(QbsProject *project, QFutureInterface<bool> *fi) :
-    m_qbsSetupProjectJob(nullptr),
+    m_fi(fi)
-    m_ruleExecutionJob(nullptr),
-    m_fi(fi),
-    m_currentProgressBase(0)
 {
     m_project = project->qbsProject();
     m_projectFilePath = project->projectFilePath().toString();

src/plugins/qbsprojectmanager/qbsprojectparser.h

@@ -70,14 +70,14 @@ private:
     void handleRuleExecutionDone();
 
     QString m_projectFilePath;
-    qbs::SetupProjectJob *m_qbsSetupProjectJob;
+    qbs::SetupProjectJob *m_qbsSetupProjectJob = nullptr;
-    qbs::BuildJob *m_ruleExecutionJob;
+    qbs::BuildJob *m_ruleExecutionJob = nullptr;
     qbs::ErrorInfo m_error;
     qbs::Project m_project;
     bool m_dryRun;
 
-    QFutureInterface<bool> *m_fi;
+    QFutureInterface<bool> *m_fi = nullptr;
-    int m_currentProgressBase;
+    int m_currentProgressBase = 0;
 };
 
 } // namespace Internal