summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2012-01-27 14:06:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-28 14:44:48 +0100
commit7c853db64239682fae2c34c6e48f847cc0042a7a (patch)
tree6cc37cf5fd6ffc1a0c52c52e5e8651f0da15cc1e
parent1fee3304fd45d04a2a89d88ae41e89c15e080400 (diff)
Code cleanup, remove QVariant::nameToType usage.
It is better to use QMetaType::type because it works well with custom types too. Change-Id: I30bc70d16b2aad4ba22682de1c215b917e64209b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/dbus/qdbusmetaobject.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index dfb2b2129b..6acaa921a6 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -202,9 +202,7 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature,
// verify that it's a valid one
if (!typeName.isEmpty()) {
// type name found
- type = QVariant::nameToType(typeName);
- if (type == QVariant::UserType)
- type = QMetaType::type(typeName);
+ type = QMetaType::type(typeName);
}
if (type == QVariant::Invalid || signature != QDBusMetaType::typeToSignature(type)) {