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/qfontsubset.cpp | |
| 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/qfontsubset.cpp')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 0c60bf7b70..875ff34a62 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -343,7 +343,7 @@ struct QTtfTable { Tag tag; QByteArray data; }; -Q_DECLARE_TYPEINFO(QTtfTable, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfTable, Q_RELOCATABLE_TYPE); struct qttf_head_table { @@ -391,7 +391,7 @@ struct qttf_name_table { QString subfamily; QString postscript_name; }; -Q_DECLARE_TYPEINFO(qttf_name_table, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(qttf_name_table, Q_RELOCATABLE_TYPE); static QTtfTable generateHead(const qttf_head_table &head); @@ -419,7 +419,7 @@ struct QTtfGlyph { quint16 numPoints; QByteArray data; }; -Q_DECLARE_TYPEINFO(QTtfGlyph, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfGlyph, Q_RELOCATABLE_TYPE); static QTtfGlyph generateGlyph(int index, const QPainterPath &path, qreal advance, qreal lsb, qreal ppem); // generates glyf, loca and hmtx @@ -619,7 +619,7 @@ struct QTtfNameRecord { quint16 nameId; QString value; }; -Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_RELOCATABLE_TYPE); static QTtfTable generateName(const QList<QTtfNameRecord> &name); |