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

make registerEnums static

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1107158
This commit is contained in:
Aaron J. Seigo 2010-03-24 23:31:08 +00:00
parent d10862ddb6
commit d362ce9245
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scriptengines/javascript/scriptenv.cpp
View File

@ -74,12 +74,13 @@ ScriptEnv *ScriptEnv::findScriptEnv(QScriptEngine *engine)
void ScriptEnv::registerEnums(QScriptValue &scriptValue, const QMetaObject &meta)
{
//manually create enum values. ugh
QScriptEngine *engine = scriptValue.engine();
for (int i = 0; i < meta.enumeratorCount(); ++i) {
QMetaEnum e = meta.enumerator(i);
//kDebug() << e.name();
for (int i=0; i < e.keyCount(); ++i) {
//kDebug() << e.key(i) << e.value(i);
scriptValue.setProperty(e.key(i), QScriptValue(m_engine, e.value(i)));
scriptValue.setProperty(e.key(i), QScriptValue(engine, e.value(i)));
}
}
}

2
scriptengines/javascript/scriptenv.h
View File

@ -46,7 +46,7 @@ public:
/** Returns the ScriptEnv in use for a given QScriptEngine or 0. */
static ScriptEnv *findScriptEnv(QScriptEngine *engine);
void registerEnums(QScriptValue &scriptValue, const QMetaObject &meta);
static void registerEnums(QScriptValue &scriptValue, const QMetaObject &meta);
bool include(const QString &path);
bool importExtensions(const KPluginInfo &info, QScriptValue &obj, Authorization &authorizer);

14
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -334,8 +334,7 @@ void SimpleJavaScriptApplet::setupObjects()
}
global.setProperty("startupArguments", args);
m_env->registerEnums(global, AppletInterface::staticMetaObject);
ScriptEnv::registerEnums(global, AppletInterface::staticMetaObject);
// Add a global loadui method for ui files
QScriptValue fun = m_engine->newFunction(SimpleJavaScriptApplet::loadui);
@ -458,7 +457,7 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
}
QScriptValue value = engine->newQObject(anim);
ScriptEnv::findScriptEnv(engine)->registerEnums(value, *anim->metaObject());
ScriptEnv::registerEnums(value, *anim->metaObject());
return value;
}
}
@ -540,7 +539,7 @@ QScriptValue SimpleJavaScriptApplet::newPlasmaSvg(QScriptContext *context, QScri
Svg *svg = new Svg(parent);
svg->setImagePath(parentedToApplet ? findSvg(engine, filename) : filename);
QScriptValue fun = engine->newQObject(svg);
ScriptEnv::findScriptEnv(engine)->registerEnums(fun, *svg->metaObject());
ScriptEnv::registerEnums(fun, *svg->metaObject());
return fun;
}
@ -558,8 +557,7 @@ QScriptValue SimpleJavaScriptApplet::newPlasmaFrameSvg(QScriptContext *context,
frameSvg->setImagePath(parentedToApplet ? filename : findSvg(engine, filename));
QScriptValue fun = engine->newQObject(frameSvg);
// FIXME: why is this necessary when it is clearly declared in FrameSvg's moc?
ScriptEnv::findScriptEnv(engine)->registerEnums(fun, *frameSvg->metaObject());
ScriptEnv::registerEnums(fun, *frameSvg->metaObject());
return fun;
}
@ -581,7 +579,7 @@ QScriptValue SimpleJavaScriptApplet::newPlasmaExtenderItem(QScriptContext *conte
Plasma::ExtenderItem *extenderItem = new Plasma::ExtenderItem(extender);
QScriptValue fun = engine->newQObject(extenderItem);
ScriptEnv::findScriptEnv(engine)->registerEnums(fun, *extenderItem->metaObject());
ScriptEnv::registerEnums(fun, *extenderItem->metaObject());
return fun;
}
@ -659,7 +657,7 @@ QScriptValue SimpleJavaScriptApplet::createWidget(QScriptContext *context, QScri
fun.setProperty("adjustSize", engine->newFunction(widgetAdjustSize));
//register enums will be accessed for instance as frame.Sunken for Frame shadow...
ScriptEnv::findScriptEnv(engine)->registerEnums(fun, *w->metaObject());
ScriptEnv::registerEnums(fun, *w->metaObject());
return fun;
}