diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-27 11:18:00 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-30 17:16:21 +0100 |
| commit | 0440614af0bb08e373d8e3e40f90b6412c043d14 (patch) | |
| tree | 28eb691637384b1c8ea9bbbc1a9675fb0d7d977b /src/gui/itemmodels | |
| parent | 5e84023344bfe8987c3ce5edf57f30261d677d2c (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.
Pick-to: 6.0
Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/gui/itemmodels')
| -rw-r--r-- | src/gui/itemmodels/qfilesystemmodel_p.h | 4 | ||||
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h index 092eae3b2e..4acd6a92df 100644 --- a/src/gui/itemmodels/qfilesystemmodel_p.h +++ b/src/gui/itemmodels/qfilesystemmodel_p.h @@ -82,7 +82,7 @@ public: bool operator==(const QFileSystemModelNodePathKey &other) const { return !compare(other, Qt::CaseInsensitive); } }; -Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_RELOCATABLE_TYPE); inline size_t qHash(const QFileSystemModelNodePathKey &key) { return qHash(key.toCaseFolded()); } #else // Q_OS_WIN @@ -316,7 +316,7 @@ public: // not recursive, meaning we sort only what we see. bool disableRecursiveSort = false; }; -Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 92eb38b40b..486006f70c 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -74,7 +74,7 @@ public: QVariant value; inline bool operator==(const QStandardItemData &other) const { return role == other.role && value == other.value; } }; -Q_DECLARE_TYPEINFO(QStandardItemData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QStandardItemData, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DATASTREAM |