Merge AnalyzerRunControl::logMessage and RunControl::appendMessage

The tools' ability to hook into processing of the output is
retained by making the function virtual.

Also remove the unusual overload of the RunControl::appendMessage
slot and the signal of the same name by renaming the signal.

Change-Id: If3c3cc2dd9c933169dc30b16e3165c9b3cf1440e
Reviewed-by: Christian Stenger <[email protected]>

11 files changed, 18 insertions, 21 deletions

diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index 06581745ed3..e64b839969c 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -96,13 +96,13 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
 
     connect(runner, &AndroidRunner::remoteErrorOutput,
         [this, runControl](const QString &msg) {
-            runControl->logApplicationMessage(msg, Utils::StdErrFormatSameLine);
+            runControl->appendMessage(msg, Utils::StdErrFormatSameLine);
             m_outputParser.processOutput(msg);
         });
 
     connect(runner, &AndroidRunner::remoteOutput,
         [this, runControl](const QString &msg) {
-            runControl->logApplicationMessage(msg, Utils::StdOutFormatSameLine);
+            runControl->appendMessage(msg, Utils::StdOutFormatSameLine);
             m_outputParser.processOutput(msg);
         });
 }
diff --git a/src/plugins/debugger/analyzer/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h
index a990bc86555..bc4ac266ebb 100644
--- a/src/plugins/debugger/analyzer/analyzerruncontrol.h
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.h
@@ -58,9 +58,6 @@ public:
 signals:
     void starting();
 
-public slots:
-    virtual void logApplicationMessage(const QString &, Utils::OutputFormat) { }
-
 private:
     bool supportsReRunning() const override { return false; }
 };
diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp
index 9da560b617c..d829cd48350 100644
--- a/src/plugins/ios/iosanalyzesupport.cpp
+++ b/src/plugins/ios/iosanalyzesupport.cpp
@@ -113,9 +113,9 @@ void IosAnalyzeSupport::handleRemoteProcessFinished(bool cleanEnd)
 {
     if (m_runControl) {
         if (!cleanEnd)
-            m_runControl->logApplicationMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
+            m_runControl->appendMessage(tr("Run ended with error."), Utils::ErrorMessageFormat);
         else
-            m_runControl->logApplicationMessage(tr("Run ended."), Utils::NormalMessageFormat);
+            m_runControl->appendMessage(tr("Run ended."), Utils::NormalMessageFormat);
         m_runControl->notifyRemoteFinished();
     }
 }
@@ -123,7 +123,7 @@ void IosAnalyzeSupport::handleRemoteProcessFinished(bool cleanEnd)
 void IosAnalyzeSupport::handleRemoteOutput(const QString &output)
 {
     if (m_runControl) {
-        m_runControl->logApplicationMessage(output, Utils::StdOutFormat);
+        m_runControl->appendMessage(output, Utils::StdOutFormat);
         m_outputParser.processOutput(output);
     }
 }
@@ -131,7 +131,7 @@ void IosAnalyzeSupport::handleRemoteOutput(const QString &output)
 void IosAnalyzeSupport::handleRemoteErrorOutput(const QString &output)
 {
     if (m_runControl)
-        m_runControl->logApplicationMessage(output, Utils::StdErrFormat);
+        m_runControl->appendMessage(output, Utils::StdErrFormat);
 }
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index ff039419204..59c97c0efd5 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -387,8 +387,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
             this, &AppOutputPane::slotRunControlFinished);
     connect(rc, &RunControl::applicationProcessHandleChanged,
             this, &AppOutputPane::enableDefaultButtons);
-    connect(rc, static_cast<void (RunControl::*)(
-                ProjectExplorer::RunControl *, const QString &, Utils::OutputFormat)>(&RunControl::appendMessage),
+    connect(rc, &RunControl::appendMessageRequested,
             this, &AppOutputPane::appendMessage);
 
     Utils::OutputFormatter *formatter = rc->outputFormatter();
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 43bcae15821..c40dc545933 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -768,7 +768,7 @@ void RunControl::bringApplicationToForegroundInternal()
 
 void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
 {
-    emit appendMessage(this, msg, format);
+    emit appendMessageRequested(this, msg, format);
 }
 
 bool Runnable::canReUseOutputPane(const Runnable &other) const
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index b02e95f8d43..4fb16419249 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -385,13 +385,14 @@ public:
     const Connection &connection() const;
     void setConnection(const Connection &connection);
 
+    virtual void appendMessage(const QString &msg, Utils::OutputFormat format);
+
 public slots:
     void bringApplicationToForeground(qint64 pid);
-    void appendMessage(const QString &msg, Utils::OutputFormat format);
 
 signals:
-    void appendMessage(ProjectExplorer::RunControl *runControl,
-        const QString &msg, Utils::OutputFormat format);
+    void appendMessageRequested(ProjectExplorer::RunControl *runControl,
+                                const QString &msg, Utils::OutputFormat format);
     void started();
     void finished();
     void applicationProcessHandleChanged();
diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
index 770e2c69453..9a7bcfa9385 100644
--- a/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
+++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
@@ -74,7 +74,7 @@ LocalQmlProfilerRunner::LocalQmlProfilerRunner(const Configuration &configuratio
     connect(this, &LocalQmlProfilerRunner::stopped,
             engine, &QmlProfilerRunControl::notifyRemoteFinished);
     connect(this, &LocalQmlProfilerRunner::appendMessage,
-            engine, &QmlProfilerRunControl::logApplicationMessage);
+            engine, &QmlProfilerRunControl::appendMessage);
     connect(engine, &Debugger::AnalyzerRunControl::starting,
             this, &LocalQmlProfilerRunner::start);
     connect(engine, &RunControl::finished,
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index 26f812ec37a..eeca421bbf9 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -197,9 +197,9 @@ void QmlProfilerRunControl::cancelProcess()
     emit finished();
 }
 
-void QmlProfilerRunControl::logApplicationMessage(const QString &msg, Utils::OutputFormat format)
+void QmlProfilerRunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
 {
-    appendMessage(msg, format);
+    AnalyzerRunControl::appendMessage(msg, format);
     d->m_outputParser.processOutput(msg);
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
index c859ab3991e..bdd42ed3b79 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
@@ -51,7 +51,7 @@ public:
     bool isRunning() const override;
     void cancelProcess();
     void notifyRemoteFinished() override;
-    void logApplicationMessage(const QString &msg, Utils::OutputFormat format) override;
+    void appendMessage(const QString &msg, Utils::OutputFormat format) override;
 
 signals:
     void processRunning(Utils::Port port);
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index 61a6c263910..d829284cdf2 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -159,7 +159,7 @@ void QnxAnalyzeSupport::remoteIsRunning()
 void QnxAnalyzeSupport::showMessage(const QString &msg, OutputFormat format)
 {
     if (state() != Inactive && m_runControl)
-        m_runControl->logApplicationMessage(msg, format);
+        m_runControl->appendMessage(msg, format);
     m_outputParser.processOutput(msg);
 }
 
diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
index 0bc847b8604..d9225d526e5 100644
--- a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
@@ -105,7 +105,7 @@ RemoteLinuxAnalyzeSupport::~RemoteLinuxAnalyzeSupport()
 void RemoteLinuxAnalyzeSupport::showMessage(const QString &msg, Utils::OutputFormat format)
 {
     if (state() != Inactive && d->runControl)
-        d->runControl->logApplicationMessage(msg, format);
+        d->runControl->appendMessage(msg, format);
     d->outputParser.processOutput(msg);
 }