BaseCheckoutWizard*: Move createCommand from factory into Wizard

Change-Id: I0dcc931f279b59f0d6cf7afb553a2fed30baae7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

4 files changed, 30 insertions, 36 deletions

diff --git a/src/plugins/git/clonewizard.cpp b/src/plugins/git/clonewizard.cpp
index fd99944563..291c857b38 100644
--- a/src/plugins/git/clonewizard.cpp
+++ b/src/plugins/git/clonewizard.cpp
@@ -53,20 +53,6 @@ VcsBase::BaseCheckoutWizard *CloneWizardFactory::create(const QString &path, QWi
     return new CloneWizard(path, parent);
 }
 
-VcsBase::Command *CloneWizardFactory::createCommand(const QList<QWizardPage*> &parameterPages,
-                                             QString *checkoutPath)
-{
-    // Collect parameters for the clone command.
-    const CloneWizardPage *cwp = 0;
-    foreach (QWizardPage *wp, parameterPages) {
-        if ((cwp = qobject_cast<const CloneWizardPage *>(wp)))
-            break;
-    }
-
-    QTC_ASSERT(cwp, return 0);
-    return cwp->createCheckoutJob(checkoutPath);
-}
-
 // --------------------------------------------------------------------
 // CloneWizard:
 // --------------------------------------------------------------------
@@ -85,5 +71,18 @@ CloneWizard::CloneWizard(const QString &path, QWidget *parent) :
     addPage(cwp);
 }
 
+VcsBase::Command *CloneWizard::createCommand(QString *checkoutDir)
+{
+    // Collect parameters for the clone command.
+    const CloneWizardPage *cwp = 0;
+    foreach (int pageId, pageIds()) {
+        if ((cwp = qobject_cast<const CloneWizardPage *>(page(pageId))))
+            break;
+    }
+
+    QTC_ASSERT(cwp, return 0);
+    return cwp->createCheckoutJob(checkoutDir);
+}
+
 } // namespace Internal
 } // namespace Git
diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h
index dffce65b10..95c62a15da 100644
--- a/src/plugins/git/clonewizard.h
+++ b/src/plugins/git/clonewizard.h
@@ -44,11 +44,6 @@ public:
     CloneWizardFactory();
 
     VcsBase::BaseCheckoutWizard *create(const QString &path, QWidget *parent = 0) const;
-
-private:
-    // BaseCheckoutWizard
-    VcsBase::Command *createCommand(const QList<QWizardPage*> &parameterPages,
-                                    QString *checkoutPath);
 };
 
 class CloneWizard : public VcsBase::BaseCheckoutWizard
@@ -57,6 +52,9 @@ class CloneWizard : public VcsBase::BaseCheckoutWizard
 
 public:
     CloneWizard(const QString &path, QWidget *parent = 0);
+
+protected:
+    VcsBase::Command *createCommand(QString *checkoutDir);
 };
 
 } // namespace Internal
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
index 4224a0e4d4..d11051d517 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp
@@ -82,18 +82,6 @@ VcsBase::BaseCheckoutWizard *GitoriousCloneWizardFactory::create(const QString &
     return new GitoriousCloneWizard(path, parent);
 }
 
-VcsBase::Command *GitoriousCloneWizardFactory::createCommand(const QList<QWizardPage*> &parameterPages,
-                                                      QString *checkoutPath)
-{
-    const Git::CloneWizardPage *cwp = 0;
-    foreach (QWizardPage *p, parameterPages) {
-        if ((cwp = qobject_cast<const Git::CloneWizardPage *>(p)))
-            break;
-    }
-    QTC_ASSERT(cwp, return 0);
-    return cwp->createCheckoutJob(checkoutPath);
-}
-
 // --------------------------------------------------------------------
 // GitoriousCloneWizard:
 // --------------------------------------------------------------------
@@ -120,5 +108,16 @@ GitoriousCloneWizard::GitoriousCloneWizard(const QString &path, QWidget *parent)
     addPage(clonePage);
 }
 
+VcsBase::Command *GitoriousCloneWizard::createCommand(QString *checkoutDir)
+{
+    const Git::CloneWizardPage *cwp = 0;
+    foreach (int pageId, pageIds()) {
+        if ((cwp = qobject_cast<const Git::CloneWizardPage *>(page(pageId))))
+            break;
+    }
+    QTC_ASSERT(cwp, return 0);
+    return cwp->createCheckoutJob(checkoutDir);
+}
+
 } // namespace Internal
 } // namespace Gitorius
diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h
index 7f35f18fb2..22dfac6de6 100644
--- a/src/plugins/git/gitorious/gitoriousclonewizard.h
+++ b/src/plugins/git/gitorious/gitoriousclonewizard.h
@@ -46,11 +46,6 @@ public:
     GitoriousCloneWizardFactory();
 
     VcsBase::BaseCheckoutWizard *create(const QString &path, QWidget *parent = 0) const;
-
-private:
-    // BaseCheckoutWizard
-    VcsBase::Command *createCommand(const QList<QWizardPage*> &parameterPages,
-                                    QString *checkoutPath);
 };
 
 class GitoriousCloneWizard : public VcsBase::BaseCheckoutWizard
@@ -59,6 +54,9 @@ class GitoriousCloneWizard : public VcsBase::BaseCheckoutWizard
 
 public:
     GitoriousCloneWizard(const QString &path, QWidget *parent = 0);
+
+protected:
+    VcsBase::Command *createCommand(QString *checkoutDir);
 };