diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-27 11:18:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-04 05:12:56 +0000 |
| commit | f3d1d963c7c6bc5f9958c857b3d8baeab61c82c5 (patch) | |
| tree | 5e003cc94e50a88d31561adc4032d0ab2c95da67 /src/network | |
| parent | 54c9588ce2150d7c43dbf6089e9729ea79b71731 (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.
Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit 0440614af0bb08e373d8e3e40f90b6412c043d14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessauthenticationmanager_p.h | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkrequest_p.h | 2 | ||||
| -rw-r--r-- | src/network/ssl/qasn1element_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h index bf57dffbb0..340991c5ff 100644 --- a/src/network/access/qnetworkaccessauthenticationmanager_p.h +++ b/src/network/access/qnetworkaccessauthenticationmanager_p.h @@ -74,7 +74,7 @@ public: return domain.isNull() && user.isNull() && password.isNull(); } }; -Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_RELOCATABLE_TYPE); inline bool operator<(const QNetworkAuthenticationCredential &t1, const QString &t2) { return t1.domain < t2; } inline bool operator<(const QString &t1, const QNetworkAuthenticationCredential &t2) diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h index 5e18da6d55..4132e506d4 100644 --- a/src/network/access/qnetworkrequest_p.h +++ b/src/network/access/qnetworkrequest_p.h @@ -91,7 +91,7 @@ private: void parseAndSetHeader(const QByteArray &key, const QByteArray &value); }; -Q_DECLARE_TYPEINFO(QNetworkHeadersPrivate::RawHeaderPair, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QNetworkHeadersPrivate::RawHeaderPair, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/network/ssl/qasn1element_p.h b/src/network/ssl/qasn1element_p.h index c0dfc9db7e..48fe45c9a5 100644 --- a/src/network/ssl/qasn1element_p.h +++ b/src/network/ssl/qasn1element_p.h @@ -175,7 +175,7 @@ private: quint8 mType; QByteArray mValue; }; -Q_DECLARE_TYPEINFO(QAsn1Element, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QAsn1Element, Q_RELOCATABLE_TYPE); inline bool operator==(const QAsn1Element &e1, const QAsn1Element &e2) { return e1.mType == e2.mType && e1.mValue == e2.mValue; } |