diff options
author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-08-13 12:23:20 +0200 |
---|---|---|
committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-08-14 13:40:42 +0200 |
commit | 23f1c1713ac161d62e330f98b03472be59def5b2 (patch) | |
tree | 2310a500ccafd858ec11ee41f4a126800239fb72 | |
parent | ed27157ca9a2c482bcfc79cf1f6f0e496b6a947c (diff) |
qmllistcompositor_p.h: Fix deprecated-copy error
Pick-to: dev
Fixes: QTBUG-86025
Change-Id: I83ce650e788aecdf4bebfc6a6a4331554f2c6be5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | src/qmlmodels/qqmllistcompositor_p.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/qmlmodels/qqmllistcompositor_p.h b/src/qmlmodels/qqmllistcompositor_p.h index 172040559c..6639726850 100644 --- a/src/qmlmodels/qqmllistcompositor_p.h +++ b/src/qmlmodels/qqmllistcompositor_p.h @@ -117,7 +117,7 @@ public: { public: inline iterator(); - inline iterator(const iterator &it); + inline iterator(const iterator &it) = default; inline iterator(Range *range, int offset, Group group, int groupCount); inline ~iterator() {} @@ -132,6 +132,7 @@ public: Range *operator ->() { return range; } const Range *operator ->() const { return range; } + iterator &operator=(const iterator &) = default; iterator &operator +=(int difference); template<typename T> T *list() const { return static_cast<T *>(range->list); } @@ -309,16 +310,6 @@ Q_DECLARE_TYPEINFO(QQmlListCompositor::Remove, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(QQmlListCompositor::Insert, Q_PRIMITIVE_TYPE); inline QQmlListCompositor::iterator::iterator() {} -inline QQmlListCompositor::iterator::iterator(const iterator &it) - : range(it.range) - , offset(it.offset) - , group(it.group) - , groupFlag(it.groupFlag) - , groupCount(it.groupCount) -{ - for (int i = 0; i < groupCount; ++i) - index[i] = it.index[i]; -} inline QQmlListCompositor::iterator::iterator( Range *range, int offset, Group group, int groupCount) |