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

ClearCaseSettings: Use FilePath for ccBinaryPath

Browse Source 
Change-Id: I0de348d0b99a1f81d75418a7927c989283c4137a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-08-02 17:39:00 +02:00
parent 278d297397
commit b84c22b2fd
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -1658,9 +1658,8 @@ ClearCasePluginPrivate::runCleartool(const FilePath &workingDir,
unsigned flags,
QTextCodec *outputCodec) const
{
const QString executable = m_settings.ccBinaryPath;
ClearCaseResponse response;
if (executable.isEmpty()) {
if (m_settings.ccBinaryPath.isEmpty()) {
response.error = true;
response.message = tr("No ClearCase executable specified.");
return response;
@@ -1669,7 +1668,7 @@ ClearCasePluginPrivate::runCleartool(const FilePath &workingDir,
auto *command = VcsBaseClient::createVcsCommand(workingDir, Environment::systemEnvironment());
command->addFlags(flags);
command->setCodec(outputCodec);
const CommandResult result = command->runCommand({FilePath::fromString(executable), arguments},
const CommandResult result = command->runCommand({m_settings.ccBinaryPath, arguments},
timeOutS);
delete command;
@@ -2330,7 +2329,7 @@ void ClearCasePluginPrivate::diffGraphical(const QString &file1, const QString &
args << file1;
if (!pred)
args << file2;
QtcProcess::startDetached({FilePath::fromString(m_settings.ccBinaryPath), args}, m_topLevel);
QtcProcess::startDetached({m_settings.ccBinaryPath, args}, m_topLevel);
}
QString ClearCasePluginPrivate::runExtDiff(const FilePath &workingDir, const QStringList &arguments,
@@ -2399,11 +2398,8 @@ bool ClearCasePluginPrivate::isConfigured() const
if (m_fakeClearTool)
return true;
#endif
const QString binary = m_settings.ccBinaryPath;
if (binary.isEmpty())
return false;
QFileInfo fi(binary);
return fi.exists() && fi.isFile() && fi.isExecutable();
const FilePath &binary = m_settings.ccBinaryPath;
return !binary.isEmpty() && binary.exists() && binary.isFile() && binary.isExecutableFile();
}
bool ClearCasePluginPrivate::supportsOperation(Operation operation) const