feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Simplify RunControl::appendMessage

Browse Source 
Use a signal directly now, the users know the caller.

Change-Id: Ib2ff4dbe3047eddf2a060eef060b487a4c17e78c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-03-11 16:22:33 +01:00
parent 14dc38eea0
commit 582f72f433
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/testrunner.cpp
View File

@@ -595,9 +595,8 @@ void TestRunner::debugTests()
outputreader->setId(inferior.executable); outputreader->setId(inferior.executable);
connect(outputreader, &TestOutputReader::newOutputAvailable, connect(outputreader, &TestOutputReader::newOutputAvailable,
TestResultsPane::instance(), &TestResultsPane::addOutput); TestResultsPane::instance(), &TestResultsPane::addOutput);
connect(runControl, &ProjectExplorer::RunControl::appendMessageRequested, connect(runControl, &ProjectExplorer::RunControl::appendMessage,
this, [outputreader] this, [outputreader](const QString &msg, Utils::OutputFormat format) {
(ProjectExplorer::RunControl *, const QString &msg, Utils::OutputFormat format) {
processOutput(outputreader, msg, format); processOutput(outputreader, msg, format);
}); });

6
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -413,8 +413,10 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
this, &AppOutputPane::slotRunControlFinished); this, &AppOutputPane::slotRunControlFinished);
connect(rc, &RunControl::applicationProcessHandleChanged, connect(rc, &RunControl::applicationProcessHandleChanged,
this, &AppOutputPane::enableDefaultButtons); this, &AppOutputPane::enableDefaultButtons);
connect(rc, &RunControl::appendMessageRequested, connect(rc, &RunControl::appendMessage,
this, &AppOutputPane::appendMessage); this, [this, rc](const QString &out, Utils::OutputFormat format) {
appendMessage(rc, out, format);
});
// First look if we can reuse a tab // First look if we can reuse a tab
const Runnable thisRunnable = rc->runnable(); const Runnable thisRunnable = rc->runnable();

5
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -1548,11 +1548,6 @@ void RunControlPrivate::debugMessage(const QString &msg)
qCDebug(statesLog()) << msg; qCDebug(statesLog()) << msg;
} }
void RunControl::appendMessage(const QString &msg, Utils::OutputFormat format)
{
emit appendMessageRequested(this, msg, format);
}
// SimpleTargetRunner // SimpleTargetRunner
SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl) SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)

5
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -451,8 +451,6 @@ public:
const Runnable &runnable() const; const Runnable &runnable() const;
void setRunnable(const Runnable &runnable); void setRunnable(const Runnable &runnable);
virtual void appendMessage(const QString &msg, Utils::OutputFormat format);
static bool showPromptToStopDialog(const QString &title, const QString &text, static bool showPromptToStopDialog(const QString &title, const QString &text,
const QString &stopButtonText = QString(), const QString &stopButtonText = QString(),
const QString &cancelButtonText = QString(), const QString &cancelButtonText = QString(),
@@ -485,8 +483,7 @@ public:
static WorkerCreator producer(RunConfiguration *runConfiguration, Core::Id runMode); static WorkerCreator producer(RunConfiguration *runConfiguration, Core::Id runMode);
signals: signals:
void appendMessageRequested(ProjectExplorer::RunControl *runControl, void appendMessage(const QString &msg, Utils::OutputFormat format);
const QString &msg, Utils::OutputFormat format);
void aboutToStart(); void aboutToStart();
void started(); void started();
void stopped(); void stopped();