1 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index b224b4b68b..149e5d37b8 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -53,15 +53,16 @@ namespace Internal {
 
 class MsvcToolChain : public ToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::Internal::MsvcToolChain)
+
 public:
     enum Type { WindowsSDK, VS };
     enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 };
 
-    explicit MsvcToolChain(Core::Id typeId);
+    explicit MsvcToolChain(Utils::Id typeId);
     ~MsvcToolChain() override;
 
     Abi targetAbi() const override;
-    Abis supportedAbis() const override;
     void setTargetAbi(const Abi &abi);
 
     bool isValid() const override;
@@ -88,7 +89,7 @@ public:
 
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
     Utils::FilePath compilerCommand() const override;
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
 
     QString varsBatArg() const { return m_varsBatArg; }
     QString varsBat() const { return m_vcvarsBat; }
@@ -126,7 +127,7 @@ protected:
     virtual Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                         const Utils::Environment &env) const;
     virtual Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
-                                                       const Core::Id &language,
+                                                       const Utils::Id &language,
                                                        const Macros &macros) const;
 
     struct GenerateEnvResult
@@ -146,7 +147,6 @@ protected:
 private:
     void updateEnvironmentModifications(Utils::EnvironmentItems modifications);
     void rescanForCompiler();
-    void detectInstalledAbis();
 
     mutable Utils::EnvironmentItems m_environmentModifications;
     mutable QFutureWatcher<GenerateEnvResult> m_envModWatcher;
@@ -158,7 +158,6 @@ private:
 
 protected:
     Abi m_abi;
-    Abis m_supportedAbis;
 
     QString m_vcvarsBat;
     QString m_varsBatArg; // Argument
@@ -166,6 +165,8 @@ protected:
 
 class PROJECTEXPLORER_EXPORT ClangClToolChain : public MsvcToolChain
 {
+    Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::Internal::ClangClToolChain)
+
 public:
     ClangClToolChain();
 
@@ -173,7 +174,7 @@ public:
     QStringList suggestedMkspecList() const override;
     void addToEnvironment(Utils::Environment &env) const override;
     Utils::FilePath compilerCommand() const override;
-    IOutputParser *outputParser() const override;
+    QList<Utils::OutputLineParser *> createOutputParsers() const override;
     QVariantMap toMap() const override;
     bool fromMap(const QVariantMap &data) override;
     std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override;
@@ -187,7 +188,7 @@ public:
     Macros msvcPredefinedMacros(const QStringList &cxxflags,
                                 const Utils::Environment &env) const override;
     Utils::LanguageVersion msvcLanguageVersion(const QStringList &cxxflags,
-                                               const Core::Id &language,
+                                               const Utils::Id &language,
                                                const Macros &macros) const override;
 
     bool operator==(const ToolChain &) const override;
@@ -202,8 +203,6 @@ private:
 
 class MsvcToolChainFactory : public ToolChainFactory
 {
-    Q_OBJECT
-
 public:
     MsvcToolChainFactory();
 
@@ -218,8 +217,6 @@ public:
 
 class ClangClToolChainFactory : public ToolChainFactory
 {
-    Q_OBJECT
-
 public:
     ClangClToolChainFactory();
 
@@ -271,6 +268,7 @@ private:
 
     void setFromMsvcToolChain();
 
+    void updateAbis();
     void handleVcVarsChange(const QString &vcVars);
     void handleVcVarsArchChange(const QString &arch);