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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,12 +169,12 @@ void ClangFormatConfigWidget::initChecksAndPreview()
m_preview->textDocument()->setFontSettings(TextEditor::TextEditorSettings::fontSettings());
m_preview->textDocument()->setSyntaxHighlighter(new CppEditor::CppHighlighter);
Utils::FileName fileName;
Utils::FilePath fileName;
if (m_project) {
connect(m_ui->applyButton, &QPushButton::clicked, this, &ClangFormatConfigWidget::apply);
fileName = m_project->projectFilePath().pathAppended("snippet.cpp");
} else {
fileName = Utils::FileName::fromString(Core::ICore::userResourcePath())
fileName = Utils::FilePath::fromString(Core::ICore::userResourcePath())
.pathAppended("snippet.cpp");
}
m_preview->textDocument()->indenter()->setFileName(fileName);
@@ -241,7 +241,7 @@ void ClangFormatConfigWidget::showGlobalCheckboxes()
static bool projectConfigExists()
{
return Utils::FileName::fromString(Core::ICore::userResourcePath())
return Utils::FilePath::fromString(Core::ICore::userResourcePath())
.pathAppended("clang-format")
.pathAppended(currentProjectUniqueId())
.pathAppended((Constants::SETTINGS_FILE_NAME))