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

no longer provide access to the package from the class, let Package do that; adapt to Package merge

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-15 13:01:17 +02:00
parent a623e16283
commit e7106d2422
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dataengine.cpp
View File

@ -473,9 +473,9 @@ bool DataEnginePrivate::isPublished() const
}
}
const Package *DataEngine::package() const
Package DataEngine::package() const
{
return d->package;
return d->package ? *d->package : Package();
}
void DataEngine::scheduleSourcesUpdated()
@ -541,11 +541,13 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info)
const QString path =
KStandardDirs::locate("data",
"plasma/dataengines/" + dataEngineDescription.pluginName() + '/');
PackageStructure::Ptr structure = Plasma::packageStructure(api, Plasma::DataEngineComponent);
structure->setPath(path);
package = new Package(path, structure);
package = new Package(Package::load("Plasma/DataEngine", api));
package->setPath(path);
if (package->isValid()) {
script = Plasma::loadScriptEngine(api, q);
}
script = Plasma::loadScriptEngine(api, q);
if (!script) {
kDebug() << "Could not create a" << api << "ScriptEngine for the"
<< dataEngineDescription.name() << "DataEngine.";

2
dataengine.h
View File

@ -231,7 +231,7 @@ NoAlignment) const;
*
* @return the Package object, or 0 if none
**/
const Package *package() const;
Package package() const;
/**
* @return the plugin name for the applet