more deprecated api removal; kservice seems almost OO now ;)
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=717491
This commit is contained in:
parent
9fa4ea3ec3
commit
06465f6cb1
@ -116,7 +116,7 @@ AbstractRunner::List AbstractRunner::loadRunners( QWidget* parent )
|
||||
KService::List offers = KServiceTypeTrader::self()->query("KRunner/Runner");
|
||||
QString error;
|
||||
foreach (KService::Ptr service, offers) {
|
||||
AbstractRunner* runner = KService::createInstance<AbstractRunner>(service, parent, QVariantList(), &error);
|
||||
AbstractRunner* runner = service->createInstance<AbstractRunner>(parent, QVariantList(), &error);
|
||||
if ( runner ) {
|
||||
kDebug() << "loaded runner : " << service->name();
|
||||
runners.append( runner );
|
||||
|
@ -123,7 +123,7 @@ Plasma::DataEngine* DataEngineManager::loadDataEngine(const QString& name)
|
||||
if (offers.isEmpty()) {
|
||||
kDebug() << "offers are empty for " << name << " with constraint " << constraint;
|
||||
} else {
|
||||
engine = KService::createInstance<Plasma::DataEngine>(offers.first(), 0, QVariantList(), &error);
|
||||
engine = offers.first()->createInstance<Plasma::DataEngine>(0, QVariantList(), &error);
|
||||
}
|
||||
|
||||
if (!engine) {
|
||||
|
@ -465,7 +465,7 @@ void Phase::init()
|
||||
|
||||
if (!offers.isEmpty()) {
|
||||
QString error;
|
||||
d->animator = KService::createInstance<Plasma::Animator>(offers.first(), 0, QVariantList(), &error);
|
||||
d->animator = offers.first()->createInstance<Plasma::Animator>(0, QVariantList(), &error);
|
||||
if (!d->animator) {
|
||||
kDebug() << "Could not load requested animator " << offers.first() << ". Error given: " << error;
|
||||
}
|
||||
|
@ -123,7 +123,7 @@ ScriptEngine* ScriptEngine::load(const QString &language, Applet *applet)
|
||||
QString error;
|
||||
ScriptEngine* engine = 0;
|
||||
foreach (KService::Ptr service, offers) {
|
||||
engine = KService::createInstance<Plasma::ScriptEngine>(service, applet, args, &error);
|
||||
engine = service->createInstance<Plasma::ScriptEngine>(applet, args, &error);
|
||||
|
||||
if (engine) {
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user