From 984692dc629ca3712d482b174a67557dd9e635a8 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 2 May 2022 19:10:45 +0200
Subject: refactor: fix deprecation up to Qt 5.15

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/icons/IconList.cpp | 8 ++++++++
 launcher/icons/MMCIcon.cpp  | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'launcher/icons')

diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp
index d426aa80..fe7c34ea 100644
--- a/launcher/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
@@ -86,7 +86,11 @@ void IconList::directoryChanged(const QString &path)
         QString &foo = (*it);
         foo = m_dir.filePath(foo);
     }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QSet<QString> new_set(new_list.begin(), new_list.end());
+#else
     auto new_set = new_list.toSet();
+#endif
     QList<QString> current_list;
     for (auto &it : icons)
     {
@@ -94,7 +98,11 @@ void IconList::directoryChanged(const QString &path)
             continue;
         current_list.push_back(it.m_images[IconType::FileBased].filename);
     }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QSet<QString> current_set(current_list.begin(), current_list.end());
+#else
     QSet<QString> current_set = current_list.toSet();
+#endif
 
     QSet<QString> to_remove = current_set;
     to_remove -= new_set;
diff --git a/launcher/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp
index f0b82ec9..29e3939b 100644
--- a/launcher/icons/MMCIcon.cpp
+++ b/launcher/icons/MMCIcon.cpp
@@ -15,7 +15,7 @@
 
 #include "MMCIcon.h"
 #include <QFileInfo>
-#include <xdgicon.h>
+#include <QIcon>
 
 IconType operator--(IconType &t, int)
 {
@@ -63,7 +63,7 @@ QIcon MMCIcon::icon() const
     if(!icon.isNull())
         return icon;
     // FIXME: inject this.
-    return XdgIcon::fromTheme(m_images[m_current_type].key);
+    return QIcon::fromTheme(m_images[m_current_type].key);
 }
 
 void MMCIcon::remove(IconType rm_type)
-- 
cgit