diff options
Diffstat (limited to 'src/plugins/bazaar')
-rw-r--r-- | src/plugins/bazaar/clonewizard.cpp | 10 | ||||
-rw-r--r-- | src/plugins/bazaar/clonewizard.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp index ec89f684eb..a01e1fc667 100644 --- a/src/plugins/bazaar/clonewizard.cpp +++ b/src/plugins/bazaar/clonewizard.cpp @@ -51,7 +51,7 @@ CloneWizardFactory::CloneWizardFactory() setDisplayName(tr("Bazaar Clone (Or Branch)")); } -VcsBase::BaseCheckoutWizard *CloneWizardFactory::create(const QString &path, QWidget *parent) const +VcsBase::BaseCheckoutWizard *CloneWizardFactory::create(const Utils::FileName &path, QWidget *parent) const { return new CloneWizard(path, parent); } @@ -60,7 +60,7 @@ VcsBase::BaseCheckoutWizard *CloneWizardFactory::create(const QString &path, QWi // CloneWizard: // -------------------------------------------------------------------- -CloneWizard::CloneWizard(const QString &path, QWidget *parent) : +CloneWizard::CloneWizard(const Utils::FileName &path, QWidget *parent) : VcsBase::BaseCheckoutWizard(path, parent) { setTitle(tr("Cloning")); @@ -70,11 +70,11 @@ CloneWizard::CloneWizard(const QString &path, QWidget *parent) : if (!vc->isConfigured()) addPage(new VcsBase::VcsConfigurationPage(vc)); CloneWizardPage *page = new CloneWizardPage; - page->setPath(path); + page->setPath(path.toString()); addPage(page); } -VcsBase::Command *CloneWizard::createCommand(QString *checkoutDir) +VcsBase::Command *CloneWizard::createCommand(Utils::FileName *checkoutDir) { const CloneWizardPage *cwp = 0; foreach (int pageId, pageIds()) { @@ -86,7 +86,7 @@ VcsBase::Command *CloneWizard::createCommand(QString *checkoutDir) return 0; const BazaarSettings &settings = BazaarPlugin::instance()->settings(); - *checkoutDir = cwp->path() + QLatin1Char('/') + cwp->directory(); + *checkoutDir = Utils::FileName::fromString(cwp->path() + QLatin1Char('/') + cwp->directory()); const CloneOptionsPanel *panel = cwp->cloneOptionsPanel(); QStringList extraOptions; diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h index b0bf361693..3363aca2bb 100644 --- a/src/plugins/bazaar/clonewizard.h +++ b/src/plugins/bazaar/clonewizard.h @@ -45,7 +45,7 @@ class CloneWizardFactory : public VcsBase::BaseCheckoutWizardFactory public: CloneWizardFactory(); - VcsBase::BaseCheckoutWizard *create(const QString &path, QWidget *parent = 0) const; + VcsBase::BaseCheckoutWizard *create(const Utils::FileName &path, QWidget *parent = 0) const; }; class CloneWizard : public VcsBase::BaseCheckoutWizard @@ -53,10 +53,10 @@ class CloneWizard : public VcsBase::BaseCheckoutWizard Q_OBJECT public: - CloneWizard(const QString &path, QWidget *parent = 0); + CloneWizard(const Utils::FileName &path, QWidget *parent = 0); protected: - VcsBase::Command *createCommand(QString *checkoutDir); + VcsBase::Command *createCommand(Utils::FileName *checkoutDir); }; } // namespace Internal |