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

* always re-reg when we set the name

Browse Source 
* automatically set the name in the plugin case

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=838869
This commit is contained in:
Aaron J. Seigo 2008-07-28 22:51:19 +00:00
parent 1cb7e7e771
commit e4a154743f
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
service.cpp
View File

@ -47,7 +47,15 @@ Service::Service(QObject *parent, const QVariantList &args)
: QObject(parent), : QObject(parent),
d(new ServicePrivate(this)) d(new ServicePrivate(this))
{ {
Q_UNUSED(args); // remove those first item since those are managed by Service and subclasses shouldn't
// need to worry about it. yes, it violates the constness of this var, but it lets us add
// or remove items later while applets can just pretend that their args always start at 0
QVariantList &mutableArgs = const_cast<QVariantList&>(args);
if (!mutableArgs.isEmpty()) {
setName(mutableArgs[0].toString());
mutableArgs.removeFirst();
}
registerOperationsScheme(); registerOperationsScheme();
} }
@ -74,10 +82,12 @@ Service* Service::load(const QString &name, QObject *parent)
KService::Ptr offer = offers.first(); KService::Ptr offer = offers.first();
QString error; QString error;
QVariantList args; QVariantList args;
args << name;
Service* service = 0; Service* service = 0;
if (Plasma::isPluginVersionCompatible(KPluginLoader(*offer).pluginVersion())) if (Plasma::isPluginVersionCompatible(KPluginLoader(*offer).pluginVersion())) {
service = offer->createInstance<Plasma::Service>(parent, args, &error); service = offer->createInstance<Plasma::Service>(parent, args, &error);
}
if (!service) { if (!service) {
kDebug() << "Couldn't load Service \"" << name << "\"! reason given: " << error; kDebug() << "Couldn't load Service \"" << name << "\"! reason given: " << error;
@ -150,9 +160,15 @@ QString Service::name() const
void Service::setName(const QString &name) void Service::setName(const QString &name)
{ {
d->name = name; d->name = name;
if (!d->config) {
registerOperationsScheme(); // now reset the config, which may be based on our name
} delete d->config;
d->config = 0;
delete d->tempFile;
d->tempFile = 0;
registerOperationsScheme();
} }
void Service::setOperationsScheme(QIODevice *xml) void Service::setOperationsScheme(QIODevice *xml)
@ -168,6 +184,11 @@ void Service::setOperationsScheme(QIODevice *xml)
void Service::registerOperationsScheme() void Service::registerOperationsScheme()
{ {
if (d->config) {
// we've already done our job. let's go home.
return;
}
if (d->name.isEmpty()) { if (d->name.isEmpty()) {
kDebug() << "No name found"; kDebug() << "No name found";
return; return;