diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-18 14:43:25 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-19 23:45:54 +0200 |
| commit | 7c070ac95979609e6ba33b829dc4a2a373ef26b5 (patch) | |
| tree | 9edc4cc4876a28ac45aeb0a3f036242b075c1092 /src/dbus | |
| parent | 857722ed8f16bb5b9e64154690f6b0bf3f880dd7 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusargument.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbuserror.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusmessage.h | 2 |
5 files changed, 7 insertions, 7 deletions
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 &); |