diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-12 10:06:19 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-12-13 21:54:01 +0100 |
| commit | 4be8755151e3433357de6479d5c70582f83485e6 (patch) | |
| tree | ada1b17604b8d0a2778cb6ac1a149c73bedf633c /src/corelib/serialization/qjsonobject.cpp | |
| parent | b6fdef44e46b97cf4dc5fee750f50054c65bf5ef (diff) | |
QCbor/QJson: s/QPair/std::pair/
Also port qMakePair() to just braced initialization and CTAD.
Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: I9eafb20ebc63bd33eb52661f4f14ad2db9fc0f00
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/serialization/qjsonobject.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsonobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index 14d26165055..77bcba01f8c 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE QJsonObject::QJsonObject() = default; /*! - \fn QJsonObject::QJsonObject(std::initializer_list<QPair<QString, QJsonValue> > args) + \fn QJsonObject::QJsonObject(std::initializer_list<std::pair<QString, QJsonValue> > args) \since 5.4 Constructs a QJsonObject instance initialized from \a args initialization list. For example: @@ -111,7 +111,7 @@ QJsonObject::QJsonObject(QCborContainerPrivate *object) */ QJsonObject::~QJsonObject() = default; -QJsonObject::QJsonObject(std::initializer_list<QPair<QString, QJsonValue> > args) +QJsonObject::QJsonObject(std::initializer_list<std::pair<QString, QJsonValue> > args) { for (const auto &arg : args) insert(arg.first, arg.second); |