From d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 6 Dec 2019 13:19:37 +0100 Subject: Replace usages of QVariant::value by qvariant_cast This is done automatically with a clazy check Change-Id: I3b59511d3d36d416c8eda74858ead611d327b116 Reviewed-by: Lars Knoll --- examples/corelib/serialization/convert/cborconverter.cpp | 2 +- examples/corelib/serialization/convert/datastreamconverter.cpp | 2 +- examples/corelib/serialization/convert/xmlconverter.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/corelib/serialization/convert') diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp index f907bb0af6..60410ed26a 100644 --- a/examples/corelib/serialization/convert/cborconverter.cpp +++ b/examples/corelib/serialization/convert/cborconverter.cpp @@ -144,7 +144,7 @@ static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrim } if (v.userType() == qMetaTypeId()) { - const auto m = v.value(); + const auto m = qvariant_cast(v); QCborMap map; for (const auto &pair : m) map.insert(convertFromVariant(pair.first, fpTrimming), diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp index 7cdb844141..7e9f5e1bdc 100644 --- a/examples/corelib/serialization/convert/datastreamconverter.cpp +++ b/examples/corelib/serialization/convert/datastreamconverter.cpp @@ -98,7 +98,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str int type = v.userType(); if (type == qMetaTypeId() || type == QVariant::Map) { const auto map = (type == QVariant::Map) ? - VariantOrderedMap(v.toMap()) : v.value(); + VariantOrderedMap(v.toMap()) : qvariant_cast(v); result = QLatin1String("Map {"); for (const auto &pair : map) { diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index e62801bf76..d9e724dfe1 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -336,7 +336,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v) } else if (type == QVariant::Map || type == qMetaTypeId()) { const VariantOrderedMap map = (type == QVariant::Map) ? VariantOrderedMap(v.toMap()) : - v.value(); + qvariant_cast(v); xml.writeStartElement("map"); for (const auto &pair : map) { @@ -425,10 +425,10 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v) default: if (type == qMetaTypeId()) { xml.writeAttribute(typeString, "number"); - xml.writeCharacters(QString::number(float(v.value()))); + xml.writeCharacters(QString::number(float(qvariant_cast(v)))); } else if (type == qMetaTypeId()) { xml.writeAttribute(typeString, "CBOR simple type"); - xml.writeCharacters(QString::number(int(v.value()))); + xml.writeCharacters(QString::number(int(qvariant_cast(v)))); } else { // does this convert to string? const char *typeName = v.typeName(); -- cgit v1.2.3