History

Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge

humbletim committed 7 years ago

Commit 271fac42 parents bad32e9 96f67931529 files · +58136 −6493Browse files

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

Unified · Split

interface/src/scripting/SettingsScriptingInterface.cpp+4−0
@@ -35,6 +35,9 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVar · 34 unmodified lines
35}35}
36 36
37void SettingsScriptingInterface::setValue(const QString& setting, const QVariant& value) {37void SettingsScriptingInterface::setValue(const QString& setting, const QVariant& value) {
38 if (getValue(setting) == value) {
39 return;
40 }
38 if (setting.startsWith("private/")) {41 if (setting.startsWith("private/")) {
39 if (_restrictPrivateValues) {42 if (_restrictPrivateValues) {
40 qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;43 qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;
@@ -47,4 +50,5 @@ void SettingsScriptingInterface::setValue(const QString& setting, const QVariant · 6 unmodified lines
47 // Dangling pointers can occur with QStrings that are implicitly shared from a QScriptEngine.50 // Dangling pointers can occur with QStrings that are implicitly shared from a QScriptEngine.
48 QString deepCopy = QString::fromUtf16(setting.utf16());51 QString deepCopy = QString::fromUtf16(setting.utf16());
49 Setting::Handle<QVariant>(deepCopy).set(value);52 Setting::Handle<QVariant>(deepCopy).set(value);
53 emit valueChanged(setting, value);
50}54}