Remove some of deprecated QVariant::Type

Change-Id: If3bf95e1c5359c50aa64c9174e12166f23d9d24b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 20 insertions, 19 deletions

diff --git a/src/imports/winextras/qquickiconloader.cpp b/src/imports/winextras/qquickiconloader.cpp
index c226143..69b235b 100644
--- a/src/imports/winextras/qquickiconloader.cpp
+++ b/src/imports/winextras/qquickiconloader.cpp
@@ -53,17 +53,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QVariant QQuickIconLoader::loadFromFile(const QUrl &url, QVariant::Type type)
+QVariant QQuickIconLoader::loadFromFile(const QUrl &url, int metaTypeId)
 {
     const QString path = QQmlFile::urlToLocalFileOrQrc(url);
     if (QFileInfo::exists(path)) {
-        switch (type) {
+        switch (metaTypeId) {
         case QMetaType::QIcon:
             return QVariant(QIcon(path));
         case QMetaType::QPixmap:
             return QVariant(QPixmap(path));
         default:
-            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, int(type));
+            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, metaTypeId);
             break;
         }
     }
@@ -78,7 +78,7 @@ QNetworkReply *QQuickIconLoader::loadFromNetwork(const QUrl &url, const QQmlEngi
 #endif // qml_network
 
 QVariant QQuickIconLoader::loadFromImageProvider(const QUrl &url, const QQmlEngine *engine,
-                                                  QVariant::Type type, QSize requestedSize)
+                                                 int metaTypeId, QSize requestedSize)
 {
     const QString providerId = url.host();
     const QString imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1);
@@ -104,13 +104,13 @@ QVariant QQuickIconLoader::loadFromImageProvider(const QUrl &url, const QQmlEngi
         break;
     }
     if (!pixmap.isNull()) {
-        switch (type) {
+        switch (metaTypeId) {
         case QMetaType::QIcon:
             return QVariant(QIcon(pixmap));
         case QMetaType::QPixmap:
             return QVariant(pixmap);
         default:
-            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, int(type));
+            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, metaTypeId);
             break;
         }
     }
@@ -118,9 +118,10 @@ QVariant QQuickIconLoader::loadFromImageProvider(const QUrl &url, const QQmlEngi
 }
 
 #if QT_CONFIG(qml_network)
-QQuickIconLoaderNetworkReplyHandler::QQuickIconLoaderNetworkReplyHandler(QNetworkReply *reply, QVariant::Type type)
+QQuickIconLoaderNetworkReplyHandler::QQuickIconLoaderNetworkReplyHandler(QNetworkReply *reply,
+                                                                         int metaTypeId)
     : QObject(reply)
-    , m_type(type)
+    , m_metaTypeId(metaTypeId)
 {
     connect(reply, &QNetworkReply::finished, this, &QQuickIconLoaderNetworkReplyHandler::onRequestFinished);
 }
@@ -136,7 +137,7 @@ void QQuickIconLoaderNetworkReplyHandler::onRequestFinished()
     const QByteArray data = reply->readAll();
     QPixmap pixmap;
     if (pixmap.loadFromData(data)) {
-        switch (m_type) {
+        switch (m_metaTypeId) {
         case QMetaType::QIcon:
             emit finished(QVariant(QIcon(pixmap)));
             break;
@@ -144,7 +145,7 @@ void QQuickIconLoaderNetworkReplyHandler::onRequestFinished()
             emit finished(QVariant(pixmap));
             break;
         default:
-            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, int(m_type));
+            qWarning("%s: Unsupported type: %d", Q_FUNC_INFO, m_metaTypeId);
             break;
         }
     }
diff --git a/src/imports/winextras/qquickiconloader_p.h b/src/imports/winextras/qquickiconloader_p.h
index abc247b..8f4166f 100644
--- a/src/imports/winextras/qquickiconloader_p.h
+++ b/src/imports/winextras/qquickiconloader_p.h
@@ -83,14 +83,14 @@ public:
     // connected to an object handling the network reply and invoked once it finishes.
     template <typename Object>
     static LoadResult load(const QUrl &url, const QQmlEngine *engine,
-                           QVariant::Type type, const QSize &requestedSize,
+                           int metaTypeId, const QSize &requestedSize,
                            Object *receiver, void (Object::*function)(const QVariant &));
 
 private:
     QQuickIconLoader() = default;
-    static QVariant loadFromFile(const QUrl &url, QVariant::Type type);
+    static QVariant loadFromFile(const QUrl &url, int metaTypeId);
     static QVariant loadFromImageProvider(const QUrl &url, const QQmlEngine *engine,
-                                          QVariant::Type type, QSize requestedSize);
+                                          int metaTypeId, QSize requestedSize);
 #if QT_CONFIG(qml_network)
     static QNetworkReply *loadFromNetwork(const QUrl &url, const QQmlEngine *engine);
 #endif
@@ -103,7 +103,7 @@ class QQuickIconLoaderNetworkReplyHandler : public QObject
     Q_OBJECT
 
 public:
-    explicit QQuickIconLoaderNetworkReplyHandler(QNetworkReply *reply, QVariant::Type);
+    explicit QQuickIconLoaderNetworkReplyHandler(QNetworkReply *reply, int);
 
 Q_SIGNALS:
     void finished(const QVariant &);
@@ -112,21 +112,21 @@ private Q_SLOTS:
     void onRequestFinished();
 
 private:
-    const QVariant::Type m_type;
+    const int m_metaTypeId;
 };
 #endif // qml_network
 
 template <typename Object>
 QQuickIconLoader::LoadResult
     QQuickIconLoader::load(const QUrl &url, const QQmlEngine *engine,
-                           QVariant::Type type, const QSize &requestedSize,
+                           int metaTypeId, const QSize &requestedSize,
                            Object *receiver, void (Object::*function)(const QVariant &))
 {
     const QString scheme = url.scheme();
     if (scheme.startsWith(u"http")) {
 #if QT_CONFIG(qml_network)
         if (QNetworkReply *reply = QQuickIconLoader::loadFromNetwork(url, engine)) {
-            auto *handler = new QQuickIconLoaderNetworkReplyHandler(reply, type);
+            auto *handler = new QQuickIconLoaderNetworkReplyHandler(reply, metaTypeId);
             QObject::connect(handler, &QQuickIconLoaderNetworkReplyHandler::finished, receiver, function);
             return LoadNetworkRequestStarted;
         }
@@ -134,8 +134,8 @@ QQuickIconLoader::LoadResult
         return LoadError;
     }
     const QVariant resource = scheme == u"image"
-        ? QQuickIconLoader::loadFromImageProvider(url, engine, type, requestedSize)
-        : QQuickIconLoader::loadFromFile(url, type); // qrc, file
+        ? QQuickIconLoader::loadFromImageProvider(url, engine, metaTypeId, requestedSize)
+        : QQuickIconLoader::loadFromFile(url, metaTypeId); // qrc, file
     if (resource.isValid()) {
         (receiver->*function)(resource);
         return LoadOk;