summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/android/createandroidmanifestwizard.cpp2
-rw-r--r--src/plugins/android/javaparser.cpp3
-rw-r--r--src/plugins/clangformat/clangformatconfigwidget.cpp4
-rw-r--r--src/plugins/clangformat/clangformatutils.cpp4
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp4
-rw-r--r--src/plugins/debugger/debuggeritemmanager.cpp3
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp4
-rw-r--r--src/plugins/git/gitclient.cpp5
-rw-r--r--src/plugins/nim/project/nimbuildconfiguration.cpp6
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp2
-rw-r--r--src/plugins/projectexplorer/msvctoolchain.cpp2
-rw-r--r--src/plugins/projectexplorer/projectmodels.cpp8
12 files changed, 20 insertions, 27 deletions
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 56a7fda56c..90bd2cf0bd 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -338,7 +338,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
if (m_copyGradle) {
FileName gradlePath = FileName::fromString(version->qmakeProperty("QT_INSTALL_PREFIX").append(QLatin1String("/src/3rdparty/gradle")));
if (!gradlePath.exists())
- gradlePath = AndroidConfigurations::currentConfig().sdkLocation().appendPath(QLatin1String("/tools/templates/gradle/wrapper"));
+ gradlePath = AndroidConfigurations::currentConfig().sdkLocation().pathAppended("/tools/templates/gradle/wrapper");
FileUtils::copyRecursively(gradlePath, FileName::fromString(m_directory),
nullptr, [this, &addedFiles](QFileInfo src, QFileInfo dst, QString *){return copy(src, dst, &addedFiles);});
}
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index 0e89ba00ea..484a349b2a 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -73,8 +73,7 @@ void JavaParser::parse(const QString &line)
Utils::FileName file = Utils::FileName::fromUserInput(m_javaRegExp.cap(2));
if (file.isChildOf(m_buildDirectory)) {
Utils::FileName relativePath = file.relativeChildPath(m_buildDirectory);
- file = m_sourceDirectory;
- file.appendPath(relativePath.toString());
+ file = m_sourceDirectory.pathAppended(relativePath.toString());
}
if (file.toFileInfo().isRelative()) {
diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
index 3e311c1e4e..4b00a180e4 100644
--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
@@ -172,10 +172,10 @@ void ClangFormatConfigWidget::initChecksAndPreview()
Utils::FileName fileName;
if (m_project) {
connect(m_ui->applyButton, &QPushButton::clicked, this, &ClangFormatConfigWidget::apply);
- fileName = m_project->projectFilePath().appendPath("snippet.cpp");
+ fileName = m_project->projectFilePath().pathAppended("snippet.cpp");
} else {
fileName = Utils::FileName::fromString(Core::ICore::userResourcePath())
- .appendPath("snippet.cpp");
+ .pathAppended("snippet.cpp");
}
m_preview->textDocument()->indenter()->setFileName(fileName);
}
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 25cbce169b..1d0369f0f3 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -174,7 +174,7 @@ static Utils::FileName projectPath()
{
const Project *project = SessionManager::startupProject();
if (project)
- return globalPath().appendPath("clang-format").appendPath(currentProjectUniqueId());
+ return globalPath().pathAppended("clang-format/" + currentProjectUniqueId());
return Utils::FileName();
}
@@ -219,7 +219,7 @@ QString configForFile(Utils::FileName fileName)
Utils::FileName assumedPathForConfig(const QString &configFile)
{
Utils::FileName fileName = Utils::FileName::fromString(configFile);
- return fileName.parentDir().appendPath("test.cpp");
+ return fileName.parentDir().pathAppended("test.cpp");
}
static clang::format::FormatStyle constructStyle(const QByteArray &baseStyle = QByteArray())
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index 4b028f1d81..b179017cfd 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -266,8 +266,8 @@ QStringList relativeDirsList(Utils::FileName currentPath, const Utils::FileName
FolderNode *addChildFolderNode(FolderNode *parent, const QString &childName)
{
- Utils::FileName parentPath = parent->filePath();
- auto node = std::make_unique<FolderNode>(parentPath.appendPath(childName));
+ const Utils::FileName path = parent->filePath().pathAppended(childName);
+ auto node = std::make_unique<FolderNode>(path);
FolderNode *childNode = node.get();
childNode->setDisplayName(childName);
parent->addNode(std::move(node));
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 3b3eed3dd6..096262a783 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -653,8 +653,7 @@ void DebuggerItemManagerPrivate::autoDetectCdbDebuggers()
// Pre Windows SDK 8: Check 'Debugging Tools for Windows'
for (const QFileInfo &fi : dir.entryInfoList({"Debugging Tools for Windows*"},
QDir::Dirs | QDir::NoDotAndDotDot)) {
- FileName filePath = FileName::fromFileInfo(fi);
- filePath.appendPath("cdb.exe");
+ const FileName filePath = FileName::fromFileInfo(fi).pathAppended("cdb.exe");
if (!cdbs.contains(filePath))
cdbs.append(filePath);
}
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index b7c1066ac5..d8e9f8458b 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -488,11 +488,11 @@ void GenericProject::updateDeploymentData()
Utils::FileName deploymentFilePath;
if (activeTarget() && activeTarget()->activeBuildConfiguration()) {
deploymentFilePath = activeTarget()->activeBuildConfiguration()->buildDirectory()
- .appendPath(fileName);
+ .pathAppended(fileName);
}
bool hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString());
if (!hasDeploymentData) {
- deploymentFilePath = projectDirectory().appendPath(fileName);
+ deploymentFilePath = projectDirectory().pathAppended(fileName);
hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString());
}
if (hasDeploymentData) {
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index b28990b714..79622646f0 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -782,14 +782,13 @@ QString GitClient::findRepositoryForDirectory(const QString &directory) const
QFileInfo fileInfo;
FileName parent;
for (FileName dir = FileName::fromString(directory); !dir.isEmpty(); dir = dir.parentDir()) {
- FileName gitName = FileName(dir).appendPath(GIT_DIRECTORY);
+ const FileName gitName = dir.pathAppended(GIT_DIRECTORY);
if (!gitName.exists())
continue; // parent might exist
fileInfo.setFile(gitName.toString());
if (fileInfo.isFile())
return dir.toString();
- gitName.appendPath("config");
- if (gitName.exists())
+ if (gitName.pathAppended("config").exists())
return dir.toString();
}
return QString();
diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp
index 4db5db8aa8..ef5fedda09 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimbuildconfiguration.cpp
@@ -65,9 +65,7 @@ static FileName defaultBuildDirectory(const Kit *k,
return FileName::fromString(buildDirectory);
auto projectDir = FileName::fromString(projectFileInfo.absoluteDir().absolutePath());
- auto result = projectDir.appendPath(buildDirectory);
-
- return result;
+ return projectDir.pathAppended(buildDirectory);
}
NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id)
@@ -128,7 +126,7 @@ BuildConfiguration::BuildType NimBuildConfiguration::buildType() const
FileName NimBuildConfiguration::cacheDirectory() const
{
- return buildDirectory().appendPath(QStringLiteral("nimcache"));
+ return buildDirectory().pathAppended("nimcache");
}
FileName NimBuildConfiguration::outFilePath() const
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 94199bd2f2..6ecf8e8645 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1460,7 +1460,7 @@ QList<ToolChain *> ClangToolChainFactory::autoDetect(const QList<ToolChain *> &a
const FileName compilerPath = FileName::fromString(Core::ICore::clangExecutable(CLANG_BINDIR));
if (!compilerPath.isEmpty()) {
- const FileName clang = compilerPath.parentDir().appendPath(
+ const FileName clang = compilerPath.parentDir().pathAppended(
HostOsInfo::withExecutableSuffix("clang"));
tcs.append(autoDetectToolchains(clang.toString(), DetectVariants::No,
Constants::C_LANGUAGE_ID, Constants::CLANG_TOOLCHAIN_TYPEID,
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index a264d4733e..4e5bb1cb18 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -2019,7 +2019,7 @@ QList<ToolChain *> ClangClToolChainFactory::autoDetect(const QList<ToolChain *>
if (!qtCreatorsClang.isEmpty()) {
qtCreatorsClang = Utils::FileName::fromString(qtCreatorsClang)
.parentDir()
- .appendPath("clang-cl.exe")
+ .pathAppended("clang-cl.exe")
.toString();
results.append(detectClangClToolChainInPath(qtCreatorsClang, alreadyKnown, "", true));
known.append(results);
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 874b38df57..31f986d864 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -219,8 +219,8 @@ bool FlatModel::setData(const QModelIndex &index, const QVariant &value, int rol
Node *node = nodeForIndex(index);
QTC_ASSERT(node, return false);
- Utils::FileName orgFilePath = node->filePath();
- Utils::FileName newFilePath = orgFilePath.parentDir().appendPath(value.toString());
+ const Utils::FileName orgFilePath = node->filePath();
+ const Utils::FileName newFilePath = orgFilePath.parentDir().pathAppended(value.toString());
ProjectExplorerPlugin::renameFile(node, newFilePath.toString());
emit renamed(orgFilePath, newFilePath);
@@ -596,9 +596,7 @@ bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int r
// Some helper functions for the file operations.
const auto targetFilePath = [&targetDir](const QString &sourceFilePath) {
- FileName targetFile = targetDir;
- targetFile.appendPath(QFileInfo(sourceFilePath).fileName());
- return targetFile.toString();
+ return targetDir.pathAppended(QFileInfo(sourceFilePath).fileName()).toString();
};
struct VcsInfo {
View Lorry Controller Status