Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 3 files). Show all
Unified · Split
| @@ -28,7 +28,6 @@ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStanda · 27 unmodified lines | ||
| 28 | 28 | static const bool HIFI_SCRIPT_DEBUGGABLES { true }; |
| 29 | 29 | static const QString SETTINGS_KEY { "RunningScripts" }; |
| 30 | 30 | static const QUrl DEFAULT_SCRIPTS_LOCATION { "file:///~//defaultScripts.js" }; |
| 31 | −static const QUrl CONTROLLER_SCRIPTS_LOCATION { "file:///~//system//controllers//controllerScripts.js" }; | |
| 32 | 31 | // Using a QVariantList so this is human-readable in the settings file |
| 33 | 32 | static Setting::Handle<QVariantList> runningScriptsHandle(SETTINGS_KEY, { QVariant(DEFAULT_SCRIPTS_LOCATION) }); |
| 34 | 33 | |
| @@ -288,10 +287,6 @@ void ScriptEngines::loadDefaultScripts() { · 253 unmodified lines | ||
| 288 | 287 | loadScript(DEFAULT_SCRIPTS_LOCATION); |
| 289 | 288 | } |
| 290 | 289 | |
| 291 | −void ScriptEngines::loadControllerScripts() { | |
| 292 | − loadScript(CONTROLLER_SCRIPTS_LOCATION); | |
| 293 | −} | |
| 294 | − | |
| 295 | 290 | void ScriptEngines::loadOneScript(const QString& scriptFilename) { |
| 296 | 291 | loadScript(scriptFilename); |
| 297 | 292 | } |