Showing the changes to interface/src/scripting/SettingsScriptingInterface.cpp (1 of 11 files). Show all
Unified · Split
| @@ -9,7 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html |
| 10 | 10 | // |
| 11 | 11 | |
| 12 | −#include "Application.h" | |
| 12 | +#include <Settings.h> | |
| 13 | + | |
| 13 | 14 | #include "SettingsScriptingInterface.h" |
| 14 | 15 | |
| 15 | 16 | |
| @@ -19,9 +20,7 @@ SettingsScriptingInterface* SettingsScriptingInterface::getInstance() { · 3 unmodified lines | ||
| 19 | 20 | } |
| 20 | 21 | |
| 21 | 22 | QVariant SettingsScriptingInterface::getValue(const QString& setting) { |
| 22 | − QSettings* settings = Application::getInstance()->lockSettings(); | |
| 23 | − QVariant value = settings->value(setting); | |
| 24 | − Application::getInstance()->unlockSettings(); | |
| 23 | + QVariant value = Settings().value(setting); | |
| 25 | 24 | if (!value.isValid()) { |
| 26 | 25 | value = ""; |
| 27 | 26 | } |
| @@ -29,9 +28,7 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting) { · 1 unmodified line | ||
| 29 | 28 | } |
| 30 | 29 | |
| 31 | 30 | QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) { |
| 32 | − QSettings* settings = Application::getInstance()->lockSettings(); | |
| 33 | − QVariant value = settings->value(setting, defaultValue); | |
| 34 | − Application::getInstance()->unlockSettings(); | |
| 31 | + QVariant value = Settings().value(setting, defaultValue); | |
| 35 | 32 | if (!value.isValid()) { |
| 36 | 33 | value = ""; |
| 37 | 34 | } |
| @@ -39,7 +36,5 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVar · 1 unmodified line | ||
| 39 | 36 | } |
| 40 | 37 | |
| 41 | 38 | void SettingsScriptingInterface::setValue(const QString& setting, const QVariant& value) { |
| 42 | − QSettings* settings = Application::getInstance()->lockSettings(); | |
| 43 | − settings->setValue(setting, value); | |
| 44 | − Application::getInstance()->unlockSettings(); | |
| 39 | + Settings().setValue(setting, value); | |
| 45 | 40 | } |