From 11bad6109606794091adc3b8a14070ac09707f45 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 10 Sep 2020 17:05:10 +0200 Subject: Deprecate QVariant::Type It's been obsolete for a long time already. Make sure the compiler now warns about it and remove all remaining uses in qtbase. Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7 Reviewed-by: Fabian Kosmale --- src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp | 2 +- src/dbus/qdbusargument.cpp | 2 +- src/dbus/qdbusmarshaller.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp index 7eb1e8b34e..cf698c79bf 100644 --- a/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp +++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp @@ -242,7 +242,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const MyArray &myArray) // Append a dictionary that associates ints to MyValue types QDBusArgument &operator<<(QDBusArgument &argument, const MyDictionary &myDict) { - argument.beginMap(QVariant::Int, qMetaTypeId()); + argument.beginMap(QMetaType::fromType(), QMetaType::fromType()); MyDictionary::const_iterator i; for (i = myDict.cbegin(); i != myDict.cend(); ++i) { argument.beginMapEntry(); diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 26ecd543f1..e17b40e58c 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -1107,7 +1107,7 @@ bool QDBusArgument::atEnd() const argument (for example, by calling asVariant() in it). For example, if the current argument is an INT32, this function - will return a QVariant with an argument of type QVariant::Int. For + will return a QVariant with an argument of type QMetaType::Int. For an array of INT32, it will return a QVariant containing a QDBusArgument. diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 4977d7b265..03da1a6780 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -192,7 +192,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg) QMetaType id = value.metaType(); if (!id.isValid()) { qWarning("QDBusMarshaller: cannot add a null QDBusVariant"); - error(QLatin1String("Variant containing QVariant::Invalid passed in arguments")); + error(QLatin1String("Invalid QVariant passed in arguments")); return false; } @@ -386,7 +386,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) QMetaType id = arg.metaType(); if (!id.isValid()) { qWarning("QDBusMarshaller: cannot add an invalid QVariant"); - error(QLatin1String("Variant containing QVariant::Invalid passed in arguments")); + error(QLatin1String("Invalid QVariant passed in arguments")); return false; } -- cgit v1.2.3