More FileName::appendPath() -> .pathAppended() changes

Change-Id: Ibc7eb4eb3ffb64658e441aafa240b1ddc0061930
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

9 files changed, 19 insertions, 29 deletions

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 77e24846ba..113f64de8b 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -682,8 +682,7 @@ bool AndroidManager::updateGradleProperties(ProjectExplorer::Target *target)
 int AndroidManager::findApiLevel(const Utils::FileName &platformPath)
 {
     int apiLevel = -1;
-    Utils::FileName propertiesPath = platformPath;
-    propertiesPath.appendPath("/source.properties");
+    const Utils::FileName propertiesPath = platformPath.pathAppended("/source.properties");
     if (propertiesPath.exists()) {
         QSettings sdkProperties(propertiesPath.toString(), QSettings::IniFormat);
         bool validInt = false;
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp
index b547145772..84658f12b2 100644
--- a/src/plugins/android/androidtoolmanager.cpp
+++ b/src/plugins/android/androidtoolmanager.cpp
@@ -244,9 +244,8 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil
                 if (lastIndex == -1) // skip line
                     break;
                 QString tmp = line.mid(lastIndex).remove(QLatin1Char(')')).trimmed();
-                Utils::FileName platformPath = sdkLocationPath;
-                platformPath.appendPath(QString("/platforms/android-%1").arg(tmp));
-                dev.sdk = AndroidManager::findApiLevel(platformPath);
+                dev.sdk = AndroidManager::findApiLevel(
+                    sdkLocationPath.pathAppended(QString("/platforms/android-%1").arg(tmp)));
             }
             if (line.contains(QLatin1String("Tag/ABI:"))) {
                 int lastIndex = line.lastIndexOf(QLatin1Char('/')) + 1;
@@ -312,10 +311,8 @@ void AndroidToolOutputParser::parseTargetListing(const QString &output,
                 continue;
             QString androidTarget = line.mid(index + 1, line.length() - index - 2);
             const QString tmp = androidTarget.mid(androidTarget.lastIndexOf(QLatin1Char('-')) + 1);
-            Utils::FileName platformPath = sdkLocation;
-            platformPath.appendPath(QString("/platforms/android-%1").arg(tmp));
-            platformParams.installedLocation = platformPath;
-            platformParams.apiLevel = AndroidManager::findApiLevel(platformPath);
+            platformParams.installedLocation = sdkLocation.pathAppended(QString("/platforms/android-%1").arg(tmp));
+            platformParams.apiLevel = AndroidManager::findApiLevel(platformParams.installedLocation);
         } else if (line.startsWith(QLatin1String("Name:"))) {
             platformParams.description = line.mid(6);
         } else if (line.startsWith(QLatin1String("Revision:"))) {
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index 4b00a180e4..fe8e1863c6 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -242,9 +242,9 @@ void ClangFormatConfigWidget::showGlobalCheckboxes()
 static bool projectConfigExists()
 {
     return Utils::FileName::fromString(Core::ICore::userResourcePath())
-        .appendPath("clang-format")
-        .appendPath(currentProjectUniqueId())
-        .appendPath((Constants::SETTINGS_FILE_NAME))
+        .pathAppended("clang-format")
+        .pathAppended(currentProjectUniqueId())
+        .pathAppended((Constants::SETTINGS_FILE_NAME))
         .exists();
 }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 8775731114..34a82a8176 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -592,8 +592,7 @@ QStringList CMakeProject::filesGeneratedFrom(const QString &sourceFile) const
     FileName baseDirectory = FileName::fromString(fi.absolutePath());
 
     while (baseDirectory.isChildOf(project)) {
-        FileName cmakeListsTxt = baseDirectory;
-        cmakeListsTxt.appendPath("CMakeLists.txt");
+        const FileName cmakeListsTxt = baseDirectory.pathAppended("CMakeLists.txt");
         if (cmakeListsTxt.exists())
             break;
         QDir dir(baseDirectory.toString());
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 596fb750e9..0a790a187e 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -217,8 +217,7 @@ void NimCompilerBuildStep::updateOutFilePath()
     auto bc = qobject_cast<NimBuildConfiguration *>(buildConfiguration());
     QTC_ASSERT(bc, return);
     const QString targetName = Utils::HostOsInfo::withExecutableSuffix(m_targetNimFile.toFileInfo().baseName());
-    FileName outFilePath = bc->buildDirectory().appendPath(targetName);
-    setOutFilePath(outFilePath);
+    setOutFilePath(bc->buildDirectory().pathAppended(targetName));
 }
 
 void NimCompilerBuildStep::updateCommand()
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 2804c0fa38..0ea96961dc 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -85,10 +85,8 @@ static QStringList searchPaths(Kit *kit)
         searchPaths << qtVersion->qmakeProperty("QT_INSTALL_PLUGINS") + '/' + dir;
 
     searchPaths << qtVersion->qmakeProperty("QT_INSTALL_LIBS");
-    searchPaths << qtVersion->qnxTarget().appendPath(qtVersion->cpuDir()).appendPath("lib")
-                   .toString();
-    searchPaths << qtVersion->qnxTarget().appendPath(qtVersion->cpuDir()).appendPath("usr/lib")
-                   .toString();
+    searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/lib").toString();
+    searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/usr/lib").toString();
 
     return searchPaths;
 }
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 2103130455..e66e5dcee4 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1645,7 +1645,7 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &ve
                             if (value.contains("XCODE")) {
                                 // we don't want to generate xcode projects...
                                 // qDebug() << "default mkspec is xcode, falling back to g++";
-                                return baseMkspecDir.appendPath("macx-g++");
+                                return baseMkspecDir.pathAppended("macx-g++");
                             }
                         }
                         break;
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index b5d65a5ccd..d3afa52aa8 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -129,9 +129,7 @@ FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(QProcess *process
 
 Utils::FileName QScxmlcGenerator::tmpFile() const
 {
-    Utils::FileName wd = workingDirectory();
-    wd.appendPath(source().fileName());
-    return wd;
+    return workingDirectory().pathAppended(source().fileName());
 }
 
 FileType QScxmlcGeneratorFactory::sourceType() const
diff --git a/src/tools/sdktool/settings.cpp b/src/tools/sdktool/settings.cpp
index f70fefcf2e..632173dc13 100644
--- a/src/tools/sdktool/settings.cpp
+++ b/src/tools/sdktool/settings.cpp
@@ -61,14 +61,14 @@ Utils::FileName Settings::getPath(const QString &file)
             = QStringList({ "android", "cmaketools", "debuggers", "devices",
                             "profiles", "qtversions", "toolchains", "abi" });
     if (lowerFile == "cmake")
-        result.appendPath("cmaketools");
+        result = result.pathAppended("cmaketools");
     else if (lowerFile == "kits")
-        result.appendPath("profiles");
+        result = result.pathAppended("profiles");
     else if (lowerFile == "qtversions")
-        result.appendPath("qtversion");
+        result = result.pathAppended("qtversion");
     else if (identical.contains(lowerFile))
-        result.appendPath(lowerFile);
+        result = result.pathAppended(lowerFile);
     else
-        result.appendPath(file); // handle arbitrary file names not known yet
+        result = result.pathAppended(file); // handle arbitrary file names not known yet
     return result.stringAppended(".xml");
 }