summaryrefslogtreecommitdiff
path: root/src/lib/buildgraph
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-09-09 14:03:09 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-09-09 14:56:59 +0200
commit7b87337f402da091648a97414d0201c096411902 (patch)
treebfa0f7adcb94a12b656a9d44a46b92d724b02e18 /src/lib/buildgraph
parentff5b33b82b8ae27ba8851f8c9f618ab983e03f06 (diff)
downloadqbs-7b87337f402da091648a97414d0201c096411902.tar.gz
Remove redundant method parameter.
Presumably the author thought the function was static. Change-Id: I5637493c6694edb15349d6189b098990471585be Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph')
-rw-r--r--src/lib/buildgraph/buildgraphloader.cpp6
-rw-r--r--src/lib/buildgraph/projectbuilddata.cpp11
-rw-r--r--src/lib/buildgraph/projectbuilddata.h5
3 files changed, 7 insertions, 15 deletions
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp
index 8be8adee2..4082b77f1 100644
--- a/src/lib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/buildgraph/buildgraphloader.cpp
@@ -410,10 +410,8 @@ void BuildGraphLoader::onProductRemoved(const ResolvedProductPtr &product,
product->project->products.removeOne(product);
if (product->buildData) {
- foreach (Artifact *artifact, product->buildData->artifacts) {
- projectBuildData->removeArtifact(artifact, projectBuildData, m_logger,
- removeArtifactsFromDisk, false);
- }
+ foreach (Artifact *artifact, product->buildData->artifacts)
+ projectBuildData->removeArtifact(artifact, m_logger, removeArtifactsFromDisk, false);
}
}
diff --git a/src/lib/buildgraph/projectbuilddata.cpp b/src/lib/buildgraph/projectbuilddata.cpp
index 927807d55..8a47e7d47 100644
--- a/src/lib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/buildgraph/projectbuilddata.cpp
@@ -141,7 +141,7 @@ static void disconnectArtifact(Artifact *artifact, ProjectBuildData *projectBuil
disconnectArtifactParents(artifact, projectBuildData, logger);
}
-void ProjectBuildData::removeArtifact(Artifact *artifact, ProjectBuildData *projectBuildData,
+void ProjectBuildData::removeArtifact(Artifact *artifact,
const Logger &logger, bool removeFromDisk, bool removeFromProduct)
{
if (logger.traceEnabled())
@@ -154,16 +154,11 @@ void ProjectBuildData::removeArtifact(Artifact *artifact, ProjectBuildData *proj
artifact->product->buildData->artifacts.remove(artifact);
artifact->product->buildData->targetArtifacts.remove(artifact);
}
- disconnectArtifact(artifact, projectBuildData, logger);
- projectBuildData->artifactsThatMustGetNewTransformers -= artifact;
+ disconnectArtifact(artifact, this, logger);
+ artifactsThatMustGetNewTransformers -= artifact;
isDirty = true;
}
-void ProjectBuildData::removeArtifact(Artifact *artifact, const Logger &logger)
-{
- removeArtifact(artifact, artifact->product->topLevelProject()->buildData.data(), logger);
-}
-
void ProjectBuildData::updateNodesThatMustGetNewTransformer(const Logger &logger)
{
RulesEvaluationContext::Scope s(evaluationContext.data());
diff --git a/src/lib/buildgraph/projectbuilddata.h b/src/lib/buildgraph/projectbuilddata.h
index a51beb96c..346291dc6 100644
--- a/src/lib/buildgraph/projectbuilddata.h
+++ b/src/lib/buildgraph/projectbuilddata.h
@@ -63,9 +63,8 @@ public:
QList<FileResourceBase *> lookupFiles(const Artifact *artifact) const;
void insertFileDependency(FileDependency *dependency);
void updateNodesThatMustGetNewTransformer(const Logger &logger);
- void removeArtifact(Artifact *artifact, const Logger &logger);
- void removeArtifact(Artifact *artifact, ProjectBuildData *projectBuildData,
- const Logger &logger, bool removeFromDisk = true, bool removeFromProduct = true);
+ void removeArtifact(Artifact *artifact, const Logger &logger, bool removeFromDisk = true,
+ bool removeFromProduct = true);
QSet<FileDependency *> fileDependencies;
RulesEvaluationContextPtr evaluationContext;