From d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
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 <lars.knoll@qt.io>
---
 src/corelib/kernel/qvariant.cpp          | 2 +-
 src/corelib/kernel/qvariant.h            | 6 +++---
 src/corelib/serialization/qjsoncbor.cpp  | 8 ++++----
 src/corelib/serialization/qjsonvalue.cpp | 6 +++---
 src/corelib/text/qlocale.cpp             | 2 +-
 src/corelib/text/qlocale_unix.cpp        | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index c00efc0afe..f3ac3fcdba 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1544,7 +1544,7 @@ static void customStreamDebug(QDebug dbg, const QVariant &variant) {
 #ifndef QT_BOOTSTRAPPED
     QMetaType::TypeFlags flags = QMetaType::typeFlags(variant.userType());
     if (flags & QMetaType::PointerToQObject)
-        dbg.nospace() << variant.value<QObject*>();
+        dbg.nospace() << qvariant_cast<QObject*>(variant);
 #else
     Q_UNUSED(dbg);
     Q_UNUSED(variant);
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 0dddfc59b3..0ffac5ad54 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -779,7 +779,7 @@ namespace QtPrivate {
                 return QSequentialIterable(QtMetaTypePrivate::QSequentialIterableImpl(reinterpret_cast<const QByteArrayList*>(v.constData())));
             }
 #endif
-            return QSequentialIterable(v.value<QtMetaTypePrivate::QSequentialIterableImpl>());
+            return QSequentialIterable(qvariant_cast<QtMetaTypePrivate::QSequentialIterableImpl>(v));
         }
     };
     template<>
@@ -794,7 +794,7 @@ namespace QtPrivate {
             if (typeId == qMetaTypeId<QVariantHash>()) {
                 return QAssociativeIterable(QtMetaTypePrivate::QAssociativeIterableImpl(reinterpret_cast<const QVariantHash*>(v.constData())));
             }
-            return QAssociativeIterable(v.value<QtMetaTypePrivate::QAssociativeIterableImpl>());
+            return QAssociativeIterable(qvariant_cast<QtMetaTypePrivate::QAssociativeIterableImpl>(v));
         }
     };
     template<>
@@ -857,7 +857,7 @@ namespace QtPrivate {
                 return QVariantValueHelper<QPair<QVariant, QVariant> >::invoke(v);
 
             if (QMetaType::hasRegisteredConverterFunction(typeId, qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
-                QtMetaTypePrivate::QPairVariantInterfaceImpl pi = v.value<QtMetaTypePrivate::QPairVariantInterfaceImpl>();
+                QtMetaTypePrivate::QPairVariantInterfaceImpl pi = qvariant_cast<QtMetaTypePrivate::QPairVariantInterfaceImpl>(v);
 
                 const QtMetaTypePrivate::VariantData d1 = pi.first();
                 QVariant v1(d1.metaTypeId, d1.data, d1.flags);
diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp
index 7136a163ee..5097f4eb81 100644
--- a/src/corelib/serialization/qjsoncbor.cpp
+++ b/src/corelib/serialization/qjsoncbor.cpp
@@ -757,13 +757,13 @@ QCborValue QCborValue::fromVariant(const QVariant &variant)
         return QCborMap::fromJsonObject(doc.object());
     }
     case QMetaType::QCborValue:
-        return variant.value<QCborValue>();
+        return qvariant_cast<QCborValue>(variant);
     case QMetaType::QCborArray:
-        return variant.value<QCborArray>();
+        return qvariant_cast<QCborArray>(variant);
     case QMetaType::QCborMap:
-        return variant.value<QCborMap>();
+        return qvariant_cast<QCborMap>(variant);
     case QMetaType::QCborSimpleType:
-        return variant.value<QCborSimpleType>();
+        return qvariant_cast<QCborSimpleType>(variant);
 #endif
     default:
         break;
diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp
index 033e438580..6cf4c7fdf9 100644
--- a/src/corelib/serialization/qjsonvalue.cpp
+++ b/src/corelib/serialization/qjsonvalue.cpp
@@ -482,11 +482,11 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
         return doc.isArray() ? QJsonValue(doc.array()) : QJsonValue(doc.object());
     }
     case QMetaType::QCborValue:
-        return variant.value<QCborValue>().toJsonValue();
+        return qvariant_cast<QCborValue>(variant).toJsonValue();
     case QMetaType::QCborArray:
-        return variant.value<QCborArray>().toJsonArray();
+        return qvariant_cast<QCborArray>(variant).toJsonArray();
     case QMetaType::QCborMap:
-        return variant.value<QCborMap>().toJsonObject();
+        return qvariant_cast<QCborMap>(variant).toJsonObject();
 #endif
     default:
         break;
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 694d491273..bc38437f8e 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -3065,7 +3065,7 @@ QList<Qt::DayOfWeek> QLocale::weekdays() const
     if (d->m_data == systemData()) {
         QVariant res = systemLocale()->query(QSystemLocale::Weekdays, QVariant());
         if (!res.isNull())
-            return static_cast<QList<Qt::DayOfWeek> >(res.value<QList<Qt::DayOfWeek> >());
+            return static_cast<QList<Qt::DayOfWeek> >(qvariant_cast<QList<Qt::DayOfWeek> >(res));
     }
 #endif
     QList<Qt::DayOfWeek> weekdays;
diff --git a/src/corelib/text/qlocale_unix.cpp b/src/corelib/text/qlocale_unix.cpp
index ff4274d932..5e1e47eae7 100644
--- a/src/corelib/text/qlocale_unix.cpp
+++ b/src/corelib/text/qlocale_unix.cpp
@@ -283,9 +283,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
         return d->uiLanguages.isEmpty() ? QVariant() : QVariant(d->uiLanguages);
     }
     case StringToStandardQuotation:
-        return lc_messages.quoteString(in.value<QStringRef>());
+        return lc_messages.quoteString(qvariant_cast<QStringRef>(in));
     case StringToAlternateQuotation:
-        return lc_messages.quoteString(in.value<QStringRef>(), QLocale::AlternateQuotation);
+        return lc_messages.quoteString(qvariant_cast<QStringRef>(in), QLocale::AlternateQuotation);
     case ListToSeparatedString:
         return lc_messages.createSeparatedList(in.toStringList());
     case LocaleChanged:
-- 
cgit v1.2.3