Clang: Clean up TidyMode/ClazyMode enumerators

Change-Id: Ie3ff0d629fd3c115df9c527e9ae8d7962fcfa156
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

7 files changed, 27 insertions, 25 deletions

diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index 5bb0d064973..c23ab56e956 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -155,7 +155,7 @@ bool isDiagnosticConfigChangable(ProjectExplorer::Project *project,
     const QSharedPointer<CppCodeModelSettings> globalSettings = codeModelSettings();
     const ClangDiagnosticConfig config = diagnosticConfig(projectSettings, *globalSettings);
 
-    if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::File
+    if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::UseConfigFile
         && diagnosticType(diagnostic) == DiagnosticType::Tidy) {
         return false;
     }
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
index cd8af27e85c..dcee2bd15c9 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -76,9 +76,9 @@ static QStringList tidyChecksArguments(const ClangDiagnosticConfig diagnosticCon
 {
     const ClangDiagnosticConfig::TidyMode tidyMode = diagnosticConfig.clangTidyMode();
     // The argument "-config={}" stops stating/evaluating the .clang-tidy file.
-    if (tidyMode == ClangDiagnosticConfig::TidyMode::Default)
+    if (tidyMode == ClangDiagnosticConfig::TidyMode::UseDefaultChecks)
         return {"-config={}"};
-    if (tidyMode == ClangDiagnosticConfig::TidyMode::ChecksPrefixList)
+    if (tidyMode == ClangDiagnosticConfig::TidyMode::UseCustomChecks)
         return {"-config={}", "-checks=" + diagnosticConfig.clangTidyChecks()};
     return {};
 }
diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp
index 446bbf8de3f..1158cf0a44f 100644
--- a/src/plugins/clangtools/clangtoolsunittests.cpp
+++ b/src/plugins/clangtools/clangtoolsunittests.cpp
@@ -87,7 +87,7 @@ static ClangDiagnosticConfig configFor(const QString &tidyChecks,
     config.setDisplayName("Test");
     config.setIsReadOnly(true);
     config.setClangOptions(QStringList{QStringLiteral("-Wno-everything")});
-    config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList);
+    config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
     const QString theTidyChecks = tidyChecks.isEmpty() ? tidyChecks : "-*," + tidyChecks;
     config.setClangTidyChecks(theTidyChecks);
     config.setClazyChecks(clazyChecks);
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index 9f0bf65e203..fed839d1166 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -173,8 +173,8 @@ static void addBuiltinConfigs(ClangDiagnosticConfigsModel &model)
                                                       "Default Clang-Tidy and Clazy checks"));
     config.setIsReadOnly(true);
     config.setClangOptions({"-w"}); // Do not emit any clang-only warnings
-    config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::Default);
-    config.setClazyMode(ClangDiagnosticConfig::ClazyMode::Default);
+    config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseDefaultChecks);
+    config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseDefaultChecks);
 
     model.appendOrUpdate(config);
 }
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp
index dfaf74cf05f..8d4f869f3fe 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.cpp
+++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp
@@ -814,13 +814,13 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig &
 
     const ClangDiagnosticConfig::TidyMode tidyMode = config.clangTidyMode();
     switch (tidyMode) {
-    case ClangDiagnosticConfig::TidyMode::File:
+    case ClangDiagnosticConfig::TidyMode::UseConfigFile:
         m_tidyChecks->tidyMode->setCurrentIndex(1);
         m_tidyChecks->plainTextEditButton->setVisible(false);
         m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage);
         break;
-    case ClangDiagnosticConfig::TidyMode::ChecksPrefixList:
-    case ClangDiagnosticConfig::TidyMode::Default:
+    case ClangDiagnosticConfig::TidyMode::UseCustomChecks:
+    case ClangDiagnosticConfig::TidyMode::UseDefaultChecks:
         m_tidyChecks->tidyMode->setCurrentIndex(0);
         if (m_tidyInfo.supportedChecks.isEmpty()) {
             m_tidyChecks->plainTextEditButton->setVisible(false);
@@ -856,7 +856,8 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
     m_clazyChecks->stackedWidget->setCurrentIndex(ClazyPages::ChecksPage);
 
     disconnectClazyItemChanged();
-    const QStringList checkNames = config.clazyMode() == ClangDiagnosticConfig::ClazyMode::Default
+    const QStringList checkNames = config.clazyMode()
+                                           == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks
                                        ? m_clazyInfo.defaultChecks
                                        : config.clazyChecks().split(',', QString::SkipEmptyParts);
     m_clazyTreeModel->enableChecks(checkNames);
@@ -875,7 +876,8 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
 
 void DiagnosticConfigsWidget::syncTidyChecksToTree(const ClangDiagnosticConfig &config)
 {
-    const QString checks = config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::Default
+    const QString checks = config.clangTidyMode()
+                                   == ClangDiagnosticConfig::TidyMode::UseDefaultChecks
                                ? m_tidyInfo.defaultChecks.join(',')
                                : config.clangTidyChecks();
     m_tidyTreeModel->selectChecks(checks);
@@ -922,8 +924,8 @@ void DiagnosticConfigsWidget::disconnectClazyItemChanged()
 void DiagnosticConfigsWidget::onClangTidyModeChanged(int index)
 {
     const ClangDiagnosticConfig::TidyMode tidyMode
-        = index == 0 ? ClangDiagnosticConfig::TidyMode::ChecksPrefixList
-                     : ClangDiagnosticConfig::TidyMode::File;
+        = index == 0 ? ClangDiagnosticConfig::TidyMode::UseCustomChecks
+                     : ClangDiagnosticConfig::TidyMode::UseConfigFile;
 
     ClangDiagnosticConfig config = currentConfig();
     config.setClangTidyMode(tidyMode);
@@ -934,8 +936,8 @@ void DiagnosticConfigsWidget::onClangTidyModeChanged(int index)
 void DiagnosticConfigsWidget::onClangTidyTreeChanged()
 {
     ClangDiagnosticConfig config = currentConfig();
-    if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::Default)
-        config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::ChecksPrefixList);
+    if (config.clangTidyMode() == ClangDiagnosticConfig::TidyMode::UseDefaultChecks)
+        config.setClangTidyMode(ClangDiagnosticConfig::TidyMode::UseCustomChecks);
     config.setClangTidyChecks(m_tidyTreeModel->selectedChecks());
     updateConfig(config);
 }
@@ -945,8 +947,8 @@ void DiagnosticConfigsWidget::onClazyTreeChanged()
     syncClazyChecksGroupBox();
 
     ClangDiagnosticConfig config = currentConfig();
-    if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::Default)
-        config.setClazyMode(ClangDiagnosticConfig::ClazyMode::SpecifiedChecks);
+    if (config.clazyMode() == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks)
+        config.setClazyMode(ClangDiagnosticConfig::ClazyMode::UseCustomChecks);
     config.setClazyChecks(m_clazyTreeModel->enabledChecks().join(","));
     updateConfig(config);
 }
diff --git a/src/plugins/cpptools/clangdiagnosticconfig.cpp b/src/plugins/cpptools/clangdiagnosticconfig.cpp
index 51cf1253667..32ef607b1a7 100644
--- a/src/plugins/cpptools/clangdiagnosticconfig.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfig.cpp
@@ -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));
diff --git a/src/plugins/cpptools/clangdiagnosticconfig.h b/src/plugins/cpptools/clangdiagnosticconfig.h
index da10a01c281..c0cf48cdec3 100644
--- a/src/plugins/cpptools/clangdiagnosticconfig.h
+++ b/src/plugins/cpptools/clangdiagnosticconfig.h
@@ -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;
 };