From fd874f8a1e413b769245aa61a866bd536a551c3c Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 24 Feb 2009 16:33:13 -0500 Subject: Fixed up sigscript namespacing in sources --- sigscript/Config.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'sigscript/Config.cpp') diff --git a/sigscript/Config.cpp b/sigscript/Config.cpp index c591285f..a5502bc1 100644 --- a/sigscript/Config.cpp +++ b/sigscript/Config.cpp @@ -21,14 +21,16 @@ // Qt includes #include -Sigscript::Config::Config(Config* parent) : +using namespace Sigscript; + +Config::Config(Config* parent) : QObject(parent), m_lock(QReadWriteLock::Recursive), m_parent(parent) { } -void Sigscript::Config::addValue(const QString& name, const QVariant& value, const Options options) +void Config::addValue(const QString& name, const QVariant& value, const Options options) { if (!m_values.contains(name)) { @@ -37,28 +39,28 @@ void Sigscript::Config::addValue(const QString& name, const QVariant& value, con } } -void Sigscript::Config::setValue(const QString& name, const QVariant& value, const Options options) +void Config::setValue(const QString& name, const QVariant& value, const Options options) { QWriteLocker locker(&m_lock); m_values[name] = Value(value, options); emit(valueChanged(name, value)); } -void Sigscript::Config::setOptions(const QString& name, const Options options) +void Config::setOptions(const QString& name, const Options options) { QWriteLocker locker(&m_lock); m_values[name].second |= options; emit(optionsChanged(name, options)); } -void Sigscript::Config::unsetOptions(const QString& name, const Options options) +void Config::unsetOptions(const QString& name, const Options options) { QWriteLocker locker(&m_lock); m_values[name].second |= ~options; emit(optionsChanged(name, options)); } -void Sigscript::Config::removeValue(const QString& name, const bool shadow) +void Config::removeValue(const QString& name, const bool shadow) { QWriteLocker locker(&m_lock); if (shadow) @@ -68,7 +70,7 @@ void Sigscript::Config::removeValue(const QString& name, const bool shadow) emit(valueRemoved(name)); } -QVariant Sigscript::Config::value(const QString& name, const bool recursive) const +QVariant Config::value(const QString& name, const bool recursive) const { QReadLocker locker(&m_lock); if (m_values.contains(name)) @@ -90,7 +92,7 @@ QVariant Sigscript::Config::value(const QString& name, const bool recursive) con return QVariant(); } -bool Sigscript::Config::hasValue(const QString& name, const bool recursive) const +bool Config::hasValue(const QString& name, const bool recursive) const { QReadLocker locker(&m_lock); if (m_values.contains(name)) @@ -100,7 +102,7 @@ bool Sigscript::Config::hasValue(const QString& name, const bool recursive) cons return false; } -Sigscript::Config::Options Sigscript::Config::options(const QString& name, const bool recursive) const +Config::Options Config::options(const QString& name, const bool recursive) const { QReadLocker locker(&m_lock); if (m_values.contains(name)) @@ -110,7 +112,7 @@ Sigscript::Config::Options Sigscript::Config::options(const QString& name, const return 0; } -QStringList Sigscript::Config::values(const bool recursive) const +QStringList Config::values(const bool recursive) const { QStringList values = m_values.keys(); if (recursive && m_parent) @@ -123,7 +125,7 @@ QStringList Sigscript::Config::values(const bool recursive) const return values.toSet().toList(); } -void Sigscript::Config::clean() +void Config::clean() { QWriteLocker locker(&m_lock); for (QMutableMapIterator i(m_values); i.hasNext(); i.next()) @@ -137,7 +139,7 @@ void Sigscript::Config::clean() } } -void Sigscript::Config::writeBack() +void Config::writeBack() { QWriteLocker locker(&m_lock); } -- cgit