1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark QDBus{ObjectPath,Signature,Variant} shared-come-qt6

Browse Source 
The compiler-generated move operations are ok.

Change-Id: Ida994b52e3ee6ce75afd50133e61488b94464eee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2015-07-08 01:24:03 +02:00
parent b8970e3e81
commit 49f7281d36
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/dbus/qdbusextratypes.h
View File

@ -53,7 +53,9 @@ class Q_DBUS_EXPORT QDBusObjectPath
{ {
QString m_path; QString m_path;
public: 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(const char *path);
inline explicit QDBusObjectPath(QLatin1String path); inline explicit QDBusObjectPath(QLatin1String path);
@ -62,6 +64,8 @@ public:
explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); } explicit QDBusObjectPath(QString &&p) : m_path(std::move(p)) { doCheck(); }
#endif #endif
void swap(QDBusObjectPath &other) Q_DECL_NOTHROW { qSwap(m_path, other.m_path); }
inline void setPath(const QString &path); inline void setPath(const QString &path);
inline QString path() const inline QString path() const
@ -70,9 +74,7 @@ public:
private: private:
void doCheck(); void doCheck();
}; };
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusObjectPath)
Q_DECLARE_TYPEINFO(QDBusObjectPath, Q_MOVABLE_TYPE);
#endif
inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) inline QDBusObjectPath::QDBusObjectPath(const char *objectPath)
: m_path(QString::fromLatin1(objectPath)) : m_path(QString::fromLatin1(objectPath))
@ -106,7 +108,9 @@ class Q_DBUS_EXPORT QDBusSignature
{ {
QString m_signature; QString m_signature;
public: 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(const char *signature);
inline explicit QDBusSignature(QLatin1String signature); inline explicit QDBusSignature(QLatin1String signature);
@ -115,6 +119,8 @@ public:
explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); } explicit QDBusSignature(QString &&sig) : m_signature(std::move(sig)) { doCheck(); }
#endif #endif
void swap(QDBusSignature &other) Q_DECL_NOTHROW { qSwap(m_signature, other.m_signature); }
inline void setSignature(const QString &signature); inline void setSignature(const QString &signature);
inline QString signature() const inline QString signature() const
@ -123,9 +129,7 @@ public:
private: private:
void doCheck(); void doCheck();
}; };
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusSignature)
Q_DECLARE_TYPEINFO(QDBusSignature, Q_MOVABLE_TYPE);
#endif
inline QDBusSignature::QDBusSignature(const char *dBusSignature) inline QDBusSignature::QDBusSignature(const char *dBusSignature)
: m_signature(QString::fromLatin1(dBusSignature)) : m_signature(QString::fromLatin1(dBusSignature))
@ -158,20 +162,23 @@ class QDBusVariant
{ {
QVariant m_variant; QVariant m_variant;
public: 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); inline explicit QDBusVariant(const QVariant &variant);
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS
explicit QDBusVariant(QVariant &&v) Q_DECL_NOTHROW : m_variant(std::move(v)) {} explicit QDBusVariant(QVariant &&v) Q_DECL_NOTHROW : m_variant(std::move(v)) {}
#endif #endif
void swap(QDBusVariant &other) Q_DECL_NOTHROW { qSwap(m_variant, other.m_variant); }
inline void setVariant(const QVariant &variant); inline void setVariant(const QVariant &variant);
inline QVariant variant() const inline QVariant variant() const
{ return m_variant; } { return m_variant; }
}; };
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusVariant)
Q_DECLARE_TYPEINFO(QDBusVariant, Q_MOVABLE_TYPE);
#endif
inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant) inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant)
: m_variant(dBusVariant) { } : m_variant(dBusVariant) { }