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

OutputFormatter: Take ownership of the line parsers

Browse Source 
For symmetry with IOutputParser.

Task-number: QTCREATORBUG-22665
Change-Id: I92e93b32e87ff4f3fa163a2d2fe13768e56bfa24
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-04-15 09:31:51 +02:00
parent c1dc36011f
commit d42920d372
8 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -112,7 +112,7 @@ private:
Utils::OutputFormat m_format;
Utils::OutputFormatter m_formatter;
VcsOutputLineParser m_parser;
VcsOutputLineParser *m_parser = nullptr;
};
OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
@@ -122,7 +122,8 @@ OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
setUndoRedoEnabled(false);
setFrameStyle(QFrame::NoFrame);
m_formatter.setBoldFontEnabled(false);
setLineParsers({&m_parser});
m_parser = new VcsOutputLineParser;
setLineParsers({m_parser});
auto agg = new Aggregation::Aggregate;
agg->add(this);
agg->add(new Core::BaseTextFind(this));
@@ -251,7 +252,7 @@ void OutputWindowPlainTextEdit::appendLinesWithStyle(const QString &s,
VcsOutputLineParser *OutputWindowPlainTextEdit::parser()
{
return &m_parser;
return m_parser;
}
void OutputWindowPlainTextEdit::setFormat(VcsOutputWindow::MessageStyle style)