From 404d3f7f2f9aa455bea423a6a00025df23cd6687 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sat, 9 Apr 2011 00:16:28 +0200
Subject: Removed the Mana namespace

It's just an annoyance when it's only applied to a few classes. Either
we place everything in this namespace or nothing, and at the moment I
don't see any rationale for placing everything in a Mana namespace.

Acked-by: Jared Adams
---
 src/configuration.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/configuration.cpp')

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 59d8a024..44621eb3 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -38,9 +38,9 @@ void Configuration::setValue(const std::string &key, const std::string &value)
     ConfigurationObject::setValue(key, value);
 
     // Notify listeners
-    Mana::Event event(Mana::Event::ConfigOptionChanged);
+    Event event(Event::ConfigOptionChanged);
     event.setString("option", key);
-    event.trigger(Mana::Event::ConfigChannel);
+    event.trigger(Event::ConfigChannel);
 }
 
 std::string ConfigurationObject::getValue(const std::string &key,
@@ -125,8 +125,8 @@ void Configuration::setDefaultValues(DefaultsData *defaultsData)
     mDefaultsData = defaultsData;
 }
 
-Mana::VariableData* Configuration::getDefault(const std::string &key,
-                                              Mana::VariableData::DataType type
+VariableData* Configuration::getDefault(const std::string &key,
+                                              VariableData::DataType type
                                              ) const
 {
     if (mDefaultsData)
@@ -153,9 +153,9 @@ int Configuration::getIntValue(const std::string &key) const
     Options::const_iterator iter = mOptions.find(key);
     if (iter == mOptions.end())
     {
-        Mana::VariableData* vd = getDefault(key, Mana::VariableData::DATA_INT);
+        VariableData* vd = getDefault(key, VariableData::DATA_INT);
         if (vd)
-            defaultValue = ((Mana::IntData*)vd)->getData();
+            defaultValue = ((IntData*)vd)->getData();
     }
     else
     {
@@ -170,11 +170,11 @@ std::string Configuration::getStringValue(const std::string &key) const
     Options::const_iterator iter = mOptions.find(key);
     if (iter == mOptions.end())
     {
-        Mana::VariableData* vd = getDefault(key,
-                                            Mana::VariableData::DATA_STRING);
+        VariableData* vd = getDefault(key,
+                                            VariableData::DATA_STRING);
 
         if (vd)
-            defaultValue = ((Mana::StringData*)vd)->getData();
+            defaultValue = ((StringData*)vd)->getData();
     }
     else
     {
@@ -190,11 +190,11 @@ float Configuration::getFloatValue(const std::string &key) const
     Options::const_iterator iter = mOptions.find(key);
     if (iter == mOptions.end())
     {
-        Mana::VariableData* vd = getDefault(key,
-            Mana::VariableData::DATA_FLOAT);
+        VariableData* vd = getDefault(key,
+            VariableData::DATA_FLOAT);
 
         if (vd)
-            defaultValue = ((Mana::FloatData*)vd)->getData();
+            defaultValue = ((FloatData*)vd)->getData();
     }
     else
     {
@@ -209,11 +209,11 @@ bool Configuration::getBoolValue(const std::string &key) const
     Options::const_iterator iter = mOptions.find(key);
     if (iter == mOptions.end())
     {
-        Mana::VariableData* vd = getDefault(key,
-            Mana::VariableData::DATA_BOOL);
+        VariableData* vd = getDefault(key,
+            VariableData::DATA_BOOL);
 
         if (vd)
-            defaultValue = ((Mana::BoolData*)vd)->getData();
+            defaultValue = ((BoolData*)vd)->getData();
     }
     else
     {
-- 
cgit v1.2.3-70-g09d2