diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/dbus/qdbusextratypes.h | |
parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/dbus/qdbusextratypes.h')
-rw-r--r-- | src/dbus/qdbusextratypes.h | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index c4e843422d..c1b8cffc79 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -47,6 +47,7 @@ #include <QtCore/qvariant.h> #include <QtCore/qstring.h> #include <QtDBus/qdbusmacros.h> +#include <QtCore/qhash.h> #ifndef QT_NO_DBUS @@ -55,45 +56,39 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -// defined in qhash.cpp -Q_CORE_EXPORT uint qHash(const QString &key); - -class Q_DBUS_EXPORT QDBusObjectPath : private QString +class Q_DBUS_EXPORT QDBusObjectPath { + QString m_path; public: inline QDBusObjectPath() { } inline explicit QDBusObjectPath(const char *path); inline explicit QDBusObjectPath(const QLatin1String &path); inline explicit QDBusObjectPath(const QString &path); - inline QDBusObjectPath &operator=(const QDBusObjectPath &path); inline void setPath(const QString &path); inline QString path() const - { return *this; } + { return m_path; } private: void doCheck(); }; inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) - : QString(QString::fromLatin1(objectPath)) + : m_path(QString::fromLatin1(objectPath)) { doCheck(); } inline QDBusObjectPath::QDBusObjectPath(const QLatin1String &objectPath) - : QString(objectPath) + : m_path(objectPath) { doCheck(); } inline QDBusObjectPath::QDBusObjectPath(const QString &objectPath) - : QString(objectPath) + : m_path(objectPath) { doCheck(); } -inline QDBusObjectPath &QDBusObjectPath::operator=(const QDBusObjectPath &_path) -{ QString::operator=(_path); doCheck(); return *this; } - inline void QDBusObjectPath::setPath(const QString &objectPath) -{ QString::operator=(objectPath); doCheck(); } +{ m_path = objectPath; doCheck(); } inline bool operator==(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) { return lhs.path() == rhs.path(); } @@ -104,46 +99,43 @@ inline bool operator!=(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) inline bool operator<(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) { return lhs.path() < rhs.path(); } -inline uint qHash(const QDBusObjectPath &objectPath) -{ return qHash(objectPath.path()); } +inline uint qHash(const QDBusObjectPath &objectPath, uint seed) +{ return qHash(objectPath.path(), seed); } -class Q_DBUS_EXPORT QDBusSignature : private QString +class Q_DBUS_EXPORT QDBusSignature { + QString m_signature; public: inline QDBusSignature() { } inline explicit QDBusSignature(const char *signature); inline explicit QDBusSignature(const QLatin1String &signature); inline explicit QDBusSignature(const QString &signature); - inline QDBusSignature &operator=(const QDBusSignature &signature); inline void setSignature(const QString &signature); inline QString signature() const - { return *this; } + { return m_signature; } private: void doCheck(); }; inline QDBusSignature::QDBusSignature(const char *dBusSignature) - : QString(QString::fromAscii(dBusSignature)) + : m_signature(QString::fromAscii(dBusSignature)) { doCheck(); } inline QDBusSignature::QDBusSignature(const QLatin1String &dBusSignature) - : QString(dBusSignature) + : m_signature(dBusSignature) { doCheck(); } inline QDBusSignature::QDBusSignature(const QString &dBusSignature) - : QString(dBusSignature) + : m_signature(dBusSignature) { doCheck(); } -inline QDBusSignature &QDBusSignature::operator=(const QDBusSignature &dbusSignature) -{ QString::operator=(dbusSignature); doCheck(); return *this; } - inline void QDBusSignature::setSignature(const QString &dBusSignature) -{ QString::operator=(dBusSignature); doCheck(); } +{ m_signature = dBusSignature; doCheck(); } inline bool operator==(const QDBusSignature &lhs, const QDBusSignature &rhs) { return lhs.signature() == rhs.signature(); } @@ -154,11 +146,12 @@ inline bool operator!=(const QDBusSignature &lhs, const QDBusSignature &rhs) inline bool operator<(const QDBusSignature &lhs, const QDBusSignature &rhs) { return lhs.signature() < rhs.signature(); } -inline uint qHash(const QDBusSignature &signature) -{ return qHash(signature.signature()); } +inline uint qHash(const QDBusSignature &signature, uint seed) +{ return qHash(signature.signature(), seed); } -class QDBusVariant : private QVariant +class QDBusVariant { + QVariant m_variant; public: inline QDBusVariant() { } inline explicit QDBusVariant(const QVariant &variant); @@ -166,14 +159,14 @@ public: inline void setVariant(const QVariant &variant); inline QVariant variant() const - { return *this; } + { return m_variant; } }; inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant) - : QVariant(dBusVariant) { } + : m_variant(dBusVariant) { } inline void QDBusVariant::setVariant(const QVariant &dBusVariant) -{ QVariant::operator=(dBusVariant); } +{ m_variant = dBusVariant; } inline bool operator==(const QDBusVariant &v1, const QDBusVariant &v2) { return v1.variant() == v2.variant(); } |