Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 45 files). Show all
Unified · Split
| @@ -311,6 +311,11 @@ QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* ob · 310 unmodified lines | ||
| 311 | 311 | return QScriptValue::NullValue; |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | +void ScriptEngine::registerFunction(const QString& name, QScriptEngine::FunctionSignature fun, int numArguments) { | |
| 315 | + QScriptValue scriptFun = newFunction(fun, numArguments); | |
| 316 | + globalObject().setProperty(name, scriptFun); | |
| 317 | +} | |
| 318 | + | |
| 314 | 319 | void ScriptEngine::registerGetterSetter(const QString& name, QScriptEngine::FunctionSignature getter, |
| 315 | 320 | QScriptEngine::FunctionSignature setter, QScriptValue object) { |
| 316 | 321 | QScriptValue setterFunction = newFunction(setter, 1); |
| @@ -625,7 +630,7 @@ void ScriptEngine::stopTimer(QTimer *timer) { · 308 unmodified lines | ||
| 625 | 630 | } |
| 626 | 631 | } |
| 627 | 632 | |
| 628 | −QUrl ScriptEngine::resolveInclude(const QString& include) const { | |
| 633 | +QUrl ScriptEngine::resolvePath(const QString& include) const { | |
| 629 | 634 | // first lets check to see if it's already a full URL |
| 630 | 635 | QUrl url(include); |
| 631 | 636 | if (!url.scheme().isEmpty()) { |
| @@ -651,7 +656,7 @@ void ScriptEngine::print(const QString& message) { · 19 unmodified lines | ||
| 651 | 656 | } |
| 652 | 657 | |
| 653 | 658 | void ScriptEngine::include(const QString& includeFile) { |
| 654 | − QUrl url = resolveInclude(includeFile); | |
| 659 | + QUrl url = resolvePath(includeFile); | |
| 655 | 660 | QString includeContents; |
| 656 | 661 | |
| 657 | 662 | if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") { |
| @@ -689,7 +694,7 @@ void ScriptEngine::include(const QString& includeFile) { · 31 unmodified lines | ||
| 689 | 694 | } |
| 690 | 695 | |
| 691 | 696 | void ScriptEngine::load(const QString& loadFile) { |
| 692 | − QUrl url = resolveInclude(loadFile); | |
| 697 | + QUrl url = resolvePath(loadFile); | |
| 693 | 698 | emit loadScript(url.toString(), false); |
| 694 | 699 | } |
| 695 | 700 | |