From db06953ca117f7d9c5083ea9779d86da4c391399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 21 May 2012 10:13:24 +0200 Subject: Replace QVariant::typeToName usage by QMetaType::typeName call. Type information is kept in QMetaType class. QVariant is delegating operations, so it is better to use QMetaType directly. Change-Id: I91209fa1c9dc4303d6bd47c96824d3cd64ce5291 Reviewed-by: Stephen Kelly Reviewed-by: Thiago Macieira --- src/corelib/kernel/qvariant.cpp | 2 +- src/dbus/qdbusmarshaller.cpp | 18 +++++++++--------- src/dbus/qdbusmetaobject.cpp | 2 +- src/dbus/qdbusreply.cpp | 2 +- src/dbus/qdbusxmlgenerator.cpp | 6 +++--- src/sql/kernel/qsqlfield.cpp | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index cd946d8b2c..3d3386027a 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1563,7 +1563,7 @@ void QVariant::detach() */ const char *QVariant::typeName() const { - return typeToName(d.type); + return QMetaType::typeName(d.type); } /*! diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index b7968a260c..00ef7fd9d8 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -238,9 +238,9 @@ inline QDBusMarshaller *QDBusMarshaller::beginArray(int id) if (!signature) { qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", - QVariant::typeToName( QVariant::Type(id) ), id); + QMetaType::typeName(id), id); error(QString::fromLatin1("Unregistered type %1 passed in arguments") - .arg(QLatin1String(QVariant::typeToName(QVariant::Type(id))))); + .arg(QLatin1String(QMetaType::typeName(id)))); return this; } @@ -253,22 +253,22 @@ inline QDBusMarshaller *QDBusMarshaller::beginMap(int kid, int vid) if (!ksignature) { qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", - QVariant::typeToName( QVariant::Type(kid) ), kid); + QMetaType::typeName(kid), kid); error(QString::fromLatin1("Unregistered type %1 passed in arguments") - .arg(QLatin1String(QVariant::typeToName(QVariant::Type(kid))))); + .arg(QLatin1String(QMetaType::typeName(kid)))); return this; } if (ksignature[1] != 0 || !QDBusUtil::isValidBasicType(*ksignature)) { qWarning("QDBusMarshaller: type '%s' (%d) cannot be used as the key type in a D-BUS map.", - QVariant::typeToName( QVariant::Type(kid) ), kid); + QMetaType::typeName(kid), kid); error(QString::fromLatin1("Type %1 passed in arguments cannot be used as a key in a map") - .arg(QLatin1String(QVariant::typeToName(QVariant::Type(kid))))); + .arg(QLatin1String(QMetaType::typeName(kid)))); return this; } const char *vsignature = QDBusMetaType::typeToSignature( QVariant::Type(vid) ); if (!vsignature) { - const char *typeName = QVariant::typeToName(QVariant::Type(vid)); + const char *typeName = QMetaType::typeName(vid); qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", typeName, vid); @@ -397,9 +397,9 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) if (!signature) { qWarning("QDBusMarshaller: type `%s' (%d) is not registered with D-BUS. " "Use qDBusRegisterMetaType to register it", - QVariant::typeToName( QVariant::Type(id) ), id); + QMetaType::typeName(id), id); error(QString::fromLatin1("Unregistered type %1 passed in arguments") - .arg(QLatin1String(QVariant::typeToName(QVariant::Type(id))))); + .arg(QLatin1String(QMetaType::typeName(id)))); return false; } diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 5570dac71d..560b964a1e 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -219,7 +219,7 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature, type = -1; } } else { - result.name = QVariant::typeToName( QVariant::Type(type) ); + result.name = QMetaType::typeName(type); } result.id = type; diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp index 9875329a26..9e3c28a16e 100644 --- a/src/dbus/qdbusreply.cpp +++ b/src/dbus/qdbusreply.cpp @@ -215,7 +215,7 @@ void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data } else { // not an argument and doesn't match? int type = reply.arguments().at(0).userType(); - receivedType = QVariant::typeToName(QVariant::Type(type)); + receivedType = QMetaType::typeName(type); receivedSignature = QDBusMetaType::typeToSignature(type); } } diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 4ad8113cd0..9b888f39bc 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -114,7 +114,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method .arg(QLatin1String(accessvalues[access])); if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { - const char *typeName = QVariant::typeToName(QVariant::Type(typeId)); + const char *typeName = QMetaType::typeName(typeId); retval += QString::fromLatin1(">\n \n \n") .arg(typeNameToXml(typeName)); } else { @@ -158,7 +158,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method // do we need to describe this argument? if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid) xml += QString::fromLatin1(" \n") - .arg(typeNameToXml(QVariant::typeToName(QVariant::Type(typeId)))); + .arg(typeNameToXml(QMetaType::typeName(typeId))); } else continue; } @@ -200,7 +200,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method // do we need to describe this argument? if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) { - const char *typeName = QVariant::typeToName( QVariant::Type(types.at(j)) ); + const char *typeName = QMetaType::typeName(types.at(j)); xml += QString::fromLatin1(" \n") .arg(isOutput ? QLatin1String("Out") : QLatin1String("In")) .arg(isOutput && !isSignal ? j - inputCount : j - 1) diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp index 47162afb47..ed9d61d6d8 100644 --- a/src/sql/kernel/qsqlfield.cpp +++ b/src/sql/kernel/qsqlfield.cpp @@ -517,7 +517,7 @@ bool QSqlField::isValid() const #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QSqlField &f) { - dbg.nospace() << "QSqlField(" << f.name() << ", " << QVariant::typeToName(f.type()); + dbg.nospace() << "QSqlField(" << f.name() << ", " << QMetaType::typeName(f.type()); if (f.length() >= 0) dbg.nospace() << ", length: " << f.length(); if (f.precision() >= 0) -- cgit v1.2.3