diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-05 16:24:00 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-26 11:44:08 +0200 |
commit | 6644a08c2167ca7c67db45b861fe7d7e21780342 (patch) | |
tree | 293c94d57698f4e45f309190e881d01760c83a50 /src/plugins/vcsbase/basecheckoutwizardfactory.cpp | |
parent | e9526eadb8e3bd567322c0841ea1f43842dff318 (diff) | |
download | qt-creator-6644a08c2167ca7c67db45b861fe7d7e21780342.tar.gz |
VcsBase: Remove BaseCheckoutWizard::setCustomLabels()
Also assert that d->wizard is not in use already and use d->wizard
consistently.
Change-Id: I85599f80e92edb2a0a0fc52c5fed1e484d0beac9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase/basecheckoutwizardfactory.cpp')
-rw-r--r-- | src/plugins/vcsbase/basecheckoutwizardfactory.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/plugins/vcsbase/basecheckoutwizardfactory.cpp b/src/plugins/vcsbase/basecheckoutwizardfactory.cpp index 16e31ccfc7..75a860659c 100644 --- a/src/plugins/vcsbase/basecheckoutwizardfactory.cpp +++ b/src/plugins/vcsbase/basecheckoutwizardfactory.cpp @@ -34,6 +34,8 @@ #include <projectexplorer/projectexplorer.h> +#include <utils/qtcassert.h> + #include <QCoreApplication> #include <QDir> #include <QMessageBox> @@ -71,8 +73,6 @@ public: BaseCheckoutWizard *wizard; QList<QWizardPage *> parameterPages; QString checkoutPath; - QString progressTitle; - QString startedStatus; }; void BaseCheckoutWizardFactoryPrivate::clear() @@ -105,18 +105,14 @@ void BaseCheckoutWizardFactory::runWizard(const QString &path, QWidget *parent, { Q_UNUSED(platform); Q_UNUSED(extraValues); + QTC_ASSERT(!d->wizard, return); // Create dialog and launch d->parameterPages = createParameterPages(path); - BaseCheckoutWizard *wizard = create(d->parameterPages, parent); - if (!d->progressTitle.isEmpty()) - wizard->setTitle(d->progressTitle); - if (!d->startedStatus.isEmpty()) - wizard->setStartedStatus(d->startedStatus); - d->wizard = wizard; - connect(wizard, SIGNAL(progressPageShown()), this, SLOT(slotProgressPageShown())); - wizard->setWindowTitle(displayName()); - if (wizard->exec() != QDialog::Accepted) + d->wizard = create(d->parameterPages, parent); + connect(d->wizard, SIGNAL(progressPageShown()), this, SLOT(slotProgressPageShown())); + d->wizard->setWindowTitle(displayName()); + if (d->wizard->exec() != QDialog::Accepted) return; // Now try to find the project file and open const QString checkoutPath = d->checkoutPath; @@ -180,12 +176,6 @@ QString BaseCheckoutWizardFactory::openProject(const QString &path, QString *err return projectFile; } -void BaseCheckoutWizardFactory::setCustomLabels(const QString &progressTitle, const QString &startedStatus) -{ - d->progressTitle = progressTitle; - d->startedStatus = startedStatus; -} - void BaseCheckoutWizardFactory::slotProgressPageShown() { Command *command = createCommand(d->parameterPages, &(d->checkoutPath)); |