From f0541a5eb03da73156d7ce5e8a8438263dc62507 Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Wed, 8 May 2019 22:23:22 +0300
Subject: bare-metal: Rename 'isCompilerExists' with 'compilerExists'

... to be consistent with other toolchains.

Change-Id: Iccf13856935241e334a3fd7a74c7ce000ae154f4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/baremetal/iarewtoolchain.cpp | 8 ++++----
 src/plugins/baremetal/keiltoolchain.cpp  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 330668eb25..565104be47 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -60,7 +60,7 @@ namespace Internal {
 static const char compilerCommandKeyC[] = "BareMetal.IarToolChain.CompilerPath";
 static const char targetAbiKeyC[] = "BareMetal.IarToolChain.TargetAbi";
 
-static bool isCompilerExists(const FileName &compilerPath)
+static bool compilerExists(const FileName &compilerPath)
 {
     const QFileInfo fi = compilerPath.toFileInfo();
     return fi.exists() && fi.isExecutable() && fi.isFile();
@@ -452,7 +452,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetect(const QList<ToolChain *> &alr
                         // Build full compiler path.
                         compilerPath += entry.subExePath;
                         const FileName fn = FileName::fromString(compilerPath);
-                        if (isCompilerExists(fn)) {
+                        if (compilerExists(fn)) {
                             // Note: threeLevelKey is a guessed toolchain version.
                             candidates.push_back({fn, threeLevelKey});
                         }
@@ -605,14 +605,14 @@ void IarToolChainConfigWidget::setFromToolchain()
     const auto tc = static_cast<IarToolChain *>(toolChain());
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_abiWidget->setAbis({}, tc->targetAbi());
-    const bool haveCompiler = isCompilerExists(m_compilerCommand->fileName());
+    const bool haveCompiler = compilerExists(m_compilerCommand->fileName());
     m_abiWidget->setEnabled(haveCompiler && !tc->isAutoDetected());
 }
 
 void IarToolChainConfigWidget::handleCompilerCommandChange()
 {
     const FileName compilerPath = m_compilerCommand->fileName();
-    const bool haveCompiler = isCompilerExists(compilerPath);
+    const bool haveCompiler = compilerExists(compilerPath);
     if (haveCompiler) {
         const auto env = Environment::systemEnvironment();
         m_macros = dumpPredefinedMacros(compilerPath, env.toStringList());
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 489bc89f2f..fb7e37cfb3 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -62,7 +62,7 @@ namespace Internal {
 static const char compilerCommandKeyC[] = "BareMetal.KeilToolchain.CompilerPath";
 static const char targetAbiKeyC[] = "BareMetal.KeilToolchain.TargetAbi";
 
-static bool isCompilerExists(const FileName &compilerPath)
+static bool compilerExists(const FileName &compilerPath)
 {
     const QFileInfo fi = compilerPath.toFileInfo();
     return fi.exists() && fi.isExecutable() && fi.isFile();
@@ -463,7 +463,7 @@ QList<ToolChain *> KeilToolchainFactory::autoDetect(const QList<ToolChain *> &al
             // Build full compiler path.
             compilerPath += entry.subExePath;
             const FileName fn = FileName::fromString(compilerPath);
-            if (isCompilerExists(fn)) {
+            if (compilerExists(fn)) {
                 QString version = registry.value("Version").toString();
                 if (version.startsWith('V'))
                     version.remove(0, 1);
@@ -611,14 +611,14 @@ void KeilToolchainConfigWidget::setFromToolchain()
     const auto tc = static_cast<KeilToolchain *>(toolChain());
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_abiWidget->setAbis({}, tc->targetAbi());
-    const bool haveCompiler = isCompilerExists(m_compilerCommand->fileName());
+    const bool haveCompiler = compilerExists(m_compilerCommand->fileName());
     m_abiWidget->setEnabled(haveCompiler && !tc->isAutoDetected());
 }
 
 void KeilToolchainConfigWidget::handleCompilerCommandChange()
 {
     const FileName compilerPath = m_compilerCommand->fileName();
-    const bool haveCompiler = isCompilerExists(compilerPath);
+    const bool haveCompiler = compilerExists(compilerPath);
     if (haveCompiler) {
         const auto env = Environment::systemEnvironment();
         m_macros = dumpPredefinedMacros(compilerPath, env.toStringList());
-- 
cgit v1.2.1