forked from qt-creator/qt-creator
Clang: Use the tree instead of the list for Clang-Tidy settings
List of checks does not give enough flexibility to select/unselect specific checks. The tree fixes that. Also remove Clang-Tidy checks line edit because it is now integrated into the tree mode as an alternative way of providing checks by pressing "Plain text edit" button. 'cpptools_clangtidychecks.h' is generated using python script 'generateClangTidyChecks.py' and clang-tidy from our LLVM/Clang 6.0 build. Change-Id: I2ed1738cb2cbbf8dac6aba563469f06f69b11593 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
@@ -55,12 +55,9 @@ static QString clangDiagnosticConfigsArrayDisplayNameKey()
|
||||
static QString clangDiagnosticConfigsArrayWarningsKey()
|
||||
{ return QLatin1String("diagnosticOptions"); }
|
||||
|
||||
static QString clangDiagnosticConfigsArrayClangTidyChecksPrefixesKey()
|
||||
static QString clangDiagnosticConfigsArrayClangTidyChecksKey()
|
||||
{ return QLatin1String("clangTidyChecks"); }
|
||||
|
||||
static QString clangDiagnosticConfigsArrayClangTidyChecksStringKey()
|
||||
{ return QLatin1String("clangTidyChecksString"); }
|
||||
|
||||
static QString clangDiagnosticConfigsArrayClangTidyModeKey()
|
||||
{ return QLatin1String("clangTidyMode"); }
|
||||
|
||||
@@ -96,10 +93,8 @@ static ClangDiagnosticConfigs customDiagnosticConfigsFromSettings(QSettings *s)
|
||||
config.setClangOptions(s->value(clangDiagnosticConfigsArrayWarningsKey()).toStringList());
|
||||
config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(
|
||||
s->value(clangDiagnosticConfigsArrayClangTidyModeKey()).toInt()));
|
||||
config.setClangTidyChecksPrefixes(
|
||||
s->value(clangDiagnosticConfigsArrayClangTidyChecksPrefixesKey()).toString());
|
||||
config.setClangTidyChecksString(
|
||||
s->value(clangDiagnosticConfigsArrayClangTidyChecksStringKey()).toString());
|
||||
config.setClangTidyChecks(
|
||||
s->value(clangDiagnosticConfigsArrayClangTidyChecksKey()).toString());
|
||||
config.setClazyChecks(s->value(clangDiagnosticConfigsArrayClazyChecksKey()).toString());
|
||||
configs.append(config);
|
||||
}
|
||||
@@ -157,10 +152,8 @@ void CppCodeModelSettings::toSettings(QSettings *s)
|
||||
s->setValue(clangDiagnosticConfigsArrayWarningsKey(), config.clangOptions());
|
||||
s->setValue(clangDiagnosticConfigsArrayClangTidyModeKey(),
|
||||
static_cast<int>(config.clangTidyMode()));
|
||||
s->setValue(clangDiagnosticConfigsArrayClangTidyChecksPrefixesKey(),
|
||||
config.clangTidyChecksPrefixes());
|
||||
s->setValue(clangDiagnosticConfigsArrayClangTidyChecksStringKey(),
|
||||
config.clangTidyChecksString());
|
||||
s->setValue(clangDiagnosticConfigsArrayClangTidyChecksKey(),
|
||||
config.clangTidyChecks());
|
||||
s->setValue(clangDiagnosticConfigsArrayClazyChecksKey(), config.clazyChecks());
|
||||
}
|
||||
s->endArray();
|
||||
|
||||
Reference in New Issue
Block a user