diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-27 11:18:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-04 05:12:56 +0000 |
| commit | f3d1d963c7c6bc5f9958c857b3d8baeab61c82c5 (patch) | |
| tree | 5e003cc94e50a88d31561adc4032d0ab2c95da67 /src/widgets/itemviews | |
| parent | 54c9588ce2150d7c43dbf6089e9729ea79b71731 (diff) | |
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.
Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit 0440614af0bb08e373d8e3e40f90b6412c043d14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qdatawidgetmapper.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qheaderview_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtableview_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtreeview_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qwidgetitemdata_p.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp index 0f6e36cc6a..19e216789c 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.cpp +++ b/src/widgets/itemviews/qdatawidgetmapper.cpp @@ -124,7 +124,7 @@ public: std::vector<WidgetMapper> widgetMap; }; -Q_DECLARE_TYPEINFO(QDataWidgetMapperPrivate::WidgetMapper, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QDataWidgetMapperPrivate::WidgetMapper, Q_RELOCATABLE_TYPE); int QDataWidgetMapperPrivate::findWidget(QWidget *w) const { diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h index 148e723be4..d3dded362d 100644 --- a/src/widgets/itemviews/qheaderview_p.h +++ b/src/widgets/itemviews/qheaderview_p.h @@ -390,7 +390,7 @@ public: }; Q_DECLARE_TYPEINFO(QHeaderViewPrivate::SectionItem, Q_PRIMITIVE_TYPE); -Q_DECLARE_TYPEINFO(QHeaderViewPrivate::LayoutChangeItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QHeaderViewPrivate::LayoutChangeItem, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index 2514ee7c33..2b110f18a0 100644 --- a/src/widgets/itemviews/qtableview_p.h +++ b/src/widgets/itemviews/qtableview_p.h @@ -127,7 +127,7 @@ private: bool cleanSpanSubIndex(SubIndex &subindex, int end, bool update = false); }; -Q_DECLARE_TYPEINFO ( QSpanCollection::Span, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO ( QSpanCollection::Span, Q_RELOCATABLE_TYPE); class QTableViewPrivate : public QAbstractItemViewPrivate diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index e9c64d4054..57ec3caed0 100644 --- a/src/widgets/itemviews/qtreeview_p.h +++ b/src/widgets/itemviews/qtreeview_p.h @@ -78,7 +78,7 @@ struct QTreeViewItem int height : 16; // row height }; -Q_DECLARE_TYPEINFO(QTreeViewItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTreeViewItem, Q_RELOCATABLE_TYPE); class Q_WIDGETS_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate { diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h index b7ed6ed862..fc0ca75d18 100644 --- a/src/widgets/itemviews/qwidgetitemdata_p.h +++ b/src/widgets/itemviews/qwidgetitemdata_p.h @@ -65,7 +65,7 @@ public: QVariant value; inline bool operator==(const QWidgetItemData &other) const { return role == other.role && value == other.value; } }; -Q_DECLARE_TYPEINFO(QWidgetItemData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QWidgetItemData, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DATASTREAM |