diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-07 20:10:50 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-12-13 21:54:01 +0100 |
| commit | 95c7f88132646489bc17b8ea32facd76a19e19fa (patch) | |
| tree | 0536fefc4b564a58bc68d53dc038e8349ab65c40 /src/corelib/tools/qarraydatapointer.h | |
| parent | cbb4aea2132fc59cd1086ba42cc221d12b5ce9e8 (diff) | |
QArrayData/Pointer: s/QPair/std::pair/
Also port from qMakePair to just braced initialization and CTAD.
Task-number: QTBUG-115841
Pick-to: 6.7
Change-Id: Ifd7220ae88b101351e91d1488ce18715eb4880e5
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/tools/qarraydatapointer.h')
| -rw-r--r-- | src/corelib/tools/qarraydatapointer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index 3969076e0c8..6657d40cf90 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -47,7 +47,7 @@ public: } Q_NODISCARD_CTOR - explicit QArrayDataPointer(QPair<QTypedArrayData<T> *, T *> adata, qsizetype n = 0) noexcept + explicit QArrayDataPointer(std::pair<QTypedArrayData<T> *, T *> adata, qsizetype n = 0) noexcept : d(adata.first), ptr(adata.second), size(n) { } |