summaryrefslogtreecommitdiffstats
path: root/sigscript/ObjectWrapper.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-02-24 16:33:13 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-02-24 16:33:13 -0500
commitfd874f8a1e413b769245aa61a866bd536a551c3c (patch)
treeaf66c155cc313e9ca777ba8a332c1133a52b3d9c /sigscript/ObjectWrapper.cpp
parenteb7d51f42aa1790be6b496a0e1882d6a9646e1c8 (diff)
downloadsigen-fd874f8a1e413b769245aa61a866bd536a551c3c.tar.gz
sigen-fd874f8a1e413b769245aa61a866bd536a551c3c.tar.xz
sigen-fd874f8a1e413b769245aa61a866bd536a551c3c.zip
Fixed up sigscript namespacing in sources
Diffstat (limited to 'sigscript/ObjectWrapper.cpp')
-rw-r--r--sigscript/ObjectWrapper.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/sigscript/ObjectWrapper.cpp b/sigscript/ObjectWrapper.cpp
index 2e36dec1..c7025078 100644
--- a/sigscript/ObjectWrapper.cpp
+++ b/sigscript/ObjectWrapper.cpp
@@ -25,37 +25,40 @@
#include <sigmod/Game.h>
#include <sigmod/Object.h>
-QMap<Sigscript::ObjectWrapper::Signature, Sigscript::ObjectWrapper*> Sigscript::ObjectWrapper::m_instances;
+using namespace Sigmod;
+using namespace Sigscript;
-Sigscript::ObjectWrapper::ObjectWrapper(const Sigmod::Object* object, ObjectWrapper* parent) :
+QMap<ObjectWrapper::Signature, ObjectWrapper*> ObjectWrapper::m_instances;
+
+ObjectWrapper::ObjectWrapper(const Object* object, ObjectWrapper* parent) :
Config(parent),
m_object(object)
{
}
-int Sigscript::ObjectWrapper::id() const
+int ObjectWrapper::id() const
{
return m_object->id();
}
-const Sigscript::ObjectWrapper* Sigscript::ObjectWrapper::parent() const
+const ObjectWrapper* ObjectWrapper::parent() const
{
return m_parent;
}
-Sigscript::ObjectWrapper* Sigscript::ObjectWrapper::parent()
+ObjectWrapper* ObjectWrapper::parent()
{
return m_parent;
}
-const Sigscript::GameWrapper* Sigscript::ObjectWrapper::game() const
+const GameWrapper* ObjectWrapper::game() const
{
if (m_parent)
return m_parent->game();
return qobject_cast<const GameWrapper*>(m_parent);
}
-Sigscript::GameWrapper* Sigscript::ObjectWrapper::game()
+GameWrapper* ObjectWrapper::game()
{
if (m_parent)
return m_parent->game();