Various Plugins: Simplify return FilePath statements

Change-Id: Ia9efb86f722caca1492b577d51442f1f23b804b4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

24 files changed, 35 insertions, 38 deletions

diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp
index 7f781f8e6df..d8f02e256fc 100644
--- a/src/libs/languageserverprotocol/lsptypes.cpp
+++ b/src/libs/languageserverprotocol/lsptypes.cpp
@@ -384,7 +384,7 @@ Utils::FilePath DocumentUri::toFilePath(const PathMapper &mapToHostPath) const
         QTC_ASSERT(mapToHostPath, return serverPath);
         return mapToHostPath(serverPath);
     }
-    return Utils::FilePath();
+    return {};
 }
 
 DocumentUri DocumentUri::fromProtocol(const QString &uri)
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 26238807e0e..8cdcb1e886a 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -901,7 +901,7 @@ static bool findNewQmlLibraryInPath(const Utils::FilePath &path,
 static FilePath modulePath(const ImportInfo &import, const FilePaths &paths)
 {
     if (!import.version().isValid())
-        return FilePath();
+        return {};
 
     const FilePaths modPaths = modulePaths(import.name(), import.version().toString(), paths);
     return modPaths.value(0); // first is best match
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index 761df90ddcd..04913de3ddc 100644
--- a/src/libs/qmljs/qmljsplugindumper.cpp
+++ b/src/libs/qmljs/qmljsplugindumper.cpp
@@ -387,14 +387,14 @@ Utils::FilePath PluginDumper::buildQmltypesPath(const QString &name) const
                                                      m_modelManager->importPathsNames());
 
     if (paths.isEmpty())
-        return Utils::FilePath();
+        return {};
 
     for (const Utils::FilePath &path : paths) {
         auto qmltypes = path.dirEntries(FileFilter(QStringList{"*.qmltypes"}, QDir::Files));
         if (!qmltypes.isEmpty())
             return qmltypes.first();
     }
-    return Utils::FilePath();
+    return {};
 }
 
 /*!
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index 957f694179b..29e0f6d7c2c 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -477,7 +477,7 @@ FilePath chooseFileFromList(const FilePaths &candidates)
         filesMenu.addAction(candidate.toUserOutput());
     if (const QAction * const action = filesMenu.exec(QCursor::pos()))
         return FilePath::fromUserInput(action->text());
-    return FilePath();
+    return {};
 }
 
 } // namespace Utils
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index e7697f1bc8f..e3ae97267dd 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -985,12 +985,12 @@ FilePath FilePath::parentDir() const
 {
     const QString basePath = path();
     if (basePath.isEmpty())
-        return FilePath();
+        return {};
 
     const QString path = basePath + QLatin1String("/..");
     const QString parent = doCleanPath(path);
     if (parent == path)
-        return FilePath();
+        return {};
 
     return withNewPath(parent);
 }
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 633d23c5e3e..afc0db6ce3f 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -452,7 +452,7 @@ FilePath AndroidConfig::emulatorToolPath() const
     if (emulatorFile.exists())
         return emulatorFile;
 
-    return FilePath();
+    return {};
 }
 
 FilePath AndroidConfig::sdkManagerToolPath() const
@@ -468,7 +468,7 @@ FilePath AndroidConfig::sdkManagerToolPath() const
     if (sdkmanagerTmpPath.exists())
         return sdkmanagerTmpPath;
 
-    return FilePath();
+    return {};
 }
 
 FilePath AndroidConfig::avdManagerToolPath() const
@@ -478,7 +478,7 @@ FilePath AndroidConfig::avdManagerToolPath() const
     if (sdkmanagerPath.exists())
         return sdkmanagerPath;
 
-    return FilePath();
+    return {};
 }
 
 void AndroidConfig::setTemporarySdkToolsPath(const Utils::FilePath &path)
@@ -498,7 +498,7 @@ FilePath AndroidConfig::sdkToolsVersionPath() const
     if (tmpSdkPath.exists())
         return tmpSdkPath;
 
-    return FilePath();
+    return {};
 }
 
 FilePath AndroidConfig::toolchainPathFromNdk(const FilePath &ndkLocation, OsType hostOs)
@@ -523,7 +523,7 @@ FilePath AndroidConfig::toolchainPathFromNdk(const FilePath &ndkLocation, OsType
     case OsTypeMac:
         hostPatterns << QLatin1String("darwin*");
         break;
-    default: /* unknown host */ return FilePath();
+    default: /* unknown host */ return {};
     }
 
     QDirIterator iter(toolchainPath.toString(), hostPatterns, QDir::Dirs);
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index 7c5b8ac3369..9a1f1d4dd52 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -196,7 +196,7 @@ Utils::FilePath ClangFormatConfigWidget::projectPath()
     if (d->project)
         return globalPath().pathAppended("clang-format/" + projectUniqueId(d->project));
 
-    return Utils::FilePath();
+    return {};
 }
 
 void ClangFormatConfigWidget::createStyleFileIfNeeded(bool isGlobal)
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 7b9a896fc10..694078b3c3c 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -338,7 +338,7 @@ Utils::FilePath findConfig(const Utils::FilePath &fileName)
 
         parentDirectory = parentDirectory.parentDir();
     }
-    return Utils::FilePath();
+    return {};
 }
 
 Utils::FilePath configForFile(const Utils::FilePath &fileName)
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 4348ac2e56d..d2653baefeb 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1567,7 +1567,7 @@ FilePath CMakeBuildConfiguration::shadowBuildDirectory(const FilePath &projectFi
                                                        BuildConfiguration::BuildType buildType)
 {
     if (projectFilePath.isEmpty())
-        return FilePath();
+        return {};
 
     const QString projectName = projectFilePath.parentDir().fileName();
     const FilePath projectDir = Project::projectDirectory(projectFilePath);
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index d39a95fccf6..3462980ef7a 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -480,7 +480,7 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
 FilePath directorySourceDir(const Configuration &c, const FilePath &sourceDir, int directoryIndex)
 {
     const size_t di = static_cast<size_t>(directoryIndex);
-    QTC_ASSERT(di < c.directories.size(), return FilePath());
+    QTC_ASSERT(di < c.directories.size(), return {});
 
     return sourceDir.resolvePath(c.directories[di].sourcePath);
 }
@@ -488,7 +488,7 @@ FilePath directorySourceDir(const Configuration &c, const FilePath &sourceDir, i
 FilePath directoryBuildDir(const Configuration &c, const FilePath &buildDir, int directoryIndex)
 {
     const size_t di = static_cast<size_t>(directoryIndex);
-    QTC_ASSERT(di < c.directories.size(), return FilePath());
+    QTC_ASSERT(di < c.directories.size(), return {});
 
     return buildDir.resolvePath(c.directories[di].buildPath);
 }
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index a503557d692..c4c53206d4c 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2428,7 +2428,7 @@ static FilePath gitBinDir(const GitClient::GitKLaunchTrial trial, const FilePath
     if (trial == GitClient::SystemPath)
         return Environment::systemEnvironment().searchInPath("gitk").parentDir();
     QTC_CHECK(false);
-    return FilePath();
+    return {};
 }
 
 void GitClient::tryLaunchingGitK(const Environment &env,
@@ -2518,7 +2518,7 @@ FilePath GitClient::gitBinDirectory() const
 {
     const QString git = vcsBinary().toString();
     if (git.isEmpty())
-        return FilePath();
+        return {};
 
     // Is 'git\cmd' in the path (folder containing .bats)?
     QString path = QFileInfo(git).absolutePath();
@@ -2564,7 +2564,7 @@ FilePath GitClient::vcsBinary() const
     bool ok;
     Utils::FilePath binary = settings().gitExecutable(&ok);
     if (!ok)
-        return Utils::FilePath();
+        return {};
     return binary;
 }
 
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 00709b126f5..cadb583188e 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -413,7 +413,7 @@ static FilePath kitDependencyPath(const Kit *kit, const QString &cmakeVariableNa
         if (configItem.key == keyName)
             return FilePath::fromUserInput(QString::fromUtf8(configItem.value));
     }
-    return FilePath();
+    return {};
 }
 
 // Kit Information
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 990fd0ff417..b5a6d82a1f9 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -225,7 +225,7 @@ static FilePath findQMakeBinaryFromMakefile(const FilePath &makefile)
             }
         }
     }
-    return FilePath();
+    return {};
 }
 
 MakeFileParse::MakeFileParse(const FilePath &makefile, Mode mode) : m_mode(mode)
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index a4a56b51963..bfcc8a89402 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -341,7 +341,7 @@ FilePath QMakeStep::makeCommand() const
 {
     if (auto ms = stepList()->firstOfType<MakeStep>())
         return ms->makeExecutable();
-    return FilePath();
+    return {};
 }
 
 QString QMakeStep::makeArguments(const QString &makefile) const
diff --git a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp
index a0d7cc89815..18c16c28e7b 100644
--- a/src/plugins/qmldesigner/components/eventlist/eventlist.cpp
+++ b/src/plugins/qmldesigner/components/eventlist/eventlist.cpp
@@ -26,7 +26,7 @@ Utils::FilePath projectFilePath()
         if (auto *proj = ProjectExplorer::ProjectManager::projectForFile(doc->fileName()))
             return proj->projectDirectory();
     }
-    return Utils::FilePath();
+    return {};
 }
 
 static Utils::FilePath findFile(const Utils::FilePath &path, const QString &fileName)
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index 7bbbac5b253..ed34abdc79d 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -334,10 +334,7 @@ void DesignDocument::updateFileName(const Utils::FilePath & /*oldFileName*/, con
 
 Utils::FilePath DesignDocument::fileName() const
 {
-    if (editor())
-        return editor()->document()->filePath();
-
-    return Utils::FilePath();
+    return editor() ? editor()->document()->filePath() : Utils::FilePath();
 }
 
 ProjectExplorer::Target *DesignDocument::currentTarget() const
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index a5b7687a2ac..3b865570aca 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -741,7 +741,7 @@ static Utils::FilePath qmllsForFile(const Utils::FilePath &file,
     QmllsSettings settings = settingsManager->lastSettings();
     bool enabled = settings.useQmlls;
     if (!enabled)
-        return Utils::FilePath();
+        return {};
     if (settings.useLatestQmlls)
         return settingsManager->latestQmlls();
     QmlJS::ModelManagerInterface::ProjectInfo pInfo = modelManager->projectInfoForPath(file);
diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
index e9f0b1a7807..ff386c7a5ba 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
@@ -98,9 +98,9 @@ Utils::FilePath QmlProfilerDetailsRewriter::getLocalFile(const QString &remoteFi
 {
     const Utils::FilePath localFile = m_projectFinder.findFile(remoteFile).constFirst();
     if (!localFile.exists() || !localFile.isReadableFile())
-        return Utils::FilePath();
+        return {};
     if (!QmlJS::ModelManagerInterface::guessLanguageOfFile(localFile).isQmlLikeOrJsLanguage())
-        return Utils::FilePath();
+        return {};
 
     return localFile.canonicalPath();
 }
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index a13f96148b0..8de173e9f37 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -98,7 +98,7 @@ FilePath QnxQtVersion::qnxTarget() const
             return FilePath::fromUserInput(item.value);
     }
 
-    return FilePath();
+    return {};
 }
 
 QString QnxQtVersion::cpuDir() const
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 15a891dc110..a0ed8041b33 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1773,7 +1773,7 @@ FilePath QtVersionPrivate::mkspecDirectoryFromVersionInfo(const QHash<ProKey, Pr
 {
     QString dataDir = qmakeProperty(versionInfo, "QT_HOST_DATA", PropertyVariantSrc);
     if (dataDir.isEmpty())
-        return FilePath();
+        return {};
     return qmakeCommand.withNewPath(dataDir + "/mkspecs").cleanPath();
 }
 
@@ -1782,7 +1782,7 @@ FilePath QtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProString>
 {
     FilePath baseMkspecDir = mkspecDirectoryFromVersionInfo(versionInfo, qmakeCommand);
     if (baseMkspecDir.isEmpty())
-        return FilePath();
+        return {};
 
     bool qt5 = false;
     QString theSpec = qmakeProperty(versionInfo, "QMAKE_XSPEC");
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index b0d41d9ba7a..f3245bd9432 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -61,7 +61,7 @@ Utils::FilePath QScxmlcGenerator::command() const
         version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit());
 
     if (!version)
-        return Utils::FilePath();
+        return {};
 
     return version->qscxmlcFilePath();
 }
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index eedc79e6864..b00291e6049 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -397,7 +397,7 @@ static FilePaths gatherQmakePathsFromQtChooser()
 {
     const QString qtchooser = QStandardPaths::findExecutable(QStringLiteral("qtchooser"));
     if (qtchooser.isEmpty())
-        return FilePaths();
+        return {};
 
     const QList<QByteArray> versions = runQtChooser(qtchooser, QStringList("-l"));
     QSet<FilePath> foundQMakes;
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index f1ff905b831..4c68d5efa54 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -39,7 +39,7 @@ Utils::FilePath UicGenerator::command() const
         version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit());
 
     if (!version)
-        return Utils::FilePath();
+        return {};
 
     return version->uicFilePath();
 }
diff --git a/src/plugins/squish/objectsmapdocument.cpp b/src/plugins/squish/objectsmapdocument.cpp
index 767f4cb058d..7f2a050b290 100644
--- a/src/plugins/squish/objectsmapdocument.cpp
+++ b/src/plugins/squish/objectsmapdocument.cpp
@@ -64,7 +64,7 @@ bool ObjectsMapDocument::saveImpl(QString *errorString,
 
 Utils::FilePath ObjectsMapDocument::fallbackSaveAsPath() const
 {
-    return Utils::FilePath();
+    return {};
 }
 
 QString ObjectsMapDocument::fallbackSaveAsFileName() const