marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port away from deprecated features of QSet

Browse source
This commit is contained in:
Jonah Brüchert 2019-12-06 22:04:33 +01:00 committed by Bhushan Shah
parent 40ece80841
commit 08e1e3a44c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
containments/homescreen/applicationlistmodel.cpp
View file

@ -51,7 +51,12 @@ ApplicationListModel::~ApplicationListModel()
void ApplicationListModel::loadSettings() void ApplicationListModel::loadSettings()
{ {
m_favorites = m_homeScreen->config().readEntry("Favorites", QStringList()); m_favorites = m_homeScreen->config().readEntry("Favorites", QStringList());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
m_desktopItems = QSet<QString>(m_homeScreen->config().readEntry("DesktopItems", QStringList()).begin(),
m_homeScreen->config().readEntry("DesktopItems", QStringList()).end());
#else
m_desktopItems = m_homeScreen->config().readEntry("DesktopItems", QStringList()).toSet(); m_desktopItems = m_homeScreen->config().readEntry("DesktopItems", QStringList()).toSet();
#endif
m_appOrder = m_homeScreen->config().readEntry("AppOrder", QStringList()); m_appOrder = m_homeScreen->config().readEntry("AppOrder", QStringList());
m_maxFavoriteCount = m_homeScreen->config().readEntry("MaxFavoriteCount", 5); m_maxFavoriteCount = m_homeScreen->config().readEntry("MaxFavoriteCount", 5);
@ -264,12 +269,12 @@ void ApplicationListModel::setLocation(int row, LauncherLocation location)
// In Desktop // In Desktop
if (location == Desktop) { if (location == Desktop) {
m_desktopItems.insert(data.storageId); m_desktopItems.insert(data.storageId);
m_homeScreen->config().writeEntry("DesktopItems", m_desktopItems.toList()); m_homeScreen->config().writeEntry("DesktopItems", m_desktopItems.values());
// Out of Desktop // Out of Desktop
} else if (data.location == Desktop) { } else if (data.location == Desktop) {
m_desktopItems.remove(data.storageId); m_desktopItems.remove(data.storageId);
m_homeScreen->config().writeEntry("DesktopItems", m_desktopItems.toList()); m_homeScreen->config().writeEntry("DesktopItems", m_desktopItems.values());
} }
data.location = location; data.location = location;

1
containments/homescreen/applicationlistmodel.h
View file

@ -24,6 +24,7 @@
#include <QObject> #include <QObject>
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QList> #include <QList>
#include <QSet>
#include "homescreen.h" #include "homescreen.h"