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

better return values

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1159674
This commit is contained in:
Aaron J. Seigo 2010-08-05 23:00:45 +00:00
parent fe8a1522be
commit e96c23c5e1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scriptengines/javascript/scriptenv.cpp
View File

@ -401,7 +401,7 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
const QString plugin = context->argument(1).toString(); const QString plugin = context->argument(1).toString();
if (type.isEmpty() || plugin.isEmpty()) { if (type.isEmpty() || plugin.isEmpty()) {
return false; return context->throwError(i18n("loadAddon takes two arguments: addon type and addon name to load"));
} }
const QString constraint = QString("[X-KDE-PluginInfo-Category] == '%1' and [X-KDE-PluginInfo-Name] == '%2'") const QString constraint = QString("[X-KDE-PluginInfo-Category] == '%1' and [X-KDE-PluginInfo-Name] == '%2'")
@ -409,7 +409,7 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
KService::List offers = KServiceTypeTrader::self()->query("Plasma/JavascriptAddon", constraint); KService::List offers = KServiceTypeTrader::self()->query("Plasma/JavascriptAddon", constraint);
if (offers.isEmpty()) { if (offers.isEmpty()) {
return false; return context->throwError(i18n("Failed to find Addon %1 of type %1", plugin, type));
} }
Plasma::PackageStructure::Ptr structure(new JavascriptAddonPackageStructure); Plasma::PackageStructure::Ptr structure(new JavascriptAddonPackageStructure);
@ -420,8 +420,7 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
QFile file(package.filePath("mainscript")); QFile file(package.filePath("mainscript"));
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
kError() << "failed to open script file" << path; return context->throwError(i18n("file to open script file for Addon %1: %1", plugin, path));
return false;
} }
QTextStream buffer(&file); QTextStream buffer(&file);
@ -432,7 +431,7 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
engine->evaluate(code, file.fileName()); engine->evaluate(code, file.fileName());
engine->popContext(); engine->popContext();
return engine->undefinedValue(); return true;
} }
/* /*