diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index 213fd88a1a2..ea439a0f43d 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -26,6 +26,7 @@ #include "clangformatconfigwidget.h" +#include "clangformatconstants.h" #include "clangformatutils.h" #include "ui_clangformatconfigwidget.h" @@ -131,7 +132,7 @@ void ClangFormatConfigWidget::initialize() m_ui->clangFormatOptionsTable->show(); m_ui->applyButton->show(); - if (m_project && !m_project->projectDirectory().appendPath(".clang-format").exists()) { + if (m_project && !m_project->projectDirectory().appendPath(SETTINGS_FILE_NAME).exists()) { m_ui->projectHasClangFormat->setText(tr("No .clang-format file for the project.")); m_ui->clangFormatOptionsTable->hide(); m_ui->applyButton->hide(); @@ -152,7 +153,7 @@ void ClangFormatConfigWidget::initialize() } else { const Project *currentProject = SessionManager::startupProject(); if (!currentProject - || !currentProject->projectDirectory().appendPath(".clang-format").exists()) { + || !currentProject->projectDirectory().appendPath(SETTINGS_FILE_NAME).exists()) { m_ui->projectHasClangFormat->hide(); } else { m_ui->projectHasClangFormat->setText( @@ -184,9 +185,9 @@ void ClangFormatConfigWidget::apply() const QByteArray text = tableToYAML(m_ui->clangFormatOptionsTable); QString filePath; if (m_project) - filePath = m_project->projectDirectory().appendPath(".clang-format").toString(); + filePath = m_project->projectDirectory().appendPath(SETTINGS_FILE_NAME).toString(); else - filePath = Core::ICore::userResourcePath() + "/.clang-format"; + filePath = Core::ICore::userResourcePath() + "/" + SETTINGS_FILE_NAME; QFile file(filePath); if (!file.open(QFile::WriteOnly)) return; diff --git a/src/plugins/clangformat/clangformatconstants.h b/src/plugins/clangformat/clangformatconstants.h index c37332bcee5..1024341c224 100644 --- a/src/plugins/clangformat/clangformatconstants.h +++ b/src/plugins/clangformat/clangformatconstants.h @@ -24,3 +24,7 @@ ****************************************************************************/ #pragma once + +namespace ClangFormat { +static const char SETTINGS_FILE_NAME[] = ".clang-format"; +} diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp index 39ebe5366d3..f0e5f785575 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp @@ -25,6 +25,8 @@ #include "clangformatutils.h" +#include "clangformatconstants.h" + #include #include #include @@ -134,7 +136,7 @@ static clang::format::FormatStyle constructStyle(bool isGlobal) void createStyleFileIfNeeded(Utils::FileName styleConfigPath, bool isGlobal) { - const QString configFile = styleConfigPath.appendPath(".clang-format").toString(); + const QString configFile = styleConfigPath.appendPath(SETTINGS_FILE_NAME).toString(); if (QFile::exists(configFile)) return; @@ -175,7 +177,7 @@ clang::format::FormatStyle currentGlobalStyle() static bool isCurrentStyleGlobal() { Utils::FileName path = projectStylePath(); - if (path.appendPath(".clang-format").exists()) + if (path.appendPath(SETTINGS_FILE_NAME).exists()) return false; return !CppCodeStyleSettings::currentProjectCodeStyle().has_value(); }