From 805e70bb6e7583c08f723f38640a7f777406fb79 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 16 Mar 2020 21:06:58 +0100
Subject: [PATCH] Use methods in KF5-activities to switch to previous/next
 activity

Summary:
Since the release of KDE Frameworks 5.68.0 we can now
use the methods exposed in KActivities::Controller to trigger a
switch to the previous or next activity from ShellCorona.

Reviewers: ngraham, ivan, apol

Reviewed By: ngraham, apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D28083
---
 shell/shellcorona.cpp | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 23a883e7d..10a39d565 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -2024,31 +2024,12 @@ int ShellCorona::screenForContainment(const Plasma::Containment *containment) co
 
 void ShellCorona::nextActivity()
 {
-    const QStringList list = m_activityController->activities(KActivities::Info::Running);
-    if (list.isEmpty()) {
-        return;
-    }
-
-    const int start = list.indexOf(m_activityController->currentActivity());
-    const int i = (start + 1) % list.size();
-
-    m_activityController->setCurrentActivity(list.at(i));
+    m_activityController->nextActivity();
 }
 
 void ShellCorona::previousActivity()
 {
-    const QStringList list = m_activityController->activities(KActivities::Info::Running);
-    if (list.isEmpty()) {
-        return;
-    }
-
-    const int start = list.indexOf(m_activityController->currentActivity());
-    int i = start - 1;
-    if(i < 0) {
-        i = list.size() - 1;
-    }
-
-    m_activityController->setCurrentActivity(list.at(i));
+    m_activityController->previousActivity();
 }
 
 void ShellCorona::stopCurrentActivity()