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 | |
| 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')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_win_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qloggingregistry_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qprocess_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/io/qsettings_p.h | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h index 7808aff2acf..778ed8ce233 100644 --- a/src/corelib/io/qfilesystemwatcher_win_p.h +++ b/src/corelib/io/qfilesystemwatcher_win_p.h @@ -138,7 +138,7 @@ public: bool operator==(const QFileSystemWatcherPathKey &other) const { return !compare(other, Qt::CaseInsensitive); } }; -Q_DECLARE_TYPEINFO(QFileSystemWatcherPathKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFileSystemWatcherPathKey, Q_RELOCATABLE_TYPE); inline size_t qHash(const QFileSystemWatcherPathKey &key) { return qHash(key.toCaseFolded()); } diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index b581af6c2f4..9687a0e20d1 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -88,7 +88,7 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QLoggingRule::PatternFlags) -Q_DECLARE_TYPEINFO(QLoggingRule, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QLoggingRule, Q_RELOCATABLE_TYPE); class Q_AUTOTEST_EXPORT QLoggingSettingsParser { diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index b04e05114dd..1f449bd4c86 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -99,7 +99,7 @@ inline bool operator<(const QProcEnvKey &a, const QProcEnvKey &b) return a.compare(b, Qt::CaseInsensitive) < 0; } -Q_DECLARE_TYPEINFO(QProcEnvKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QProcEnvKey, Q_RELOCATABLE_TYPE); typedef QString QProcEnvValue; #else @@ -133,7 +133,7 @@ public: mutable QByteArray byteValue; mutable QString stringValue; }; -Q_DECLARE_TYPEINFO(QProcEnvValue, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QProcEnvValue, Q_RELOCATABLE_TYPE); #endif class QProcessEnvironmentPrivate: public QSharedData diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index aa144ecadda..a5995df211d 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -194,7 +194,7 @@ static QString cleanPath(const QString &_path) return path; } -Q_DECLARE_TYPEINFO(QResourceRoot, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QResourceRoot, Q_RELOCATABLE_TYPE); typedef QList<QResourceRoot*> ResourceList; struct QResourceGlobalData 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; diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index b70733e7b87..180ac8b2cdb 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 { |