From 91050d376fb07dbb8f26922cf722d0acb8203999 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 7 Dec 2023 15:23:37 +0100
Subject: [PATCH] Make a few things C++-20 compatible

Change-Id: Ie9756a996efe435d1b6f493a0687d063b3287423
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .../axivion/dashboard/dashboardclient.cpp     | 12 ++++-----
 .../perfprofilerflamegraphmodel.cpp           |  1 +
 .../propertyeditor/gradientmodel.cpp          | 26 +++++++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/plugins/axivion/dashboard/dashboardclient.cpp b/src/plugins/axivion/dashboard/dashboardclient.cpp
index 6dc2b9cb590..34942de78d5 100644
--- a/src/plugins/axivion/dashboard/dashboardclient.cpp
+++ b/src/plugins/axivion/dashboard/dashboardclient.cpp
@@ -23,7 +23,7 @@ namespace Axivion::Internal
 {
 
 Credential::Credential(const QString &apiToken)
-    : m_authorizationValue(QByteArrayLiteral(u8"AxToken ") + apiToken.toUtf8())
+    : m_authorizationValue(QByteArrayLiteral("AxToken ") + apiToken.toUtf8())
 {
 }
 
@@ -167,15 +167,15 @@ static void fetch(QPromise<ResponseData> promise,
                   Credential credential)
 {
     QNetworkRequest request{ url };
-    request.setRawHeader(QByteArrayLiteral(u8"Accept"),
+    request.setRawHeader(QByteArrayLiteral("Accept"),
                          QByteArray(jsonContentType.data(), jsonContentType.size()));
-    request.setRawHeader(QByteArrayLiteral(u8"Authorization"),
+    request.setRawHeader(QByteArrayLiteral("Authorization"),
                          credential.authorizationValue());
-    QByteArray ua = QByteArrayLiteral(u8"Axivion")
+    QByteArray ua = QByteArrayLiteral("Axivion")
                     + QCoreApplication::applicationName().toUtf8()
-                    + QByteArrayLiteral(u8"Plugin/")
+                    + QByteArrayLiteral("Plugin/")
                     + QCoreApplication::applicationVersion().toUtf8();
-    request.setRawHeader(QByteArrayLiteral(u8"X-Axivion-User-Agent"), ua);
+    request.setRawHeader(QByteArrayLiteral("X-Axivion-User-Agent"), ua);
     QNetworkReply *reply = clientData->networkAccessManager.get(request);
     QObject::connect(reply,
                      &QNetworkReply::finished,
diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
index 48a2d38142d..09b6879be91 100644
--- a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
+++ b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
@@ -16,6 +16,7 @@ namespace Internal {
 class Payload
 {
 public:
+    Payload() = default;
     Payload(const PerfProfilerFlameGraphData *parent, PerfProfilerFlameGraphModel::Data *data,
             uint numSamples)
         : m_parent(parent), m_data(data), m_numSamples(numSamples)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
index cadca2fd604..53af36c7ae1 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
@@ -125,21 +125,21 @@ public:
     }
 };
 
-constexpr QmlDesigner::PropertyNameView linearX1Str = u8"x1";
-constexpr QmlDesigner::PropertyNameView linearX2Str = u8"x2";
-constexpr QmlDesigner::PropertyNameView linearY1Str = u8"y1";
-constexpr QmlDesigner::PropertyNameView linearY2Str = u8"y2";
+constexpr QmlDesigner::PropertyNameView linearX1Str = "x1";
+constexpr QmlDesigner::PropertyNameView linearX2Str = "x2";
+constexpr QmlDesigner::PropertyNameView linearY1Str = "y1";
+constexpr QmlDesigner::PropertyNameView linearY2Str = "y2";
 
-constexpr QmlDesigner::PropertyNameView radialCenterRadiusStr = u8"centerRadius";
-constexpr QmlDesigner::PropertyNameView radialCenterXStr = u8"centerX";
-constexpr QmlDesigner::PropertyNameView radialCenterYStr = u8"centerY";
-constexpr QmlDesigner::PropertyNameView radialFocalRadiusStr = u8"focalRadius";
-constexpr QmlDesigner::PropertyNameView radialFocalXStr = u8"focalX";
-constexpr QmlDesigner::PropertyNameView radialFocalYStr = u8"focalY";
+constexpr QmlDesigner::PropertyNameView radialCenterRadiusStr = "centerRadius";
+constexpr QmlDesigner::PropertyNameView radialCenterXStr = "centerX";
+constexpr QmlDesigner::PropertyNameView radialCenterYStr = "centerY";
+constexpr QmlDesigner::PropertyNameView radialFocalRadiusStr = "focalRadius";
+constexpr QmlDesigner::PropertyNameView radialFocalXStr = "focalX";
+constexpr QmlDesigner::PropertyNameView radialFocalYStr = "focalY";
 
-constexpr QmlDesigner::PropertyNameView conicalAngleStr = u8"angle";
-constexpr QmlDesigner::PropertyNameView conicalCenterXStr = u8"centerX";
-constexpr QmlDesigner::PropertyNameView conicalCenterYStr = u8"centerY";
+constexpr QmlDesigner::PropertyNameView conicalAngleStr = "angle";
+constexpr QmlDesigner::PropertyNameView conicalCenterXStr = "centerX";
+constexpr QmlDesigner::PropertyNameView conicalCenterYStr = "centerY";
 
 constexpr ShapeGradientPropertyData defaultLinearShapeGradients[] = {
     {linearX1Str,