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/text/qtextobject.h | |
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/text/qtextobject.h')
-rw-r--r-- | src/gui/text/qtextobject.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index c41893f37a..5402360baf 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -179,7 +179,7 @@ private: Q_DECLARE_PRIVATE(QTextFrame) Q_DISABLE_COPY(QTextFrame) }; -Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_RELOCATABLE_TYPE); inline void QTextFrame::setFrameFormat(const QTextFrameFormat &aformat) { QTextObject::setFormat(aformat); } @@ -284,8 +284,8 @@ private: friend class QTextLayout; }; -Q_DECLARE_TYPEINFO(QTextBlock, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextBlock, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QTextFragment @@ -320,7 +320,7 @@ private: int ne; }; -Q_DECLARE_TYPEINFO(QTextFragment, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextFragment, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE |