Avoid explicit checks for windows host when working with file paths

We have fileNameCaseSensitivity and withExecutableSuffix et al.

Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

4 files changed, 14 insertions, 26 deletions

diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
index ef03492da4..49c3ef0709 100644
--- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp
+++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
@@ -127,8 +127,8 @@ BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const QVariantM
 void BlackBerryApiLevelConfiguration::ctor()
 {
     QString host = qnxHost().toString();
-    FileName qmake4Path = QnxUtils::executableWithExtension(FileName::fromString(host + QLatin1String("/usr/bin/qmake")));
-    FileName qmake5Path = QnxUtils::executableWithExtension(FileName::fromString(host + QLatin1String("/usr/bin/qt5/qmake")));
+    FileName qmake4Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qmake")));
+    FileName qmake5Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qt5/qmake")));
     if (qmake4Path.toFileInfo().exists())
         m_qmake4BinaryFile = qmake4Path;
 
diff --git a/src/plugins/qnx/qnxbaseconfiguration.cpp b/src/plugins/qnx/qnxbaseconfiguration.cpp
index 4efcf0002c..e34f507626 100644
--- a/src/plugins/qnx/qnxbaseconfiguration.cpp
+++ b/src/plugins/qnx/qnxbaseconfiguration.cpp
@@ -146,16 +146,17 @@ void QnxBaseConfiguration::ctor(const FileName &envScript)
             m_qnxHost = Utils::FileName::fromString(item.value);
     }
 
-    FileName qccPath = QnxUtils::executableWithExtension(
-                FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/qcc")));
-    FileName armlev7GdbPath = QnxUtils::executableWithExtension(
-                FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb")));
-    if (!armlev7GdbPath.toFileInfo().exists())
-        armlev7GdbPath = QnxUtils::executableWithExtension(
-                    FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb")));
-
-    FileName x86GdbPath = QnxUtils::executableWithExtension(
-                FileName::fromString(m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb")));
+    FileName qccPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+        m_qnxHost.toString() + QLatin1String("/usr/bin/qcc")));
+    FileName armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+        m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb")));
+    if (!armlev7GdbPath.toFileInfo().exists()) {
+        armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+            m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb")));
+    }
+
+    FileName x86GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+        m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb")));
 
     if (qccPath.toFileInfo().exists())
         m_qccCompiler = qccPath;
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 7dc0afce79..3791ecfa78 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -178,14 +178,6 @@ QString QnxUtils::envFilePath(const QString &ndkPath, const QString &targetVersi
     return envFile;
 }
 
-Utils::FileName QnxUtils::executableWithExtension(const Utils::FileName &fileName)
-{
-    Utils::FileName result = fileName;
-    if (Utils::HostOsInfo::isWindowsHost())
-        result.appendString(QLatin1String(".exe"));
-    return result;
-}
-
 QString QnxUtils::bbDataDirPath()
 {
     const QString homeDir = QDir::homePath();
@@ -272,11 +264,7 @@ QList<ConfigInstallInformation> QnxUtils::installedConfigs(const QString &config
 
 QString QnxUtils::sdkInstallerPath(const QString &ndkPath)
 {
-    QString sdkinstallPath;
-    if (Utils::HostOsInfo::isWindowsHost())
-        sdkinstallPath = ndkPath + QLatin1String("/qde.exe");
-    else
-        sdkinstallPath = ndkPath + QLatin1String("/qde");
+    QString sdkinstallPath = Utils::HostOsInfo::withExecutableSuffix(ndkPath + QLatin1String("/qde"));
 
     if (QFileInfo(sdkinstallPath).exists())
         return sdkinstallPath;
diff --git a/src/plugins/qnx/qnxutils.h b/src/plugins/qnx/qnxutils.h
index 963d130fc4..611d0c6558 100644
--- a/src/plugins/qnx/qnxutils.h
+++ b/src/plugins/qnx/qnxutils.h
@@ -69,7 +69,6 @@ public:
     static QList<Utils::EnvironmentItem> qnxEnvironmentFromEnvFile(const QString &fileName);
     static bool isValidNdkPath(const QString & ndkPath);
     static QString envFilePath(const QString & ndkPath, const QString& targetVersion = QString());
-    static Utils::FileName executableWithExtension(const Utils::FileName &fileName);
     static QString bbDataDirPath();
     static QString bbqConfigPath();
     static QString defaultTargetVersion(const QString& ndkPath);