* fix typo in PLASMA_EXPORT_SCRIPTENGINE name; guess nobody is using this yet? ;)

* port to new plugin system
* forget about taking a QVariantList in the ScriptEngine ctor. it's not going to be used

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=705983
This commit is contained in:
Aaron J. Seigo 2007-08-29 03:00:00 +00:00
parent 1316a45e7e
commit e600dbe4c3
2 changed files with 6 additions and 8 deletions

View File

@ -35,11 +35,10 @@ public:
Applet* applet;
};
ScriptEngine::ScriptEngine(QObject *parent, const QStringList &args)
ScriptEngine::ScriptEngine(QObject *parent)
: QObject(parent),
d(new Private)
{
Q_UNUSED(args)
d->applet = 0;
}
@ -120,7 +119,7 @@ ScriptEngine* ScriptEngine::load(const QString &language, Applet *applet)
return 0;
}
QStringList args;
QVariantList args;
ScriptEngine* engine = 0;
foreach (KService::Ptr service, offers) {
engine = KService::createInstance<Plasma::ScriptEngine>(service, applet, args);

View File

@ -56,7 +56,7 @@ public:
*
* @param applet the Applet object that will house the plasmoid
**/
explicit ScriptEngine(QObject *parent, const QStringList &args);
explicit ScriptEngine(QObject *parent);
virtual ~ScriptEngine();
void init(Applet* applet);
@ -117,10 +117,9 @@ private:
Private * const d;
};
#define K_EXPORT_PLASMA_SCRIPENGINE(libname, classname) \
K_EXPORT_COMPONENT_FACTORY( \
plasma_scriptengine_##libname, \
KGenericFactory<classname>("plasma_scriptengine_" #libname))
#define K_EXPORT_PLASMA_SCRIPTENGINE(libname, classname) \
K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
K_EXPORT_PLUGIN(factory("plasma_scriptengine_" #libname))
} // namespace Plasma