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

Utils::ShellCommand: Rename runSynchronous to runFullySynchronous

Browse Source 
This name just got free, so use it for the method that actually is
called if the process runs with the FullySynchronously flag set.

Change-Id: Ic86bb291d578ad06b74db1ab89a22b1b8cb4f4bb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-07-04 16:32:28 +02:00
parent cc27125092
commit 53c602633c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/shellcommand.cpp
View File

@@ -327,7 +327,7 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
proxy->appendCommand(dir, binary, arguments); proxy->appendCommand(dir, binary, arguments);
if (d->m_flags & FullySynchronously) { if (d->m_flags & FullySynchronously) {
response = runSynchronous(binary, arguments, timeoutS, dir, interpreter); response = runFullySynchronous(binary, arguments, timeoutS, dir, interpreter);
} else { } else {
Utils::SynchronousProcess process; Utils::SynchronousProcess process;
process.setExitCodeInterpreter(interpreter); process.setExitCodeInterpreter(interpreter);
@@ -393,11 +393,11 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
return response; return response;
} }
Utils::SynchronousProcessResponse ShellCommand::runSynchronous(const Utils::FileName &binary, Utils::SynchronousProcessResponse ShellCommand::runFullySynchronous(const Utils::FileName &binary,
const QStringList &arguments, const QStringList &arguments,
int timeoutS, int timeoutS,
const QString &workingDirectory, const QString &workingDirectory,
const ExitCodeInterpreter &interpreter) const ExitCodeInterpreter &interpreter)
{ {
Utils::SynchronousProcessResponse response; Utils::SynchronousProcessResponse response;

6
src/libs/utils/shellcommand.h
View File

@@ -162,9 +162,9 @@ protected:
private: private:
void run(QFutureInterface<void> &future); void run(QFutureInterface<void> &future);
SynchronousProcessResponse runSynchronous(const FileName &binary, const QStringList &arguments, SynchronousProcessResponse runFullySynchronous(const FileName &binary, const QStringList &arguments,
int timeoutS, const QString &workingDirectory, int timeoutS, const QString &workingDirectory,
const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter); const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter);
class Internal::ShellCommandPrivate *const d; class Internal::ShellCommandPrivate *const d;
}; };