From 5ad3c0ee13e5118d10682dfaf188b75d129b8c35 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vladzzag@gmail.com>
Date: Wed, 18 Sep 2019 11:08:17 +0300
Subject: [PATCH] Port away from deprecated qVariantFromValue

Summary:
qVariantFromValue is deprecated since Qt 5.14. It's advised to use
QVariant::fromValue instead.

Test Plan: Compiles.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D24042
---
 scripting/scripting.cpp       | 2 +-
 scripting/scripting_model.cpp | 2 +-
 tabbox/clientmodel.cpp        | 2 +-
 tabbox/desktopmodel.cpp       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
index 8aa6eabffb..ba18792fda 100644
--- a/scripting/scripting.cpp
+++ b/scripting/scripting.cpp
@@ -207,7 +207,7 @@ QScriptValue kwinCallDBus(QScriptContext *context, QScriptEngine *engine)
     for (int i=4; i<argumentsCount; ++i) {
         if (context->argument(i).isArray()) {
             QStringList stringArray = engine->fromScriptValue<QStringList>(context->argument(i));
-            arguments << qVariantFromValue(stringArray);
+            arguments << QVariant::fromValue(stringArray);
         } else {
             arguments << context->argument(i).toVariant();
         }
diff --git a/scripting/scripting_model.cpp b/scripting/scripting_model.cpp
index 911aeda781..77417851d7 100644
--- a/scripting/scripting_model.cpp
+++ b/scripting/scripting_model.cpp
@@ -699,7 +699,7 @@ QVariant ClientModel::data(const QModelIndex &index, int role) const
     }
     if (role == Qt::DisplayRole || role == ClientRole) {
         if (AbstractClient *client = m_root->clientForId(index.internalId())) {
-            return qVariantFromValue(client);
+            return QVariant::fromValue(client);
         }
     }
     return QVariant();
diff --git a/tabbox/clientmodel.cpp b/tabbox/clientmodel.cpp
index 19741fb2a5..6ea6f5fc87 100644
--- a/tabbox/clientmodel.cpp
+++ b/tabbox/clientmodel.cpp
@@ -71,7 +71,7 @@ QVariant ClientModel::data(const QModelIndex& index, int role) const
         return caption;
     }
     case ClientRole:
-        return qVariantFromValue((void*)client.data());
+        return QVariant::fromValue<void *>(client.data());
     case DesktopNameRole: {
         return tabBox->desktopName(client.data());
     }
diff --git a/tabbox/desktopmodel.cpp b/tabbox/desktopmodel.cpp
index ececb20058..8d8338aea9 100644
--- a/tabbox/desktopmodel.cpp
+++ b/tabbox/desktopmodel.cpp
@@ -61,7 +61,7 @@ QVariant DesktopModel::data(const QModelIndex& index, int role) const
     case DesktopRole:
         return m_desktopList[ desktopIndex ];
     case ClientModelRole:
-        return qVariantFromValue((void*)m_clientModels[ m_desktopList[ desktopIndex ] ]);
+        return QVariant::fromValue<void *>(m_clientModels[m_desktopList[desktopIndex]]);
     default:
         return QVariant();
     }