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.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/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index ac8f54155d0..eb18595595a 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -108,7 +108,7 @@ struct QConfFileCustomFormat QSettings::WriteFunc writeFunc; Qt::CaseSensitivity caseSensitivity; }; -Q_DECLARE_TYPEINFO(QConfFileCustomFormat, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QConfFileCustomFormat, Q_RELOCATABLE_TYPE); typedef QHash<QString, QConfFile *> ConfFileHash; typedef QCache<QString, QConfFile> ConfFileCache; @@ -1715,7 +1715,7 @@ public: int position; }; -Q_DECLARE_TYPEINFO(QSettingsIniKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSettingsIniKey, Q_RELOCATABLE_TYPE); static bool operator<(const QSettingsIniKey &k1, const QSettingsIniKey &k2) { @@ -1734,7 +1734,7 @@ struct QSettingsIniSection inline QSettingsIniSection() : position(-1) {} }; -Q_DECLARE_TYPEINFO(QSettingsIniSection, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSettingsIniSection, Q_RELOCATABLE_TYPE); typedef QMap<QString, QSettingsIniSection> IniMap; |