From b412bd09a281d04af8758fb5cb2836afd194f8df Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 14 Jun 2019 11:29:12 +0200
Subject: [PATCH] Android: Remove the CToolChainList type alias

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>
---
 src/plugins/android/androidtoolchain.cpp | 6 +++---
 src/plugins/android/androidtoolchain.h   | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index c8b72178b85..26f28ed6c93 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -61,7 +61,7 @@ static const QList<Core::Id> LanguageIds = {ProjectExplorer::Constants::CXX_LANG
                                             ProjectExplorer::Constants::C_LANGUAGE_ID};
 
 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) {
         return tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID
@@ -151,7 +151,7 @@ AndroidToolChainFactory::AndroidToolChainFactory()
     setToolchainConstructor([] { return new AndroidToolChain; });
 }
 
-ToolChainList AndroidToolChainFactory::autoDetect(CToolChainList &alreadyKnown)
+ToolChainList AndroidToolChainFactory::autoDetect(const ToolChainList &alreadyKnown)
 {
     return autodetectToolChainsForNdk(alreadyKnown);
 }
@@ -163,7 +163,7 @@ static FilePath clangPlusPlusPath(const FilePath &clangPath)
                     QFileInfo(clangPath.toString()).baseName() + "++"));
 }
 
-ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(CToolChainList &alreadyKnown)
+ToolChainList AndroidToolChainFactory::autodetectToolChainsForNdk(const ToolChainList &alreadyKnown)
 {
     QList<ToolChain *> result;
     FilePath clangPath = AndroidConfigurations::currentConfig().clangPath();
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index 433101a5139..359ba447f47 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -31,7 +31,6 @@ namespace Android {
 namespace Internal {
 
 using ToolChainList = QList<ProjectExplorer::ToolChain *>;
-using CToolChainList = const QList<ProjectExplorer::ToolChain *>;
 
 class AndroidToolChain : public ProjectExplorer::ClangToolChain
 {
@@ -63,7 +62,7 @@ class AndroidToolChainFactory : public ProjectExplorer::ToolChainFactory
 public:
     AndroidToolChainFactory();
 
-    ToolChainList autoDetect(CToolChainList &alreadyKnown) override;
+    ToolChainList autoDetect(const ToolChainList &alreadyKnown) override;
 
     class AndroidToolChainInformation
     {
@@ -74,7 +73,7 @@ public:
         QString version;
     };
 
-    static ToolChainList autodetectToolChainsForNdk(CToolChainList &alreadyKnown);
+    static ToolChainList autodetectToolChainsForNdk(const ToolChainList &alreadyKnown);
 };
 
 } // namespace Internal