[PATCH 3/6] qa: Replace deprecated qVariantFromValue() by QVariant::fromValue()

From 1f21c1f9613031ae263eeed0c4883bfcd5488343 Mon Sep 17 00:00:00 2001
Bug: https://bugs.quassel-irc.org/issues/1544
Bug-Ubuntu: https://bugs.launchpad.net/quassel/+bug/1885436
Origin: upstream, https://github.com/quassel/quassel/pull/518
Origin: upstream, https://github.com/quassel/quassel/commit/1f21c1f9613031ae263eeed0c4883bfcd5488343

Deprecated since Qt 5.14.

Gbp-Pq: Topic qt514
Gbp-Pq: Name 0003-qa-Replace-deprecated-qVariantFromValue-by-QVariant-.patch

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 5c0ae8e7f55ce590faef90079f5c34a750a5fc95..c9225830de05771c3be13992b045daf48a0d6cd2 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -182,7 +182,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);
@@ -205,8 +205,8 @@ QHash<int, BufferId> CoreAccountSettings::jumpKeyMap()
 void CoreAccountSettings::setBufferViewOverlay(const QSet<int> &viewIds)
 {
     QVariantList variants;
-    foreach(int viewId, viewIds) {
-        variants << qVariantFromValue(viewId);
+    foreach (int viewId, viewIds) {
+        variants << QVariant::fromValue(viewId);
     }
     setAccountValue("BufferViewOverlay", variants);
 }

diff --git a/src/common/bufferviewconfig.cpp b/src/common/bufferviewconfig.cpp
index e16697f485bb712ed28a68f86a365fab09a51935..643099d7543981c5cf43a46c9af4cd35acc40e4c 100644 (file)
--- a/src/common/bufferviewconfig.cpp
+++ b/src/common/bufferviewconfig.cpp
@@ -150,8 +150,8 @@ QVariantList BufferViewConfig::initBufferList() const
 {
     QVariantList buffers;
 
-    foreach(BufferId bufferId, _buffers) {
-        buffers << qVariantFromValue(bufferId);
+    foreach (BufferId bufferId, _buffers) {
+        buffers << QVariant::fromValue(bufferId);
     }
 
     return buffers;
@@ -186,8 +186,8 @@ QVariantList BufferViewConfig::initRemovedBuffers() const
 {
     QVariantList removedBuffers;
 
-    foreach(BufferId bufferId, _removedBuffers) {
-        removedBuffers << qVariantFromValue(bufferId);
+    foreach (BufferId bufferId, _removedBuffers) {
+        removedBuffers << QVariant::fromValue(bufferId);
     }
 
     return removedBuffers;
@@ -208,8 +208,8 @@ QVariantList BufferViewConfig::initTemporarilyRemovedBuffers() const
 {
     QVariantList temporarilyRemovedBuffers;
 
-    foreach(BufferId bufferId, _temporarilyRemovedBuffers) {
-        temporarilyRemovedBuffers << qVariantFromValue(bufferId);
+    foreach (BufferId bufferId, _temporarilyRemovedBuffers) {
+        temporarilyRemovedBuffers << QVariant::fromValue(bufferId);
     }
 
     return temporarilyRemovedBuffers;

diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp
index 0ca53c15a329bb34c55d91a64c3e07057ae34d3f..80f47a8a78aeff41bdcbc511d8bdcbf54e20928d 100644 (file)
--- a/src/core/coreirclisthelper.cpp
+++ b/src/core/coreirclisthelper.cpp
@@ -90,10 +90,8 @@ bool CoreIrcListHelper::endOfChannelList(const NetworkId &netId)
         QVariantList channelList;
         foreach(ChannelDescription channel, _channelLists[netId]) {
             QVariantList channelVariant;
-            channelVariant << channel.channelName
-                           << channel.userCount
-                           << channel.topic;
-            channelList << qVariantFromValue<QVariant>(channelVariant);
+            channelVariant << channel.channelName << channel.userCount << channel.topic;
+            channelList << QVariant::fromValue<QVariant>(channelVariant);
         }
         _finishedChannelLists[netId] = channelList;
         _channelLists.remove(netId);

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index 2545d1bfcf8a16c3699df3be11067fc4b73f326e..9bafbc01877f1f4380f466f44c3015f2459c4592 100644 (file)
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -47,7 +47,7 @@ QList<IdentityId> CoreUserSettings::identityIds()
 
 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));
 }
 
 

diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp
index 629a071e3350a7044bdf7b1284b1def49282bb5a..0c03bc51db4e275e1583e90c471319977f671231 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.cpp
+++ b/src/qtui/settingspages/bufferviewsettingspage.cpp
@@ -127,12 +127,12 @@ void BufferViewSettingsPage::load()
     // load network selector
     ui.networkSelector->clear();
     ui.networkSelector->addItem(tr("All"));
-    ui.networkSelector->setItemData(0, qVariantFromValue<NetworkId>(NetworkId()));
-    const Network *net;
-    foreach(NetworkId netId, Client::networkIds()) {
+    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;
 
@@ -207,7 +207,7 @@ void BufferViewSettingsPage::coreConnectionStateChanged(bool state)
 void BufferViewSettingsPage::addBufferView(BufferViewConfig *config)
 {
     QListWidgetItem *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, SIGNAL(updatedRemotely()), this, SLOT(updateBufferView()));
     connect(config, SIGNAL(destroyed()), this, SLOT(bufferViewDeleted()));
     ui.deleteBufferView->setEnabled(ui.bufferViewList->count() > 1);