ProjectExplorer: Remove unused virtual Toolchain::builtInHeaderPaths()

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

src/plugins/baremetal/iarewtoolchain.cpp

@@ -379,13 +379,6 @@ ToolChain::BuiltInHeaderPathsRunner IarToolChain::createBuiltInHeaderPathsRunner
     };
 }
 
-HeaderPaths IarToolChain::builtInHeaderPaths(const QStringList &cxxFlags,
-                                             const FilePath &fileName,
-                                             const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(cxxFlags, fileName.toString(), "");
-}
-
 void IarToolChain::addToEnvironment(Environment &env) const
 {
     if (!m_compilerCommand.isEmpty()) {

src/plugins/baremetal/iarewtoolchain.h

@@ -64,9 +64,6 @@ public:
     Utils::WarningFlags warningFlags(const QStringList &cxxflags) const final;
 
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &) const final;
-    ProjectExplorer::HeaderPaths builtInHeaderPaths(const QStringList &cxxFlags,
-                                                    const Utils::FilePath &,
-                                                    const Utils::Environment &env) const final;
     void addToEnvironment(Utils::Environment &env) const final;
     QList<Utils::OutputLineParser *> createOutputParsers() const final;
 

src/plugins/baremetal/keiltoolchain.cpp

@@ -506,13 +506,6 @@ ToolChain::BuiltInHeaderPathsRunner KeilToolChain::createBuiltInHeaderPathsRunne
     };
 }
 
-HeaderPaths KeilToolChain::builtInHeaderPaths(const QStringList &cxxFlags,
-                                              const FilePath &fileName,
-                                              const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(cxxFlags, fileName.toString(), "");
-}
-
 void KeilToolChain::addToEnvironment(Environment &env) const
 {
     if (!m_compilerCommand.isEmpty()) {

src/plugins/baremetal/keiltoolchain.h

@@ -65,9 +65,6 @@ public:
 
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &) const final;
-    ProjectExplorer::HeaderPaths builtInHeaderPaths(const QStringList &cxxFlags,
-                                                    const Utils::FilePath &,
-                                                    const Utils::Environment &env) const final;
     void addToEnvironment(Utils::Environment &env) const final;
     QList<Utils::OutputLineParser *> createOutputParsers() const final;
 

src/plugins/baremetal/sdcctoolchain.cpp

@@ -287,13 +287,6 @@ ToolChain::BuiltInHeaderPathsRunner SdccToolChain::createBuiltInHeaderPathsRunne
     };
 }
 
-HeaderPaths SdccToolChain::builtInHeaderPaths(const QStringList &cxxFlags,
-                                              const FilePath &fileName,
-                                              const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(cxxFlags, fileName.toString(), "");
-}
-
 void SdccToolChain::addToEnvironment(Environment &env) const
 {
     if (!m_compilerCommand.isEmpty()) {

src/plugins/baremetal/sdcctoolchain.h

@@ -64,9 +64,6 @@ public:
 
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &) const final;
-    ProjectExplorer::HeaderPaths builtInHeaderPaths(const QStringList &cxxFlags,
-                                                    const Utils::FilePath &,
-                                                    const Utils::Environment &env) const final;
     void addToEnvironment(Utils::Environment &env) const final;
     QList<Utils::OutputLineParser *> createOutputParsers() const final;
 

src/plugins/nim/project/nimtoolchain.cpp

@@ -86,12 +86,6 @@ ToolChain::BuiltInHeaderPathsRunner NimToolChain::createBuiltInHeaderPathsRunner
     return ToolChain::BuiltInHeaderPathsRunner();
 }
 
-HeaderPaths NimToolChain::builtInHeaderPaths(const QStringList &, const FilePath &,
-                                             const Environment &) const
-{
-    return {};
-}
-
 void NimToolChain::addToEnvironment(Environment &env) const
 {
     if (isValid())

src/plugins/nim/project/nimtoolchain.h

@@ -47,9 +47,6 @@ public:
 
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &) const override;
-    ProjectExplorer::HeaderPaths builtInHeaderPaths(const QStringList &flags,
-                                                    const Utils::FilePath &sysRoot,
-                                                    const Utils::Environment &) const final;
     void addToEnvironment(Utils::Environment &env) const final;
     Utils::FilePath makeCommand(const Utils::Environment &env) const final;
     Utils::FilePath compilerCommand() const final;

src/plugins/projectexplorer/customtoolchain.cpp

@@ -165,13 +165,6 @@ ToolChain::BuiltInHeaderPathsRunner CustomToolChain::createBuiltInHeaderPathsRun
     };
 }
 
-HeaderPaths CustomToolChain::builtInHeaderPaths(const QStringList &cxxFlags,
-                                                const FilePath &fileName,
-                                                const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(cxxFlags, fileName.toString(), "");
-}
-
 void CustomToolChain::addToEnvironment(Environment &env) const
 {
     if (!m_compilerCommand.isEmpty()) {

src/plugins/projectexplorer/customtoolchain.h

@@ -77,9 +77,6 @@ public:
 
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &) const override;
-    HeaderPaths builtInHeaderPaths(const QStringList &cxxFlags,
-                                   const Utils::FilePath &,
-                                   const Utils::Environment &env) const override;
     void addToEnvironment(Utils::Environment &env) const override;
     QStringList suggestedMkspecList() const override;
     QList<Utils::OutputLineParser *> createOutputParsers() const override;

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -657,16 +657,6 @@ ToolChain::BuiltInHeaderPathsRunner GccToolChain::createBuiltInHeaderPathsRunner
     };
 }
 
-HeaderPaths GccToolChain::builtInHeaderPaths(const QStringList &flags,
-                                             const FilePath &sysRootPath,
-                                             const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(flags,
-                                               sysRootPath.isEmpty() ? sysRoot()
-                                                                     : sysRootPath.toString(),
-                                               originalTargetTriple());
-}
-
 void GccToolChain::addCommandPathToEnvironment(const FilePath &command, Environment &env)
 {
     const Utils::FilePath compilerDir = command.parentDir();

src/plugins/projectexplorer/gcctoolchain.h

@@ -84,11 +84,7 @@ public:
     Utils::WarningFlags warningFlags(const QStringList &cflags) const override;
 
     MacroInspectionRunner createMacroInspectionRunner() const override;
-
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &env) const override;
-    HeaderPaths builtInHeaderPaths(const QStringList &flags,
-                                   const Utils::FilePath &sysRootPath,
-                                   const Utils::Environment &env) const override;
 
     void addToEnvironment(Utils::Environment &env) const override;
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -1083,13 +1083,6 @@ ToolChain::BuiltInHeaderPathsRunner MsvcToolChain::createBuiltInHeaderPathsRunne
     };
 }
 
-HeaderPaths MsvcToolChain::builtInHeaderPaths(const QStringList &cxxflags,
-                                              const Utils::FilePath &sysRoot,
-                                              const Environment &env) const
-{
-    return createBuiltInHeaderPathsRunner(env)(cxxflags, sysRoot.toString(), "");
-}
-
 void MsvcToolChain::addToEnvironment(Utils::Environment &env) const
 {
     // We cache the full environment (incoming + modifications by setup script).

src/plugins/projectexplorer/msvctoolchain.h

@@ -81,9 +81,6 @@ public:
     Utils::WarningFlags warningFlags(const QStringList &cflags) const override;
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(
             const Utils::Environment &env) const override;
-    HeaderPaths builtInHeaderPaths(const QStringList &cxxflags,
-                                   const Utils::FilePath &sysRoot,
-                                   const Utils::Environment &env) const override;
     void addToEnvironment(Utils::Environment &env) const override;
 
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;

src/plugins/projectexplorer/toolchain.h

@@ -139,9 +139,6 @@ public:
     using BuiltInHeaderPathsRunner = std::function<HeaderPaths(
         const QStringList &cxxflags, const QString &sysRoot, const QString &originalTargetTriple)>;
     virtual BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &env) const = 0;
-    virtual HeaderPaths builtInHeaderPaths(const QStringList &cxxflags,
-                                           const Utils::FilePath &sysRoot,
-                                           const Utils::Environment &env) const = 0;
     virtual void addToEnvironment(Utils::Environment &env) const = 0;
     virtual Utils::FilePath makeCommand(const Utils::Environment &env) const = 0;
 

src/plugins/projectexplorer/toolchainsettingsaccessor.cpp

@@ -318,8 +318,6 @@ public:
     LanguageExtensions languageExtensions(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags) return LanguageExtension::None; }
     WarningFlags warningFlags(const QStringList &cflags) const override { Q_UNUSED(cflags) return WarningFlags::NoWarnings; }
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &) const override { return BuiltInHeaderPathsRunner(); }
-    HeaderPaths builtInHeaderPaths(const QStringList &cxxflags, const FilePath &sysRoot, const Utils::Environment &) const override
-    { Q_UNUSED(cxxflags) Q_UNUSED(sysRoot) return {}; }
     void addToEnvironment(Environment &env) const override { Q_UNUSED(env) }
     FilePath makeCommand(const Environment &) const override { return FilePath::fromString("make"); }
     FilePath compilerCommand() const override { return Utils::FilePath::fromString("/tmp/test/gcc"); }