Fixed up sigscript namespacing in sources

1 files changed, 17 insertions, 13 deletions

diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp
index 98463e5d..212f2bc6 100644
--- a/sigscript/MapWarpWrapper.cpp
+++ b/sigscript/MapWarpWrapper.cpp
@@ -22,7 +22,11 @@
 #include "GameWrapper.h"
 #include "MapWrapper.h"
 
-Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::create(const Sigmod::MapWarp* warp, MapWrapper* parent)
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigscript;
+
+MapWarpWrapper* MapWarpWrapper::create(const MapWarp* warp, MapWrapper* parent)
 {
     Signature sig = Signature(parent, Subsignature(warp->className(), warp->id()));
     if (!m_instances.contains(sig))
@@ -30,47 +34,47 @@ Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::create(const Sigmod::MapWa
     return qobject_cast<MapWarpWrapper*>(m_instances[sig]);
 }
 
-Sigscript::MapWarpWrapper::MapWarpWrapper(const Sigmod::MapWarp* warp, MapWrapper* parent) :
+MapWarpWrapper::MapWarpWrapper(const MapWarp* warp, MapWrapper* parent) :
         ObjectWrapper(warp, parent),
         m_warp(warp)
 {
 }
 
-Sigmod::MapWarp::Type Sigscript::MapWarpWrapper::type(const QString& name) const
+MapWarp::Type MapWarpWrapper::type(const QString& name) const
 {
     if (name == "Door")
-        return Sigmod::MapWarp::Door;
+        return MapWarp::Door;
     else if (name == "Warp")
-        return Sigmod::MapWarp::Warp;
+        return MapWarp::Warp;
     else if (name == "Hole")
-        return Sigmod::MapWarp::Hole;
+        return MapWarp::Hole;
     else if (name == "Boundary")
-        return Sigmod::MapWarp::Boundary;
-    return QVariant(-1).value<Sigmod::MapWarp::Type>();
+        return MapWarp::Boundary;
+    return QVariant(-1).value<MapWarp::Type>();
 }
 
-QString Sigscript::MapWarpWrapper::name() const
+QString MapWarpWrapper::name() const
 {
     return m_warp->name();
 }
 
-QRect Sigscript::MapWarpWrapper::area() const
+QRect MapWarpWrapper::area() const
 {
     ALLOW_OVERRIDE_SO(warp, QRect, area);
     return m_warp->area();
 }
 
-Sigmod::MapWarp::Type Sigscript::MapWarpWrapper::type() const
+MapWarp::Type MapWarpWrapper::type() const
 {
     return m_warp->type();
 }
 
-Sigscript::MapWarpWrapper* Sigscript::MapWarpWrapper::toWarp()
+MapWarpWrapper* MapWarpWrapper::toWarp()
 {
     return game()->map(m_warp->toMap())->warp(m_warp->toWarp());
 }
 
-Sigcore::Script Sigscript::MapWarpWrapper::script() const
+Script MapWarpWrapper::script() const
 {
     return m_warp->script();
 }