feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use more nullptr in puppetcreator

Browse Source 
Change-Id: Ia723b1629c0d5aff49f54dc026efe0f822f2267a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tobias Hunger
2017-10-05 14:50:28 +02:00
parent f1888a6331
commit 0fe63ea698
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/instances/puppetcreator.h
View File

@@ -84,7 +84,7 @@ protected:
bool startBuildProcess(const QString &buildDirectoryPath, bool startBuildProcess(const QString &buildDirectoryPath,
const QString &command, const QString &command,
const QStringList &processArguments = QStringList(), const QStringList &processArguments = QStringList(),
PuppetBuildProgressDialog *progressDialog = 0) const; PuppetBuildProgressDialog *progressDialog = nullptr) const;
static QString puppetSourceDirectoryPath(); static QString puppetSourceDirectoryPath();
static QString qml2PuppetProjectFile(); static QString qml2PuppetProjectFile();
static QString qmlPuppetProjectFile(); static QString qmlPuppetProjectFile();
@@ -116,10 +116,10 @@ protected:
private: private:
QString m_qtCreatorVersion; QString m_qtCreatorVersion;
mutable QString m_compileLog; mutable QString m_compileLog;
ProjectExplorer::Kit *m_kit; ProjectExplorer::Kit *m_kit = nullptr;
PuppetType m_availablePuppetType; PuppetType m_availablePuppetType;
static QHash<Core::Id, PuppetType> m_qml2PuppetForKitPuppetHash; static QHash<Core::Id, PuppetType> m_qml2PuppetForKitPuppetHash;
const Model *m_model; const Model *m_model = nullptr;
#ifndef QMLDESIGNER_TEST #ifndef QMLDESIGNER_TEST
const DesignerSettings m_designerSettings; const DesignerSettings m_designerSettings;
#endif #endif