Give the ArtifactVisitor functions unique names.

Overloading and polymorphism don't mix well.
Also remove the visit() functions taking lists. They are overkill.

Change-Id: I36571e19ad5551f996d46ef1f9315fb17d754ac1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

4 files changed, 15 insertions, 29 deletions

diff --git a/src/lib/buildgraph/artifactcleaner.cpp b/src/lib/buildgraph/artifactcleaner.cpp
index a4ded0a62..d19fb7c37 100644
--- a/src/lib/buildgraph/artifactcleaner.cpp
+++ b/src/lib/buildgraph/artifactcleaner.cpp
@@ -94,10 +94,10 @@ public:
     {
     }
 
-    void visit(const BuildProduct::ConstPtr &product)
+    void visitProduct(const BuildProduct::ConstPtr &product)
     {
         m_product = product;
-        ArtifactVisitor::visit(product);
+        ArtifactVisitor::visitProduct(product);
     }
 
     const QSet<QString> &directories() const { return m_directories; }
@@ -128,7 +128,7 @@ void ArtifactCleaner::cleanup(const QList<BuildProduct::ConstPtr> &products, boo
     QSet<QString> directories;
     foreach (const BuildProduct::ConstPtr &product, products) {
         CleanupVisitor visitor(!buildOptions.keepGoing, buildOptions.dryRun, removeAll);
-        visitor.visit(product);
+        visitor.visitProduct(product);
         directories.unite(visitor.directories());
     }
 
diff --git a/src/lib/buildgraph/artifactvisitor.cpp b/src/lib/buildgraph/artifactvisitor.cpp
index af467fe64..c593fe584 100644
--- a/src/lib/buildgraph/artifactvisitor.cpp
+++ b/src/lib/buildgraph/artifactvisitor.cpp
@@ -37,7 +37,7 @@ ArtifactVisitor::ArtifactVisitor(int artifactType) : m_artifactType(artifactType
 {
 }
 
-void ArtifactVisitor::visit(Artifact *artifact)
+void ArtifactVisitor::visitArtifact(Artifact *artifact)
 {
     if (m_allArtifacts.contains(artifact))
         return;
@@ -47,31 +47,19 @@ void ArtifactVisitor::visit(Artifact *artifact)
     else if (m_artifactType == Artifact::Generated)
         return;
     foreach (Artifact * const child, artifact->children)
-        visit(child);
+        visitArtifact(child);
 }
 
-void ArtifactVisitor::visit(const BuildProduct::ConstPtr &product)
+void ArtifactVisitor::visitProduct(const BuildProduct::ConstPtr &product)
 {
     foreach (Artifact * const artifact, product->targetArtifacts)
-        visit(artifact);
+        visitArtifact(artifact);
 }
 
-void ArtifactVisitor::visit(const BuildProject::ConstPtr &project)
+void ArtifactVisitor::visitProject(const BuildProject::ConstPtr &project)
 {
     foreach (const BuildProduct::ConstPtr &product, project->buildProducts())
-        visit(product);
-}
-
-void ArtifactVisitor::visit(const QList<BuildProject::ConstPtr> &projects)
-{
-    foreach (const BuildProject::ConstPtr &project, projects)
-        visit(project);
-}
-
-void ArtifactVisitor::visit(const QList<BuildProject::Ptr> &projects)
-{
-    foreach (const BuildProject::ConstPtr &project, projects)
-        visit(project);
+        visitProduct(product);
 }
 
 } // namespace Internal
diff --git a/src/lib/buildgraph/artifactvisitor.h b/src/lib/buildgraph/artifactvisitor.h
index 6d6266772..7eb77785e 100644
--- a/src/lib/buildgraph/artifactvisitor.h
+++ b/src/lib/buildgraph/artifactvisitor.h
@@ -43,11 +43,9 @@ class ArtifactVisitor
 public:
     ArtifactVisitor(int artifactType);
 
-    virtual void visit(Artifact *artifact);
-    virtual void visit(const BuildProduct::ConstPtr &product);
-    virtual void visit(const BuildProject::ConstPtr &project);
-    virtual void visit(const QList<BuildProject::ConstPtr> &projects);
-    virtual void visit(const QList<BuildProject::Ptr> &projects);
+    virtual void visitArtifact(Artifact *artifact);
+    virtual void visitProduct(const BuildProduct::ConstPtr &product);
+    virtual void visitProject(const BuildProject::ConstPtr &project);
 
 private:
     virtual void doVisit(Artifact *artifact) = 0;
diff --git a/src/lib/buildgraph/executor.cpp b/src/lib/buildgraph/executor.cpp
index b277333ca..901c36596 100644
--- a/src/lib/buildgraph/executor.cpp
+++ b/src/lib/buildgraph/executor.cpp
@@ -200,9 +200,9 @@ void Executor::build(const QList<BuildProduct::Ptr> &productsToBuild)
         MocEffortCalculator mocEffortCalculator;
         BuildEffortCalculator buildEffortCalculator;
         foreach (const BuildProduct::ConstPtr &product, m_productsToBuild) {
-            scanEffortCalculator.visit(product);
-            mocEffortCalculator.visit(product);
-            buildEffortCalculator.visit(product);
+            scanEffortCalculator.visitProduct(product);
+            mocEffortCalculator.visitProduct(product);
+            buildEffortCalculator.visitProduct(product);
         }
         scanEffort = scanEffortCalculator.effort();
         mocEffort = mocEffortCalculator.effort();