From 5fb2f2d6527ddce0fab4c854118f30131b14f017 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 30 Oct 2013 16:24:58 +0100
Subject: [PATCH] Utils::FileName: Rename append to appendString()

The function's operation of simply appending the string as is would be
fine if FileNames were strings. But they aren't, so the function name
should be intentionally ugly to stand out.

Change-Id: I85e16844e2d69cacb6566c538182b84300c45161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/libs/utils/fileutils.cpp                  | 8 ++++----
 src/libs/utils/fileutils.h                    | 4 ++--
 src/plugins/android/androidconfigurations.cpp | 8 ++++----
 src/plugins/android/androidmanager.cpp        | 2 +-
 src/plugins/qnx/qnxutils.cpp                  | 2 +-
 src/tools/sdktool/settings.cpp                | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 1451f6fa79..4d7756b293 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -635,18 +635,18 @@ FileName FileName::relativeChildPath(const FileName &parent) const
 FileName &FileName::appendPath(const QString &s)
 {
     if (!isEmpty() && !QString::endsWith(QLatin1Char('/')))
-        append(QLatin1Char('/'));
-    append(s);
+        appendString(QLatin1Char('/'));
+    appendString(s);
     return *this;
 }
 
-FileName &FileName::append(const QString &str)
+FileName &FileName::appendString(const QString &str)
 {
     QString::append(str);
     return *this;
 }
 
-FileName &FileName::append(QChar str)
+FileName &FileName::appendString(QChar str)
 {
     QString::append(str);
     return *this;
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index 026152d2ea..96c1d46991 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -75,8 +75,8 @@ public:
 
     Utils::FileName relativeChildPath(const FileName &parent) const;
     Utils::FileName &appendPath(const QString &s);
-    Utils::FileName &append(const QString &str);
-    Utils::FileName &append(QChar str);
+    Utils::FileName &appendString(const QString &str);
+    Utils::FileName &appendString(QChar str);
 
     using QString::size;
     using QString::count;
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 5d2263d6bd..44d06d8310 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -334,22 +334,22 @@ FileName AndroidConfigurations::toolPath(Abi::Architecture architecture, const Q
 
 FileName AndroidConfigurations::stripPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-strip" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-strip" QTC_HOST_EXE_SUFFIX));
 }
 
 FileName AndroidConfigurations::readelfPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-readelf" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-readelf" QTC_HOST_EXE_SUFFIX));
 }
 
 FileName AndroidConfigurations::gccPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-gcc" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-gcc" QTC_HOST_EXE_SUFFIX));
 }
 
 FileName AndroidConfigurations::gdbPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).appendString(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
 }
 
 FileName AndroidConfigurations::openJDKPath() const
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index aed0ebe0f1..0328cb64ad 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -288,7 +288,7 @@ Utils::FileName AndroidManager::libsPath(ProjectExplorer::Target *target)
 
 Utils::FileName AndroidManager::stringsPath(ProjectExplorer::Target *target)
 {
-    return dirPath(target).append(AndroidStringsFileName);
+    return dirPath(target).appendString(AndroidStringsFileName);
 }
 
 Utils::FileName AndroidManager::defaultPropertiesPath(ProjectExplorer::Target *target)
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index e87dd8dd8a..5d26da2008 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -182,7 +182,7 @@ Utils::FileName QnxUtils::executableWithExtension(const Utils::FileName &fileNam
 {
     Utils::FileName result = fileName;
     if (Utils::HostOsInfo::isWindowsHost())
-        result.append(QLatin1String(".exe"));
+        result.appendString(QLatin1String(".exe"));
     return result;
 }
 
diff --git a/src/tools/sdktool/settings.cpp b/src/tools/sdktool/settings.cpp
index 74b5d18d6c..06c180cdca 100644
--- a/src/tools/sdktool/settings.cpp
+++ b/src/tools/sdktool/settings.cpp
@@ -77,6 +77,6 @@ Utils::FileName Settings::getPath(const QString &file)
         result.appendPath(QLatin1String("debuggers"));
     else
         return Utils::FileName();
-    result.append(QLatin1String(".xml"));
+    result.appendString(QLatin1String(".xml"));
     return result;
 }
-- 
GitLab