diff --git a/shell/shellcorona.h b/shell/shellcorona.h --- a/shell/shellcorona.h +++ b/shell/shellcorona.h @@ -187,9 +187,6 @@ void addOutput(QScreen* screen); void primaryOutputChanged(); - void activityOpened(); - void activityClosed(); - void activityRemoved(); void panelContainmentDestroyed(QObject* cont); void desktopContainmentDestroyed(QObject*); void showOpenGLNotCompatibleWarning(); diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -189,7 +189,7 @@ connect(m_activityConsumer, &KActivities::Consumer::currentActivityChanged, this, &ShellCorona::currentActivityChanged); connect(m_activityConsumer, &KActivities::Consumer::activityAdded, this, &ShellCorona::activityAdded); - connect(m_activityConsumer, SIGNAL(activityRemoved(QString)), this, SLOT(activityRemoved(QString))); + connect(m_activityConsumer, &KActivities::Consumer::activityRemoved, this, &ShellCorona::activityRemoved); new Osd(this); @@ -1565,38 +1565,6 @@ return -1; } -void ShellCorona::activityOpened() -{ - Activity *activity = qobject_cast(sender()); - if (activity) { - QList cs = importLayout(activity->config()); - for (Plasma::Containment *containment : cs) { - insertContainment(activity->name(), containment->lastScreen(), containment); - } - } -} - -void ShellCorona::activityClosed() -{ - Activity *activity = qobject_cast(sender()); - if (activity) { - KConfigGroup cg = activity->config(); - exportLayout(cg, m_desktopContainments.value(activity->name()).values()); - } -} - -void ShellCorona::activityRemoved() -{ - //when an activity is removed delete all associated desktop containments - Activity *activity = qobject_cast(sender()); - if (activity) { - QHash< int, Plasma::Containment* > containmentHash = m_desktopContainments.take(activity->name()); - for (auto a : containmentHash) { - a->destroy(); - } - } -} - void ShellCorona::nextActivity() { const QStringList list = m_activityConsumer->activities(KActivities::Info::Running);