ProjectExplorer: Clean up IOutputParser interface

- Remove unneeded/unused functions.
- De-virtualize where possible.

In particular, after untangling a number of self-referential
redirections, it became apparent that the outputAdded()
infrastructure was entirely unused.

Change-Id: I51e1beed008df2727b42494b087efa476342397e
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 8 insertions, 9 deletions

diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h
index cd65378fe2..b27ad25a54 100644
--- a/src/plugins/projectexplorer/ioutputparser.h
+++ b/src/plugins/projectexplorer/ioutputparser.h
@@ -28,7 +28,7 @@
 #include "projectexplorer_export.h"
 #include "buildstep.h"
 
-namespace Utils { class FilePath; }
+#include <utils/fileutils.h>
 
 namespace ProjectExplorer {
 class Task;
@@ -41,9 +41,7 @@ public:
     IOutputParser() = default;
     ~IOutputParser() override;
 
-    virtual void appendOutputParser(IOutputParser *parser);
-
-    IOutputParser *takeOutputParserChain();
+    void appendOutputParser(IOutputParser *parser);
 
     IOutputParser *childParser() const;
     void setChildParser(IOutputParser *parser);
@@ -52,25 +50,26 @@ public:
     virtual void stdError(const QString &line);
 
     virtual bool hasFatalErrors() const;
-    virtual void setWorkingDirectory(const QString &workingDirectory);
+
     void setWorkingDirectory(const Utils::FilePath &fn);
 
     void flush(); // flush out pending tasks
 
     static QString rightTrimmed(const QString &in);
 
+    virtual void taskAdded(const ProjectExplorer::Task &task, int linkedOutputLines = 0, int skipLines = 0);
+
 signals:
-    void addOutput(const QString &string, ProjectExplorer::BuildStep::OutputFormat format);
     void addTask(const ProjectExplorer::Task &task, int linkedOutputLines = 0, int skipLines = 0);
 
-public slots:
-    virtual void outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format);
-    virtual void taskAdded(const ProjectExplorer::Task &task, int linkedOutputLines = 0, int skipLines = 0);
+protected:
+    Utils::FilePath workingDirectory() const { return m_workingDir; }
 
 private:
     virtual void doFlush();
 
     IOutputParser *m_parser = nullptr;
+    Utils::FilePath m_workingDir;
 };
 
 } // namespace ProjectExplorer