summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus/qdbusabstractinterface/pinger.h
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-04-29 00:11:28 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-02 08:30:59 +0200
commitade888860334d207f5f070b0bc9c4c98deaf3862 (patch)
tree133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/auto/dbus/qdbusabstractinterface/pinger.h
parent6102ab8d646d76a68bb460885394501e90b4fd1f (diff)
Don't use obsolete qVariantValue, qVariantCanConvert, etc.
qVariantValue and qVariantCanConvert are Compatibility members, while in Qt4.8 they are marked as Qt 3 Support Members. qVariantFromValue and qVariantSetValue are Obsolete members. Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/dbus/qdbusabstractinterface/pinger.h')
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/pinger.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/pinger.h b/tests/auto/dbus/qdbusabstractinterface/pinger.h
index 7fc6e640fe..0b6e8343bb 100644
--- a/tests/auto/dbus/qdbusabstractinterface/pinger.h
+++ b/tests/auto/dbus/qdbusabstractinterface/pinger.h
@@ -81,19 +81,19 @@ public:
inline RegisteredType complexProp() const
{ return qvariant_cast< RegisteredType >(property("complexProp")); }
inline void setComplexProp(RegisteredType value)
- { setProperty("complexProp", qVariantFromValue(value)); }
+ { setProperty("complexProp", QVariant::fromValue(value)); }
Q_PROPERTY(QString stringProp READ stringProp WRITE setStringProp)
inline QString stringProp() const
{ return qvariant_cast< QString >(property("stringProp")); }
inline void setStringProp(const QString &value)
- { setProperty("stringProp", qVariantFromValue(value)); }
+ { setProperty("stringProp", QVariant::fromValue(value)); }
Q_PROPERTY(QDBusVariant variantProp READ variantProp WRITE setVariantProp)
inline QDBusVariant variantProp() const
{ return qvariant_cast< QDBusVariant >(property("variantProp")); }
inline void setVariantProp(const QDBusVariant &value)
- { setProperty("variantProp", qVariantFromValue(value)); }
+ { setProperty("variantProp", QVariant::fromValue(value)); }
public Q_SLOTS: // METHODS
inline QDBusPendingReply<RegisteredType> complexMethod()
@@ -120,7 +120,7 @@ public Q_SLOTS: // METHODS
inline QDBusPendingReply<int> sleepMethod(int in0)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(in0);
+ argumentList << QVariant::fromValue(in0);
return asyncCallWithArgumentList(QLatin1String("sleepMethod"), argumentList);
}