[FIX] Pokemod objects now know about parents

[FIX] Project includes are now relative
[FIX] Headers included for better detection of invalid headers
[FIX] Validation code commented out so it can be done better

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

1 files changed, 10 insertions, 12 deletions

diff --git a/pokemod/Move.h b/pokemod/Move.h
index 3649ef6f..f7a862ec 100644
--- a/pokemod/Move.h
+++ b/pokemod/Move.h
@@ -18,21 +18,19 @@
 #ifndef __POKEMOD_MOVE__
 #define __POKEMOD_MOVE__
 
-// Qt includes
-#include <QList>
-#include <QString>
-#include <QStringList>
+// Pokemod includes
+#include "Object.h"
 
 // General includes
-#include <Exception.h>
-#include <Fraction.h>
+#include "../general/Exception.h"
+#include "../general/Fraction.h"
 
-// Pokemod includes
-#include "Object.h"
+// Qt includes
+#include <QList>
+#include <QString>
 
 // Forward declarations
 class MoveEffect;
-class Pokemod;
 
 class Move : public Object
 {
@@ -57,9 +55,9 @@ class Move : public Object
         static const QStringList ChoiceStr;
         
         Move(const Move& move);
-        Move(const Pokemod* pokemod, const int id);
-        Move(const Move& move, const Pokemod* pokemod, const int id);
-        Move(const QDomElement& xml, const Pokemod* pokemod, const int id = INT_MAX);
+        Move(const Object* parent, const int id);
+        Move(const Move& move, const Object* parent, const int id);
+        Move(const QDomElement& xml, const Object* parent, const int id = INT_MAX);
         ~Move();
         
         void load(const QDomElement& xml, int id = INT_MAX);