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

allow setting empty sources

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1175923
This commit is contained in:
Aaron J. Seigo 2010-09-16 07:02:19 +00:00
parent 7db67d1164
commit 46c28dffcf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scriptengines/javascript/dataengine/javascriptdataengine.cpp
View File

@ -108,8 +108,8 @@ int JavaScriptDataEngine::pollingInterval() const
QScriptValue JavaScriptDataEngine::jsSetData(QScriptContext *context, QScriptEngine *engine) QScriptValue JavaScriptDataEngine::jsSetData(QScriptContext *context, QScriptEngine *engine)
{ {
if (context->argumentCount() < 2) { if (context->argumentCount() < 1) {
return context->throwError(i18n("setData() takes at least two arguments")); return context->throwError(i18n("setData() takes at least one argument"));
} }
QString error; QString error;
@ -120,7 +120,10 @@ QScriptValue JavaScriptDataEngine::jsSetData(QScriptContext *context, QScriptEng
} }
const QString source = context->argument(0).toString(); const QString source = context->argument(0).toString();
if (context->argument(1).isArray() || context->argument(1).isObject()) { if (context->argumentCount() == 1) {
iFace->setData(source, DataEngine::Data());
} else if (context->argument(1).isArray() || context->argument(1).isObject()) {
kDebug( )<< "array or object";
QScriptValueIterator it(context->argument(1)); QScriptValueIterator it(context->argument(1));
DataEngine::Data data; DataEngine::Data data;
@ -131,7 +134,7 @@ QScriptValue JavaScriptDataEngine::jsSetData(QScriptContext *context, QScriptEng
iFace->setData(source, data); iFace->setData(source, data);
} else { } else {
QString value = context->argument(1).toString(); const QString value = context->argument(1).toString();
if (context->argumentCount() > 2) { if (context->argumentCount() > 2) {
if (context->argument(2).isArray() || context->argument(2).isObject()) { if (context->argument(2).isArray() || context->argument(2).isObject()) {
QScriptValueIterator it(context->argument(2)); QScriptValueIterator it(context->argument(2));