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/corelib/io/qsettings_p.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/corelib/io/qsettings_p.h')
| -rw-r--r-- | src/corelib/io/qsettings_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index b70733e7b8..180ac8b2cd 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -108,7 +108,7 @@ private: }; #endif -Q_DECLARE_TYPEINFO(QSettingsKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSettingsKey, Q_RELOCATABLE_TYPE); typedef QMap<QSettingsKey, QByteArray> UnparsedSettingsMap; typedef QMap<QSettingsKey, QVariant> ParsedSettingsMap; @@ -134,7 +134,7 @@ public: int num; int maxNum; }; -Q_DECLARE_TYPEINFO(QSettingsGroup, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSettingsGroup, Q_RELOCATABLE_TYPE); inline QString QSettingsGroup::toString() const { |