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/vcsbase | |
| parent | bba65155620fada5f85370bd667e602bd094139c (diff) | |
| download | qt-creator-a44c403b5f580e786a380766638df440b1f31ae3.tar.gz | |
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/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/checkoutprogresswizardpage.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp index 4efaee4b15..662fb74720 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp @@ -95,8 +95,8 @@ void CheckoutProgressWizardPage::start(VcsCommand *command) QTC_ASSERT(m_state != Running, return); m_command = command; command->setProgressiveOutput(true); - connect(command, &VcsCommand::output, this, &CheckoutProgressWizardPage::reportStdOut); - connect(command, &VcsCommand::errorText, this, &CheckoutProgressWizardPage::reportStdErr); + connect(command, &VcsCommand::stdOutText, this, &CheckoutProgressWizardPage::reportStdOut); + connect(command, &VcsCommand::stdErrText, this, &CheckoutProgressWizardPage::reportStdErr); connect(command, &VcsCommand::finished, this, &CheckoutProgressWizardPage::slotFinished); QApplication::setOverrideCursor(Qt::WaitCursor); m_logPlainTextEdit->clear(); diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 9cd0a36db4..327d1dfa6e 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -148,7 +148,7 @@ VcsCommand *VcsBaseClientImpl::createCommand(const QString &workingDirectory, if (editor) // assume that the commands output is the important thing cmd->addFlags(VcsCommand::SilentOutput); } else if (editor) { - connect(cmd, &VcsCommand::output, editor, &VcsBaseEditorWidget::setPlainText); + connect(cmd, &VcsCommand::stdOutText, editor, &VcsBaseEditorWidget::setPlainText); } return cmd; @@ -545,7 +545,7 @@ void VcsBaseClient::emitParsedStatus(const QString &repository, const QStringLis QStringList args(vcsCommandString(StatusCommand)); args << extraOptions; VcsCommand *cmd = createCommand(repository); - connect(cmd, &VcsCommand::output, this, &VcsBaseClient::statusParser); + connect(cmd, &VcsCommand::stdOutText, this, &VcsBaseClient::statusParser); enqueueJob(cmd, args); } |