Fixed sigencore to use namespaces in sources

1 files changed, 13 insertions, 10 deletions

diff --git a/sigencore/Containment.cpp b/sigencore/Containment.cpp
index 116f73f0..f84bbfed 100644
--- a/sigencore/Containment.cpp
+++ b/sigencore/Containment.cpp
@@ -25,27 +25,30 @@
 #include <sigscript/GameWrapper.h>
 #include <sigscript/RulesWrapper.h>
 
-Sigencore::Containment::Containment(Sigscript::GameWrapper* game, Sigscript::Config* parent) :
-        Sigscript::Config(parent),
+using namespace Sigscript;
+using namespace Sigencore;
+
+Containment::Containment(GameWrapper* game, Config* parent) :
+        Config(parent),
         m_game(game)
 {
 }
 
-Sigencore::Containment::~Containment()
+Containment::~Containment()
 {
 }
 
-QList<Sigencore::Creature*> Sigencore::Containment::members() const
+QList<Creature*> Containment::members() const
 {
     return m_members;
 }
 
-int Sigencore::Containment::numMembers() const
+int Containment::numMembers() const
 {
     return m_members.size();
 }
 
-bool Sigencore::Containment::addMember(Creature* member)
+bool Containment::addMember(Creature* member)
 {
     member->setContainment(this);
     m_members.append(member);
@@ -53,13 +56,13 @@ bool Sigencore::Containment::addMember(Creature* member)
     return true;
 }
 
-bool Sigencore::Containment::removeMember(Creature* member)
+bool Containment::removeMember(Creature* member)
 {
     // TODO
     return false;
 }
 
-Sigencore::Creature* Sigencore::Containment::findMember(const QUuid& id) const
+Creature* Containment::findMember(const QUuid& id) const
 {
     foreach (Creature* member, m_members)
     {
@@ -69,7 +72,7 @@ Sigencore::Creature* Sigencore::Containment::findMember(const QUuid& id) const
     return NULL;
 }
 
-bool Sigencore::Containment::reorder(const int from, const int to)
+bool Containment::reorder(const int from, const int to)
 {
     if ((from < m_members.size()) && (to < m_members.size()))
     {
@@ -81,7 +84,7 @@ bool Sigencore::Containment::reorder(const int from, const int to)
     return false;
 }
 
-Sigscript::GameWrapper* Sigencore::Containment::game() const
+GameWrapper* Containment::game() const
 {
     return m_game;
 }