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

Merge AnalyzerRunControl::logMessage and RunControl::appendMessage

Browse Source 
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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-05-13 11:27:51 +02:00
parent 6512227302
commit 67f9a26208
11 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/localqmlprofilerrunner.cpp
View File

@@ -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,

4
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -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);
}

2
src/plugins/qmlprofiler/qmlprofilerruncontrol.h
View File

@@ -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);