summaryrefslogtreecommitdiff
path: root/src/plugins/cvs
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-05-05 18:17:46 +0200
committerTobias Hunger <tobias.hunger@digia.com>2014-05-26 11:45:08 +0200
commit434ecd6215cb2fd057375bb44cb94a825de4bebb (patch)
tree43316efebd55407ee0b90e13346c9320c56199b0 /src/plugins/cvs
parent338782020cc390bf40ce594a8625745d614ac26c (diff)
downloadqt-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/cvs')
-rw-r--r--src/plugins/cvs/checkoutwizard.cpp10
-rw-r--r--src/plugins/cvs/checkoutwizard.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cvs/checkoutwizard.cpp b/src/plugins/cvs/checkoutwizard.cpp
index d37aeff212..6c7cfca6d4 100644
--- a/src/plugins/cvs/checkoutwizard.cpp
+++ b/src/plugins/cvs/checkoutwizard.cpp
@@ -48,7 +48,7 @@ CheckoutWizardFactory::CheckoutWizardFactory()
setDisplayName(tr("CVS Checkout"));
}
-VcsBase::BaseCheckoutWizard *CheckoutWizardFactory::create(const QString &path, QWidget *parent) const
+VcsBase::BaseCheckoutWizard *CheckoutWizardFactory::create(const Utils::FileName &path, QWidget *parent) const
{
return new CheckoutWizard(path, parent);
}
@@ -57,18 +57,18 @@ VcsBase::BaseCheckoutWizard *CheckoutWizardFactory::create(const QString &path,
// CheckoutWizard:
// --------------------------------------------------------------------
-CheckoutWizard::CheckoutWizard(const QString &path, QWidget *parent) :
+CheckoutWizard::CheckoutWizard(const Utils::FileName &path, QWidget *parent) :
VcsBase::BaseCheckoutWizard(path, parent)
{
const Core::IVersionControl *vc = CvsPlugin::instance()->versionControl();
if (!vc->isConfigured())
addPage(new VcsBase::VcsConfigurationPage(vc));
CheckoutWizardPage *cwp = new CheckoutWizardPage;
- cwp->setPath(path);
+ cwp->setPath(path.toString());
addPage(cwp);
}
-VcsBase::Command *CheckoutWizard::createCommand(QString *checkoutDir)
+VcsBase::Command *CheckoutWizard::createCommand(Utils::FileName *checkoutDir)
{
// Collect parameters for the checkout command.
// CVS does not allow for checking out into a different directory.
@@ -86,7 +86,7 @@ VcsBase::Command *CheckoutWizard::createCommand(QString *checkoutDir)
const QString repository = cwp->repository();
args << QLatin1String("checkout") << repository;
const QString workingDirectory = cwp->path();
- *checkoutDir = workingDirectory + QLatin1Char('/') + repository;
+ *checkoutDir = Utils::FileName::fromString(workingDirectory + QLatin1Char('/') + repository);
VcsBase::Command *command = new VcsBase::Command(binary, workingDirectory,
QProcessEnvironment::systemEnvironment());
diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h
index b57710ae93..cd0b1e2dc6 100644
--- a/src/plugins/cvs/checkoutwizard.h
+++ b/src/plugins/cvs/checkoutwizard.h
@@ -43,7 +43,7 @@ class CheckoutWizardFactory : public VcsBase::BaseCheckoutWizardFactory
public:
CheckoutWizardFactory();
- VcsBase::BaseCheckoutWizard *create(const QString &path, QWidget *parent = 0) const;
+ VcsBase::BaseCheckoutWizard *create(const Utils::FileName &path, QWidget *parent = 0) const;
};
class CheckoutWizard : public VcsBase::BaseCheckoutWizard
@@ -51,10 +51,10 @@ class CheckoutWizard : public VcsBase::BaseCheckoutWizard
Q_OBJECT
public:
- CheckoutWizard(const QString &path, QWidget *parent = 0);
+ CheckoutWizard(const Utils::FileName &path, QWidget *parent = 0);
protected:
- VcsBase::Command *createCommand(QString *checkoutDir);
+ VcsBase::Command *createCommand(Utils::FileName *checkoutDir);
};
} // namespace Internal