From 7c070ac95979609e6ba33b829dc4a2a373ef26b5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 May 2020 14:43:25 +0200 Subject: Sweep Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 -> Q_DECLARE_SHARED This is Qt 6, so Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 is the same as Q_DECLARE_SHARED. Let's hope we'll collectively get better at detecting missing Q_DECLARE_SHARED so we won't need a Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT7 in the future. Change-Id: I3da9faff4c66b64a3b257309012a2a10a6c6d027 Reviewed-by: Lars Knoll --- src/corelib/itemmodels/qitemselectionmodel.h | 2 +- src/corelib/serialization/qjsonarray.h | 2 +- src/corelib/serialization/qjsondocument.h | 2 +- src/corelib/serialization/qjsonobject.h | 2 +- src/corelib/serialization/qjsonvalue.h | 2 +- src/corelib/serialization/qxmlstream.h | 2 +- src/dbus/qdbusargument.h | 2 +- src/dbus/qdbusconnection.h | 2 +- src/dbus/qdbuserror.h | 2 +- src/dbus/qdbusextratypes.h | 6 +++--- src/dbus/qdbusmessage.h | 2 +- src/gui/image/qpixmapcache.h | 2 +- src/gui/kernel/qcursor.h | 2 +- src/gui/painting/qpainterpath.h | 2 +- src/gui/painting/qpolygon.h | 4 ++-- src/gui/painting/qregion.h | 2 +- src/network/kernel/qhostaddress.h | 2 +- src/network/kernel/qhostinfo.h | 2 +- src/sql/kernel/qsqlerror.h | 2 +- src/sql/models/qsqlrelationaltablemodel.h | 2 +- src/xml/sax/qxml.h | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index a1badc7693..b332158c27 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -257,7 +257,7 @@ public: const QItemSelectionRange &other, QItemSelection *result); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QItemSelection) +Q_DECLARE_SHARED(QItemSelection) #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index d39522bd2f..4466210ce6 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -250,7 +250,7 @@ private: QExplicitlySharedDataPointer a; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonArray) +Q_DECLARE_SHARED(QJsonArray) Q_CORE_EXPORT size_t qHash(const QJsonArray &array, size_t seed = 0); diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index fd3a3ac61d..8c2840eda7 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -172,7 +172,7 @@ private: std::unique_ptr d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonDocument) +Q_DECLARE_SHARED(QJsonDocument) #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index dc449eecf4..4002a8bc24 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -300,7 +300,7 @@ private: QExplicitlySharedDataPointer o; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonObject) +Q_DECLARE_SHARED(QJsonObject) Q_CORE_EXPORT size_t qHash(const QJsonObject &object, size_t seed = 0); diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index fa877ff7ee..6acdace562 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -230,7 +230,7 @@ public: QJsonValueRef* operator->() { return &valueRef; } }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) +Q_DECLARE_SHARED(QJsonValue) Q_CORE_EXPORT size_t qHash(const QJsonValue &value, size_t seed = 0); diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index 1b22dfa4c7..6d6930767a 100644 --- a/src/corelib/serialization/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h @@ -88,7 +88,7 @@ public: inline int position() const { return m_position; } inline int size() const { return m_size; } }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QXmlStreamStringRef) +Q_DECLARE_SHARED(QXmlStreamStringRef) class QXmlStreamReaderPrivate; diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index f388a65bed..cfa66d348e 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -150,7 +150,7 @@ protected: friend class QDBusArgumentPrivate; mutable QDBusArgumentPrivate *d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusArgument) +Q_DECLARE_SHARED(QDBusArgument) QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusArgument) diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 368f811602..1361fc5035 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -212,7 +212,7 @@ private: friend class QDBusConnectionPrivate; QDBusConnectionPrivate *d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusConnection) +Q_DECLARE_SHARED(QDBusConnection) Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::RegisterOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions) diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 312bac71de..50538b395b 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -132,7 +132,7 @@ private: // so the following field cannot be used: void *unused; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusError) +Q_DECLARE_SHARED(QDBusError) #ifndef QT_NO_DEBUG_STREAM Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusError &); diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index d172d51294..6b948c6895 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -79,7 +79,7 @@ public: private: void doCheck(); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusObjectPath) +Q_DECLARE_SHARED(QDBusObjectPath) inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) : m_path(QString::fromLatin1(objectPath)) @@ -132,7 +132,7 @@ public: private: void doCheck(); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusSignature) +Q_DECLARE_SHARED(QDBusSignature) inline QDBusSignature::QDBusSignature(const char *dBusSignature) : m_signature(QString::fromLatin1(dBusSignature)) @@ -179,7 +179,7 @@ public: inline QVariant variant() const { return m_variant; } }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusVariant) +Q_DECLARE_SHARED(QDBusVariant) inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant) : m_variant(dBusVariant) { } diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 41845317c4..33a706abd2 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -129,7 +129,7 @@ private: friend class QDBusMessagePrivate; QDBusMessagePrivate *d_ptr; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusMessage) +Q_DECLARE_SHARED(QDBusMessage) #ifndef QT_NO_DEBUG_STREAM Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusMessage &); diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index 757e024808..33021d1773 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -88,7 +88,7 @@ public: static int totalUsed(); #endif }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPixmapCache::Key) +Q_DECLARE_SHARED(QPixmapCache::Key) QT_END_NAMESPACE diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index d3b4140ec7..21ea13c0d7 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -119,7 +119,7 @@ private: friend Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept; QCursorData *d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QCursor) +Q_DECLARE_SHARED(QCursor) Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept; inline bool operator!=(const QCursor &lhs, const QCursor &rhs) noexcept { return !(lhs == rhs); } diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 0b006d466c..b72a5d3298 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -224,7 +224,7 @@ private: #endif }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPainterPath) +Q_DECLARE_SHARED(QPainterPath) Q_DECLARE_TYPEINFO(QPainterPath::Element, Q_PRIMITIVE_TYPE); #ifndef QT_NO_DATASTREAM diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index 584965af3b..8812cb6a93 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -95,7 +95,7 @@ public: bool intersects(const QPolygon &r) const; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygon) +Q_DECLARE_SHARED(QPolygon) inline QPolygon::QPolygon(int asize) : QVector(asize) {} @@ -170,7 +170,7 @@ public: bool intersects(const QPolygonF &r) const; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygonF) +Q_DECLARE_SHARED(QPolygonF) inline QPolygonF::QPolygonF(int asize) : QVector(asize) {} diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index dac58bd2eb..b4d79462d4 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -157,7 +157,7 @@ Q_GUI_EXPORT static const struct QRegionData shared_empty; static void cleanUp(QRegionData *x); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QRegion) +Q_DECLARE_SHARED(QRegion) /***************************************************************************** QRegion stream functions diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index ffa08aca30..6f83bdef05 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -160,7 +160,7 @@ protected: QExplicitlySharedDataPointer d; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QHostAddress::ConversionMode) -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QHostAddress) +Q_DECLARE_SHARED(QHostAddress) inline bool operator ==(QHostAddress::SpecialAddress address1, const QHostAddress &address2) { return address2 == address1; } diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index cda286b423..047ab3bbd9 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -156,7 +156,7 @@ private: QtPrivate::QSlotObjectBase *slotObj); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QHostInfo) +Q_DECLARE_SHARED(QHostInfo) QT_END_NAMESPACE diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 285ea88ee2..fd147852c0 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -93,7 +93,7 @@ private: }; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QSqlError) +Q_DECLARE_SHARED(QSqlError) #ifndef QT_NO_DEBUG_STREAM Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlError &); diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 2ebadaabd1..f9e3620eb6 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -76,7 +76,7 @@ public: private: QString tName, iColumn, dColumn; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QSqlRelation) +Q_DECLARE_SHARED(QSqlRelation) class QSqlRelationalTableModelPrivate; diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 5dd9afa672..badc5c778d 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -188,7 +188,7 @@ private: }; Q_DECLARE_TYPEINFO(QXmlAttributes::Attribute, Q_MOVABLE_TYPE); -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QXmlAttributes) +Q_DECLARE_SHARED(QXmlAttributes) // // SAX Input Source -- cgit v1.2.3