feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: Ie494f7ae8a96d97c9497b3ef38d774d2cf787b7f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-16 14:49:56 +02:00
parent 3f57cdfba9
commit 1e9636ab8a
12 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangformat/clangformatconfigwidget.cpp
View File

@@ -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);
}

4
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -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())