summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-05-07 17:34:12 +0200
committerOrgad Shaneh <orgads@gmail.com>2018-05-13 19:45:06 +0000
commit79aa48e9a4de7054eb3d1e89a5d18e4f8726a94d (patch)
tree165d1cc060b903ff418a46f59c08c150ead3ad81 /src/plugins/qmakeprojectmanager
parent07e67b21880525265b8e85efb1df257a166171ea (diff)
downloadqt-creator-79aa48e9a4de7054eb3d1e89a5d18e4f8726a94d.tar.gz
QmakeProjectManager: Consistently use nullptr
Fixed by clang-tidy modernize-use-nullptr. Change-Id: Ie03a95647d66b97782663b9ff87dbac595496326 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r--src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
index 292f1c0540..000d80b271 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h
@@ -40,7 +40,7 @@ class ClassList : public QListView
Q_OBJECT
public:
- explicit ClassList(QWidget *parent = 0);
+ explicit ClassList(QWidget *parent = nullptr);
QString className(int row) const;
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
index 25c6751a37..b772123771 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
@@ -86,10 +86,10 @@ public:
QString makefile() const;
enum MakefileState { MakefileMatches, MakefileForWrongProject, MakefileIncompatible, MakefileMissing };
- MakefileState compareToImportFrom(const QString &makefile, QString *errorString = 0);
- static Utils::FileName extractSpecFromArguments(QString *arguments,
- const QString &directory, const QtSupport::BaseQtVersion *version,
- QStringList *outArgs = 0);
+ MakefileState compareToImportFrom(const QString &makefile, QString *errorString = nullptr);
+ static Utils::FileName extractSpecFromArguments(
+ QString *arguments, const QString &directory, const QtSupport::BaseQtVersion *version,
+ QStringList *outArgs = nullptr);
QVariantMap toMap() const override;
@@ -136,7 +136,7 @@ private:
bool m_shadowBuild = true;
bool m_isEnabled = true;
- QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration = 0;
+ QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration = nullptr;
QmakeProFileNode *m_subNodeBuild = nullptr;
ProjectExplorer::FileNode *m_fileNodeBuild = nullptr;