diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-05-15 15:42:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 20:25:11 +0200 |
commit | 5159379c107678e784d172924c18d4e9f562c86b (patch) | |
tree | ff0fa0b601b5d5851e37471f7c3f7e300712369d /src/dbus | |
parent | 5a110517bb3e2df7aaf66e33ad37b2201ebd62f6 (diff) |
Use QMetaType API directly instead of going through QVariant.
Change-Id: I418ccca7cb6e2aa1ba678e24dd36b39ebecadcbe
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusmarshaller.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 145d991e0e..b7968a260c 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -176,7 +176,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) } const QVariant &value = arg.variant(); - QVariant::Type id = QVariant::Type(value.userType()); + int id = value.userType(); if (id == QVariant::Invalid) { qWarning("QDBusMarshaller: cannot add a null QDBusVariant"); error(QLatin1String("Variant containing QVariant::Invalid passed in arguments")); @@ -185,7 +185,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) QByteArray tmpSignature; const char *signature = 0; - if (int(id) == QDBusMetaTypeId::argument) { + if (id == QDBusMetaTypeId::argument) { // take the signature from the QDBusArgument object we're marshalling tmpSignature = qvariant_cast<QDBusArgument>(value).currentSignature().toLatin1(); @@ -197,9 +197,9 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) if (!signature) { qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", - QVariant::typeToName( id ), id); + QMetaType::typeName(id), id); error(QString::fromLatin1("Unregistered type %1 passed in arguments") - .arg(QLatin1String(QVariant::typeToName(id)))); + .arg(QLatin1String(QMetaType::typeName(id)))); return false; } |