diff options
author | hjk <hjk@qt.io> | 2019-05-17 13:28:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-20 14:37:13 +0000 |
commit | 0595e67c82d718240d40c1f689a0b3d7923e3590 (patch) | |
tree | ccb17bd890ee0a76f0484a9b443e4d813778e66d | |
parent | 7729c81f024973ddf176c5b162ba21e4f9c271b4 (diff) |
More FileName::pathAppended()
Change-Id: Ie20ec34ea9712b3ec49e6233b23cef84c2019f03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
7 files changed, 17 insertions, 20 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 019c35dd423..0d9b1a23289 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1077,9 +1077,7 @@ QProcessEnvironment AndroidConfigurations::toolsEnvironment(const AndroidConfig Utils::FileName jdkLocation = config.openJDKLocation(); if (!jdkLocation.isEmpty()) { env.set("JAVA_HOME", jdkLocation.toUserOutput()); - Utils::FileName binPath = jdkLocation; - binPath.appendPath("bin"); - env.prependOrSetPath(binPath.toUserOutput()); + env.prependOrSetPath(jdkLocation.pathAppended("bin").toUserOutput()); } return env.toProcessEnvironment(); } diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 54bca1e55ed..e103986f469 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -591,9 +591,9 @@ void AndroidRunnerWorker::handleJdbWaiting() auto jdbPath = AndroidConfigurations::currentConfig().openJDKLocation().pathAppended("bin"); if (Utils::HostOsInfo::isWindowsHost()) - jdbPath.appendPath("jdb.exe"); + jdbPath = jdbPath.pathAppended("jdb.exe"); else - jdbPath.appendPath("jdb"); + jdbPath = jdbPath.pathAppended("jdb"); QStringList jdbArgs("-connect"); jdbArgs << QString("com.sun.jdi.SocketAttach:hostname=localhost,port=%1") diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 1d0369f0f39..7af95e64f33 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -243,16 +243,16 @@ static clang::format::FormatStyle constructStyle(const QByteArray &baseStyle = Q void createStyleFileIfNeeded(bool isGlobal) { - Utils::FileName path = isGlobal ? globalPath() : projectPath(); - const QString configFile = path.appendPath(Constants::SETTINGS_FILE_NAME).toString(); + const Utils::FileName path = isGlobal ? globalPath() : projectPath(); + const QString configFile = path.pathAppended(Constants::SETTINGS_FILE_NAME).toString(); if (QFile::exists(configFile)) return; - QDir().mkpath(path.parentDir().toString()); + QDir().mkpath(path.toString()); if (!isGlobal) { const Project *project = SessionManager::startupProject(); - Utils::FileName possibleProjectConfig = project->rootProjectDirectory().appendPath( + Utils::FileName possibleProjectConfig = project->rootProjectDirectory().pathAppended( Constants::SETTINGS_FILE_NAME); if (possibleProjectConfig.exists()) { // Just copy th .clang-format if current project has one. @@ -296,7 +296,7 @@ static clang::format::FormatStyle styleForFile(Utils::FileName fileName, bool ch if (configFile.isEmpty()) { // If no configuration is found create a global one (if it does not yet exist) and use it. createStyleFileIfNeeded(true); - configFile = globalPath().appendPath(Constants::SETTINGS_FILE_NAME).toString(); + configFile = globalPath().pathAppended(Constants::SETTINGS_FILE_NAME).toString(); } fileName = assumedPathForConfig(configFile); @@ -334,23 +334,23 @@ static std::string readFile(const QString &path) std::string currentProjectConfigText() { - const QString configPath = projectPath().appendPath(Constants::SETTINGS_FILE_NAME).toString(); + const QString configPath = projectPath().pathAppended(Constants::SETTINGS_FILE_NAME).toString(); return readFile(configPath); } std::string currentGlobalConfigText() { - const QString configPath = globalPath().appendPath(Constants::SETTINGS_FILE_NAME).toString(); + const QString configPath = globalPath().pathAppended(Constants::SETTINGS_FILE_NAME).toString(); return readFile(configPath); } clang::format::FormatStyle currentProjectStyle() { - return styleForFile(projectPath().appendPath(Constants::SAMPLE_FILE_NAME), false); + return styleForFile(projectPath().pathAppended(Constants::SAMPLE_FILE_NAME), false); } clang::format::FormatStyle currentGlobalStyle() { - return styleForFile(globalPath().appendPath(Constants::SAMPLE_FILE_NAME), false); + return styleForFile(globalPath().pathAppended(Constants::SAMPLE_FILE_NAME), false); } } // namespace ClangFormat diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index 7593057b661..66652dfcbad 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -47,6 +47,7 @@ using namespace ProjectExplorer; using namespace QtSupport; +using namespace Utils; namespace { @@ -232,8 +233,7 @@ QVector<CMakeToolChainData> extractToolChainsFromCache(const CMakeConfig &config QList<void *> CMakeProjectImporter::examineDirectory(const Utils::FileName &importPath) const { qCInfo(cmInputLog()) << "Examining directory:" << importPath.toUserOutput(); - Utils::FileName cacheFile = importPath; - cacheFile.appendPath("CMakeCache.txt"); + const FileName cacheFile = importPath.pathAppended("CMakeCache.txt"); if (!cacheFile.exists()) { qCDebug(cmInputLog()) << cacheFile.toUserOutput() << "does not exist, returning."; diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp index 73d7ea00f34..70440c35973 100644 --- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp +++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp @@ -416,7 +416,7 @@ void TeaLeafReader::extractData() const FileName srcDir = m_parameters.sourceDirectory; const FileName bldDir = m_parameters.workDirectory; - const FileName topCMake = Utils::FileName(srcDir).appendPath("CMakeLists.txt"); + const FileName topCMake = srcDir.pathAppended("CMakeLists.txt"); resetData(); diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index d78a8091bff..2103130455b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1599,8 +1599,7 @@ FileName BaseQtVersion::mkspecFromVersionInfo(const QHash<ProKey, ProString> &ve else qt5 = true; - FileName mkspecFullPath = baseMkspecDir; - mkspecFullPath.appendPath(theSpec); + FileName mkspecFullPath = baseMkspecDir.pathAppended(theSpec); // qDebug() << "default mkspec is located at" << mkspecFullPath; diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp index d8ae7124d6d..ea02a111020 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp +++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp @@ -54,7 +54,7 @@ QString testDataDir = QLatin1String(SRCDIR "/data"); static QmlProjectItem *loadQmlProject(QString name, QString *error) { return QmlProjectFileFormat::parseProjectFile( - Utils::FileName::fromString(testDataDir).appendPath(name + ".qmlproject"), error); + Utils::FileName::fromString(testDataDir).pathAppended(name + ".qmlproject"), error); } void tst_FileFormat::testFileFilter() |