summaryrefslogtreecommitdiffstats
path: root/sigscript/Config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sigscript/Config.cpp')
-rw-r--r--sigscript/Config.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/sigscript/Config.cpp b/sigscript/Config.cpp
index a5502bc1..d7f38fd2 100644
--- a/sigscript/Config.cpp
+++ b/sigscript/Config.cpp
@@ -46,20 +46,6 @@ void Config::setValue(const QString& name, const QVariant& value, const Options
emit(valueChanged(name, value));
}
-void Config::setOptions(const QString& name, const Options options)
-{
- QWriteLocker locker(&m_lock);
- m_values[name].second |= options;
- emit(optionsChanged(name, options));
-}
-
-void Config::unsetOptions(const QString& name, const Options options)
-{
- QWriteLocker locker(&m_lock);
- m_values[name].second |= ~options;
- emit(optionsChanged(name, options));
-}
-
void Config::removeValue(const QString& name, const bool shadow)
{
QWriteLocker locker(&m_lock);
@@ -102,16 +88,6 @@ bool Config::hasValue(const QString& name, const bool recursive) const
return false;
}
-Config::Options Config::options(const QString& name, const bool recursive) const
-{
- QReadLocker locker(&m_lock);
- if (m_values.contains(name))
- return m_values[name].second;
- if (recursive && m_parent)
- return m_parent->options(name, recursive);
- return 0;
-}
-
QStringList Config::values(const bool recursive) const
{
QStringList values = m_values.keys();
@@ -125,6 +101,30 @@ QStringList Config::values(const bool recursive) const
return values.toSet().toList();
}
+void Config::setOptions(const QString& name, const Options options)
+{
+ QWriteLocker locker(&m_lock);
+ m_values[name].second |= options;
+ emit(optionsChanged(name, options));
+}
+
+void Config::unsetOptions(const QString& name, const Options options)
+{
+ QWriteLocker locker(&m_lock);
+ m_values[name].second |= ~options;
+ emit(optionsChanged(name, options));
+}
+
+Config::Options Config::options(const QString& name, const bool recursive) const
+{
+ QReadLocker locker(&m_lock);
+ if (m_values.contains(name))
+ return m_values[name].second;
+ if (recursive && m_parent)
+ return m_parent->options(name, recursive);
+ return 0;
+}
+
void Config::clean()
{
QWriteLocker locker(&m_lock);