diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-02-10 12:21:25 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 12:47:52 +0100 |
commit | 51f2a0c3318549a6f9388e3d4920eb23a60f8b7b (patch) | |
tree | f25f66a07b4d4320978909aa069c5251d11145ca /src/dbus | |
parent | 1a49a529ee3e721ea8736bd0c34a0086a2dbad4d (diff) |
Cleanup usage of QVariant::Type.
QVariant::Type is marked as obsolete. It is not possible to get rid of
it completely, in a source compatible way, but at least we can remove it
safely from a method arguments list.
Change-Id: I26b58099bfa6d32f3a583a8ae0047f0bb36bcd0d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusargument.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 1c2cb6f0f0..6e6e676dae 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -89,7 +89,7 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) if (signature.isEmpty() || !ok || !QDBusUtil::isValidSingleSignature(QString::fromLatin1(signature))) { qWarning("QDBusMarshaller: type `%s' produces invalid D-BUS signature `%s' " "(Did you forget to call beginStructure() ?)", - QVariant::typeToName( QVariant::Type(id) ), + QMetaType::typeName(id), signature.isEmpty() ? "<empty>" : signature.constData()); return ""; } else if ((signature.at(0) != DBUS_TYPE_ARRAY && signature.at(0) != DBUS_STRUCT_BEGIN_CHAR) || @@ -97,9 +97,9 @@ QByteArray QDBusArgumentPrivate::createSignature(int id) signature.at(1) == DBUS_TYPE_STRING))) { qWarning("QDBusMarshaller: type `%s' attempts to redefine basic D-BUS type '%s' (%s) " "(Did you forget to call beginStructure() ?)", - QVariant::typeToName( QVariant::Type(id) ), + QMetaType::typeName(id), signature.constData(), - QVariant::typeToName( QVariant::Type(QDBusMetaType::signatureToType(signature))) ); + QMetaType::typeName(QDBusMetaType::signatureToType(signature))); return ""; } return signature; |