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

Clang: Clean up TidyMode/ClazyMode enumerators

Browse Source 
Change-Id: Ie3ff0d629fd3c115df9c527e9ae8d7962fcfa156
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-24 11:31:42 +02:00
parent 7d851c12ed
commit dcb35676df
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList());
const int tidyModeValue = s->value(diagnosticConfigsTidyModeKey).toInt();
if (tidyModeValue == 0) { // Convert from settings of <= Qt Creator 4.10
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList);
config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
config.setClangTidyChecks("-*");
} else {
config.setClangTidyMode(static_cast<ClangDiagnosticConfig::TidyMode>(tidyModeValue));

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

@@ -61,9 +61,9 @@ public:
enum class TidyMode
{
// Disabled, // Used by Qt Creator 4.10 and below.
ChecksPrefixList = 1,
File,
Default,
UseCustomChecks = 1,
UseConfigFile,
UseDefaultChecks,
};
TidyMode clangTidyMode() const;
void setClangTidyMode(TidyMode mode);
@@ -74,8 +74,8 @@ public:
// Clazy
enum class ClazyMode
{
Default,
SpecifiedChecks,
UseDefaultChecks,
UseCustomChecks,
};
ClazyMode clazyMode() const;
void setClazyMode(const ClazyMode &clazyMode);
@@ -90,10 +90,10 @@ private:
Core::Id m_id;
QString m_displayName;
QStringList m_clangOptions;
TidyMode m_clangTidyMode = TidyMode::Default;
TidyMode m_clangTidyMode = TidyMode::UseDefaultChecks;
QString m_clangTidyChecks;
QString m_clazyChecks;
ClazyMode m_clazyMode = ClazyMode::Default;
ClazyMode m_clazyMode = ClazyMode::UseDefaultChecks;
bool m_isReadOnly = false;
bool m_useBuildSystemWarnings = false;
};