summaryrefslogtreecommitdiff
path: root/settings.cpp
diff options
context:
space:
mode:
authorBrian Potchik <brian@vector35.com>2019-08-07 15:30:53 -0400
committerBrian Potchik <brian@vector35.com>2019-08-07 15:30:53 -0400
commit25cf00a276d9a3da3134601d82654c87bcd9ef9c (patch)
treecb4411e48db783440a6ef0f1dece3ccea5e3a7a6 /settings.cpp
parent4704a1ee70e5b1a82989b2b3b016146fc183aefe (diff)
Settings system improvements.
Diffstat (limited to 'settings.cpp')
-rw-r--r--settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings.cpp b/settings.cpp
index c779c10e..3ea43a7e 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -124,9 +124,9 @@ bool Settings::UpdateProperty(const std::string& key, const std::string& propert
}
-bool Settings::DeserializeSchema(const string& schema)
+bool Settings::DeserializeSchema(const string& schema, BNSettingsScope scope, bool merge)
{
- return BNSettingsDeserializeSchema(m_object, schema.c_str());
+ return BNSettingsDeserializeSchema(m_object, schema.c_str(), scope, merge);
}