diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-20 19:45:00 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 22:23:13 +0100 |
| commit | 3e1e0b41a81b7c3e4140264dcaede7ab8a51bf77 (patch) | |
| tree | cbcdec27eec13d6b1cba2fa2dc6f8eb29dbe5a55 /src/dbus/qdbusinterface.cpp | |
| parent | 83e055424af8331eafd744ea33dfe8a4ecdaf1e6 (diff) | |
Use the new QMetaMethod API in QtDBus
Use QMetaMethod::name() instead of parsing the signature.
Use QMetaMethod::returnType() instead of resolving the type id
via the type name.
Change-Id: If5d0198c5f1329fd9d9340acd58bd4a36933d960
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusinterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index b336396f3b..f6a84b9980 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -300,7 +300,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv) const int *outputTypes = metaObject->outputTypesForMethod(id); int outputTypesCount = *outputTypes++; - if (*mm.typeName()) { + if (mm.returnType() != QMetaType::UnknownType && mm.returnType() != QMetaType::Void) { // this method has a return type if (argv[0] && it != args.constEnd()) copyArgument(argv[0], *outputTypes++, *it); |