feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Some QString -> FileName transformation

Browse Source 
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Orgad Shaneh
2014-07-15 23:32:11 +03:00
committed by Orgad Shaneh
parent f8dfa03d4f
commit 71b56d2b9c
62 changed files with 237 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cvs/checkoutwizard.cpp
View File

@@ -80,7 +80,7 @@ VcsBase::Command *CheckoutWizard::createCommand(Utils::FileName *checkoutDir)
QTC_ASSERT(cwp, return 0);
const CvsSettings settings = CvsPlugin::instance()->settings();
const QString binary = settings.binaryPath();
const Utils::FileName binary = settings.binaryPath();
QStringList args;
const QString repository = cwp->repository();

4
src/plugins/cvs/cvscontrol.cpp
View File

@@ -55,10 +55,10 @@ Core::Id CvsControl::id() const
bool CvsControl::isConfigured() const
{
const QString binary = m_plugin->settings().binaryPath();
const Utils::FileName binary = m_plugin->settings().binaryPath();
if (binary.isEmpty())
return false;
QFileInfo fi(binary);
QFileInfo fi = binary.toFileInfo();
return fi.exists() && fi.isFile() && fi.isExecutable();
}

4
src/plugins/cvs/cvsplugin.cpp
View File

@@ -1125,7 +1125,7 @@ CvsResponse CvsPlugin::runCvs(const QString &workingDirectory,
unsigned flags,
QTextCodec *outputCodec) const
{
const QString executable = m_settings.binaryPath();
const Utils::FileName executable = m_settings.binaryPath();
CvsResponse response;
if (executable.isEmpty()) {
response.result = CvsResponse::OtherError;
@@ -1154,7 +1154,7 @@ CvsResponse CvsPlugin::runCvs(const QString &workingDirectory,
}
if (response.result != CvsResponse::Ok)
response.message = sp_resp.exitMessage(executable, timeOut);
response.message = sp_resp.exitMessage(executable.toString(), timeOut);
return response;
}

2
src/plugins/cvs/settingspage.cpp
View File

@@ -66,7 +66,7 @@ CvsSettings SettingsPageWidget::settings() const
void SettingsPageWidget::setSettings(const CvsSettings &s)
{
m_ui.commandPathChooser->setPath(s.binaryPath());
m_ui.commandPathChooser->setFileName(s.binaryPath());
m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey));
m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey));
m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey));