[clang-tidy] Add QtEnabled option to modernize-use-integer-sign-comparison

- rename QtEnabled option to EnableQtSupport

Author: qt-tatiana

clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.cpp

@@ -81,12 +81,12 @@ UseIntegerSignComparisonCheck::UseIntegerSignComparisonCheck(
       IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
                                                utils::IncludeSorter::IS_LLVM),
                       areDiagsSelfContained()),
-      QtFrameworkEnabled(Options.get("QtEnabled", false)) {}
+      EnableQtSupport(Options.get("EnableQtSupport", false)) {}
 
 void UseIntegerSignComparisonCheck::storeOptions(
     ClangTidyOptions::OptionMap &Opts) {
   Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
-  Options.store(Opts, "QtEnabled", QtFrameworkEnabled);
+  Options.store(Opts, "EnableQtSupport", EnableQtSupport);
 }
 
 void UseIntegerSignComparisonCheck::registerMatchers(MatchFinder *Finder) {
@@ -157,15 +157,16 @@ void UseIntegerSignComparisonCheck::check(
       diag(BinaryOp->getBeginLoc(),
            "comparison between 'signed' and 'unsigned' integers");
   std::string CmpNamespace;
-  std::string CmpHeader;
-  if (getLangOpts().CPlusPlus17 && QtFrameworkEnabled) {
-    CmpHeader = "<QtCore/q20utility.h>";
-    CmpNamespace = llvm::Twine("q20::" + parseOpCode(OpCode)).str();
-  }
+  llvm::StringRef CmpHeader;
+
   if (getLangOpts().CPlusPlus20) {
     CmpHeader = "<utility>";
     CmpNamespace = llvm::Twine("std::" + parseOpCode(OpCode)).str();
+  } else if (getLangOpts().CPlusPlus17 && EnableQtSupport) {
+    CmpHeader = "<QtCore/q20utility.h>";
+    CmpNamespace = llvm::Twine("q20::" + parseOpCode(OpCode)).str();
   }
+
   // Prefer modernize-use-integer-sign-comparison when C++20 is available!
   Diag << FixItHint::CreateReplacement(
       CharSourceRange(R1, SubExprLHS != nullptr),

clang-tools-extra/clang-tidy/modernize/UseIntegerSignComparisonCheck.h

@@ -30,12 +30,12 @@ class UseIntegerSignComparisonCheck : public ClangTidyCheck {
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
   bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
-    return LangOpts.CPlusPlus20 || (LangOpts.CPlusPlus17 && QtFrameworkEnabled);
+    return LangOpts.CPlusPlus20 || (LangOpts.CPlusPlus17 && EnableQtSupport);
   }
 
 private:
   utils::IncludeInserter IncludeInserter;
-  const bool QtFrameworkEnabled;
+  const bool EnableQtSupport;
 };
 
 } // namespace clang::tidy::modernize

clang-tools-extra/docs/ReleaseNotes.rst

@@ -303,7 +303,7 @@ Changes in existing checks
 
 - Improved :doc:`modernize-use-integer-sign-comparison
   <clang-tidy/checks/modernize/use-integer-sign-comparison>` check to
-  add an option ``QtEnabled``, that makes C++17 ``q20::cmp_*`` alternative
+  add an option ``EnableQtSupport``, that makes C++17 ``q20::cmp_*`` alternative
   available for Qt-based applications.
 
 - Improved :doc:`modernize-use-nullptr

clang-tools-extra/docs/clang-tidy/checks/modernize/use-integer-sign-comparison.rst

@@ -35,7 +35,7 @@ Options
   A string specifying which include-style is used, `llvm` or `google`.
   Default is `llvm`.
 
-.. option:: QtEnabled
+.. option:: EnableQtSupport
 
   Makes C++17 ``q20::cmp_*`` alternative available for Qt-based
   applications. Default is `false`.

clang-tools-extra/test/clang-tidy/checkers/modernize/use-integer-sign-comparison-qt.cpp

@@ -1,6 +1,6 @@
 // CHECK-FIXES: #include <QtCore/q20utility.h>
 // RUN: %check_clang_tidy -std=c++17 %s modernize-use-integer-sign-comparison %t -- \
-// RUN: -config="{CheckOptions: {modernize-use-integer-sign-comparison.QtEnabled: true}}"
+// RUN: -config="{CheckOptions: {modernize-use-integer-sign-comparison.EnableQtSupport: true}}"
 
 // The code that triggers the check
 #define MAX_MACRO(a, b) (a < b) ? b : a