aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-08-02 19:09:31 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-08-20 14:00:16 +0000
commitdd61fdb5017dcd9521ec389b0b40dad9a93bfd21 (patch)
tree489ad170aa60cb2089f7a7d6a2abca6c667c70aa /src/lib/corelib/tools
parent36c67caee1a65b601446ac9c67d5a3dae03ee1f3 (diff)
corelib: Apply modernize-use-nullptr
Use nullptr instead of 0. Change-Id: Id5b7933844730e244a2dcf3fcebf24f9f048047f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools')
-rw-r--r--src/lib/corelib/tools/persistence.cpp2
-rw-r--r--src/lib/corelib/tools/profile.h4
-rw-r--r--src/lib/corelib/tools/setupprojectparameters.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index 216dfad24..759ae4d7f 100644
--- a/src/lib/corelib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
@@ -81,7 +81,7 @@ void PersistentPool::load(const QString &filePath)
QByteArray magic;
m_stream >> magic;
if (magic != QBS_PERSISTENCE_MAGIC) {
- m_stream.setDevice(0);
+ m_stream.setDevice(nullptr);
throw ErrorInfo(Tr::tr("Cannot use stored build graph at '%1': Incompatible file format. "
"Expected magic token '%2', got '%3'.")
.arg(filePath, QString::fromLatin1(QBS_PERSISTENCE_MAGIC),
diff --git a/src/lib/corelib/tools/profile.h b/src/lib/corelib/tools/profile.h
index a4c6a91f1..2ccc99def 100644
--- a/src/lib/corelib/tools/profile.h
+++ b/src/lib/corelib/tools/profile.h
@@ -59,7 +59,7 @@ public:
bool exists() const;
QVariant value(const QString &key, const QVariant &defaultValue = QVariant(),
- ErrorInfo *error = 0) const;
+ ErrorInfo *error = nullptr) const;
void setValue(const QString &key, const QVariant &value);
void remove(const QString &key);
@@ -72,7 +72,7 @@ public:
void removeProfile();
enum KeySelection { KeySelectionRecursive, KeySelectionNonRecursive };
- QStringList allKeys(KeySelection selection, ErrorInfo *error = 0) const;
+ QStringList allKeys(KeySelection selection, ErrorInfo *error = nullptr) const;
static QString cleanName(const QString &name);
diff --git a/src/lib/corelib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h
index fd73d0748..fe7e3d487 100644
--- a/src/lib/corelib/tools/setupprojectparameters.h
+++ b/src/lib/corelib/tools/setupprojectparameters.h
@@ -97,7 +97,9 @@ public:
void setOverriddenValues(const QVariantMap &values);
QVariantMap overriddenValuesTree() const;
- static QVariantMap expandedBuildConfiguration(const Profile &profile, const QString &configurationName, ErrorInfo *errorInfo = 0);
+ static QVariantMap expandedBuildConfiguration(const Profile &profile,
+ const QString &configurationName,
+ ErrorInfo *errorInfo = nullptr);
ErrorInfo expandBuildConfiguration();
QVariantMap buildConfiguration() const;
QVariantMap buildConfigurationTree() const;