From 53c602633c59a89c7874d5d55e0ed91226e0c3f3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 4 Jul 2016 16:32:28 +0200 Subject: [PATCH] Utils::ShellCommand: Rename runSynchronous to runFullySynchronous 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 --- src/libs/utils/shellcommand.cpp | 12 ++++++------ src/libs/utils/shellcommand.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index cb2ce489fc9..527be6614f8 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -327,7 +327,7 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName proxy->appendCommand(dir, binary, arguments); if (d->m_flags & FullySynchronously) { - response = runSynchronous(binary, arguments, timeoutS, dir, interpreter); + response = runFullySynchronous(binary, arguments, timeoutS, dir, interpreter); } else { Utils::SynchronousProcess process; process.setExitCodeInterpreter(interpreter); @@ -393,11 +393,11 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName return response; } -Utils::SynchronousProcessResponse ShellCommand::runSynchronous(const Utils::FileName &binary, - const QStringList &arguments, - int timeoutS, - const QString &workingDirectory, - const ExitCodeInterpreter &interpreter) +Utils::SynchronousProcessResponse ShellCommand::runFullySynchronous(const Utils::FileName &binary, + const QStringList &arguments, + int timeoutS, + const QString &workingDirectory, + const ExitCodeInterpreter &interpreter) { Utils::SynchronousProcessResponse response; diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h index 4511611b869..512b37c55a3 100644 --- a/src/libs/utils/shellcommand.h +++ b/src/libs/utils/shellcommand.h @@ -162,9 +162,9 @@ protected: private: void run(QFutureInterface &future); - SynchronousProcessResponse runSynchronous(const FileName &binary, const QStringList &arguments, - int timeoutS, const QString &workingDirectory, - const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter); + SynchronousProcessResponse runFullySynchronous(const FileName &binary, const QStringList &arguments, + int timeoutS, const QString &workingDirectory, + const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter); class Internal::ShellCommandPrivate *const d; };