alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove ContainmentPrivate::globalContainmentActionPlugins

Browse Source
This commit is contained in:
Marco Martin 2013-02-25 15:58:31 +01:00
parent 342146b2fc
commit 2f2039ed23
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plasma/containment.cpp
View File

@ -586,14 +586,7 @@ void Containment::addContainmentActions(const QString &trigger, const QString &p
QHash<QString, ContainmentActions*> &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)

2
src/plasma/private/containment_p.cpp
View File

@ -41,8 +41,6 @@
namespace Plasma
{
QHash<QString, ContainmentActions*> ContainmentPrivate::globalActionPlugins;
const char ContainmentPrivate::defaultWallpaper[] = "image";
const char ContainmentPrivate::defaultWallpaperMode[] = "SingleImage";

1
src/plasma/private/containment_p.h
View File

@ -111,7 +111,6 @@ public:
bool drawWallpaper : 1;
ContainmentActions::ContainmentActionsSource containmentActionsSource;
static QHash<QString, ContainmentActions*> globalActionPlugins;
static const char defaultWallpaper[];
static const char defaultWallpaperMode[];
};