CppEditor: Support wrapping strings in QByteArrayLiteral()

Fixes: QTCREATORBUG-12995
Change-Id: I9c0136b93fcfde0d2326bbd2bd6dbd5e75ae97a8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 19 insertions, 14 deletions

diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 74862772e5..3465066c7f 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -141,7 +141,8 @@ enum DefPos {
 
 inline bool isQtStringLiteral(const QByteArray &id)
 {
-    return id == "QLatin1String" || id == "QLatin1Literal" || id == "QStringLiteral";
+    return id == "QLatin1String" || id == "QLatin1Literal" || id == "QStringLiteral"
+           || id == "QByteArrayLiteral";
 }
 
 inline bool isQtStringTranslation(const QByteArray &id)
@@ -1110,21 +1111,20 @@ enum ActionFlags {
     EncloseInQLatin1CharAction = 0x1,
     EncloseInQLatin1StringAction = 0x2,
     EncloseInQStringLiteralAction = 0x4,
-    EncloseActionMask = EncloseInQLatin1CharAction
-    | EncloseInQLatin1StringAction | EncloseInQStringLiteralAction,
-    TranslateTrAction = 0x8,
-    TranslateQCoreApplicationAction = 0x10,
-    TranslateNoopAction = 0x20,
-    TranslationMask = TranslateTrAction
-    | TranslateQCoreApplicationAction | TranslateNoopAction,
-    RemoveObjectiveCAction = 0x40,
-    ConvertEscapeSequencesToCharAction = 0x100,
-    ConvertEscapeSequencesToStringAction = 0x200,
-    SingleQuoteAction = 0x400,
-    DoubleQuoteAction = 0x800
+    EncloseInQByteArrayLiteralAction = 0x8,
+    EncloseActionMask = EncloseInQLatin1CharAction | EncloseInQLatin1StringAction
+                        | EncloseInQStringLiteralAction | EncloseInQByteArrayLiteralAction,
+    TranslateTrAction = 0x10,
+    TranslateQCoreApplicationAction = 0x20,
+    TranslateNoopAction = 0x40,
+    TranslationMask = TranslateTrAction | TranslateQCoreApplicationAction | TranslateNoopAction,
+    RemoveObjectiveCAction = 0x100,
+    ConvertEscapeSequencesToCharAction = 0x200,
+    ConvertEscapeSequencesToStringAction = 0x400,
+    SingleQuoteAction = 0x800,
+    DoubleQuoteAction = 0x1000
 };
 
-
 /* Convert single-character string literals into character literals with some
  * special cases "a" --> 'a', "'" --> '\'', "\n" --> '\n', "\"" --> '"'. */
 static QByteArray stringToCharEscapeSequences(const QByteArray &content)
@@ -1160,6 +1160,8 @@ static QString stringLiteralReplacement(unsigned actions)
         return QLatin1String("QLatin1String");
     if (actions & EncloseInQStringLiteralAction)
         return QLatin1String("QStringLiteral");
+    if (actions & EncloseInQByteArrayLiteralAction)
+        return QLatin1String("QByteArrayLiteral");
     if (actions & TranslateTrAction)
         return QLatin1String("tr");
     if (actions & TranslateQCoreApplicationAction)
@@ -1350,6 +1352,9 @@ void WrapStringLiteral::doMatch(const CppQuickFixInterface &interface, QuickFixO
         actions = EncloseInQStringLiteralAction | objectiveCActions;
         result << new WrapStringLiteralOp(interface, priority, actions,
                                           msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
+        actions = EncloseInQByteArrayLiteralAction | objectiveCActions;
+        result << new WrapStringLiteralOp(interface, priority, actions,
+                                          msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
     }
 }