Vcs: Remove propertyPages from wizardFactory

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

2 files changed, 14 insertions, 15 deletions

diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp
index 9069103b09..7802adbeee 100644
--- a/src/plugins/subversion/checkoutwizard.cpp
+++ b/src/plugins/subversion/checkoutwizard.cpp
@@ -51,16 +51,9 @@ CheckoutWizardFactory::CheckoutWizardFactory()
     setDisplayName(tr("Subversion Checkout"));
 }
 
-QList<QWizardPage*> CheckoutWizardFactory::createParameterPages(const QString &path)
+VcsBase::BaseCheckoutWizard *CheckoutWizardFactory::create(const QString &path, QWidget *parent) const
 {
-    QList<QWizardPage*> rc;
-    const Core::IVersionControl *vc = SubversionPlugin::instance()->versionControl();
-    if (!vc->isConfigured())
-        rc.append(new VcsBase::VcsConfigurationPage(vc));
-    CheckoutWizardPage *cwp = new CheckoutWizardPage;
-    cwp->setPath(path);
-    rc.append(cwp);
-    return rc;
+    return new CheckoutWizard(path, parent);
 }
 
 VcsBase::Command *CheckoutWizardFactory::createCommand(const QList<QWizardPage*> &parameterPages,
@@ -95,9 +88,16 @@ VcsBase::Command *CheckoutWizardFactory::createCommand(const QList<QWizardPage*>
 // CheckoutWizard:
 // --------------------------------------------------------------------
 
-CheckoutWizard::CheckoutWizard(const QList<QWizardPage *> &parameterPages, QWidget *parent) :
-    VcsBase::BaseCheckoutWizard(parameterPages, parent)
-{ }
+CheckoutWizard::CheckoutWizard(const QString &path, QWidget *parent) :
+    VcsBase::BaseCheckoutWizard(path, parent)
+{
+    const Core::IVersionControl *vc = SubversionPlugin::instance()->versionControl();
+    if (!vc->isConfigured())
+        addPage(new VcsBase::VcsConfigurationPage(vc));
+    CheckoutWizardPage *cwp = new CheckoutWizardPage;
+    cwp->setPath(path);
+    addPage(cwp);
+}
 
 } // namespace Internal
 } // namespace Subversion
diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h
index e14082a201..26c99c7236 100644
--- a/src/plugins/subversion/checkoutwizard.h
+++ b/src/plugins/subversion/checkoutwizard.h
@@ -43,11 +43,10 @@ class CheckoutWizardFactory : public VcsBase::BaseCheckoutWizardFactory
 public:
     CheckoutWizardFactory();
 
-    VcsBase::BaseCheckoutWizard *create(const QList<QWizardPage *> &parameterPages, QWidget *parent = 0) const;
+    VcsBase::BaseCheckoutWizard *create(const QString &path, QWidget *parent = 0) const;
 
 private:
     // BaseCheckoutWizard
-    QList<QWizardPage*> createParameterPages(const QString &path);
     VcsBase::Command *createCommand(const QList<QWizardPage*> &parameterPage,
                                     QString *checkoutPath);
 };
@@ -57,7 +56,7 @@ class CheckoutWizard : public VcsBase::BaseCheckoutWizard
     Q_OBJECT
 
 public:
-    CheckoutWizard(const QList<QWizardPage *> &parameterPages, QWidget *parent = 0);
+    CheckoutWizard(const QString &path, QWidget *parent = 0);
 };
 
 } // namespace Internal