Some more FileName::appendPath -> pathAppended() changes

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

src/libs/utils/fileinprojectfinder.cpp

@@ -318,8 +318,7 @@ bool FileInProjectFinder::findFileOrDirectory(const QString &originalPath, FileH
 
     // check if absolute path is found in sysroot
     if (!m_sysroot.isEmpty()) {
-        FileName sysrootPath = m_sysroot;
+        const FileName sysrootPath = m_sysroot.pathAppended(originalPath);
-        sysrootPath.appendPath(originalPath);
         if (checkPath(sysrootPath.toString(), origLength, fileHandler, directoryHandler)) {
             return handleSuccess(originalPath, QStringList(sysrootPath.toString()), origLength,
                                  "in sysroot");

src/libs/utils/fileutils.cpp

@@ -107,7 +107,7 @@ bool FileUtils::removeRecursively(const FileName &filePath, QString *error)
         QStringList fileNames = dir.entryList(QDir::Files | QDir::Hidden
                                               | QDir::System | QDir::Dirs | QDir::NoDotAndDotDot);
         foreach (const QString &fileName, fileNames) {
-            if (!removeRecursively(FileName(filePath).appendPath(fileName), error))
+            if (!removeRecursively(filePath.pathAppended(fileName), error))
                 return false;
         }
         if (!QDir::root().rmdir(dir.path())) {
@@ -205,7 +205,7 @@ bool FileUtils::isFileNewerThan(const FileName &filePath, const QDateTime &timeS
         const QStringList dirContents = QDir(filePath.toString())
             .entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
         foreach (const QString &curFileName, dirContents) {
-            if (isFileNewerThan(FileName(filePath).appendPath(curFileName), timeStamp))
+            if (isFileNewerThan(filePath.pathAppended(curFileName), timeStamp))
                 return true;
         }
     }

src/plugins/android/androidavdmanager.cpp

@@ -442,9 +442,9 @@ bool AvdManagerOutputParser::parseAvd(const QStringList &deviceInfo, AndroidDevi
                    qCDebug(avdManagerLog) << "Avd Parsing: Cannot find ABI:" << configFile;
 
                 // Get Target
-                Utils::FileName avdInfoFile = avdPath.parentDir();
                 QString avdInfoFileName = avdPath.toFileInfo().baseName() + ".ini";
-                avdInfoFile.appendPath(avdInfoFileName);
+                const Utils::FileName
+                        avdInfoFile = avdPath.parentDir().pathAppended(avdInfoFileName);
                 QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat);
                 value = avdInfo.value(avdInfoTargetKey).toString();
                 if (!value.isEmpty())

src/plugins/android/androidconfigurations.cpp

@@ -349,23 +349,19 @@ FileName AndroidConfig::sdkManagerToolPath() const
 
 FileName AndroidConfig::avdManagerToolPath() const
 {
-    FileName avdManagerPath = m_sdkLocation;
     QString toolPath = "tools/bin/avdmanager";
     if (HostOsInfo::isWindowsHost())
         toolPath += ANDROID_BAT_SUFFIX;
-    avdManagerPath = avdManagerPath.appendPath(toolPath);
+    return m_sdkLocation.pathAppended(toolPath);
-    return avdManagerPath;
 }
 
 FileName AndroidConfig::aaptToolPath() const
 {
-    Utils::FileName aaptToolPath = m_sdkLocation;
+    const Utils::FileName aaptToolPath = m_sdkLocation.pathAppended("build-tools");
-    aaptToolPath.appendPath("build-tools");
     QString toolPath = QString("%1/aapt").arg(buildToolsVersion().toString());
     if (HostOsInfo::isWindowsHost())
         toolPath += QTC_HOST_EXE_SUFFIX;
-    aaptToolPath.appendPath(toolPath);
+    return aaptToolPath.pathAppended(toolPath);
-    return aaptToolPath;
 }
 
 FileName AndroidConfig::clangPath() const

src/plugins/clangtools/clangtoolsprojectsettings.cpp

@@ -107,10 +107,8 @@ void ClangToolsProjectSettings::load()
         if (message.isEmpty())
             continue;
         Utils::FileName fullPath = Utils::FileName::fromString(fp);
-        if (fullPath.toFileInfo().isRelative()) {
+        if (fullPath.toFileInfo().isRelative())
-            fullPath = m_project->projectDirectory();
+            fullPath = m_project->projectDirectory().pathAppended(fp);
-            fullPath.appendPath(fp);
-        }
         if (!fullPath.exists())
             continue;
         const QString contextKind = diag.value(SETTINGS_KEY_SUPPRESSED_DIAGS_CONTEXTKIND).toString();

src/plugins/cmakeprojectmanager/builddirmanager.cpp

@@ -50,6 +50,7 @@
 #include <QSet>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace CMakeProjectManager {
 namespace Internal {
@@ -310,8 +311,8 @@ void BuildDirManager::clearCache()
     QTC_ASSERT(m_parameters.isValid(), return);
     QTC_ASSERT(!m_isHandlingError, return);
 
-    auto cmakeCache = m_parameters.workDirectory.appendPath("CMakeCache.txt");
+    const FileName cmakeCache = m_parameters.workDirectory.pathAppended("CMakeCache.txt");
-    auto cmakeFiles = m_parameters.workDirectory.appendPath("CMakeFiles");
+    const FileName cmakeFiles = m_parameters.workDirectory.pathAppended("CMakeFiles");
 
     const bool mustCleanUp = cmakeCache.exists() || cmakeFiles.exists();
     if (!mustCleanUp)

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -109,7 +109,7 @@ void CMakeBuildConfiguration::initialize(const BuildInfo &info)
         m_initialConfiguration.prepend(CMakeProjectManager::CMakeConfigItem{"CMAKE_TOOLCHAIN_FILE",
                                                                             CMakeProjectManager::CMakeConfigItem::Type::PATH,
                                                                             "Android CMake toolchain file",
-                                                                            ndkLocation.appendPath("build/cmake/android.toolchain.cmake").toUserOutput().toUtf8()});
+                                                                            ndkLocation.pathAppended("build/cmake/android.toolchain.cmake").toUserOutput().toUtf8()});
         m_initialConfiguration.prepend(CMakeProjectManager::CMakeConfigItem{"ANDROID_ABI",
                                                                             CMakeProjectManager::CMakeConfigItem::Type::STRING,
                                                                             "Android ABI",

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -194,9 +194,7 @@ bool CMakeBuildStep::init()
     // Warn if doing out-of-source builds with a CMakeCache.txt is the source directory
     const Utils::FileName projectDirectory = bc->target()->project()->projectDirectory();
     if (bc->buildDirectory() != projectDirectory) {
-        Utils::FileName cmc = projectDirectory;
+        if (projectDirectory.pathAppended("CMakeCache.txt").exists()) {
-        cmc.appendPath("CMakeCache.txt");
-        if (cmc.exists()) {
             emit addTask(Task(Task::Warning,
                               tr("There is a CMakeCache.txt file in \"%1\", which suggest an "
                                  "in-source build was done before. You are now building in \"%2\", "