Clean up generator code

- Remove unnecessary namespace qualifications.
- Add virtual destructor to base class.

Change-Id: Ie6ae45c1fb8ef8756b1ddffb58de452e38de1e15
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

4 files changed, 34 insertions, 33 deletions

diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index 93d78ea50..9d5abc302 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -54,7 +54,7 @@ ProjectGenerator::~ProjectGenerator()
     delete d;
 }
 
-static QString _configurationName(const qbs::Project &project)
+static QString _configurationName(const Project &project)
 {
     return project.projectConfiguration()
             .value(QStringLiteral("qbs")).toMap()
@@ -72,7 +72,7 @@ void ProjectGenerator::generate(const QList<Project> &projects,
 {
     d->projects = projects;
     std::sort(d->projects.begin(), d->projects.end(),
-              [](const qbs::Project &a, const qbs::Project &b) {
+              [](const Project &a, const Project &b) {
                   return _configurationName(a) < _configurationName(b); });
     d->buildConfigurations = buildConfigurations;
     std::sort(d->buildConfigurations.begin(), d->buildConfigurations.end(),
@@ -106,7 +106,7 @@ QStringList ProjectGenerator::buildConfigurationCommandLine(const Project &proje
 
     const QString name = config.take(QStringLiteral("qbs.configurationName")).toString();
     if (name.isEmpty())
-        throw qbs::ErrorInfo(QStringLiteral("Can't find configuration name for project"));
+        throw ErrorInfo(QStringLiteral("Can't find configuration name for project"));
 
     QStringList commandLineParameters;
     commandLineParameters += name;
@@ -123,7 +123,7 @@ QStringList ProjectGenerator::buildConfigurationCommandLine(const Project &proje
 // Count the number of products in the project (singular)
 // Precondition: each project data (i.e. per-configuration project data)
 // has the same number of products.
-static int _productCount(const QList<qbs::ProjectData> &projects)
+static int _productCount(const QList<ProjectData> &projects)
 {
     int count = -1;
     for (const auto &project : projects) {
@@ -134,7 +134,7 @@ static int _productCount(const QList<qbs::ProjectData> &projects)
     return count;
 }
 
-static int _subprojectCount(const QList<qbs::ProjectData> &projects)
+static int _subprojectCount(const QList<ProjectData> &projects)
 {
     int count = -1;
     for (const auto &project : projects) {
@@ -146,11 +146,11 @@ static int _subprojectCount(const QList<qbs::ProjectData> &projects)
 }
 
 static GeneratableProjectData _reduceProjectConfigurations(
-        const QMap<QString, qbs::ProjectData> &map) {
+        const QMap<QString, ProjectData> &map) {
     GeneratableProjectData gproject;
 
     // Add the project's project data for each configuration
-    QMapIterator<QString, qbs::ProjectData> it(map);
+    QMapIterator<QString, ProjectData> it(map);
     while (it.hasNext()) {
         it.next();
         gproject.data.insert(it.key(), it.value());
@@ -161,7 +161,7 @@ static GeneratableProjectData _reduceProjectConfigurations(
         GeneratableProductData prod;
 
         // once for each configuration
-        QMapIterator<QString, qbs::ProjectData> it(map);
+        QMapIterator<QString, ProjectData> it(map);
         while (it.hasNext()) {
             it.next();
             prod.data.insert(it.key(), it.value().products().at(i));
@@ -172,10 +172,10 @@ static GeneratableProjectData _reduceProjectConfigurations(
 
     // Add the project's subprojects...
     for (int i = 0; i < _subprojectCount(map.values()); ++i) {
-        QMap<QString, qbs::ProjectData> subprojectMap;
+        QMap<QString, ProjectData> subprojectMap;
 
         // once for each configuration
-        QMapIterator<QString, qbs::ProjectData> it(map);
+        QMapIterator<QString, ProjectData> it(map);
         while (it.hasNext()) {
             it.next();
             subprojectMap.insert(it.key(), it.value().subProjects().at(i));
@@ -189,7 +189,7 @@ static GeneratableProjectData _reduceProjectConfigurations(
 
 const GeneratableProject ProjectGenerator::project() const
 {
-    QMap<QString, qbs::ProjectData> rootProjects;
+    QMap<QString, ProjectData> rootProjects;
     GeneratableProject proj;
     for (const auto &project : projects()) {
         const QString configurationName = _configurationName(project);
diff --git a/src/lib/corelib/generators/generatordata.cpp b/src/lib/corelib/generators/generatordata.cpp
index c279c4b20..f8151d32a 100644
--- a/src/lib/corelib/generators/generatordata.cpp
+++ b/src/lib/corelib/generators/generatordata.cpp
@@ -38,15 +38,15 @@ namespace qbs {
 QString GeneratableProductData::name() const
 {
     QString name;
-    QMapIterator<QString, qbs::ProductData> it(data);
+    QMapIterator<QString, ProductData> it(data);
     while (it.hasNext()) {
         it.next();
         QString oldName = name;
         name = it.value().name();
         if (!oldName.isEmpty() && oldName != name)
-            throw qbs::ErrorInfo(QLatin1String("Products with different names per-configuration "
-                                               "are not compatible with this generator. Consider "
-                                               "using the targetName property instead."));
+            throw ErrorInfo(QLatin1String("Products with different names per-configuration "
+                                          "are not compatible with this generator. Consider "
+                                          "using the targetName property instead."));
     }
     return name;
 }
@@ -54,15 +54,15 @@ QString GeneratableProductData::name() const
 QStringList GeneratableProductData::dependencies() const
 {
     QStringList list;
-    QMapIterator<QString, qbs::ProductData> it(data);
+    QMapIterator<QString, ProductData> it(data);
     while (it.hasNext()) {
         it.next();
         QStringList oldList = list;
         list = it.value().dependencies();
         if (!oldList.isEmpty() && oldList != list)
-            throw qbs::ErrorInfo(QLatin1String("Products with different dependency lists "
-                                               "per-configuration are not compatible with this "
-                                               "generator."));
+            throw ErrorInfo(QLatin1String("Products with different dependency lists "
+                                          "per-configuration are not compatible with this "
+                                          "generator."));
     }
     return list;
 }
@@ -70,14 +70,14 @@ QStringList GeneratableProductData::dependencies() const
 QString GeneratableProjectData::name() const
 {
     QString name;
-    QMapIterator<QString, qbs::ProjectData> it(data);
+    QMapIterator<QString, ProjectData> it(data);
     while (it.hasNext()) {
         it.next();
         QString oldName = name;
         name = it.value().name();
         if (!oldName.isEmpty() && oldName != name)
-            throw qbs::ErrorInfo(QLatin1String("Projects with different names per-configuration "
-                                               "are not compatible with this generator."));
+            throw ErrorInfo(QLatin1String("Projects with different names per-configuration "
+                                          "are not compatible with this generator."));
     }
     return name;
 }
@@ -85,7 +85,7 @@ QString GeneratableProjectData::name() const
 QDir GeneratableProject::baseBuildDirectory() const
 {
     QSet<QString> baseBuildDirectory;
-    QMapIterator<QString, qbs::ProjectData> it(data);
+    QMapIterator<QString, ProjectData> it(data);
     while (it.hasNext()) {
         it.next();
         QDir dir(it.value().buildDirectory());
@@ -99,7 +99,7 @@ QDir GeneratableProject::baseBuildDirectory() const
 QFileInfo GeneratableProject::filePath() const
 {
     QSet<QString> filePath;
-    QMapIterator<QString, qbs::ProjectData> it(data);
+    QMapIterator<QString, ProjectData> it(data);
     while (it.hasNext()) {
         it.next();
         filePath.insert(it.value().location().filePath());
diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h
index 2d394751b..3320858a9 100644
--- a/src/lib/corelib/generators/generatordata.h
+++ b/src/lib/corelib/generators/generatordata.h
@@ -38,9 +38,9 @@
 
 namespace qbs {
 
-typedef QMap<QString, qbs::Project> GeneratableProjectMap;
-typedef QMap<QString, qbs::ProjectData> GeneratableProjectDataMap;
-typedef QMap<QString, qbs::ProductData> GeneratableProductDataMap;
+typedef QMap<QString, Project> GeneratableProjectMap;
+typedef QMap<QString, ProjectData> GeneratableProjectDataMap;
+typedef QMap<QString, ProductData> GeneratableProductDataMap;
 
 struct GeneratableProductData {
     GeneratableProductDataMap data;
diff --git a/src/lib/corelib/generators/igeneratableprojectvisitor.h b/src/lib/corelib/generators/igeneratableprojectvisitor.h
index d805d878f..c96cd8dd7 100644
--- a/src/lib/corelib/generators/igeneratableprojectvisitor.h
+++ b/src/lib/corelib/generators/igeneratableprojectvisitor.h
@@ -37,6 +37,8 @@ namespace qbs {
 
 class IGeneratableProjectVisitor {
 public:
+    virtual ~IGeneratableProjectVisitor() { }
+
     // Collapsed configurations
     virtual void visitProject(const GeneratableProject &project) {
         Q_UNUSED(project);
@@ -65,27 +67,26 @@ public:
     }
 
     // Expanded configurations
-    virtual void visitProject(const qbs::Project &project,
-                              const QString &configuration) {
+    virtual void visitProject(const Project &project, const QString &configuration) {
         Q_UNUSED(project);
         Q_UNUSED(configuration);
     }
 
-    virtual void visitProjectData(const qbs::ProjectData &parentProjectData,
-                                  const qbs::ProjectData &projectData,
+    virtual void visitProjectData(const ProjectData &parentProjectData,
+                                  const ProjectData &projectData,
                                   const QString &configuration) {
         Q_UNUSED(parentProjectData);
         Q_UNUSED(projectData);
         Q_UNUSED(configuration);
     }
 
-    virtual void visitProjectData(const qbs::ProjectData &projectData,
+    virtual void visitProjectData(const ProjectData &projectData,
                                   const QString &configuration) {
         Q_UNUSED(projectData);
         Q_UNUSED(configuration);
     }
 
-    virtual void visitProduct(const qbs::ProductData &productData,
+    virtual void visitProduct(const ProductData &productData,
                               const QString &configuration) {
         Q_UNUSED(productData);
         Q_UNUSED(configuration);