diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp index 9ac3ceff5..28f92685d 100644 --- a/src/plasma/containment.cpp +++ b/src/plasma/containment.cpp @@ -586,14 +586,7 @@ void Containment::addContainmentActions(const QString &trigger, const QString &p QHash &Containment::containmentActions() { - switch (d->containmentActionsSource) { - case ContainmentActions::Activity: - //FIXME - case ContainmentActions::Local: - return d->localActionPlugins; - default: - return d->globalActionPlugins; - } + return d->localActionPlugins; } void Containment::setActivity(const QString &activityId) diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp index 93a75bb03..b1562f310 100644 --- a/src/plasma/private/containment_p.cpp +++ b/src/plasma/private/containment_p.cpp @@ -41,8 +41,6 @@ namespace Plasma { -QHash ContainmentPrivate::globalActionPlugins; - const char ContainmentPrivate::defaultWallpaper[] = "image"; const char ContainmentPrivate::defaultWallpaperMode[] = "SingleImage"; diff --git a/src/plasma/private/containment_p.h b/src/plasma/private/containment_p.h index 4358e66e9..fb75901af 100644 --- a/src/plasma/private/containment_p.h +++ b/src/plasma/private/containment_p.h @@ -111,7 +111,6 @@ public: bool drawWallpaper : 1; ContainmentActions::ContainmentActionsSource containmentActionsSource; - static QHash globalActionPlugins; static const char defaultWallpaper[]; static const char defaultWallpaperMode[]; };