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/image | |
| 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/image')
| -rw-r--r-- | src/gui/image/qicon_p.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qiconloader_p.h | 2 | ||||
| -rw-r--r-- | src/gui/image/qmovie.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h index 40cb0c7efa..244da260b0 100644 --- a/src/gui/image/qicon_p.h +++ b/src/gui/image/qicon_p.h @@ -97,7 +97,7 @@ struct QPixmapIconEngineEntry QIcon::State state; bool isNull() const {return (fileName.isEmpty() && pixmap.isNull()); } }; -Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_RELOCATABLE_TYPE); inline QPixmapIconEngineEntry::QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s) : fileName(file), size(image.size()), scale(image.devicePixelRatio()), mode(m), state(s) diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index a17cea183e..d02b2da2cc 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -86,7 +86,7 @@ struct QIconDirInfo short scale; Type type; }; -Q_DECLARE_TYPEINFO(QIconDirInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QIconDirInfo, Q_RELOCATABLE_TYPE); class QIconLoaderEngineEntry { diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 096b4f6877..e99093d582 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -220,7 +220,7 @@ public: static inline QFrameInfo endMarker() { return QFrameInfo(true); } }; -Q_DECLARE_TYPEINFO(QFrameInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFrameInfo, Q_RELOCATABLE_TYPE); class QMoviePrivate : public QObjectPrivate { |