[FIX] Moved Hat, Fraction, Matrix, and Script to sigcore

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@281 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 16 insertions, 14 deletions

diff --git a/sigmod/Move.h b/sigmod/Move.h
index 2c8082b0..f4a6d2da 100644
--- a/sigmod/Move.h
+++ b/sigmod/Move.h
@@ -18,10 +18,12 @@
 #ifndef SIGMOD_MOVE
 #define SIGMOD_MOVE
 
+// Sigcore includes
+#include "../sigcore/Fraction.h"
+#include "../sigcore/Script.h"
+
 // Sigmod includes
-#include "Fraction.h"
 #include "Object.h"
-#include "Script.h"
 
 namespace Sigmod
 {
@@ -45,42 +47,42 @@ class SIGMOD_EXPORT Move : public Object
         QDomElement save() const;
         
         void setName(const QString& name);
-        void setAccuracy(const Fraction& accuracy);
+        void setAccuracy(const Sigcore::Fraction& accuracy);
         void setPower(const int power);
         void setType(const int type);
         void setSpecial(const bool special);
         void setPowerPoints(const int powerPoints);
         void setPriority(const int priority);
         void setDescription(const QString& description);
-        void setBattleScript(const Script& battleScript);
-        void setWorldScript(const Script& worldScript);
-        void setPriorityScript(const Script& priorityScript);
+        void setBattleScript(const Sigcore::Script& battleScript);
+        void setWorldScript(const Sigcore::Script& worldScript);
+        void setPriorityScript(const Sigcore::Script& priorityScript);
         
         QString name() const;
-        Fraction accuracy() const;
+        Sigcore::Fraction accuracy() const;
         int power() const;
         int type() const;
         bool special() const;
         int powerPoints() const;
         int priority() const;
         QString description() const;
-        Script battleScript() const;
-        Script worldScript() const;
-        Script priorityScript() const;
+        Sigcore::Script battleScript() const;
+        Sigcore::Script worldScript() const;
+        Sigcore::Script priorityScript() const;
         
         Move& operator=(const Move& rhs);
     private:
         QString m_name;
-        Fraction m_accuracy;
+        Sigcore::Fraction m_accuracy;
         int m_power;
         int m_type;
         bool m_special;
         int m_powerPoints;
         int m_priority;
         QString m_description;
-        Script m_battleScript;
-        Script m_worldScript;
-        Script m_priorityScript;
+        Sigcore::Script m_battleScript;
+        Sigcore::Script m_worldScript;
+        Sigcore::Script m_priorityScript;
 };
 }