From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Fri, 27 Nov 2020 11:18:00 +0100 Subject: Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in QtBase. As the two are synonymous, this patch should have no impact on users. Pick-to: 6.0 Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c Reviewed-by: Lars Knoll Reviewed-by: Andrei Golubev --- src/corelib/itemmodels/qabstractitemmodel.h | 6 +++--- src/corelib/itemmodels/qabstractitemmodel_p.h | 2 +- src/corelib/itemmodels/qitemselectionmodel.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/corelib/itemmodels') diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 5d4ac59966..9b10106187 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -71,7 +71,7 @@ public: void clearData() noexcept { m_data.clear(); } }; -Q_DECLARE_TYPEINFO(QModelRoleData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QModelRoleData, Q_RELOCATABLE_TYPE); class QModelRoleDataSpan; @@ -151,7 +151,7 @@ public: } }; -Q_DECLARE_TYPEINFO(QModelRoleDataSpan, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QModelRoleDataSpan, Q_RELOCATABLE_TYPE); class QAbstractItemModel; class QPersistentModelIndex; @@ -196,7 +196,7 @@ private: quintptr i; const QAbstractItemModel *m; }; -Q_DECLARE_TYPEINFO(QModelIndex, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QModelIndex, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug, const QModelIndex &); diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h index a2892cea87..dbab493c9c 100644 --- a/src/corelib/itemmodels/qabstractitemmodel_p.h +++ b/src/corelib/itemmodels/qabstractitemmodel_p.h @@ -152,7 +152,7 @@ public: static bool isVariantLessThan(const QVariant &left, const QVariant &right, Qt::CaseSensitivity cs = Qt::CaseSensitive, bool isLocaleAware = false); }; -Q_DECLARE_TYPEINFO(QAbstractItemModelPrivate::Change, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QAbstractItemModelPrivate::Change, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index f2b608c05c..cf8fadde1b 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -112,7 +112,7 @@ public: private: QPersistentModelIndex tl, br; }; -Q_DECLARE_TYPEINFO(QItemSelectionRange, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QItemSelectionRange, Q_RELOCATABLE_TYPE); class QItemSelection; class QItemSelectionModelPrivate; -- cgit v1.2.3