feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make a few things C++-20 compatible

Browse Source 
Change-Id: Ie9756a996efe435d1b6f493a0687d063b3287423
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-12-07 15:23:37 +01:00
parent 3ee8be9a54
commit 91050d376f
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/axivion/dashboard/dashboardclient.cpp
View File

@@ -23,7 +23,7 @@ namespace Axivion::Internal
{ {
Credential::Credential(const QString &apiToken) 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) Credential credential)
{ {
QNetworkRequest request{ url }; QNetworkRequest request{ url };
request.setRawHeader(QByteArrayLiteral(u8"Accept"), request.setRawHeader(QByteArrayLiteral("Accept"),
QByteArray(jsonContentType.data(), jsonContentType.size())); QByteArray(jsonContentType.data(), jsonContentType.size()));
request.setRawHeader(QByteArrayLiteral(u8"Authorization"), request.setRawHeader(QByteArrayLiteral("Authorization"),
credential.authorizationValue()); credential.authorizationValue());
QByteArray ua = QByteArrayLiteral(u8"Axivion") QByteArray ua = QByteArrayLiteral("Axivion")
+ QCoreApplication::applicationName().toUtf8() + QCoreApplication::applicationName().toUtf8()
+ QByteArrayLiteral(u8"Plugin/") + QByteArrayLiteral("Plugin/")
+ QCoreApplication::applicationVersion().toUtf8(); + 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); QNetworkReply *reply = clientData->networkAccessManager.get(request);
QObject::connect(reply, QObject::connect(reply,
&QNetworkReply::finished, &QNetworkReply::finished,

1
src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
View File

@@ -16,6 +16,7 @@ namespace Internal {
class Payload class Payload
{ {
public: public:
Payload() = default;
Payload(const PerfProfilerFlameGraphData *parent, PerfProfilerFlameGraphModel::Data *data, Payload(const PerfProfilerFlameGraphData *parent, PerfProfilerFlameGraphModel::Data *data,
uint numSamples) uint numSamples)
: m_parent(parent), m_data(data), m_numSamples(numSamples) : m_parent(parent), m_data(data), m_numSamples(numSamples)

26
src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
View File

@@ -125,21 +125,21 @@ public:
} }
}; };
constexpr QmlDesigner::PropertyNameView linearX1Str = u8"x1"; constexpr QmlDesigner::PropertyNameView linearX1Str = "x1";
constexpr QmlDesigner::PropertyNameView linearX2Str = u8"x2"; constexpr QmlDesigner::PropertyNameView linearX2Str = "x2";
constexpr QmlDesigner::PropertyNameView linearY1Str = u8"y1"; constexpr QmlDesigner::PropertyNameView linearY1Str = "y1";
constexpr QmlDesigner::PropertyNameView linearY2Str = u8"y2"; constexpr QmlDesigner::PropertyNameView linearY2Str = "y2";
constexpr QmlDesigner::PropertyNameView radialCenterRadiusStr = u8"centerRadius"; constexpr QmlDesigner::PropertyNameView radialCenterRadiusStr = "centerRadius";
constexpr QmlDesigner::PropertyNameView radialCenterXStr = u8"centerX"; constexpr QmlDesigner::PropertyNameView radialCenterXStr = "centerX";
constexpr QmlDesigner::PropertyNameView radialCenterYStr = u8"centerY"; constexpr QmlDesigner::PropertyNameView radialCenterYStr = "centerY";
constexpr QmlDesigner::PropertyNameView radialFocalRadiusStr = u8"focalRadius"; constexpr QmlDesigner::PropertyNameView radialFocalRadiusStr = "focalRadius";
constexpr QmlDesigner::PropertyNameView radialFocalXStr = u8"focalX"; constexpr QmlDesigner::PropertyNameView radialFocalXStr = "focalX";
constexpr QmlDesigner::PropertyNameView radialFocalYStr = u8"focalY"; constexpr QmlDesigner::PropertyNameView radialFocalYStr = "focalY";
constexpr QmlDesigner::PropertyNameView conicalAngleStr = u8"angle"; constexpr QmlDesigner::PropertyNameView conicalAngleStr = "angle";
constexpr QmlDesigner::PropertyNameView conicalCenterXStr = u8"centerX"; constexpr QmlDesigner::PropertyNameView conicalCenterXStr = "centerX";
constexpr QmlDesigner::PropertyNameView conicalCenterYStr = u8"centerY"; constexpr QmlDesigner::PropertyNameView conicalCenterYStr = "centerY";
constexpr ShapeGradientPropertyData defaultLinearShapeGradients[] = { constexpr ShapeGradientPropertyData defaultLinearShapeGradients[] = {
{linearX1Str, {linearX1Str,