Showing the changes to interface/src/ui/ScriptEditorWidget.cpp (1 of 37 files). Show all
Unified · Split
| @@ -98,7 +98,7 @@ bool ScriptEditorWidget::setRunning(bool run) { · 97 unmodified lines | |||
| 98 | if (run) { | 98 | if (run) { |
| 99 | const QString& scriptURLString = QUrl(_currentScript).toString(); | 99 | const QString& scriptURLString = QUrl(_currentScript).toString(); |
| 100 | // Reload script so that an out of date copy is not retrieved from the cache | 100 | // Reload script so that an out of date copy is not retrieved from the cache |
| 101 | _scriptEngine = Application::getInstance()->loadScript(scriptURLString, true, true, false, true); | 101 | _scriptEngine = qApp->loadScript(scriptURLString, true, true, false, true); |
| 102 | connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); | 102 | connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); |
| 103 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); | 103 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| 104 | connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); | 104 | connect(_scriptEngine, &ScriptEngine::printedMessage, this, &ScriptEditorWidget::onScriptPrint); |
| @@ -106,7 +106,7 @@ bool ScriptEditorWidget::setRunning(bool run) { · 1 unmodified line | |||
| 106 | connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished); | 106 | connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished); |
| 107 | } else { | 107 | } else { |
| 108 | connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished); | 108 | connect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished); |
| 109 | Application::getInstance()->stopScript(_currentScript); | 109 | qApp->stopScript(_currentScript); |
| 110 | _scriptEngine = NULL; | 110 | _scriptEngine = NULL; |
| 111 | } | 111 | } |
| 112 | return true; | 112 | return true; |
| @@ -170,7 +170,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) { · 57 unmodified lines | |||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | const QString& scriptURLString = QUrl(_currentScript).toString(); | 172 | const QString& scriptURLString = QUrl(_currentScript).toString(); |
| 173 | _scriptEngine = Application::getInstance()->getScriptEngine(scriptURLString); | 173 | _scriptEngine = qApp->getScriptEngine(scriptURLString); |
| 174 | if (_scriptEngine != NULL) { | 174 | if (_scriptEngine != NULL) { |
| 175 | connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); | 175 | connect(_scriptEngine, &ScriptEngine::runningStateChanged, this, &ScriptEditorWidget::runningStateChanged); |
| 176 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); | 176 | connect(_scriptEngine, &ScriptEngine::errorMessage, this, &ScriptEditorWidget::onScriptError); |
| @@ -186,10 +186,10 @@ bool ScriptEditorWidget::save() { · 9 unmodified lines | |||
| 186 | 186 | ||
| 187 | bool ScriptEditorWidget::saveAs() { | 187 | bool ScriptEditorWidget::saveAs() { |
| 188 | QString fileName = QFileDialog::getSaveFileName(this, tr("Save script"), | 188 | QString fileName = QFileDialog::getSaveFileName(this, tr("Save script"), |
| 189 | Application::getInstance()->getPreviousScriptLocation(), | 189 | qApp->getPreviousScriptLocation(), |
| 190 | tr("JavaScript Files (*.js)")); | 190 | tr("JavaScript Files (*.js)")); |
| 191 | if (!fileName.isEmpty()) { | 191 | if (!fileName.isEmpty()) { |
| 192 | Application::getInstance()->setPreviousScriptLocation(fileName); | 192 | qApp->setPreviousScriptLocation(fileName); |
| 193 | return saveFile(fileName); | 193 | return saveFile(fileName); |
| 194 | } else { | 194 | } else { |
| 195 | return false; | 195 | return false; |