summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/baremetal/iarewtoolchain.cpp7
-rw-r--r--src/plugins/baremetal/iarewtoolchain.h3
-rw-r--r--src/plugins/baremetal/keiltoolchain.cpp7
-rw-r--r--src/plugins/baremetal/keiltoolchain.h3
-rw-r--r--src/plugins/baremetal/sdcctoolchain.cpp7
-rw-r--r--src/plugins/baremetal/sdcctoolchain.h3
-rw-r--r--src/plugins/nim/project/nimtoolchain.cpp6
-rw-r--r--src/plugins/nim/project/nimtoolchain.h3
-rw-r--r--src/plugins/projectexplorer/customtoolchain.cpp7
-rw-r--r--src/plugins/projectexplorer/customtoolchain.h3
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp10
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.h4
-rw-r--r--src/plugins/projectexplorer/msvctoolchain.cpp7
-rw-r--r--src/plugins/projectexplorer/msvctoolchain.h3
-rw-r--r--src/plugins/projectexplorer/toolchain.h3
-rw-r--r--src/plugins/projectexplorer/toolchainsettingsaccessor.cpp2
16 files changed, 0 insertions, 78 deletions
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 76e1f97481..49dde50796 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/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()) {
diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h
index 9d17879a5e..1f11235d02 100644
--- a/src/plugins/baremetal/iarewtoolchain.h
+++ b/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;
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 4473a4f1ce..f98fd63ede 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/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()) {
diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h
index 3fbd3d1717..f242ef419f 100644
--- a/src/plugins/baremetal/keiltoolchain.h
+++ b/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;
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index aef3894c7f..81cfa04683 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/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()) {
diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h
index 3b4d0f51e3..488c73ba6d 100644
--- a/src/plugins/baremetal/sdcctoolchain.h
+++ b/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;
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index 06448300f0..d966700e93 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/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())
diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h
index 0f7d6da6a4..3a99fab8aa 100644
--- a/src/plugins/nim/project/nimtoolchain.h
+++ b/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;
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index ab115a2dbd..60e864e48b 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/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()) {
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index 5bc7250e3f..05c00b2059 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/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;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index eaa93a4b05..2f377a6add 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/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();
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index d3d05cc611..330e9ddf40 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/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;
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index c7ae6943a6..ed6faa20be 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/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).
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index 811d563070..725296561f 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/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;
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 141be73990..ee32834fcc 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/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;
diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
index 870d7b6159..d7e086c2a8 100644
--- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
+++ b/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"); }
View Lorry Controller Status