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

ClangFormat: Use the constant for the configuration filename

Browse Source 
It is unlikely that this name changes but let's follow good
coding practices.

Change-Id: I12adbf155f26b1b3a02d07092fcc113e0c5157e6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-13 09:29:09 +01:00
parent 0ee07ae2ad
commit cc118a16e6
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,8 @@
#include "clangformatutils.h"
#include "clangformatconstants.h"
#include <coreplugin/icore.h>
#include <cpptools/cppcodestylesettings.h>
#include <texteditor/tabsettings.h>
@@ -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();
}