Showing the changes to interface/src/ui/ScriptEditorWindow.cpp (1 of 37 files). Show all
Unified · Split
| @@ -90,10 +90,10 @@ void ScriptEditorWindow::loadScriptMenu(const QString& scriptName) { · 89 unmodified lines | |||
| 90 | 90 | ||
| 91 | void ScriptEditorWindow::loadScriptClicked() { | 91 | void ScriptEditorWindow::loadScriptClicked() { |
| 92 | QString scriptName = QFileDialog::getOpenFileName(this, tr("Interface"), | 92 | QString scriptName = QFileDialog::getOpenFileName(this, tr("Interface"), |
| 93 | Application::getInstance()->getPreviousScriptLocation(), | 93 | qApp->getPreviousScriptLocation(), |
| 94 | tr("JavaScript Files (*.js)")); | 94 | tr("JavaScript Files (*.js)")); |
| 95 | if (!scriptName.isEmpty()) { | 95 | if (!scriptName.isEmpty()) { |
| 96 | Application::getInstance()->setPreviousScriptLocation(scriptName); | 96 | qApp->setPreviousScriptLocation(scriptName); |
| 97 | addScriptEditorWidget("loading...")->loadFile(scriptName); | 97 | addScriptEditorWidget("loading...")->loadFile(scriptName); |
| 98 | updateButtons(); | 98 | updateButtons(); |
| 99 | } | 99 | } |
| @@ -101,7 +101,7 @@ void ScriptEditorWindow::loadScriptClicked() { · 1 unmodified line | |||
| 101 | 101 | ||
| 102 | void ScriptEditorWindow::loadMenuAboutToShow() { | 102 | void ScriptEditorWindow::loadMenuAboutToShow() { |
| 103 | _loadMenu->clear(); | 103 | _loadMenu->clear(); |
| 104 | QStringList runningScripts = Application::getInstance()->getRunningScripts(); | 104 | QStringList runningScripts = qApp->getRunningScripts(); |
| 105 | if (runningScripts.count() > 0) { | 105 | if (runningScripts.count() > 0) { |
| 106 | QSignalMapper* signalMapper = new QSignalMapper(this); | 106 | QSignalMapper* signalMapper = new QSignalMapper(this); |
| 107 | foreach (const QString& runningScript, runningScripts) { | 107 | foreach (const QString& runningScript, runningScripts) { |