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

change X-Plasma-Requires-<foo> to be a string (Required/Optional/Unused) instead of a bool.

Browse Source 
now I can tell the difference between something that will only use a feature when allowed, and something that doesn't care about that feature at all.

svn path=/trunk/KDE/kdelibs/; revision=967779
This commit is contained in:
Chani Armitage 2009-05-13 23:28:00 +00:00
parent 4c2c5a1813
commit bac10ee82b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
applet.cpp
View File

@ -1751,10 +1751,20 @@ KPluginInfo::List Applet::listAppletInfo(const QString &category,
while (it.hasNext()) {
KService::Ptr p = it.next();
QString prop = QString("X-Plasma-Requires-").append(key);
QVariant req = p->property(prop, QVariant::Bool);
//FIXME before release, switch the if statement:
//if (!req.isValid() || req.toBool()) {
if (req.isValid() && req.toBool()) {
QVariant req = p->property(prop, QVariant::String);
//valid values: Required/Optional/Unused
QString reqValue;
if (req.isValid()) {
reqValue = req.toString();
} else {
//TODO if it's a scripted language default to not-required because the bindings disable it
//this isn't actually implemented in any bindings yet but should be possible for
//anything but c++
}
//TODO 4.3 be very strict about what we accept
//if (!(reqValue == "Optional" || reqValue == "Unused")) {
//for testing purposes I'm being lax right now
if (reqValue == "Required") {
it.remove();
}
}