Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -4042,20 +4042,20 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 4041 unmodified lines | |||
| 4042 | return scriptEngine; | 4042 | return scriptEngine; |
| 4043 | } | 4043 | } |
| 4044 | 4044 | ||
| 4045 | void Application::handleScriptEngineLoaded(const QUrl& scriptURL) { | 4045 | void Application::handleScriptEngineLoaded(const QString& scriptFilename) { |
| 4046 | ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(sender()); | 4046 | ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(sender()); |
| 4047 | 4047 | ||
| 4048 | _scriptEnginesHash.insertMulti(scriptURL.toString(), scriptEngine); | 4048 | _scriptEnginesHash.insertMulti(scriptFilename, scriptEngine); |
| 4049 | _runningScriptsWidget->setRunningScripts(getRunningScripts()); | 4049 | _runningScriptsWidget->setRunningScripts(getRunningScripts()); |
| 4050 | UserActivityLogger::getInstance().loadedScript(scriptURL.toString()); | 4050 | UserActivityLogger::getInstance().loadedScript(scriptFilename); |
| 4051 | 4051 | ||
| 4052 | // register our application services and set it off on its own thread | 4052 | // register our application services and set it off on its own thread |
| 4053 | registerScriptEngineWithApplicationServices(scriptEngine); | 4053 | registerScriptEngineWithApplicationServices(scriptEngine); |
| 4054 | } | 4054 | } |
| 4055 | 4055 | ||
| 4056 | void Application::handleScriptLoadError(const QUrl& scriptURL) { | 4056 | void Application::handleScriptLoadError(const QString& scriptFilename) { |
| 4057 | qDebug() << "Application::loadScript(), script failed to load..."; | 4057 | qDebug() << "Application::loadScript(), script failed to load..."; |
| 4058 | QMessageBox::warning(getWindow(), "Error Loading Script", scriptURL.toString() + " failed to load."); | 4058 | QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load."); |
| 4059 | } | 4059 | } |
| 4060 | 4060 | ||
| 4061 | void Application::scriptFinished(const QString& scriptName) { | 4061 | void Application::scriptFinished(const QString& scriptName) { |