feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Rename one ToolChainFactory::autoDetect overload

Browse Source 
... to detectForImport(). The overloads have different purposes,
sharing the name makes reasoning about them hard.

Change-Id: I57bfbbc1aa06ef85251e39c404bdbe5584a2ea41
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-07-02 10:26:58 +02:00
parent ed2371fb3b
commit 0715917414
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/nim/project/nimtoolchainfactory.cpp
View File

@@ -73,7 +73,7 @@ QList<ToolChain *> NimToolChainFactory::autoDetect(const QList<ToolChain *> &alr
return result; return result;
} }
QList<ToolChain *> NimToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> NimToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language)
{ {
QList<ToolChain *> result; QList<ToolChain *> result;
if (language == Constants::C_NIMLANGUAGE_ID) { if (language == Constants::C_NIMLANGUAGE_ID) {

2
src/plugins/nim/project/nimtoolchainfactory.h
View File

@@ -42,7 +42,7 @@ public:
NimToolChainFactory(); NimToolChainFactory();
QList<ProjectExplorer::ToolChain *> autoDetect(const QList<ProjectExplorer::ToolChain *> &alreadyKnown) final; QList<ProjectExplorer::ToolChain *> autoDetect(const QList<ProjectExplorer::ToolChain *> &alreadyKnown) final;
QList<ProjectExplorer::ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; QList<ProjectExplorer::ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final;
}; };
class NimToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget class NimToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget

8
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -880,7 +880,7 @@ QList<ToolChain *> GccToolChainFactory::autoDetect(const QList<ToolChain *> &alr
return tcs; return tcs;
} }
QList<ToolChain *> GccToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> GccToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language)
{ {
const QString fileName = compilerPath.fileName(); const QString fileName = compilerPath.fileName();
if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc") if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc")
@@ -1455,7 +1455,7 @@ QList<ToolChain *> ClangToolChainFactory::autoDetect(const QList<ToolChain *> &a
return tcs; return tcs;
} }
QList<ToolChain *> ClangToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> ClangToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language)
{ {
const QString fileName = compilerPath.fileName(); const QString fileName = compilerPath.fileName();
if ((language == Constants::C_LANGUAGE_ID && fileName.startsWith("clang") && !fileName.startsWith("clang++")) if ((language == Constants::C_LANGUAGE_ID && fileName.startsWith("clang") && !fileName.startsWith("clang++"))
@@ -1637,7 +1637,7 @@ QList<ToolChain *> MingwToolChainFactory::autoDetect(const QList<ToolChain *> &a
return result; return result;
} }
QList<ToolChain *> MingwToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> MingwToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language)
{ {
const QString fileName = compilerPath.fileName(); const QString fileName = compilerPath.fileName();
if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc") if ((language == Constants::C_LANGUAGE_ID && (fileName.startsWith("gcc")
@@ -1714,7 +1714,7 @@ QList<ToolChain *> LinuxIccToolChainFactory::autoDetect(const QList<ToolChain *>
return result; return result;
} }
QList<ToolChain *> LinuxIccToolChainFactory::autoDetect(const FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> LinuxIccToolChainFactory::detectForImport(const FilePath &compilerPath, const Core::Id &language)
{ {
const QString fileName = compilerPath.fileName(); const QString fileName = compilerPath.fileName();
if ((language == Constants::CXX_LANGUAGE_ID && fileName.startsWith("icpc")) || if ((language == Constants::CXX_LANGUAGE_ID && fileName.startsWith("icpc")) ||

8
src/plugins/projectexplorer/gcctoolchainfactories.h
View File

@@ -55,7 +55,7 @@ public:
GccToolChainFactory(); GccToolChainFactory();
QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override;
QList<ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) override; QList<ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) override;
protected: protected:
enum class DetectVariants { Yes, No }; enum class DetectVariants { Yes, No };
@@ -138,7 +138,7 @@ public:
ClangToolChainFactory(); ClangToolChainFactory();
QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override;
QList<ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; QList<ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final;
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -153,7 +153,7 @@ public:
MingwToolChainFactory(); MingwToolChainFactory();
QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override;
QList<ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; QList<ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final;
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -168,7 +168,7 @@ public:
LinuxIccToolChainFactory(); LinuxIccToolChainFactory();
QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override;
QList<ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) final; QList<ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language) final;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/projectexplorer/projectimporter.cpp
View File

@@ -372,7 +372,7 @@ createToolChains(const Utils::FilePath &toolChainPath, const Core::Id &language)
ProjectImporter::ToolChainData data; ProjectImporter::ToolChainData data;
for (ToolChainFactory *factory : ToolChainFactory::allToolChainFactories()) { for (ToolChainFactory *factory : ToolChainFactory::allToolChainFactories()) {
data.tcs = factory->autoDetect(toolChainPath, language); data.tcs = factory->detectForImport(toolChainPath, language);
if (data.tcs.isEmpty()) if (data.tcs.isEmpty())
continue; continue;

2
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -442,7 +442,7 @@ QList<ToolChain *> ToolChainFactory::autoDetect(const QList<ToolChain *> &alread
return QList<ToolChain *>(); return QList<ToolChain *>();
} }
QList<ToolChain *> ToolChainFactory::autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language) QList<ToolChain *> ToolChainFactory::detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language)
{ {
Q_UNUSED(compilerPath); Q_UNUSED(compilerPath);
Q_UNUSED(language); Q_UNUSED(language);

2
src/plugins/projectexplorer/toolchain.h
View File

@@ -199,7 +199,7 @@ public:
Core::Id supportedToolChainType() const; Core::Id supportedToolChainType() const;
virtual QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); virtual QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown);
virtual QList<ToolChain *> autoDetect(const Utils::FilePath &compilerPath, const Core::Id &language); virtual QList<ToolChain *> detectForImport(const Utils::FilePath &compilerPath, const Core::Id &language);
virtual bool canCreate() const; virtual bool canCreate() const;
virtual ToolChain *create(); virtual ToolChain *create();