QbsProjectManager: Use member-initializers

Complements 11632bbedd.

Change-Id: Id94f53ae1de871aa16257a043f4b95c971c11d6f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-07-30 22:45:53 +03:00
committed by Orgad Shaneh
parent 495356ce9d
commit 9c688e8f9e
6 changed files with 13 additions and 22 deletions

View File

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

View File

@@ -41,7 +41,7 @@ private:
void apply() override;
void finish() override;
QbsProfilesSettingsWidget *m_widget;
QbsProfilesSettingsWidget *m_widget = nullptr;
bool m_useQtcSettingsDirPersistent;
};

View File

@@ -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.

View File

@@ -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

View File

@@ -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();

View File

@@ -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