History

Merge branch master into protocol_changes

HifiExperiments committed 2 years ago

Commit ee705d21 parent f9e729b370 files · +11827 −6045Browse files

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

Unified · Split

interface/src/scripting/SettingsScriptingInterface.cpp+7−1
@@ -21,6 +21,9 @@ SettingsScriptingInterface* SettingsScriptingInterface::getInstance() { · 20 unmodified lines
21}21}
22 22
23QVariant SettingsScriptingInterface::getValue(const QString& setting) {23QVariant SettingsScriptingInterface::getValue(const QString& setting) {
24 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
25 return {""};
26 }
24 QVariant value = Setting::Handle<QVariant>(setting).get();27 QVariant value = Setting::Handle<QVariant>(setting).get();
25 if (!value.isValid()) {28 if (!value.isValid()) {
26 value = "";29 value = "";
@@ -29,6 +32,9 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting) { · 2 unmodified lines
29}32}
30 33
31QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {34QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVariant& defaultValue) {
35 if (_restrictPrivateValues && setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
36 return {""};
37 }
32 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();38 QVariant value = Setting::Handle<QVariant>(setting, defaultValue).get();
33 if (!value.isValid()) {39 if (!value.isValid()) {
34 value = "";40 value = "";
@@ -40,7 +46,7 @@ void SettingsScriptingInterface::setValue(const QString& setting, const QVariant · 5 unmodified lines
40 if (getValue(setting) == value) {46 if (getValue(setting) == value) {
41 return;47 return;
42 }48 }
43 if (setting.startsWith("private/")) {49 if (setting.startsWith("private/") || setting.startsWith(SETTINGS_FULL_PRIVATE_GROUP_NAME + "/")) {
44 if (_restrictPrivateValues) {50 if (_restrictPrivateValues) {
45 qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;51 qWarning() << "SettingsScriptingInterface::setValue -- restricted write: " << setting << value;
46 return;52 return;