aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph
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/buildgraph
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/buildgraph')
-rw-r--r--src/lib/corelib/buildgraph/artifactcleaner.h2
-rw-r--r--src/lib/corelib/buildgraph/executor.cpp2
-rw-r--r--src/lib/corelib/buildgraph/inputartifactscanner.cpp2
-rw-r--r--src/lib/corelib/buildgraph/processcommandexecutor.cpp2
-rw-r--r--src/lib/corelib/buildgraph/projectbuilddata.h4
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/buildgraph/artifactcleaner.h b/src/lib/corelib/buildgraph/artifactcleaner.h
index 34be4e0f4..4d8c86ea8 100644
--- a/src/lib/corelib/buildgraph/artifactcleaner.h
+++ b/src/lib/corelib/buildgraph/artifactcleaner.h
@@ -59,7 +59,7 @@ public:
private:
void removeEmptyDirectories(const QString &rootDir, const CleanOptions &options,
- bool *isEmpty = 0);
+ bool *isEmpty = nullptr);
Logger m_logger;
bool m_hasError;
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index ce20391cd..9a97b054e 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -772,7 +772,7 @@ void Executor::addExecutorJobs()
}
}
-void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0)
+void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = nullptr)
{
if (childrenAdded)
*childrenAdded = false;
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index 7255a36ba..051560aba 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -170,7 +170,7 @@ void InputArtifactScanner::scanForFileDependencies(Artifact *inputArtifact)
for (DependencyScanner * const scanner : scanners) {
scanForScannerFileDependencies(scanner, inputArtifact, fileToBeScanned,
- scanner->recursive() ? &filesToScan : 0, cacheItem[scanner->key()]);
+ scanner->recursive() ? &filesToScan : nullptr, cacheItem[scanner->key()]);
}
}
}
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index cee45bcd0..0818e1200 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -197,7 +197,7 @@ void ProcessCommandExecutor::doStart()
void ProcessCommandExecutor::cancel()
{
// We don't want this command to be reported as failing, since we explicitly terminated it.
- disconnect(this, &ProcessCommandExecutor::reportProcessResult, 0, 0);
+ disconnect(this, &ProcessCommandExecutor::reportProcessResult, nullptr, nullptr);
m_process.cancel();
}
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.h b/src/lib/corelib/buildgraph/projectbuilddata.h
index e63922bae..0df303c0b 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.h
+++ b/src/lib/corelib/buildgraph/projectbuilddata.h
@@ -62,7 +62,7 @@ class ScriptEngine;
class QBS_AUTOTEST_EXPORT ProjectBuildData
{
public:
- ProjectBuildData(const ProjectBuildData *other = 0);
+ ProjectBuildData(const ProjectBuildData *other = nullptr);
~ProjectBuildData();
static QString deriveBuildGraphFilePath(const QString &buildDir, const QString &projectId);
@@ -75,7 +75,7 @@ public:
QList<FileResourceBase *> lookupFiles(const Artifact *artifact) const;
void insertFileDependency(FileDependency *dependency);
void removeArtifactAndExclusiveDependents(Artifact *artifact, const Logger &logger,
- bool removeFromProduct = true, ArtifactSet *removedArtifacts = 0);
+ bool removeFromProduct = true, ArtifactSet *removedArtifacts = nullptr);
void removeArtifact(Artifact *artifact, const Logger &logger, bool removeFromDisk = true,
bool removeFromProduct = true);