diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-01-26 16:54:43 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 10:51:40 +0100 |
| commit | 259388157c3b9541dc24e2fcb08a404c29e9d19f (patch) | |
| tree | 10e47707685142e97595e4852cc6a1ab3a5cebf2 /src/dbus/qdbusxmlgenerator.cpp | |
| parent | bd5881b460cf2c42415ff3ff779f0c366c85a403 (diff) | |
Remove qDBusNameToTypeId function.
The function is redundant and can be replaced by QMetaType::type().
Change-Id: I131a7fd285a60d8bd0f3b958668a43bd5da2d6c4
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusxmlgenerator.cpp')
| -rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 4e4bff04a5..1471720f02 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -101,7 +101,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method if (mp.isWritable()) access |= 2; - int typeId = qDBusNameToTypeId(mp.typeName()); + int typeId = mp.userType(); if (!typeId) continue; const char *signature = QDBusMetaType::typeToSignature(typeId); @@ -150,7 +150,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method .arg(QLatin1String(signature.left(paren))); // check the return type first - int typeId = qDBusNameToTypeId(mm.typeName()); + int typeId = QMetaType::type(mm.typeName()); if (typeId) { const char *typeName = QDBusMetaType::typeToSignature(typeId); if (typeName) { |