From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Fri, 27 Nov 2020 11:18:00 +0100 Subject: 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 Reviewed-by: Andrei Golubev --- .../accessible/linux/qspi_struct_marshallers_p.h | 14 +++++----- src/gui/image/qicon_p.h | 2 +- src/gui/image/qiconloader_p.h | 2 +- src/gui/image/qmovie.cpp | 2 +- src/gui/itemmodels/qfilesystemmodel_p.h | 4 +-- src/gui/itemmodels/qstandarditemmodel_p.h | 2 +- src/gui/kernel/qevent.h | 4 +-- src/gui/kernel/qkeysequence.cpp | 2 +- src/gui/kernel/qpointingdevice.h | 2 +- src/gui/kernel/qshortcutmap.cpp | 2 +- src/gui/math3d/qmatrix4x4.h | 2 +- src/gui/math3d/qquaternion.h | 2 +- src/gui/painting/qcolor.h | 2 +- src/gui/painting/qpageranges.h | 2 +- src/gui/painting/qpainter_p.h | 2 +- src/gui/painting/qplatformbackingstore.cpp | 2 +- src/gui/painting/qtransform.h | 2 +- src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h | 8 +++--- src/gui/platform/unix/dbustray/qdbustraytypes_p.h | 4 +-- src/gui/rhi/qrhi_p.h | 30 ++++++++++---------- src/gui/rhi/qrhi_p_p.h | 10 +++---- src/gui/rhi/qrhid3d11_p_p.h | 6 ++-- src/gui/rhi/qrhigles2_p_p.h | 6 ++-- src/gui/rhi/qrhimetal.mm | 4 +-- src/gui/rhi/qrhiprofiler_p.h | 4 +-- src/gui/rhi/qrhiprofiler_p_p.h | 2 +- src/gui/rhi/qrhivulkan_p_p.h | 12 ++++---- src/gui/rhi/qshader_p.h | 6 ++-- src/gui/text/freetype/qfontengine_ft_p.h | 2 +- src/gui/text/qcssparser_p.h | 32 +++++++++++----------- src/gui/text/qfontdatabase_p.h | 2 +- src/gui/text/qfontsubset.cpp | 8 +++--- src/gui/text/qstatictext_p.h | 2 +- src/gui/text/qtextdocumentfragment_p.h | 4 +-- src/gui/text/qtextengine_p.h | 2 +- src/gui/text/qtextformat.cpp | 2 +- src/gui/text/qtexthtmlparser_p.h | 4 +-- src/gui/text/qtextobject.h | 8 +++--- src/gui/text/qzip.cpp | 2 +- src/gui/text/qzipreader_p.h | 2 +- src/gui/util/qgridlayoutengine_p.h | 2 +- src/gui/util/qshaderformat_p.h | 2 +- src/gui/util/qshadergenerator_p.h | 2 +- src/gui/util/qshadergraph_p.h | 6 ++-- src/gui/util/qshadergraphloader_p.h | 2 +- src/gui/util/qshadernode_p.h | 4 +-- src/gui/util/qshadernodeport_p.h | 2 +- src/gui/util/qshadernodesloader_p.h | 2 +- src/gui/util/qtexturefiledata_p.h | 2 +- src/gui/vulkan/qvulkaninstance.h | 4 +-- 50 files changed, 120 insertions(+), 120 deletions(-) (limited to 'src/gui') diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h index 9850058efc..c7a4a97176 100644 --- a/src/gui/accessible/linux/qspi_struct_marshallers_p.h +++ b/src/gui/accessible/linux/qspi_struct_marshallers_p.h @@ -76,7 +76,7 @@ struct QSpiObjectReference QSpiObjectReference(const QDBusConnection& connection, const QDBusObjectPath& path) : service(connection.baseService()), path(path) {} }; -Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, even though it +Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_RELOCATABLE_TYPE); // QDBusObjectPath is movable, even though it // cannot be marked that way until Qt 6 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiObjectReference &address); @@ -96,7 +96,7 @@ struct QSpiAccessibleCacheItem QString description; QSpiUIntList state; }; -Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_RELOCATABLE_TYPE); typedef QList QSpiAccessibleCacheArray; @@ -109,7 +109,7 @@ struct QSpiAction QString description; QString keyBinding; }; -Q_DECLARE_TYPEINFO(QSpiAction, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAction, Q_RELOCATABLE_TYPE); typedef QList QSpiActionArray; @@ -121,7 +121,7 @@ struct QSpiEventListener QString listenerAddress; QString eventName; }; -Q_DECLARE_TYPEINFO(QSpiEventListener, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiEventListener, Q_RELOCATABLE_TYPE); typedef QList QSpiEventListenerArray; @@ -138,7 +138,7 @@ struct QSpiTextRange { QString contents; QVariant v; }; -Q_DECLARE_TYPEINFO(QSpiTextRange, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiTextRange, Q_RELOCATABLE_TYPE); typedef QList QSpiTextRangeList; typedef QMap QSpiAttributeSet; @@ -153,7 +153,7 @@ struct QSpiAppUpdate { int type; /* Is an application added or removed */ QString address; /* D-Bus address of application added or removed */ }; -Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_RELOCATABLE_TYPE); QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAppUpdate &update); const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAppUpdate &update); @@ -167,7 +167,7 @@ struct QSpiDeviceEvent { QString text; bool isText; }; -Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_RELOCATABLE_TYPE); QDBusArgument &operator<<(QDBusArgument &argument, const QSpiDeviceEvent &event); const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiDeviceEvent &event); 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 { diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h index 092eae3b2e..4acd6a92df 100644 --- a/src/gui/itemmodels/qfilesystemmodel_p.h +++ b/src/gui/itemmodels/qfilesystemmodel_p.h @@ -82,7 +82,7 @@ public: bool operator==(const QFileSystemModelNodePathKey &other) const { return !compare(other, Qt::CaseInsensitive); } }; -Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_RELOCATABLE_TYPE); inline size_t qHash(const QFileSystemModelNodePathKey &key) { return qHash(key.toCaseFolded()); } #else // Q_OS_WIN @@ -316,7 +316,7 @@ public: // not recursive, meaning we sort only what we see. bool disableRecursiveSort = false; }; -Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 92eb38b40b..486006f70c 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -74,7 +74,7 @@ public: QVariant value; inline bool operator==(const QStandardItemData &other) const { return role == other.role && value == other.value; } }; -Q_DECLARE_TYPEINFO(QStandardItemData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QStandardItemData, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DATASTREAM diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7d8d4e20f1..3f8b53262f 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -721,7 +721,7 @@ private: int m_replacementStart; int m_replacementLength; }; -Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QInputMethodQueryEvent : public QEvent { @@ -745,7 +745,7 @@ private: friend QTypeInfo; QList m_values; }; -Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_RELOCATABLE_TYPE); #endif // QT_NO_INPUTMETHOD diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 5d2a95c33f..c10ba93954 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1059,7 +1059,7 @@ struct QModifKeyName { int qt_key; QString name; }; -Q_DECLARE_TYPEINFO(QModifKeyName, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QModifKeyName, Q_RELOCATABLE_TYPE); Q_GLOBAL_STATIC(QList, globalModifs) Q_GLOBAL_STATIC(QList, globalPortableModifs) diff --git a/src/gui/kernel/qpointingdevice.h b/src/gui/kernel/qpointingdevice.h index 1e220e235f..094780765a 100644 --- a/src/gui/kernel/qpointingdevice.h +++ b/src/gui/kernel/qpointingdevice.h @@ -79,7 +79,7 @@ private: // In this case, m_numericId will then turn into an index into that array (or hash). qint64 m_numericId; }; -Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT size_t qHash(QPointingDeviceUniqueId key, size_t seed = 0) noexcept; diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 7fabfc5f54..2945115402 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -87,7 +87,7 @@ struct QShortcutEntry QObject *owner; QShortcutMap::ContextMatcher contextMatcher; }; -Q_DECLARE_TYPEINFO(QShortcutEntry, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShortcutEntry, Q_RELOCATABLE_TYPE); #ifdef Dump_QShortcutMap /*! \internal diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 2a448f0baf..402f27fcb5 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -213,7 +213,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrix4x4::Flags) QT_WARNING_PUSH QT_WARNING_DISABLE_FLOAT_COMPARE -Q_DECLARE_TYPEINFO(QMatrix4x4, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QMatrix4x4, Q_RELOCATABLE_TYPE); inline QMatrix4x4::QMatrix4x4 (float m11, float m12, float m13, float m14, diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 99ee9085f9..76fa237afd 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -169,7 +169,7 @@ private: float wp, xp, yp, zp; }; -Q_DECLARE_TYPEINFO(QQuaternion, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QQuaternion, Q_RELOCATABLE_TYPE); inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {} diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 65d82c2043..06b264eacf 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -297,7 +297,7 @@ public: // can't give friendship to a namespace, so it needs to be public : cspec(spec), ct(a1, a2, a3, a4, a5) {} #endif // Q_COMPILER_UNIFORM_INIT }; -Q_DECLARE_TYPEINFO(QColor, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE); inline QColor::QColor(QLatin1String aname) { setNamedColor(aname); } diff --git a/src/gui/painting/qpageranges.h b/src/gui/painting/qpageranges.h index 823d83665b..d525124a62 100644 --- a/src/gui/painting/qpageranges.h +++ b/src/gui/painting/qpageranges.h @@ -116,7 +116,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageRanges &pageRanges); #endif Q_DECLARE_SHARED(QPageRanges) -Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 29e2aca175..71e90c9717 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -140,7 +140,7 @@ public: }; -Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QPainterState : public QPaintEngineState { diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp index 1a7c6c5189..bf7dc55644 100644 --- a/src/gui/painting/qplatformbackingstore.cpp +++ b/src/gui/painting/qplatformbackingstore.cpp @@ -80,7 +80,7 @@ struct QBackingstoreTextureInfo QPlatformTextureList::Flags flags; }; -Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_RELOCATABLE_TYPE); class QPlatformTextureListPrivate : public QObjectPrivate { diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index a84563baea..a1ec8e9399 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -177,7 +177,7 @@ private: mutable uint m_type : 5; mutable uint m_dirty : 5; }; -Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTransform, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(const QTransform &key, size_t seed = 0) noexcept; diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h index 047f6c963c..092798d9e3 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h +++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes_p.h @@ -82,7 +82,7 @@ public: int m_id; QVariantMap m_properties; }; -Q_DECLARE_TYPEINFO(QDBusMenuItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QDBusMenuItem, Q_RELOCATABLE_TYPE); const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuItem &item); const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuItem &item); @@ -94,7 +94,7 @@ public: int id; QStringList properties; }; -Q_DECLARE_TYPEINFO(QDBusMenuItemKeys, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QDBusMenuItemKeys, Q_RELOCATABLE_TYPE); const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuItemKeys &keys); const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuItemKeys &keys); @@ -112,7 +112,7 @@ public: QVariantMap m_properties; QList m_children; }; -Q_DECLARE_TYPEINFO(QDBusMenuLayoutItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QDBusMenuLayoutItem, Q_RELOCATABLE_TYPE); const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuLayoutItem &); const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuLayoutItem &item); @@ -127,7 +127,7 @@ public: QDBusVariant m_data; uint m_timestamp; }; -Q_DECLARE_TYPEINFO(QDBusMenuEvent, Q_MOVABLE_TYPE); // QDBusVariant is movable, even though it cannot +Q_DECLARE_TYPEINFO(QDBusMenuEvent, Q_RELOCATABLE_TYPE); // QDBusVariant is movable, even though it cannot // be marked as such until Qt 6. const QDBusArgument &operator<<(QDBusArgument &arg, const QDBusMenuEvent &ev); diff --git a/src/gui/platform/unix/dbustray/qdbustraytypes_p.h b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h index d11ccd04ec..5a48a9110a 100644 --- a/src/gui/platform/unix/dbustray/qdbustraytypes_p.h +++ b/src/gui/platform/unix/dbustray/qdbustraytypes_p.h @@ -75,7 +75,7 @@ struct QXdgDBusImageStruct int height; QByteArray data; }; -Q_DECLARE_TYPEINFO(QXdgDBusImageStruct, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QXdgDBusImageStruct, Q_RELOCATABLE_TYPE); using QXdgDBusImageVector = QList; @@ -89,7 +89,7 @@ struct QXdgDBusToolTipStruct QString title; QString subTitle; }; -Q_DECLARE_TYPEINFO(QXdgDBusToolTipStruct, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QXdgDBusToolTipStruct, Q_RELOCATABLE_TYPE); const QDBusArgument &operator<<(QDBusArgument &argument, const QXdgDBusImageStruct &icon); const QDBusArgument &operator>>(const QDBusArgument &argument, QXdgDBusImageStruct &icon); diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h index 6de14c47ad..fc3034c984 100644 --- a/src/gui/rhi/qrhi_p.h +++ b/src/gui/rhi/qrhi_p.h @@ -90,7 +90,7 @@ private: quint32 m_s = 0; }; -Q_DECLARE_TYPEINFO(QRhiDepthStencilClearValue, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiDepthStencilClearValue, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiDepthStencilClearValue &a, const QRhiDepthStencilClearValue &b) noexcept; @@ -122,7 +122,7 @@ private: float m_maxDepth = 1.0f; }; -Q_DECLARE_TYPEINFO(QRhiViewport, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiViewport, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiViewport &a, const QRhiViewport &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiViewport &a, const QRhiViewport &b) noexcept; @@ -146,7 +146,7 @@ private: std::array m_rect { { 0, 0, 0, 0 } }; }; -Q_DECLARE_TYPEINFO(QRhiScissor, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiScissor, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiScissor &a, const QRhiScissor &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiScissor &a, const QRhiScissor &b) noexcept; @@ -181,7 +181,7 @@ private: int m_instanceStepRate = 1; }; -Q_DECLARE_TYPEINFO(QRhiVertexInputBinding, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVertexInputBinding, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiVertexInputBinding &a, const QRhiVertexInputBinding &b) noexcept; @@ -237,7 +237,7 @@ private: int m_matrixSlice = -1; }; -Q_DECLARE_TYPEINFO(QRhiVertexInputAttribute, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVertexInputAttribute, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiVertexInputAttribute &a, const QRhiVertexInputAttribute &b) noexcept; @@ -281,7 +281,7 @@ private: friend Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiVertexInputLayout &); }; -Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVertexInputLayout, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiVertexInputLayout &a, const QRhiVertexInputLayout &b) noexcept; @@ -318,7 +318,7 @@ private: QShader::Variant m_shaderVariant = QShader::StandardShader; }; -Q_DECLARE_TYPEINFO(QRhiShaderStage, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiShaderStage, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QRhiShaderStage &a, const QRhiShaderStage &b) noexcept; Q_GUI_EXPORT bool operator!=(const QRhiShaderStage &a, const QRhiShaderStage &b) noexcept; @@ -466,7 +466,7 @@ private: int m_resolveLevel = 0; }; -Q_DECLARE_TYPEINFO(QRhiColorAttachment, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiColorAttachment, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiTextureRenderTargetDescription { @@ -499,7 +499,7 @@ private: QRhiTexture *m_depthTexture = nullptr; }; -Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiTextureRenderTargetDescription, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiTextureSubresourceUploadDescription { @@ -531,7 +531,7 @@ private: QPoint m_sourceTopLeft; }; -Q_DECLARE_TYPEINFO(QRhiTextureSubresourceUploadDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiTextureSubresourceUploadDescription, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiTextureUploadEntry { @@ -554,7 +554,7 @@ private: QRhiTextureSubresourceUploadDescription m_desc; }; -Q_DECLARE_TYPEINFO(QRhiTextureUploadEntry, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiTextureUploadEntry, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiTextureUploadDescription { @@ -577,7 +577,7 @@ private: QVarLengthArray m_entries; }; -Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiTextureUploadDescription, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiTextureCopyDescription { @@ -615,7 +615,7 @@ private: QPoint m_destinationTopLeft; }; -Q_DECLARE_TYPEINFO(QRhiTextureCopyDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiTextureCopyDescription, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiReadbackDescription { @@ -638,7 +638,7 @@ private: int m_level = 0; }; -Q_DECLARE_TYPEINFO(QRhiReadbackDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiReadbackDescription, Q_RELOCATABLE_TYPE); struct Q_GUI_EXPORT QRhiNativeHandles { @@ -1249,7 +1249,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::Flags) Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiGraphicsPipeline::ColorMask) -Q_DECLARE_TYPEINFO(QRhiGraphicsPipeline::TargetBlend, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiGraphicsPipeline::TargetBlend, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QRhiSwapChain : public QRhiResource { diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h index ad1e3c0fe0..538df66868 100644 --- a/src/gui/rhi/qrhi_p_p.h +++ b/src/gui/rhi/qrhi_p_p.h @@ -351,7 +351,7 @@ private: QRhiBufferDataPrivate *d = nullptr; }; -Q_DECLARE_TYPEINFO(QRhiBufferData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiBufferData, Q_RELOCATABLE_TYPE); class QRhiResourceUpdateBatchPrivate { @@ -498,8 +498,8 @@ public: static QRhiResourceUpdateBatchPrivate *get(QRhiResourceUpdateBatch *b) { return b->d; } }; -Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::BufferOp, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiResourceUpdateBatchPrivate::TextureOp, Q_RELOCATABLE_TYPE); template struct QRhiBatchedBindings @@ -652,8 +652,8 @@ private: QHash m_textures; }; -Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Buffer, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Texture, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Buffer, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiPassResourceTracker::Texture, Q_RELOCATABLE_TYPE); template class QRhiBackendCommandList diff --git a/src/gui/rhi/qrhid3d11_p_p.h b/src/gui/rhi/qrhid3d11_p_p.h index ff62327bdf..3b56393900 100644 --- a/src/gui/rhi/qrhid3d11_p_p.h +++ b/src/gui/rhi/qrhid3d11_p_p.h @@ -277,7 +277,7 @@ struct QD3D11ShaderResourceBindings : public QRhiShaderResourceBindings friend class QRhiD3D11; }; -Q_DECLARE_TYPEINFO(QD3D11ShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QD3D11ShaderResourceBindings::BoundResourceData, Q_RELOCATABLE_TYPE); struct QD3D11GraphicsPipeline : public QRhiGraphicsPipeline { @@ -762,8 +762,8 @@ public: } deviceCurse; }; -Q_DECLARE_TYPEINFO(QRhiD3D11::TextureReadback, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiD3D11::BufferReadback, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiD3D11::TextureReadback, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiD3D11::BufferReadback, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/rhi/qrhigles2_p_p.h b/src/gui/rhi/qrhigles2_p_p.h index a231740c66..a336497b63 100644 --- a/src/gui/rhi/qrhigles2_p_p.h +++ b/src/gui/rhi/qrhigles2_p_p.h @@ -258,7 +258,7 @@ struct QGles2UniformDescription int arrayDim; }; -Q_DECLARE_TYPEINFO(QGles2UniformDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QGles2UniformDescription, Q_RELOCATABLE_TYPE); struct QGles2SamplerDescription { @@ -266,7 +266,7 @@ struct QGles2SamplerDescription int binding; }; -Q_DECLARE_TYPEINFO(QGles2SamplerDescription, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QGles2SamplerDescription, Q_RELOCATABLE_TYPE); using QGles2UniformDescriptionVector = QVarLengthArray; using QGles2SamplerDescriptionVector = QVarLengthArray; @@ -998,7 +998,7 @@ public: QHash m_shaderCache; }; -Q_DECLARE_TYPEINFO(QRhiGles2::DeferredReleaseEntry, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiGles2::DeferredReleaseEntry, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm index d8eb325909..9e0655ef06 100644 --- a/src/gui/rhi/qrhimetal.mm +++ b/src/gui/rhi/qrhimetal.mm @@ -216,8 +216,8 @@ struct QRhiMetalData QHash shaderCache; }; -Q_DECLARE_TYPEINFO(QRhiMetalData::DeferredReleaseEntry, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiMetalData::TextureReadback, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiMetalData::DeferredReleaseEntry, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiMetalData::TextureReadback, Q_RELOCATABLE_TYPE); struct QMetalBufferData { diff --git a/src/gui/rhi/qrhiprofiler_p.h b/src/gui/rhi/qrhiprofiler_p.h index 89fd0a8798..6bd72988dc 100644 --- a/src/gui/rhi/qrhiprofiler_p.h +++ b/src/gui/rhi/qrhiprofiler_p.h @@ -112,8 +112,8 @@ private: friend class QRhiProfilerPrivate; }; -Q_DECLARE_TYPEINFO(QRhiProfiler::CpuTime, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiProfiler::GpuTime, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiProfiler::CpuTime, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiProfiler::GpuTime, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/rhi/qrhiprofiler_p_p.h b/src/gui/rhi/qrhiprofiler_p_p.h index 9e209fe98e..349b4d6b74 100644 --- a/src/gui/rhi/qrhiprofiler_p_p.h +++ b/src/gui/rhi/qrhiprofiler_p_p.h @@ -114,7 +114,7 @@ public: QHash swapchains; }; -Q_DECLARE_TYPEINFO(QRhiProfilerPrivate::Sc, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiProfilerPrivate::Sc, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/rhi/qrhivulkan_p_p.h b/src/gui/rhi/qrhivulkan_p_p.h index d3f42957b1..7fdb108da4 100644 --- a/src/gui/rhi/qrhivulkan_p_p.h +++ b/src/gui/rhi/qrhivulkan_p_p.h @@ -99,7 +99,7 @@ struct QVkBuffer : public QRhiBuffer friend class QRhiVulkan; }; -Q_DECLARE_TYPEINFO(QVkBuffer::DynamicUpdate, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVkBuffer::DynamicUpdate, Q_RELOCATABLE_TYPE); struct QVkTexture; @@ -294,7 +294,7 @@ struct QVkShaderResourceBindings : public QRhiShaderResourceBindings friend class QRhiVulkan; }; -Q_DECLARE_TYPEINFO(QVkShaderResourceBindings::BoundResourceData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVkShaderResourceBindings::BoundResourceData, Q_RELOCATABLE_TYPE); struct QVkGraphicsPipeline : public QRhiGraphicsPipeline { @@ -991,10 +991,10 @@ public: QList releaseQueue; }; -Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiVulkan::DeferredReleaseEntry, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiVulkan::TextureReadback, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QRhiVulkan::BufferReadback, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVulkan::DescriptorPoolData, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVulkan::DeferredReleaseEntry, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVulkan::TextureReadback, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QRhiVulkan::BufferReadback, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/rhi/qshader_p.h b/src/gui/rhi/qshader_p.h index 689d92b91d..0091851e50 100644 --- a/src/gui/rhi/qshader_p.h +++ b/src/gui/rhi/qshader_p.h @@ -79,7 +79,7 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QShaderVersion::Flags) -Q_DECLARE_TYPEINFO(QShaderVersion, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderVersion, Q_RELOCATABLE_TYPE); class QShaderCode; Q_GUI_EXPORT size_t qHash(const QShaderCode &, size_t = 0) noexcept; @@ -103,7 +103,7 @@ private: QByteArray m_entryPoint; }; -Q_DECLARE_TYPEINFO(QShaderCode, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderCode, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QShader { @@ -192,7 +192,7 @@ private: QShader::Variant m_sourceVariant = QShader::StandardShader; }; -Q_DECLARE_TYPEINFO(QShaderKey, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderKey, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT bool operator==(const QShader &lhs, const QShader &rhs) noexcept; Q_GUI_EXPORT size_t qHash(const QShader &s, size_t seed = 0) noexcept; diff --git a/src/gui/text/freetype/qfontengine_ft_p.h b/src/gui/text/freetype/qfontengine_ft_p.h index dcbe49ff99..8962327cd1 100644 --- a/src/gui/text/freetype/qfontengine_ft_p.h +++ b/src/gui/text/freetype/qfontengine_ft_p.h @@ -338,7 +338,7 @@ private: QFixed scalableBitmapScaleFactor; }; -Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_RELOCATABLE_TYPE); inline size_t qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g) diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 1f71a1c4af..1ccfc45d21 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -391,7 +391,7 @@ struct Value Q_GUI_EXPORT QString toString() const; }; -QT_CSS_DECLARE_TYPEINFO(Value, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(Value, Q_RELOCATABLE_TYPE) struct ColorData { ColorData() : role(QPalette::NoRole), type(Invalid) {} @@ -401,7 +401,7 @@ struct ColorData { QPalette::ColorRole role; enum { Invalid, Color, Role} type; }; -QT_CSS_DECLARE_TYPEINFO(ColorData, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(ColorData, Q_RELOCATABLE_TYPE) struct BrushData { BrushData() : role(QPalette::NoRole), type(Invalid) {} @@ -411,7 +411,7 @@ struct BrushData { QPalette::ColorRole role; enum { Invalid, Brush, Role, DependsOnThePalette } type; }; -QT_CSS_DECLARE_TYPEINFO(BrushData, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(BrushData, Q_RELOCATABLE_TYPE) struct BackgroundData { BrushData brush; @@ -419,7 +419,7 @@ struct BackgroundData { Repeat repeat; Qt::Alignment alignment; }; -QT_CSS_DECLARE_TYPEINFO(BackgroundData, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(BackgroundData, Q_RELOCATABLE_TYPE) struct LengthData { qreal number; @@ -432,7 +432,7 @@ struct BorderData { BorderStyle style; BrushData color; }; -QT_CSS_DECLARE_TYPEINFO(BorderData, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(BorderData, Q_RELOCATABLE_TYPE) // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; } // 2. QList - x:hover, y:clicked z:checked @@ -483,7 +483,7 @@ struct Q_GUI_EXPORT Declaration void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const; bool borderCollapseValue() const; }; -QT_CSS_DECLARE_TYPEINFO(Declaration, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(Declaration, Q_RELOCATABLE_TYPE) const quint64 PseudoClass_Unknown = Q_UINT64_C(0x0000000000000000); const quint64 PseudoClass_Enabled = Q_UINT64_C(0x0000000000000001); @@ -543,7 +543,7 @@ struct Pseudo QString function; bool negated; }; -QT_CSS_DECLARE_TYPEINFO(Pseudo, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(Pseudo, Q_RELOCATABLE_TYPE) struct AttributeSelector { @@ -562,7 +562,7 @@ struct AttributeSelector QString value; ValueMatchType valueMatchCriterium; }; -QT_CSS_DECLARE_TYPEINFO(AttributeSelector, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(AttributeSelector, Q_RELOCATABLE_TYPE) struct BasicSelector { @@ -584,7 +584,7 @@ struct BasicSelector Relation relationToNext; }; -QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_RELOCATABLE_TYPE) struct Q_GUI_EXPORT Selector { @@ -593,7 +593,7 @@ struct Q_GUI_EXPORT Selector quint64 pseudoClass(quint64 *negated = nullptr) const; QString pseudoElement() const; }; -QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(Selector, Q_RELOCATABLE_TYPE) struct StyleRule { @@ -602,28 +602,28 @@ struct StyleRule QList declarations; int order; }; -QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_RELOCATABLE_TYPE) struct MediaRule { QStringList media; QList styleRules; }; -QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_RELOCATABLE_TYPE) struct PageRule { QString selector; QList declarations; }; -QT_CSS_DECLARE_TYPEINFO(PageRule, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(PageRule, Q_RELOCATABLE_TYPE) struct ImportRule { QString href; QStringList media; }; -QT_CSS_DECLARE_TYPEINFO(ImportRule, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(ImportRule, Q_RELOCATABLE_TYPE) enum StyleSheetOrigin { StyleSheetOrigin_Unspecified, @@ -647,7 +647,7 @@ struct StyleSheet Q_GUI_EXPORT void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive); }; -QT_CSS_DECLARE_TYPEINFO(StyleSheet, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(StyleSheet, Q_RELOCATABLE_TYPE) class Q_GUI_EXPORT StyleSelector @@ -745,7 +745,7 @@ struct Symbol int start, len; Q_GUI_EXPORT QString lexem() const; }; -QT_CSS_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE) +QT_CSS_DECLARE_TYPEINFO(Symbol, Q_RELOCATABLE_TYPE) class Q_GUI_EXPORT Scanner { diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h index 303109e1a7..f7998153a1 100644 --- a/src/gui/text/qfontdatabase_p.h +++ b/src/gui/text/qfontdatabase_p.h @@ -272,7 +272,7 @@ public: void invalidate(); }; -Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 0c60bf7b70..875ff34a62 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -343,7 +343,7 @@ struct QTtfTable { Tag tag; QByteArray data; }; -Q_DECLARE_TYPEINFO(QTtfTable, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfTable, Q_RELOCATABLE_TYPE); struct qttf_head_table { @@ -391,7 +391,7 @@ struct qttf_name_table { QString subfamily; QString postscript_name; }; -Q_DECLARE_TYPEINFO(qttf_name_table, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(qttf_name_table, Q_RELOCATABLE_TYPE); static QTtfTable generateHead(const qttf_head_table &head); @@ -419,7 +419,7 @@ struct QTtfGlyph { quint16 numPoints; QByteArray data; }; -Q_DECLARE_TYPEINFO(QTtfGlyph, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfGlyph, Q_RELOCATABLE_TYPE); static QTtfGlyph generateGlyph(int index, const QPainterPath &path, qreal advance, qreal lsb, qreal ppem); // generates glyf, loca and hmtx @@ -619,7 +619,7 @@ struct QTtfNameRecord { quint16 nameId; QString value; }; -Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTtfNameRecord, Q_RELOCATABLE_TYPE); static QTtfTable generateName(const QList &name); diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h index 3760d3bf0f..1d79148bdc 100644 --- a/src/gui/text/qstatictext_p.h +++ b/src/gui/text/qstatictext_p.h @@ -119,7 +119,7 @@ private: // private to avoid abuse // ================ // 43 bytes per item }; -Q_DECLARE_TYPEINFO(QStaticTextItem, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QStaticTextItem, Q_RELOCATABLE_TYPE); class QStaticText; class Q_AUTOTEST_EXPORT QStaticTextPrivate diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h index 3683cd8d4f..a321b84c5a 100644 --- a/src/gui/text/qtextdocumentfragment_p.h +++ b/src/gui/text/qtextdocumentfragment_p.h @@ -233,9 +233,9 @@ private: int currentNodeIdx; const QTextHtmlParserNode *currentNode; }; -Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_RELOCATABLE_TYPE); Q_DECLARE_TYPEINFO(QTextHtmlImporter::TableCellIterator, Q_PRIMITIVE_TYPE); -Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_RELOCATABLE_TYPE); Q_DECLARE_TYPEINFO(QTextHtmlImporter::RowColSpanInfo, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index 0e80510058..6ae3196963 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -673,7 +673,7 @@ public: LayoutData _layoutData; void *_memory[MemSize]; }; -Q_DECLARE_TYPEINFO(QTextEngine::ItemDecoration, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextEngine::ItemDecoration, Q_RELOCATABLE_TYPE); struct QTextLineItemIterator { diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 1da04b871a..985209473c 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -177,7 +177,7 @@ struct Property { return key == other.key && value == other.value; } }; } -Q_DECLARE_TYPEINFO(Property, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(Property, Q_RELOCATABLE_TYPE); class QTextFormatPrivate : public QSharedData { diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h index 2650c9cc3e..b99f73fafb 100644 --- a/src/gui/text/qtexthtmlparser_p.h +++ b/src/gui/text/qtexthtmlparser_p.h @@ -269,7 +269,7 @@ struct QTextHtmlParserNode { friend class QTextHtmlParser; }; -Q_DECLARE_TYPEINFO(QTextHtmlParserNode, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlParserNode, Q_RELOCATABLE_TYPE); class QTextHtmlParser @@ -357,7 +357,7 @@ protected: const QTextDocument *resourceProvider; }; #if QT_CONFIG(cssparser) -Q_DECLARE_TYPEINFO(QTextHtmlParser::ExternalStyleSheet, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlParser::ExternalStyleSheet, Q_RELOCATABLE_TYPE); #endif QT_END_NAMESPACE diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index c41893f37a..5402360baf 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -179,7 +179,7 @@ private: Q_DECLARE_PRIVATE(QTextFrame) Q_DISABLE_COPY(QTextFrame) }; -Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_RELOCATABLE_TYPE); inline void QTextFrame::setFrameFormat(const QTextFrameFormat &aformat) { QTextObject::setFormat(aformat); } @@ -284,8 +284,8 @@ private: friend class QTextLayout; }; -Q_DECLARE_TYPEINFO(QTextBlock, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextBlock, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextBlock::iterator, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QTextFragment @@ -320,7 +320,7 @@ private: int ne; }; -Q_DECLARE_TYPEINFO(QTextFragment, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextFragment, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 867e67698b..0f50a7508a 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -414,7 +414,7 @@ struct FileHeader QByteArray extra_field; QByteArray file_comment; }; -Q_DECLARE_TYPEINFO(FileHeader, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(FileHeader, Q_RELOCATABLE_TYPE); class QZipPrivate { diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h index 0f695c74d5..add3a40087 100644 --- a/src/gui/text/qzipreader_p.h +++ b/src/gui/text/qzipreader_p.h @@ -118,7 +118,7 @@ private: QZipReaderPrivate *d; Q_DISABLE_COPY_MOVE(QZipReader) }; -Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_RELOCATABLE_TYPE); Q_DECLARE_TYPEINFO(QZipReader::Status, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 17b65b6220..341d159fb1 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -214,7 +214,7 @@ public: } } }; -Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_MOVABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0 +Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_RELOCATABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0 bool operator==(const QGridLayoutBox &box1, const QGridLayoutBox &box2); inline bool operator!=(const QGridLayoutBox &box1, const QGridLayoutBox &box2) diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h index 3559c67414..e47fbb8a03 100644 --- a/src/gui/util/qshaderformat_p.h +++ b/src/gui/util/qshaderformat_p.h @@ -114,7 +114,7 @@ inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexc return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderFormat, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderFormat, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergenerator_p.h b/src/gui/util/qshadergenerator_p.h index 1f6f9d2532..4d3a09c92f 100644 --- a/src/gui/util/qshadergenerator_p.h +++ b/src/gui/util/qshadergenerator_p.h @@ -70,7 +70,7 @@ public: QShaderFormat format; }; -Q_DECLARE_TYPEINFO(QShaderGenerator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGenerator, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h index 41ad22cedb..dbc5f3fab7 100644 --- a/src/gui/util/qshadergraph_p.h +++ b/src/gui/util/qshadergraph_p.h @@ -111,9 +111,9 @@ inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::S return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderGraph, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergraphloader_p.h b/src/gui/util/qshadergraphloader_p.h index e7aa19fa2d..bdd02799f7 100644 --- a/src/gui/util/qshadergraphloader_p.h +++ b/src/gui/util/qshadergraphloader_p.h @@ -89,7 +89,7 @@ private: QShaderGraph m_graph; }; -Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h index 15382fe0b4..303a404165 100644 --- a/src/gui/util/qshadernode_p.h +++ b/src/gui/util/qshadernode_p.h @@ -117,8 +117,8 @@ inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rh return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderNode, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNode, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernodeport_p.h b/src/gui/util/qshadernodeport_p.h index c69ba23a3f..e4e11f6826 100644 --- a/src/gui/util/qshadernodeport_p.h +++ b/src/gui/util/qshadernodeport_p.h @@ -79,7 +79,7 @@ inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) n return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderNodePort, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNodePort, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernodesloader_p.h b/src/gui/util/qshadernodesloader_p.h index 432d7d4494..8afdd294ca 100644 --- a/src/gui/util/qshadernodesloader_p.h +++ b/src/gui/util/qshadernodesloader_p.h @@ -86,7 +86,7 @@ private: QHash m_nodes; }; -Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qtexturefiledata_p.h b/src/gui/util/qtexturefiledata_p.h index 2df23de33c..fb732cd84c 100644 --- a/src/gui/util/qtexturefiledata_p.h +++ b/src/gui/util/qtexturefiledata_p.h @@ -106,7 +106,7 @@ private: QSharedDataPointer d; }; -Q_DECLARE_TYPEINFO(QTextureFileData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextureFileData, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QTextureFileData &d); diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 618f8a9e40..58948854b4 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -104,7 +104,7 @@ struct QVulkanLayer QVersionNumber specVersion; QByteArray description; }; -Q_DECLARE_TYPEINFO(QVulkanLayer, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVulkanLayer, Q_RELOCATABLE_TYPE); inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept { @@ -127,7 +127,7 @@ struct QVulkanExtension QByteArray name; uint32_t version; }; -Q_DECLARE_TYPEINFO(QVulkanExtension, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVulkanExtension, Q_RELOCATABLE_TYPE); inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept { -- cgit v1.2.3