diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-08 09:42:51 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-08 09:31:33 +0000 |
commit | 98fb412e6e735184927f6d23e392566576904633 (patch) | |
tree | 61d09c935e67056306dfcc68723df8b6ad418f6c /src/plugins/nim | |
parent | ad1f79075dec8ed6b2e9da7eb250e8865214a88e (diff) |
IOutputParser: Replace std{Out,Err} with a single parameterized function
Another step towards parser/formatter unification.
Task-number: QTCREATORBUG-22665
Change-Id: I6de86b3aee2c54585cdd4b06d21b0ea67300aeac
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/nim')
-rw-r--r-- | src/plugins/nim/project/nimblebuildstep.cpp | 13 | ||||
-rw-r--r-- | src/plugins/nim/project/nimcompilerbuildstep.cpp | 12 |
2 files changed, 5 insertions, 20 deletions
diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp index 6c45f4fb15..eb7a31f07a 100644 --- a/src/plugins/nim/project/nimblebuildstep.cpp +++ b/src/plugins/nim/project/nimblebuildstep.cpp @@ -45,20 +45,13 @@ namespace { class NimParser : public IOutputParser { -public: - void stdOutput(const QString &line) final - { - parseLine(line.trimmed()); - IOutputParser::stdOutput(line); - } - - void stdError(const QString &line) final +private: + void handleLine(const QString &line, Utils::OutputFormat type) override { parseLine(line.trimmed()); - IOutputParser::stdError(line); + IOutputParser::handleLine(line, type); } -private: void parseLine(const QString &line) { static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 83bf618ba8..071bc85cb2 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -47,20 +47,12 @@ namespace Nim { class NimParser : public ProjectExplorer::IOutputParser { -public: - void stdOutput(const QString &line) final + void handleLine(const QString &line, Utils::OutputFormat type) override { parseLine(line.trimmed()); - IOutputParser::stdOutput(line); + IOutputParser::handleLine(line, type); } - void stdError(const QString &line) final - { - parseLine(line.trimmed()); - IOutputParser::stdError(line); - } - -private: void parseLine(const QString &line) { static QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)", |