diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index 1451f6fa79e9cb972f259e106d04c153bd88ea54..4d7756b293f28d9a29fb7120587782c4b154d409 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 026152d2ea57d97f229fb791824d8db1837fb4e1..96c1d46991d036c0e91e3f2645c5e980441a06e7 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 5d2263d6bd597f6c7f64efdd1da5d03a49b8f666..44d06d8310e1a9a30d15338ff4fcf25eee1b08d4 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 aed0ebe0f194ea1cafdcbea0db9fc998165f1290..0328cb64ad669fdce0f8ef23ad5244c9932ab923 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 e87dd8dd8a802cddc91e7188afbd13d076337550..5d26da2008c0355f7004f7ca8c6356fce4930858 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 74b5d18d6cda83d1cd4f0c76dc369418553cce63..06c180cdca48fac9864015b6d1372a3b31be8851 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; }