diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp index 4ad9fd7194c..0ba7e466a6e 100644 --- a/src/plugins/projectexplorer/ioutputparser.cpp +++ b/src/plugins/projectexplorer/ioutputparser.cpp @@ -123,10 +123,6 @@ namespace ProjectExplorer { -IOutputParser::IOutputParser() : m_parser(0) -{ -} - IOutputParser::~IOutputParser() { delete m_parser; @@ -142,19 +138,15 @@ void IOutputParser::appendOutputParser(IOutputParser *parser) } m_parser = parser; - connect(parser, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat)), - this, SLOT(outputAdded(QString,ProjectExplorer::BuildStep::OutputFormat)), Qt::DirectConnection); - connect(parser, SIGNAL(addTask(ProjectExplorer::Task, int, int)), - this, SLOT(taskAdded(ProjectExplorer::Task, int, int)), Qt::DirectConnection); + connect(parser, &IOutputParser::addOutput, this, &IOutputParser::outputAdded, Qt::DirectConnection); + connect(parser, &IOutputParser::addTask, this, &IOutputParser::taskAdded, Qt::DirectConnection); } IOutputParser *IOutputParser::takeOutputParserChain() { IOutputParser *parser = m_parser; - disconnect(parser, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat)), - this, SLOT(outputAdded(QString,ProjectExplorer::BuildStep::OutputFormat))); - disconnect(parser, SIGNAL(addTask(ProjectExplorer::Task, int, int)), - this, SLOT(taskAdded(ProjectExplorer::Task, int, int))); + disconnect(parser, &IOutputParser::addOutput, this, &IOutputParser::outputAdded); + disconnect(parser, &IOutputParser::addTask, this, &IOutputParser::taskAdded); m_parser = 0; return parser; } @@ -169,6 +161,8 @@ void IOutputParser::setChildParser(IOutputParser *parser) if (m_parser != parser) delete m_parser; m_parser = parser; + connect(parser, &IOutputParser::addOutput, this, &IOutputParser::outputAdded, Qt::DirectConnection); + connect(parser, &IOutputParser::addTask, this, &IOutputParser::taskAdded, Qt::DirectConnection); } void IOutputParser::stdOutput(const QString &line) diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h index 095f9c79e19..03b8468b661 100644 --- a/src/plugins/projectexplorer/ioutputparser.h +++ b/src/plugins/projectexplorer/ioutputparser.h @@ -39,7 +39,7 @@ class PROJECTEXPLORER_EXPORT IOutputParser : public QObject { Q_OBJECT public: - IOutputParser(); + IOutputParser() = default; ~IOutputParser(); virtual void appendOutputParser(IOutputParser *parser); @@ -71,7 +71,7 @@ public slots: private: virtual void doFlush(); - IOutputParser *m_parser; + IOutputParser *m_parser = 0; }; } // namespace ProjectExplorer