replace qDBusNameToTypeId() with QMetaType::type()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index f7badbc..1f440af 100644 (file)
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -445,7 +445,7 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode,
                 if (mm.methodType() != QMetaMethod::Slot && mm.methodType() != QMetaMethod::Method)
                     continue;
 
-                const int returnType = qDBusNameToTypeId(mm.typeName());
+                const int returnType = QMetaType::type(mm.typeName());
                 if (returnType == QMetaType::Void) {
                     mode = QDBus::NoBlock;
                     break;

diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index e1a0827..82f4f16 100644 (file)
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -307,7 +307,6 @@ public:
 
 // in qdbusmisc.cpp
 extern int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes);
-extern int qDBusNameToTypeId(const char *name);
 extern bool qDBusInterfaceInObject(QObject *obj, const QString &interface_name);
 extern QString qDBusInterfaceFromMetaObject(const QMetaObject *mo);
 

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index f6ffab9..9bf0f25 100644 (file)
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -641,7 +641,7 @@ static int findMetaSlot(const QMetaObject *mo, const QByteArray &name, int flags
         if (paren != name.length() || !slotname.startsWith(name))
             continue;
 
-        const int returnType = qDBusNameToTypeId(mm.typeName());
+        const int returnType = QMetaType::type(mm.typeName());
         const bool isScriptable = mm.attributes() & QMetaMethod::Scriptable;
 
         int inputCount = qDBusParametersForMethod(mm, metaTypes);

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index c55a871..d0a5b2a 100644 (file)
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -321,7 +321,7 @@ static int writeProperty(QObject *obj, const QByteArray &property_name, QVariant
     int id = mp.type();
     if (id == QVariant::UserType) {
         // dynamic type
-        id = qDBusNameToTypeId(mp.typeName());
+        id = QMetaType::type(mp.typeName());
         if (id == -1) {
             // type not registered?
             qWarning("QDBusConnection: Unable to handle unregistered datatype '%s' for property '%s::%s'",
@@ -428,7 +428,7 @@ static QVariantMap readAllProperties(QObject *object, int flags)
             continue;
 
         // is it a registered property?
-        int typeId = qDBusNameToTypeId(mp.typeName());
+        int typeId = QMetaType::type(mp.typeName());
         if (!typeId)
             continue;
         const char *signature = QDBusMetaType::typeToSignature(typeId);

diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index 5641511..98041e1 100644 (file)
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -45,14 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-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;
@@ -131,7 +123,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
@@ -150,7 +142,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

diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp
index 6692d85..9dfcba3 100644 (file)
--- a/src/dbus/qdbusxmlgenerator.cpp
+++ b/src/dbus/qdbusxmlgenerator.cpp
@@ -92,7 +92,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
             if (mp.isWritable())
                 access |= 2;
 
-            int typeId = qDBusNameToTypeId(mp.typeName());
+            int typeId = QMetaType::type(mp.typeName());
             if (!typeId)
                 continue;
             const char *signature = QDBusMetaType::typeToSignature(typeId);
@@ -141,7 +141,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) {