diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-29 12:50:12 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-05-07 13:07:14 +0000 |
commit | a44c403b5f580e786a380766638df440b1f31ae3 (patch) | |
tree | 94b28a5b90be78215cecc6f132a5caf56176abea /src/plugins/git | |
parent | bba65155620fada5f85370bd667e602bd094139c (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/plugins/git')
-rw-r--r-- | src/plugins/git/gitclient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 983e7a11eea..a7e10d41744 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -152,7 +152,7 @@ void BaseController::runCommand(const QList<QStringList> &args, QTextCodec *code m_command = new VcsCommand(m_directory, gitClient()->processEnvironment()); m_command->setCodec(codec ? codec : EditorManager::defaultTextCodec()); - connect(m_command, &VcsCommand::output, this, &BaseController::processOutput); + connect(m_command, &VcsCommand::stdOutText, this, &BaseController::processOutput); connect(m_command, &VcsCommand::finished, this, &BaseController::reloadFinished); m_command->addFlags(diffExecutionFlags()); @@ -476,8 +476,8 @@ public: handler->setParent(command); // delete when command goes out of scope command->addFlags(VcsCommand::ExpectRepoChanges); - connect(command, &VcsCommand::output, handler, &ConflictHandler::readStdOut); - connect(command, &VcsCommand::errorText, handler, &ConflictHandler::readStdErr); + connect(command, &VcsCommand::stdOutText, handler, &ConflictHandler::readStdOut); + connect(command, &VcsCommand::stdErrText, handler, &ConflictHandler::readStdErr); } static void handleResponse(const Utils::SynchronousProcessResponse &response, @@ -1467,7 +1467,7 @@ void GitClient::branchesForCommit(const QString &revision) auto controller = qobject_cast<DiffEditorController *>(sender()); QString workingDirectory = controller->baseDirectory(); VcsCommand *command = vcsExec(workingDirectory, arguments, 0, false, 0, workingDirectory); - connect(command, &VcsCommand::output, controller, + connect(command, &VcsCommand::stdOutText, controller, &DiffEditorController::informationForCommitReceived); } |