1 files changed, 17 insertions, 9 deletions

diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 8ecf7aa375..1de34ce655 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -52,22 +52,24 @@ class LinuxIccToolChainFactory;
 // GccToolChain
 // --------------------------------------------------------------------------
 
-inline const QStringList languageOption(Core::Id languageId)
+inline const QStringList languageOption(Utils::Id languageId)
 {
     if (languageId == Constants::C_LANGUAGE_ID)
         return {"-x", "c"};
     return {"-x", "c++"};
 }
 
-inline const QStringList gccPredefinedMacrosOptions(Core::Id languageId)
+inline const QStringList gccPredefinedMacrosOptions(Utils::Id languageId)
 {
     return languageOption(languageId) + QStringList({"-E", "-dM"});
 }
 
 class PROJECTEXPLORER_EXPORT GccToolChain : public ToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::GccToolChain)
+
 public:
-    GccToolChain(Core::Id typeId);
+    GccToolChain(Utils::Id typeId);
 
     Abi targetAbi() const override;
     QString originalTargetTriple() const override;
@@ -92,7 +94,7 @@ public:
     void addToEnvironment(Utils::Environment &env) const override;
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
     QStringList suggestedMkspecList() const override;
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
 
     QVariantMap toMap() const override;
     bool fromMap(const QVariantMap &data) override;
@@ -154,7 +156,7 @@ protected:
                                           const QStringList &platformCodeGenFlags,
                                           OptionsReinterpreter reinterpretOptions,
                                           HeaderPathsCache headerCache,
-                                          Core::Id languageId,
+                                          Utils::Id languageId,
                                           ExtraHeaderPathsFunction extraHeaderPathsFunction,
                                           const QStringList &flags,
                                           const QString &sysRoot,
@@ -182,7 +184,7 @@ private:
     static QStringList gccPrepareArguments(const QStringList &flags,
                                            const QString &sysRoot,
                                            const QStringList &platformCodeGenFlags,
-                                           Core::Id languageId,
+                                           Utils::Id languageId,
                                            OptionsReinterpreter reinterpretOptions);
 
 protected:
@@ -212,9 +214,11 @@ private:
 
 class PROJECTEXPLORER_EXPORT ClangToolChain : public GccToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ClangToolChain)
+
 public:
     ClangToolChain();
-    explicit ClangToolChain(Core::Id typeId);
+    explicit ClangToolChain(Utils::Id typeId);
     ~ClangToolChain() override;
 
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
@@ -222,7 +226,7 @@ public:
     Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override;
     Utils::WarningFlags warningFlags(const QStringList &cflags) const override;
 
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
 
     QStringList suggestedMkspecList() const override;
     void addToEnvironment(Utils::Environment &env) const override;
@@ -258,6 +262,8 @@ private:
 
 class PROJECTEXPLORER_EXPORT MingwToolChain : public GccToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::MingwToolChain)
+
 public:
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
 
@@ -276,9 +282,11 @@ private:
 
 class PROJECTEXPLORER_EXPORT LinuxIccToolChain : public GccToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::LinuxIccToolChain)
+
 public:
     Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override;
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
 
     QStringList suggestedMkspecList() const override;