Clean up the ProjectGenerator interface

Make the virtual generate() function private; it is only supposed to be
called from within this class. Merge the two "private:" sections while
we're at it.

Change-Id: I43dbd5d45e8c5d803f1bfbf088dbe1944a59c05b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/lib/corelib/generators/generator.h b/src/lib/corelib/generators/generator.h
index 8c7bfde8b..abb804d62 100644
--- a/src/lib/corelib/generators/generator.h
+++ b/src/lib/corelib/generators/generator.h
@@ -66,8 +66,6 @@ public:
      */
     virtual QString generatorName() const = 0;
 
-    virtual void generate() = 0;
-
     void generate(const QList<Project> &projects,
                   const QList<QVariantMap> &buildConfigurations,
                   const InstallOptions &installOptions,
@@ -78,19 +76,19 @@ public:
     QFileInfo qbsExecutableFilePath() const;
     QString qbsSettingsDir() const;
 
-private:
-    QList<Project> projects() const;
-    QList<QVariantMap> buildConfigurations() const;
-    QVariantMap buildConfiguration(const Project &project) const;
-
-    QStringList buildConfigurationCommandLine(const Project &project) const;
-
 protected:
     ProjectGenerator();
 
     const Internal::Logger &logger() const;
 
 private:
+    virtual void generate() = 0;
+
+    QList<Project> projects() const;
+    QList<QVariantMap> buildConfigurations() const;
+    QVariantMap buildConfiguration(const Project &project) const;
+    QStringList buildConfigurationCommandLine(const Project &project) const;
+
     ProjectGeneratorPrivate *d;
 };