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

ClangTools: Remove pointless "Disable" setting for clang-tidy

Browse Source 
...as unchecking the root item in the tree has the same effect.

Change-Id: I960ea2c09a71dad3b0ba3dfb38a19055653354cd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-24 10:25:52 +02:00
parent 0d7a30cdfe
commit 7d851c12ed
6 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cpptools/clangdiagnosticconfig.cpp
View File

@@ -190,10 +190,14 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
config.setId(Core::Id::fromSetting(s->value(diagnosticConfigIdKey)));
config.setDisplayName(s->value(diagnosticConfigDisplayNameKey).toString());
config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList());
config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(
s->value(diagnosticConfigsTidyModeKey).toInt()));
config.setClangTidyChecks(
s->value(diagnosticConfigsTidyChecksKey).toString());
const int tidyModeValue = s->value(diagnosticConfigsTidyModeKey).toInt();
if (tidyModeValue == 0) { // Convert from settings of <= Qt Creator 4.10
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList);
config.setClangTidyChecks("-*");
} else {
config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(tidyModeValue));
config.setClangTidyChecks(s->value(diagnosticConfigsTidyChecksKey).toString());
}
config.setClazyMode(static_cast<ClangDiagnosticConfig::ClazyMode>(
s->value(diagnosticConfigsClazyModeKey).toInt()));

6
src/plugins/cpptools/clangdiagnosticconfig.h
View File

@@ -60,8 +60,8 @@ public:
// Clang-Tidy
enum class TidyMode
{
Disabled,
ChecksPrefixList,
// Disabled, // Used by Qt Creator 4.10 and below.
ChecksPrefixList = 1,
File,
Default,
};
@@ -90,7 +90,7 @@ private:
Core::Id m_id;
QString m_displayName;
QStringList m_clangOptions;
TidyMode m_clangTidyMode = TidyMode::Disabled;
TidyMode m_clangTidyMode = TidyMode::Default;
QString m_clangTidyChecks;
QString m_clazyChecks;
ClazyMode m_clazyMode = ClazyMode::Default;