diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-05 18:17:46 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-26 11:45:08 +0200 |
commit | 434ecd6215cb2fd057375bb44cb94a825de4bebb (patch) | |
tree | 43316efebd55407ee0b90e13346c9320c56199b0 /src/plugins/mercurial | |
parent | 338782020cc390bf40ce594a8625745d614ac26c (diff) | |
download | qt-creator-434ecd6215cb2fd057375bb44cb94a825de4bebb.tar.gz |
Vcs: Use Utils::FileName where possible in the CheckoutWizards
Change-Id: I7e90f2c3468099229620d6713b39b69d8dbe8ff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/clonewizard.cpp | 10 | ||||
-rw-r--r-- | src/plugins/mercurial/clonewizard.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/mercurial/clonewizard.cpp b/src/plugins/mercurial/clonewizard.cpp index 04a464d699..453de71ff0 100644 --- a/src/plugins/mercurial/clonewizard.cpp +++ b/src/plugins/mercurial/clonewizard.cpp @@ -48,7 +48,7 @@ CloneWizardFactory::CloneWizardFactory() setDisplayName(tr("Mercurial Clone")); } -BaseCheckoutWizard *CloneWizardFactory::create(const QString &path, QWidget *parent) const +BaseCheckoutWizard *CloneWizardFactory::create(const Utils::FileName &path, QWidget *parent) const { return new CloneWizard(path, parent); } @@ -57,7 +57,7 @@ BaseCheckoutWizard *CloneWizardFactory::create(const QString &path, QWidget *par // CloneWizard: // -------------------------------------------------------------------- -CloneWizard::CloneWizard(const QString &path, QWidget *parent) : +CloneWizard::CloneWizard(const Utils::FileName &path, QWidget *parent) : VcsBase::BaseCheckoutWizard(path, parent) { setTitle(tr("Cloning")); @@ -67,11 +67,11 @@ CloneWizard::CloneWizard(const QString &path, QWidget *parent) : if (!vc->isConfigured()) addPage(new VcsConfigurationPage(vc)); CloneWizardPage *page = new CloneWizardPage; - page->setPath(path); + page->setPath(path.toString()); addPage(page); } -Command *CloneWizard::createCommand(QString *checkoutDir) +Command *CloneWizard::createCommand(Utils::FileName *checkoutDir) { const CloneWizardPage *cwp = 0; foreach (int pageId, pageIds()) { @@ -89,7 +89,7 @@ Command *CloneWizard::createCommand(QString *checkoutDir) QStringList args; args << QLatin1String("clone") << cwp->repository() << directory; - *checkoutDir = path + QLatin1Char('/') + directory; + *checkoutDir = Utils::FileName::fromString(path + QLatin1Char('/') + directory); VcsBase::Command *command = new VcsBase::Command(settings.binaryPath(), path, QProcessEnvironment::systemEnvironment()); command->addJob(args, -1); diff --git a/src/plugins/mercurial/clonewizard.h b/src/plugins/mercurial/clonewizard.h index 73fdb5beaf..c46aaf0301 100644 --- a/src/plugins/mercurial/clonewizard.h +++ b/src/plugins/mercurial/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; private: const QIcon m_icon; @@ -56,10 +56,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 |