From 1f21c1f9613031ae263eeed0c4883bfcd5488343 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 7 Jan 2020 19:25:38 +0100
Subject: [PATCH 1/1] qa: Replace deprecated qVariantFromValue() by
 QVariant::fromValue()

Deprecated since Qt 5.14.
---
 src/client/clientsettings.cpp                     | 4 ++--
 src/common/bufferviewconfig.cpp                   | 6 +++---
 src/core/coreirclisthelper.cpp                    | 2 +-
 src/core/coreusersettings.cpp                     | 2 +-
 src/qtui/settingspages/bufferviewsettingspage.cpp | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 91e6d07c..f525e3df 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -161,7 +161,7 @@ void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId>& keyMap)
     QVariantMap variants;
     QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
     while (mapIter != keyMap.constEnd()) {
-        variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
+        variants[QString::number(mapIter.key())] = QVariant::fromValue(mapIter.value());
         ++mapIter;
     }
     setAccountValue("JumpKeyMap", variants);
@@ -183,7 +183,7 @@ void CoreAccountSettings::setBufferViewOverlay(const QSet<int>& viewIds)
 {
     QVariantList variants;
     foreach (int viewId, viewIds) {
-        variants << qVariantFromValue(viewId);
+        variants << QVariant::fromValue(viewId);
     }
     setAccountValue("BufferViewOverlay", variants);
 }
diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index b1a39d8c..3bd71f79 100644
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -110,7 +110,7 @@ QVariantList BufferViewConfig::initBufferList() const
     QVariantList buffers;
 
     foreach (BufferId bufferId, _buffers) {
-        buffers << qVariantFromValue(bufferId);
+        buffers << QVariant::fromValue(bufferId);
     }
 
     return buffers;
@@ -132,7 +132,7 @@ QVariantList BufferViewConfig::initRemovedBuffers() const
     QVariantList removedBuffers;
 
     foreach (BufferId bufferId, _removedBuffers) {
-        removedBuffers << qVariantFromValue(bufferId);
+        removedBuffers << QVariant::fromValue(bufferId);
     }
 
     return removedBuffers;
@@ -152,7 +152,7 @@ QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const
     QVariantList temporarilyRemovedBuffers;
 
     foreach (BufferId bufferId, _temporarilyRemovedBuffers) {
-        temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+        temporarilyRemovedBuffers << QVariant::fromValue(bufferId);
     }
 
     return temporarilyRemovedBuffers;
diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp
index 723e652c..cadb5e3c 100644
--- a/src/core/coreirclisthelper.cpp
+++ b/src/core/coreirclisthelper.cpp
@@ -87,7 +87,7 @@ bool CoreIrcListHelper::endOfChannelList(const NetworkId& netId)
         foreach (ChannelDescription channel, _channelLists[netId]) {
             QVariantList channelVariant;
             channelVariant << channel.channelName << channel.userCount << channel.topic;
-            channelList << qVariantFromValue<QVariant>(channelVariant);
+            channelList << QVariant::fromValue<QVariant>(channelVariant);
         }
         _finishedChannelLists[netId] = channelList;
         _channelLists.remove(netId);
diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index 4b956394..d12eb96d 100644
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -45,7 +45,7 @@ QList<IdentityId> CoreUserSettings::identityIds() const
 
 void CoreUserSettings::storeIdentity(const Identity& identity)
 {
-    setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), qVariantFromValue(identity));
+    setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), QVariant::fromValue(identity));
 }
 
 void CoreUserSettings::removeIdentity(IdentityId id)
diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index 37214cd2..233016b3 100644
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -126,12 +126,12 @@ void BufferViewSettingsPage::load()
     // load network selector
     ui.networkSelector->clear();
     ui.networkSelector->addItem(tr("All"));
-    ui.networkSelector->setItemData(0, qVariantFromValue<NetworkId>(NetworkId()));
+    ui.networkSelector->setItemData(0, QVariant::fromValue(NetworkId()));
     const Network* net;
     foreach (NetworkId netId, Client::networkIds()) {
         net = Client::network(netId);
         ui.networkSelector->addItem(net->networkName());
-        ui.networkSelector->setItemData(ui.networkSelector->count() - 1, qVariantFromValue<NetworkId>(net->networkId()));
+        ui.networkSelector->setItemData(ui.networkSelector->count() - 1, QVariant::fromValue(net->networkId()));
     }
     _ignoreWidgetChanges = false;
 
@@ -206,7 +206,7 @@ void BufferViewSettingsPage::coreConnectionStateChanged(bool state)
 void BufferViewSettingsPage::addBufferView(BufferViewConfig* config)
 {
     auto* item = new QListWidgetItem(config->bufferViewName(), ui.bufferViewList);
-    item->setData(Qt::UserRole, qVariantFromValue<QObject*>(qobject_cast<QObject*>(config)));
+    item->setData(Qt::UserRole, QVariant::fromValue(qobject_cast<QObject*>(config)));
     connect(config, &SyncableObject::updatedRemotely, this, &BufferViewSettingsPage::updateBufferView);
     connect(config, &QObject::destroyed, this, &BufferViewSettingsPage::bufferViewDeleted);
     ui.deleteBufferView->setEnabled(ui.bufferViewList->count() > 1);
-- 
2.20.1