aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/shellcommand.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-04-29 12:50:12 +0200
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-05-07 13:07:14 +0000
commita44c403b5f580e786a380766638df440b1f31ae3 (patch)
tree94b28a5b90be78215cecc6f132a5caf56176abea /src/libs/utils/shellcommand.cpp
parentbba65155620fada5f85370bd667e602bd094139c (diff)
ShellCommand: Rename some signals
Rename the signals used to report stdout/stderr to make it clearer what they actually do. Remove some unimplemented private member functions while at it. Change-Id: I7e856f906ccb45964f3b1b64336d4d8ebca7b9ee Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/libs/utils/shellcommand.cpp')
-rw-r--r--src/libs/utils/shellcommand.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp
index c183155e3e8..ae533ef6fac 100644
--- a/src/libs/utils/shellcommand.cpp
+++ b/src/libs/utils/shellcommand.cpp
@@ -289,9 +289,9 @@ void ShellCommand::run(QFutureInterface<void> &future)
if (!d->m_aborted) {
if (!d->m_progressiveOutput) {
- emit output(stdOut);
+ emit stdOutText(stdOut);
if (!stdErr.isEmpty())
- emit errorText(stdErr);
+ emit stdErrText(stdErr);
}
emit finished(d->m_lastExecSuccess, d->m_lastExecExitCode, cookie());
@@ -350,7 +350,7 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
if (!(d->m_flags & SuppressStdErr))
proxy->appendError(text);
if (d->m_progressiveOutput)
- emit errorText(text);
+ emit stdErrText(text);
});
}
@@ -366,7 +366,7 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
if (d->m_flags & ShowStdOut)
proxy->append(text);
if (d->m_progressiveOutput) {
- emit output(text);
+ emit stdOutText(text);
d->m_hadOutput = true;
}
});