adapt to changes in PackageStructure api

This commit is contained in:
Aaron Seigo 2011-07-19 21:53:03 +02:00
parent 240a7b1ebb
commit e40bb1bcdd
4 changed files with 7 additions and 7 deletions

View File

@ -2199,7 +2199,7 @@ QString AppletPrivate::parentAppConstraint(const QString &parentApp)
KPluginInfo::List Applet::listAppletInfo(const QString &category, const QString &parentApp)
{
return PluginLoader::pluginLoader()->listAppletInfo(category, parentApp);
return PluginLoader::self()->listAppletInfo(category, parentApp);
}
KPluginInfo::List Applet::listAppletInfoForMimeType(const QString &mimeType)
@ -2309,7 +2309,7 @@ Applet *Applet::loadPlasmoid(const QString &path, uint appletId, const QVariantL
Applet *Applet::load(const QString &appletName, uint appletId, const QVariantList &args)
{
return PluginLoader::pluginLoader()->loadApplet(appletName, appletId, args);
return PluginLoader::self()->loadApplet(appletName, appletId, args);
}
Applet *Applet::load(const KPluginInfo &info, uint appletId, const QVariantList &args)

View File

@ -128,7 +128,7 @@ Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name)
return engine;
}
DataEngine *engine = PluginLoader::pluginLoader()->loadDataEngine(name);
DataEngine *engine = PluginLoader::self()->loadDataEngine(name);
if (!engine) {
return d->nullEngine();
}
@ -178,7 +178,7 @@ QStringList DataEngineManager::listAllEngines(const QString &parentApp)
KPluginInfo::List DataEngineManager::listEngineInfo(const QString &parentApp)
{
return PluginLoader::pluginLoader()->listDataEngineInfo(parentApp);
return PluginLoader::self()->listDataEngineInfo(parentApp);
}
KPluginInfo::List DataEngineManager::listEngineInfoByCategory(const QString &category, const QString &parentApp)

View File

@ -238,7 +238,7 @@ public:
return 0;
}
AbstractRunner *runner = PluginLoader::pluginLoader()->loadRunner(service->property("X-KDE-PluginInfo-Name", QVariant::String).toString());
AbstractRunner *runner = PluginLoader::self()->loadRunner(service->property("X-KDE-PluginInfo-Name", QVariant::String).toString());
if (runner) {
runner->setParent(q);
@ -617,7 +617,7 @@ QMimeData * RunnerManager::mimeDataForMatch(const QueryMatch &match) const
KPluginInfo::List RunnerManager::listRunnerInfo(const QString &parentApp)
{
return PluginLoader::pluginLoader()->listRunnerInfo(parentApp);
return PluginLoader::self()->listRunnerInfo(parentApp);
}
void RunnerManager::setupMatchSession()

View File

@ -72,7 +72,7 @@ Service *Service::load(const QString &name, QObject *parent)
Service *Service::load(const QString &name, const QVariantList &args, QObject *parent)
{
return PluginLoader::pluginLoader()->loadService(name, args, parent);
return PluginLoader::self()->loadService(name, args, parent);
}
Service *Service::access(const KUrl &url, QObject *parent)