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>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index 1d40a4544f..dd5c95508c 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -69,14 +69,6 @@ bool qDBusCheckAsyncTag(const char *tag)
     return false;
 }
 
-int qDBusNameToTypeId(const char *name)
-{
-    int id = static_cast<int>( QVariant::nameToType(name) );
-    if (id == QVariant::UserType)
-        id = QMetaType::type(name);
-    return id;
-}
-
 QString qDBusInterfaceFromMetaObject(const QMetaObject *mo)
 {
     QString interface;
@@ -158,7 +150,7 @@ int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes)
             QByteArray basictype = type;
             basictype.truncate(type.length() - 1);
 
-            int id = qDBusNameToTypeId(basictype);
+            int id = QMetaType::type(basictype);
             if (id == 0) {
                 //qWarning("Could not parse the method '%s'", mm.signature());
                 // invalid type in method parameter list
@@ -177,7 +169,7 @@ int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes)
             return -1;          // not allowed
         }
 
-        int id = qDBusNameToTypeId(type);
+        int id = QMetaType::type(type);
         if (id == 0) {
             //qWarning("Could not parse the method '%s'", mm.signature());
             // invalid type in method parameter list