1 files changed, 18 insertions, 14 deletions
diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp
index 64231b5f..fe614ad9 100644
--- a/sigscript/MoveWrapper.cpp
+++ b/sigscript/MoveWrapper.cpp
@@ -24,7 +24,11 @@
 // Sigmod includes
 #include <sigmod/Move.h>
 
-Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, GameWrapper* parent)
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigscript;
+
+MoveWrapper* MoveWrapper::create(const Move* move, GameWrapper* parent)
 {
     Signature sig = Signature(parent, Subsignature(move->className(), move->id()));
     if (!m_instances.contains(sig))
@@ -32,66 +36,66 @@ Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move,
     return qobject_cast<MoveWrapper*>(m_instances[sig]);
 }
 
-Sigscript::MoveWrapper::MoveWrapper(const Sigmod::Move* move, GameWrapper* parent) :
+MoveWrapper::MoveWrapper(const Move* move, GameWrapper* parent) :
         ObjectWrapper(move, parent),
         m_move(move)
 {
 }
 
-QString Sigscript::MoveWrapper::name() const
+QString MoveWrapper::name() const
 {
     return m_move->name();
 }
 
-Sigcore::Fraction Sigscript::MoveWrapper::accuracy() const
+Fraction MoveWrapper::accuracy() const
 {
-    ALLOW_OVERRIDE_SO(move, Sigcore::Fraction, accuracy);
+    ALLOW_OVERRIDE_SO(move, Fraction, accuracy);
     return m_move->accuracy();
 }
 
-int Sigscript::MoveWrapper::power() const
+int MoveWrapper::power() const
 {
     ALLOW_OVERRIDE_SO(move, int, power);
     return m_move->power();
 }
 
-Sigscript::TypeWrapper* Sigscript::MoveWrapper::type()
+TypeWrapper* MoveWrapper::type()
 {
     return game()->type(m_move->type());
 }
 
-bool Sigscript::MoveWrapper::special() const
+bool MoveWrapper::special() const
 {
     return m_move->special();
 }
 
-int Sigscript::MoveWrapper::powerPoints() const
+int MoveWrapper::powerPoints() const
 {
     return m_move->powerPoints();
 }
 
-int Sigscript::MoveWrapper::priority() const
+int MoveWrapper::priority() const
 {
     ALLOW_OVERRIDE_SO(move, int, priority);
     return m_move->priority();
 }
 
-QString Sigscript::MoveWrapper::description() const
+QString MoveWrapper::description() const
 {
     return m_move->description();
 }
 
-Sigcore::Script Sigscript::MoveWrapper::battleScript() const
+Script MoveWrapper::battleScript() const
 {
     return m_move->battleScript();
 }
 
-Sigcore::Script Sigscript::MoveWrapper::worldScript() const
+Script MoveWrapper::worldScript() const
 {
     return m_move->worldScript();
 }
 
-Sigcore::Script Sigscript::MoveWrapper::priorityScript() const
+Script MoveWrapper::priorityScript() const
 {
     return m_move->priorityScript();
 }