From d20ad165142c6bd079002e996ebcba1f18d7e301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= Date: Mon, 10 Oct 2016 18:21:06 +0200 Subject: [PATCH] When a launcher is on all activities, the list is now empty --- libtaskmanager/launchertasksmodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libtaskmanager/launchertasksmodel.cpp b/libtaskmanager/launchertasksmodel.cpp index 6ab45d1d0..95904130a 100644 --- a/libtaskmanager/launchertasksmodel.cpp +++ b/libtaskmanager/launchertasksmodel.cpp @@ -60,7 +60,7 @@ public: for (const auto &launcher: launchersOrder) { const auto activities = activitiesForLauncher[launcher]; qDebug() << "GREPME: activities for launcher" << launcher << activities; - if (activities.contains(NULL_UUID) || activities.contains(activity)) { + if (activities.isEmpty() || activities.contains(activity)) { result << launcher; } } @@ -307,7 +307,7 @@ void LauncherTasksModel::setSerializedLauncherList(const QStringList &serialized // If this is shown on all activities, we do not need to remember // each activity separately if (d->activitiesForLauncher[url].contains(NULL_UUID)) { - d->activitiesForLauncher[url] = QStringList({ NULL_UUID }); + d->activitiesForLauncher[url].clear(); } } @@ -340,7 +340,7 @@ bool LauncherTasksModel::requestAddLauncher(const QUrl &_url) // Adding the launcher to all activities const int count = d->launchersOrder.count(); beginInsertRows(QModelIndex(), count, count); - d->activitiesForLauncher[url] = QStringList({ NULL_UUID }); + d->activitiesForLauncher[url]; // = QStringList(); d->launchersOrder.append(url); endInsertRows();