From 3737a8cb4950912ff17d2f5b69bed3ed3e55538e Mon Sep 17 00:00:00 2001
From: David Redondo <kde@david-redondo.de>
Date: Wed, 5 Aug 2020 15:17:54 +0200
Subject: [PATCH] Port away from deprecated QSet related methods

---
 applets/kicker/plugin/runnermodel.cpp     | 2 +-
 kcms/translations/translationsmodel.cpp   | 2 +-
 libtaskmanager/launchertasksmodel.cpp     | 4 ++--
 libtaskmanager/taskgroupingproxymodel.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applets/kicker/plugin/runnermodel.cpp b/applets/kicker/plugin/runnermodel.cpp
index 9b730624d..0cd5e4eeb 100644
--- a/applets/kicker/plugin/runnermodel.cpp
+++ b/applets/kicker/plugin/runnermodel.cpp
@@ -167,7 +167,7 @@ QStringList RunnerModel::runners() const
 
 void RunnerModel::setRunners(const QStringList &runners)
 {
-    if (m_runners.toSet() != runners.toSet()) {
+    if (std::is_permutation(runners.cbegin(), runners.cend(), m_runners.cbegin(), m_runners.cend())) {
         m_runners = runners;
 
         if (m_runnerManager) {
diff --git a/kcms/translations/translationsmodel.cpp b/kcms/translations/translationsmodel.cpp
index b00ff9137..093f8c825 100644
--- a/kcms/translations/translationsmodel.cpp
+++ b/kcms/translations/translationsmodel.cpp
@@ -274,7 +274,7 @@ void AvailableTranslationsModel::setSelectedLanguages(const QStringList &languag
 {
     beginResetModel();
 
-    m_availableLanguages = (m_installedLanguages - QSet<QString>::fromList(languages)).values();
+    m_availableLanguages = (m_installedLanguages - QSet<QString>(languages.cbegin(), languages.cend())).values();
 
     QCollator c;
     c.setCaseSensitivity(Qt::CaseInsensitive);
diff --git a/libtaskmanager/launchertasksmodel.cpp b/libtaskmanager/launchertasksmodel.cpp
index a90090f16..5be31b751 100644
--- a/libtaskmanager/launchertasksmodel.cpp
+++ b/libtaskmanager/launchertasksmodel.cpp
@@ -150,7 +150,7 @@ bool LauncherTasksModel::Private::requestAddLauncherToActivities(const QUrl &_ur
         return false;
     }
 
-    const auto activities = ActivitiesSet::fromList(_activities);
+    const auto activities = ActivitiesSet(_activities.cbegin(), _activities.cend());
 
     if (url.isLocalFile() && KDesktopFile::isDesktopFile(url.toLocalFile())) {
         KDesktopFile f(url.toLocalFile());
@@ -406,7 +406,7 @@ void LauncherTasksModel::setLauncherList(const QStringList &serializedLaunchers)
         std::tie(url, _activities) =
             deserializeLauncher(serializedLauncher);
 
-        auto activities = ActivitiesSet::fromList(_activities);
+        auto activities = ActivitiesSet(_activities.cbegin(), _activities.cend());
 
         // Is url is not valid, ignore it
         if (!isValidLauncherUrl(url)) {
diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp
index a920610a7..9fe264c55 100644
--- a/libtaskmanager/taskgroupingproxymodel.cpp
+++ b/libtaskmanager/taskgroupingproxymodel.cpp
@@ -851,7 +851,7 @@ QStringList TaskGroupingProxyModel::blacklistedAppIds() const
 
 void TaskGroupingProxyModel::setBlacklistedAppIds(const QStringList &list)
 {
-    const QSet<QString> &set = QSet<QString>::fromList(list);
+    const QSet<QString> &set = QSet<QString>(list.cbegin(), list.cend());
 
     if (d->blacklistedAppIds != set) {
         d->blacklistedAppIds = set;
@@ -882,7 +882,7 @@ QStringList TaskGroupingProxyModel::blacklistedLauncherUrls() const
 
 void TaskGroupingProxyModel::setBlacklistedLauncherUrls(const QStringList &list)
 {
-    const QSet<QString> &set = QSet<QString>::fromList(list);
+    const QSet<QString> &set = QSet<QString>(list.cbegin(), list.cend());
 
     if (d->blacklistedLauncherUrls != set) {
         d->blacklistedLauncherUrls = set;