summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/utils/fileutils.cpp13
-rw-r--r--src/libs/utils/fileutils.h3
-rw-r--r--src/libs/utils/settingsaccessor.cpp11
-rw-r--r--src/plugins/android/androidmanager.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp3
-rw-r--r--src/plugins/projectexplorer/userfileaccessor.cpp19
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp10
-rw-r--r--src/tools/sdktool/settings.cpp3
8 files changed, 27 insertions, 41 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index a8b2df721c..e95051488a 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -855,16 +855,11 @@ FileName &FileName::appendPath(const QString &s)
return *this;
}
-FileName &FileName::appendString(const QString &str)
+FileName FileName::stringAppended(const QString &str) const
{
- m_data.append(str);
- return *this;
-}
-
-FileName &FileName::appendString(QChar str)
-{
- m_data.append(str);
- return *this;
+ FileName fn = *this;
+ fn.m_data.append(str);
+ return fn;
}
uint FileName::hash(uint seed) const
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index 782cc23fa2..7bcb9e9a29 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -94,8 +94,7 @@ public:
FileName relativeChildPath(const FileName &parent) const;
FileName &appendPath(const QString &s);
- FileName &appendString(const QString &str);
- FileName &appendString(QChar str);
+ FileName stringAppended(const QString &str) const;
void clear() { m_data.clear(); }
bool isEmpty() const { return m_data.isEmpty(); }
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 662ad4bd43..2499597db0 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -244,9 +244,7 @@ BackUpStrategy::backupName(const QVariantMap &oldData, const FileName &path, con
{
if (oldData == data)
return nullopt;
- FileName backup = path;
- backup.appendString(".bak");
- return backup;
+ return path.stringAppended(".bak");
}
BackingUpSettingsAccessor::BackingUpSettingsAccessor(const QString &docType,
@@ -370,13 +368,14 @@ VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FileName &
const int oldVersion = versionFromMap(oldData);
if (!oldEnvironmentId.isEmpty() && oldEnvironmentId != m_accessor->settingsId())
- backupName.appendString('.' + QString::fromLatin1(oldEnvironmentId).mid(1, 7));
+ backupName = backupName.stringAppended
+ ('.' + QString::fromLatin1(oldEnvironmentId).mid(1, 7));
if (oldVersion != m_accessor->currentVersion()) {
VersionUpgrader *upgrader = m_accessor->upgrader(oldVersion);
if (upgrader)
- backupName.appendString('.' + upgrader->backupExtension());
+ backupName = backupName.stringAppended('.' + upgrader->backupExtension());
else
- backupName.appendString('.' + QString::number(oldVersion));
+ backupName = backupName.stringAppended('.' + QString::number(oldVersion));
}
if (backupName == path)
return nullopt;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 6a45bd6d45..d6694e4cb0 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -286,9 +286,9 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target)
settings["useLLVM"] = true;
settings["ndk-host"] = AndroidConfigurations::currentConfig().toolchainHost();
settings["stdcpp-path"] = AndroidConfigurations::currentConfig().ndkLocation()
- .appendPath("/sources/cxx-stl/llvm-libc++/libs/")
- .appendString(targetArch(target))
- .appendPath("libc++_shared.so").toString();
+ .appendPath("/sources/cxx-stl/llvm-libc++/libs/"
+ + targetArch(target)
+ + "/libc++_shared.so").toString();
return settings;
}
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 95714140f2..261f7cd41a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -204,8 +204,7 @@ const QList<BuildTargetInfo> CMakeBuildConfiguration::appTargets() const
BuildTargetInfo bti;
bti.displayName = ct.title;
bti.targetFilePath = ct.executable;
- bti.projectFilePath = ct.sourceDirectory;
- bti.projectFilePath.appendString('/');
+ bti.projectFilePath = ct.sourceDirectory.stringAppended("/");
bti.workingDirectory = ct.workingDirectory;
bti.buildKey = CMakeTargetNode::generateId(ct.sourceDirectory, ct.title);
appTargetList.append(bti);
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 8fbe8c9fc2..2a4924fd24 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -242,17 +242,16 @@ static QString makeRelative(QString path)
// Return complete file path of the .user file.
static FileName externalUserFilePath(const Utils::FileName &projectFilePath, const QString &suffix)
{
- FileName result;
static const optional<QString> externalUserFileDir = defineExternalUserFileDir();
if (externalUserFileDir) {
// Recreate the relative project file hierarchy under the shared directory.
// PersistentSettingsWriter::write() takes care of creating the path.
- result = FileName::fromString(externalUserFileDir.value());
- result.appendString('/' + makeRelative(projectFilePath.toString()));
- result.appendString(suffix);
+ return FileName::fromString(externalUserFileDir.value()
+ + '/' + makeRelative(projectFilePath.toString())
+ + suffix);
}
- return result;
+ return {};
}
} // namespace
@@ -388,9 +387,8 @@ QVariant UserFileAccessor::retrieveSharedSettings() const
FileName UserFileAccessor::projectUserFile() const
{
static const QString qtcExt = QLatin1String(qgetenv("QTC_EXTENSION"));
- FileName projectUserFile = m_project->projectFilePath();
- projectUserFile.appendString(generateSuffix(qtcExt.isEmpty() ? FILE_EXTENSION_STR : qtcExt));
- return projectUserFile;
+ return m_project->projectFilePath()
+ .stringAppended(generateSuffix(qtcExt.isEmpty() ? FILE_EXTENSION_STR : qtcExt));
}
FileName UserFileAccessor::externalUserFile() const
@@ -403,9 +401,8 @@ FileName UserFileAccessor::externalUserFile() const
FileName UserFileAccessor::sharedFile() const
{
static const QString qtcExt = QLatin1String(qgetenv("QTC_SHARED_EXTENSION"));
- FileName sharedFile = m_project->projectFilePath();
- sharedFile.appendString(generateSuffix(qtcExt.isEmpty() ? ".shared" : qtcExt));
- return sharedFile;
+ return m_project->projectFilePath()
+ .stringAppended(generateSuffix(qtcExt.isEmpty() ? ".shared" : qtcExt));
}
QVariantMap UserFileAccessor::postprocessMerge(const QVariantMap &main,
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index b6790642a5..0070c14bf7 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -1941,12 +1941,10 @@ FileNameList QmakeProFile::generatedFiles(const FileName &buildDir,
return { };
FileName location = buildDir;
location.appendPath(sourceFile.toFileInfo().completeBaseName());
- FileName header = location;
- header.appendString(singleVariableValue(Variable::HeaderExtension));
- FileName cpp = location;
- cpp.appendString(singleVariableValue(Variable::CppExtension));
-
- return { header, cpp };
+ return {
+ location.stringAppended(singleVariableValue(Variable::HeaderExtension)),
+ location.stringAppended(singleVariableValue(Variable::CppExtension))
+ };
}
return { };
}
diff --git a/src/tools/sdktool/settings.cpp b/src/tools/sdktool/settings.cpp
index e4c74cc19e..3c567afd0c 100644
--- a/src/tools/sdktool/settings.cpp
+++ b/src/tools/sdktool/settings.cpp
@@ -71,6 +71,5 @@ Utils::FileName Settings::getPath(const QString &file)
result.appendPath(lowerFile);
else
result.appendPath(file); // handle arbitrary file names not known yet
- result.appendString(".xml");
- return result;
+ return result.stringAppended(".xml");
}
View Lorry Controller Status