1 files changed, 7 insertions, 15 deletions

diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index c84d0bba1a..fafa9f58c7 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -39,7 +39,6 @@ QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 class QTextEdit;
 class QComboBox;
-class QPushButton;
 QT_END_NAMESPACE
 
 namespace Utils { class PathChooser; }
@@ -61,7 +60,7 @@ class PROJECTEXPLORER_EXPORT CustomToolChain : public ToolChain
 public:
     class Parser {
     public:
-        Core::Id parserId;   ///< A unique id identifying a parser
+        Utils::Id parserId;   ///< A unique id identifying a parser
         QString displayName; ///< A translateable name to show in the user interface
     };
 
@@ -84,7 +83,7 @@ public:
                                    const Utils::Environment &env) const override;
     void addToEnvironment(Utils::Environment &env) const override;
     QStringList suggestedMkspecList() const override;
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
     QStringList headerPathsList() const;
     void setHeaderPaths(const QStringList &list);
 
@@ -106,15 +105,15 @@ public:
     void setMkspecs(const QString &);
     QString mkspecs() const;
 
-    Core::Id outputParserId() const;
-    void setOutputParserId(Core::Id parserId);
-    CustomParserSettings customParserSettings() const;
-    void setCustomParserSettings(const CustomParserSettings &settings);
+    Utils::Id outputParserId() const;
+    void setOutputParserId(Utils::Id parserId);
     static QList<CustomToolChain::Parser> parsers();
 
 private:
     CustomToolChain();
 
+    Internal::CustomParserSettings customParserSettings() const;
+
     Utils::FilePath m_compilerCommand;
     Utils::FilePath m_makeCommand;
 
@@ -124,8 +123,7 @@ private:
     QStringList m_cxx11Flags;
     QStringList m_mkspecs;
 
-    Core::Id m_outputParserId;
-    CustomParserSettings m_customParserSettings;
+    Utils::Id m_outputParserId;
 
     friend class Internal::CustomToolChainFactory;
     friend class ToolChainFactory;
@@ -135,8 +133,6 @@ namespace Internal {
 
 class CustomToolChainFactory : public ToolChainFactory
 {
-    Q_OBJECT
-
 public:
     CustomToolChainFactory();
 };
@@ -157,7 +153,6 @@ public:
 private:
     void updateSummaries();
     void errorParserChanged(int index = -1);
-    void openCustomParserSettingsDialog();
 
 protected:
     void applyImpl() override;
@@ -177,9 +172,6 @@ protected:
     QLineEdit *m_cxx11Flags;
     QLineEdit *m_mkspecs;
     QComboBox *m_errorParserComboBox;
-    QPushButton *m_customParserSettingsButton;
-
-    CustomParserSettings m_customParserSettings;
 };
 
 } // namespace Internal