diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 2f9b8b68bb6..58ed88bd51a 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -595,9 +595,8 @@ void TestRunner::debugTests() outputreader->setId(inferior.executable); connect(outputreader, &TestOutputReader::newOutputAvailable, TestResultsPane::instance(), &TestResultsPane::addOutput); - connect(runControl, &ProjectExplorer::RunControl::appendMessageRequested, - this, [outputreader] - (ProjectExplorer::RunControl *, const QString &msg, Utils::OutputFormat format) { + connect(runControl, &ProjectExplorer::RunControl::appendMessage, + this, [outputreader](const QString &msg, Utils::OutputFormat format) { processOutput(outputreader, msg, format); }); diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 3a6e1a77ccd..173f02fc2a1 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -413,8 +413,10 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) this, &AppOutputPane::slotRunControlFinished); connect(rc, &RunControl::applicationProcessHandleChanged, this, &AppOutputPane::enableDefaultButtons); - connect(rc, &RunControl::appendMessageRequested, - this, &AppOutputPane::appendMessage); + connect(rc, &RunControl::appendMessage, + this, [this, rc](const QString &out, Utils::OutputFormat format) { + appendMessage(rc, out, format); + }); // First look if we can reuse a tab const Runnable thisRunnable = rc->runnable(); diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 4b52f645a10..7922a069bec 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -1548,11 +1548,6 @@ void RunControlPrivate::debugMessage(const QString &msg) qCDebug(statesLog()) << msg; } -void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format) -{ - emit appendMessageRequested(this, msg, format); -} - // SimpleTargetRunner SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl) diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 32052e59b6f..bde49f99f4a 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -451,8 +451,6 @@ public: const Runnable &runnable() const; void setRunnable(const Runnable &runnable); - virtual void appendMessage(const QString &msg, Utils::OutputFormat format); - static bool showPromptToStopDialog(const QString &title, const QString &text, const QString &stopButtonText = QString(), const QString &cancelButtonText = QString(), @@ -485,8 +483,7 @@ public: static WorkerCreator producer(RunConfiguration *runConfiguration, Core::Id runMode); signals: - void appendMessageRequested(ProjectExplorer::RunControl *runControl, - const QString &msg, Utils::OutputFormat format); + void appendMessage(const QString &msg, Utils::OutputFormat format); void aboutToStart(); void started(); void stopped();