diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-08 01:24:03 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 18:13:37 +0000 |
| commit | 49f7281d36028055e61175c23bc455b4147480b9 (patch) | |
| tree | 5c97570c0cfb94273d9588799c82f3698fadf5e0 /src/dbus/qdbusextratypes.h | |
| parent | b8970e3e81faff2dc0fa3ddbe461b8f6429ba555 (diff) | |
Mark QDBus{ObjectPath,Signature,Variant} shared-come-qt6
The compiler-generated move operations are ok.
Change-Id: Ida994b52e3ee6ce75afd50133e61488b94464eee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusextratypes.h')
| -rw-r--r-- | src/dbus/qdbusextratypes.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 6939afd6ab..8495b3a320 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -53,7 +53,9 @@ class Q_DBUS_EXPORT QDBusObjectPath { QString m_path; public: - inline QDBusObjectPath() { } + QDBusObjectPath() Q_DECL_NOTHROW : m_path() {} + // compiler-generated copy/move constructor/assignment operators are ok! + // compiler-generated destructor is ok! inline explicit QDBusObjectPath(const char *path); inline explicit QDBusObjectPath(QLatin1String path); @@ -62,6 +64,8 @@ public: explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); } #endif + void swap(QDBusObjectPath &other) Q_DECL_NOTHROW { qSwap(m_path, other.m_path); } + inline void setPath(const QString &path); inline QString path() const @@ -70,9 +74,7 @@ public: private: void doCheck(); }; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -Q_DECLARE_TYPEINFO(QDBusObjectPath, Q_MOVABLE_TYPE); -#endif +Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusObjectPath) inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) : m_path(QString::fromLatin1(objectPath)) @@ -106,7 +108,9 @@ class Q_DBUS_EXPORT QDBusSignature { QString m_signature; public: - inline QDBusSignature() { } + QDBusSignature() Q_DECL_NOTHROW : m_signature() {} + // compiler-generated copy/move constructor/assignment operators are ok! + // compiler-generated destructor is ok! inline explicit QDBusSignature(const char *signature); inline explicit QDBusSignature(QLatin1String signature); @@ -115,6 +119,8 @@ public: explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); } #endif + void swap(QDBusSignature &other) Q_DECL_NOTHROW { qSwap(m_signature, other.m_signature); } + inline void setSignature(const QString &signature); inline QString signature() const @@ -123,9 +129,7 @@ public: private: void doCheck(); }; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -Q_DECLARE_TYPEINFO(QDBusSignature, Q_MOVABLE_TYPE); -#endif +Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusSignature) inline QDBusSignature::QDBusSignature(const char *dBusSignature) : m_signature(QString::fromLatin1(dBusSignature)) @@ -158,20 +162,23 @@ class QDBusVariant { QVariant m_variant; public: - inline QDBusVariant() { } + QDBusVariant() Q_DECL_NOTHROW : m_variant() {} + // compiler-generated copy/move constructor/assignment operators are ok! + // compiler-generated destructor is ok! + inline explicit QDBusVariant(const QVariant &variant); #ifdef Q_COMPILER_RVALUE_REFS explicit QDBusVariant(QVariant &&v) Q_DECL_NOTHROW : m_variant(std::move(v)) {} #endif + void swap(QDBusVariant &other) Q_DECL_NOTHROW { qSwap(m_variant, other.m_variant); } + inline void setVariant(const QVariant &variant); inline QVariant variant() const { return m_variant; } }; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -Q_DECLARE_TYPEINFO(QDBusVariant, Q_MOVABLE_TYPE); -#endif +Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusVariant) inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant) : m_variant(dBusVariant) { } |