Qt Designer: Replace QStringLiteral by modern literals

As a drive-by, extend the list of C++ keywords checked for naming.

Pick-to: 6.5
Change-Id: I37b095d0fa29b9c431b7ad11bb5f962a8eeb5d79
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/designer/src/lib/sdk/abstractintegration.cpp b/src/designer/src/lib/sdk/abstractintegration.cpp
index 896d444ab..ee0ff7f45 100644
--- a/src/designer/src/lib/sdk/abstractintegration.cpp
+++ b/src/designer/src/lib/sdk/abstractintegration.cpp
@@ -296,7 +296,7 @@ public:
 
 QDesignerIntegrationPrivate::QDesignerIntegrationPrivate(QDesignerIntegration *qq) :
     q(qq),
-    headerSuffix(QStringLiteral(".h")),
+    headerSuffix(u".h"_s),
     headerLowercase(true),
     m_features(QDesignerIntegrationInterface::DefaultFeature),
     m_resourceFileWatcherBehaviour(QDesignerIntegrationInterface::PromptToReloadResourceFile),
@@ -349,7 +349,7 @@ void QDesignerIntegrationPrivate::initialize()
         QtGradientUtils::restoreState(m_gradientManager, QString::fromLatin1(f.readAll()));
         f.close();
     } else {
-        QFile defaultGradients(QStringLiteral(":/qt-project.org/designer/defaultgradients.xml"));
+        QFile defaultGradients(u":/qt-project.org/designer/defaultgradients.xml"_s);
         if (defaultGradients.open(QIODevice::ReadOnly)) {
             QtGradientUtils::restoreState(m_gradientManager, QString::fromLatin1(defaultGradients.readAll()));
             defaultGradients.close();
@@ -565,12 +565,12 @@ void QDesignerIntegrationPrivate::updateCustomWidgetPlugins()
 static QString fixHelpClassName(const QString &className)
 {
     // ### generalize using the Widget Data Base
-    if (className == QStringLiteral("Line"))
-        return QStringLiteral("QFrame");
-    if (className == QStringLiteral("Spacer"))
-        return QStringLiteral("QSpacerItem");
-    if (className == QStringLiteral("QLayoutWidget"))
-        return QStringLiteral("QLayout");
+    if (className == "Line"_L1)
+        return u"QFrame"_s;
+    if (className == "Spacer"_L1)
+        return u"QSpacerItem"_s;
+    if (className == "QLayoutWidget"_L1)
+        return u"QLayout"_s;
     return className;
 }
 
@@ -604,7 +604,7 @@ QString QDesignerIntegrationPrivate::contextHelpId() const
     }
     QString helpId = fixHelpClassName(className);
     if (!currentPropertyName.isEmpty()) {
-        helpId += QStringLiteral("::");
+        helpId += "::"_L1;
         helpId += currentPropertyName;
     }
     return helpId;