diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 523ef9ea349..f5a118d673b 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -20,7 +20,7 @@ class QCborContainerPrivate; class Q_CORE_EXPORT QCborMap { public: - typedef QPair value_type; + typedef std::pair value_type; typedef QCborValue key_type; typedef QCborValue mapped_type; typedef qsizetype size_type; @@ -34,9 +34,9 @@ public: public: typedef std::random_access_iterator_tag iterator_category; typedef qsizetype difference_type; - typedef QPair value_type; - typedef QPair reference; - typedef QPair pointer; + typedef std::pair value_type; + typedef std::pair reference; + typedef std::pair pointer; constexpr Iterator() = default; constexpr Iterator(const Iterator &) = default; @@ -94,9 +94,9 @@ public: public: typedef std::random_access_iterator_tag iterator_category; typedef qsizetype difference_type; - typedef QPair value_type; - typedef QPair reference; - typedef QPair pointer; + typedef std::pair value_type; + typedef std::pair reference; + typedef std::pair pointer; constexpr ConstIterator() = default; constexpr ConstIterator(const ConstIterator &) = default; 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 > args) + \fn QJsonObject::QJsonObject(std::initializer_list > 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 > args) +QJsonObject::QJsonObject(std::initializer_list > args) { for (const auto &arg : args) insert(arg.first, arg.second); diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index d7d3fe549bb..64967d4a0ee 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -21,7 +21,7 @@ class Q_CORE_EXPORT QJsonObject public: QJsonObject(); - QJsonObject(std::initializer_list > args); + QJsonObject(std::initializer_list > args); ~QJsonObject();