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

Android: Remove the CToolChainList type alias

Browse Source 
The pattern to alias const types is not used elsewhere in creator
and apparently to difficult for me. It's the second time I wondered
why a const value can be bound to a "non const" CToolChainList &.

Change-Id: I0d179dcaed01a1eafde4390f3fc55bf77417adc8
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2019-06-14 11:29:12 +02:00
parent 3c92742605
commit b412bd09a2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidtoolchain.cpp
View File

@@ -61,7 +61,7 @@ static const QList<Core::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANG
ProjectExplorer::Constants::C_LANGUAGE_ID}; ProjectExplorer::Constants::C_LANGUAGE_ID};
static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, const QString &target, static ToolChain *findToolChain(Utils::FilePath &compilerPath, Core::Id lang, const QString &target,
CToolChainList &alreadyKnown) const ToolChainList &alreadyKnown)
{ {
ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) { ToolChain * tc = Utils::findOrDefault(alreadyKnown, [target, compilerPath, lang](ToolChain *tc) {
return tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID return tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
@@ -151,7 +151,7 @@ AndroidToolChainFactory::AndroidToolChainFactory()
setToolchainConstructor([] { return new AndroidToolChain; }); setToolchainConstructor([] { return new AndroidToolChain; });
} }
ToolChainList AndroidToolChainFactory::autoDetect(CToolChainList &alreadyKnown) ToolChainList AndroidToolChainFactory::autoDetect(const ToolChainList &alreadyKnown)
{ {
return autodetectToolChainsForNdk(alreadyKnown); return autodetectToolChainsForNdk(alreadyKnown);
} }
@@ -163,7 +163,7 @@ static FilePath clangPlusPlusPath(const FilePath &clangPath)
QFileInfo(clangPath.toString()).baseName() + "++")); QFileInfo(clangPath.toString()).baseName() + "++"));
} }
ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(CToolChainList &alreadyKnown) ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(const ToolChainList &alreadyKnown)
{ {
QList<ToolChain *> result; QList<ToolChain *> result;
FilePath clangPath = AndroidConfigurations::currentConfig().clangPath(); FilePath clangPath = AndroidConfigurations::currentConfig().clangPath();

5
src/plugins/android/androidtoolchain.h
View File

@@ -31,7 +31,6 @@ namespace Android {
namespace Internal { namespace Internal {
using ToolChainList = QList<ProjectExplorer::ToolChain *>; using ToolChainList = QList<ProjectExplorer::ToolChain *>;
using CToolChainList = const QList<ProjectExplorer::ToolChain *>;
class AndroidToolChain : public ProjectExplorer::ClangToolChain class AndroidToolChain : public ProjectExplorer::ClangToolChain
{ {
@@ -63,7 +62,7 @@ class AndroidToolChainFactory : public ProjectExplorer::ToolChainFactory
public: public:
AndroidToolChainFactory(); AndroidToolChainFactory();
ToolChainList autoDetect(CToolChainList &alreadyKnown) override; ToolChainList autoDetect(const ToolChainList &alreadyKnown) override;
class AndroidToolChainInformation class AndroidToolChainInformation
{ {
@@ -74,7 +73,7 @@ public:
QString version; QString version;
}; };
static ToolChainList autodetectToolChainsForNdk(CToolChainList &alreadyKnown); static ToolChainList autodetectToolChainsForNdk(const ToolChainList &alreadyKnown);
}; };
} // namespace Internal } // namespace Internal