diff options
Diffstat (limited to 'src/dbus/qdbusmisc.cpp')
| -rw-r--r-- | src/dbus/qdbusmisc.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index e7c7715eaa..7d68bf1185 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDBus module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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 |