diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-15 14:59:51 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-16 10:40:33 +0000 |
commit | 6f32538c5da7cfa1a6804336dcb4db0e4f205c28 (patch) | |
tree | ffa5f04f8e0d6a760e07e8091597a4b8e8f7fe66 /src/plugins/qmakeprojectmanager | |
parent | d04597f2aaab7966d1b94864f1292135959680ae (diff) |
ProjectExplorer: Split up the IOutputParser class
For symmetry with Utils::OutputFormatter.
Task-number: QTCREATORBUG-22665
Change-Id: I148fed69dba042ad3ef26e080829c31cd3f357fd
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 8 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparser.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index d5540b7060..6ff538f70a 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -166,18 +166,18 @@ bool QmakeMakeStep::init() setOutputParser(new ProjectExplorer::GnuMakeParser()); ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit()); - IOutputParser *xcodeBuildParser = nullptr; + OutputTaskParser *xcodeBuildParser = nullptr; if (tc && tc->targetAbi().os() == Abi::DarwinOS) { xcodeBuildParser = new XcodebuildParser; appendOutputParser(xcodeBuildParser); } - QList<IOutputParser *> additionalParsers = target()->kit()->createOutputParsers(); + QList<OutputTaskParser *> additionalParsers = target()->kit()->createOutputParsers(); - // make may cause qmake to be run, add last to make sure // it has a low priority. + // make may cause qmake to be run, add last to make sure it has a low priority. additionalParsers << new QMakeParser; if (xcodeBuildParser) { - for (IOutputParser * const p : qAsConst(additionalParsers)) + for (OutputTaskParser * const p : qAsConst(additionalParsers)) p->setRedirectionDetector(xcodeBuildParser); } appendOutputParsers(additionalParsers); diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.cpp b/src/plugins/qmakeprojectmanager/qmakeparser.cpp index 86a0ffc67b..20633f397d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparser.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparser.cpp @@ -40,7 +40,7 @@ QMakeParser::QMakeParser() : m_error(QLatin1String("^(.+):(\\d+):\\s(.+)$")) m_error.setMinimal(true); } -IOutputParser::Status QMakeParser::doHandleLine(const QString &line, OutputFormat type) +OutputTaskParser::Status QMakeParser::handleLine(const QString &line, OutputFormat type) { if (type != Utils::StdErrFormat) return Status::NotHandled; diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.h b/src/plugins/qmakeprojectmanager/qmakeparser.h index 822700efd0..14c5b20d88 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparser.h +++ b/src/plugins/qmakeprojectmanager/qmakeparser.h @@ -33,7 +33,7 @@ namespace QmakeProjectManager { -class QMAKEPROJECTMANAGER_EXPORT QMakeParser : public ProjectExplorer::IOutputParser +class QMAKEPROJECTMANAGER_EXPORT QMakeParser : public ProjectExplorer::OutputTaskParser { Q_OBJECT @@ -41,7 +41,7 @@ public: QMakeParser(); private: - Status doHandleLine(const QString &line, Utils::OutputFormat type) override; + Status handleLine(const QString &line, Utils::OutputFormat type) override; QRegExp m_error; }; |