History

Totally removed Application's setting memember

Atlante45 committed 11 years ago

Commit c2b7ff11 parent 92e9df011 files · +94 −142Browse files

Showing the changes to interface/src/scripting/SettingsScriptingInterface.cpp (1 of 11 files). Show all

Unified · Split

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