ProjectExplorer: Consolidate macro and header path cache handling

All except Nim and the test tool chain were referencing the cache,
so move it to the base.

This removes also toolChainUpdated() overloads, including the
MsvcToolChain one that missed to call the base implementation
and the ClangClToolChain one that worked around that.

Change-Id: I8a99734aa3c697c635809a3648673a10ca14a2d8
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 1 insertions, 6 deletions

diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 9161a6ea37..facc0e3231 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -29,7 +29,6 @@
 
 #include "projectexplorerconstants.h"
 #include "toolchain.h"
-#include "toolchaincache.h"
 #include "abi.h"
 #include "headerpath.h"
 
@@ -155,7 +154,7 @@ protected:
                                           const Utils::FileName &compilerCommand,
                                           const QStringList &platformCodeGenFlags,
                                           OptionsReinterpreter reinterpretOptions,
-                                          std::shared_ptr<Cache<HeaderPaths>> headerCache,
+                                          HeaderPathsCache headerCache,
                                           Core::Id languageId,
                                           ExtraHeaderPathsFunction extraHeaderPathsFunction,
                                           const QStringList &flags,
@@ -178,7 +177,6 @@ protected:
         bool m_doesEnable = false;
         bool m_triggered = false;
     };
-    void toolChainUpdated() override;
 
 private:
     explicit GccToolChain(Detection d);
@@ -196,7 +194,6 @@ protected:
     QStringList m_platformLinkerFlags;
 
     OptionsReinterpreter m_optionsReinterpreter = [](const QStringList &v) { return v; };
-    mutable std::shared_ptr<Cache<HeaderPaths>> m_headerPathsCache;
     mutable ExtraHeaderPathsFunction m_extraHeaderPathsFunction = [](HeaderPaths &) {};
 
 private:
@@ -206,8 +203,6 @@ private:
     mutable HeaderPaths m_headerPaths;
     mutable QString m_version;
 
-    mutable std::shared_ptr<Cache<MacroInspectionReport, 64>> m_predefinedMacrosCache;
-
     friend class Internal::GccToolChainConfigWidget;
     friend class Internal::GccToolChainFactory;
     friend class ToolChainFactory;