[FIX] Script to make a tarball now defaults to HEAD for the revision

[FIX] Enumeration types used to help remove some checks
[FIX] Macro code moved to static members of Object (not all though)
[FIX] Scripting wrappers now share information by keeping track of already-created instances of the wrapper
[FIX] Scripting methods are now Q_SCRIPTABLE and not slots

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

1 files changed, 10 insertions, 14 deletions

diff --git a/pokescripting/MapTrainerTeamMemberWrapper.h b/pokescripting/MapTrainerTeamMemberWrapper.h
index cfc264f8..0e9e3ea7 100644
--- a/pokescripting/MapTrainerTeamMemberWrapper.h
+++ b/pokescripting/MapTrainerTeamMemberWrapper.h
@@ -29,6 +29,7 @@ namespace Pokescripting
 // Forward declarations
 class AbilityWrapper;
 class ItemWrapper;
+class MapTrainerWrapper;
 class MoveWrapper;
 class NatureWrapper;
 class SpeciesWrapper;
@@ -38,21 +39,16 @@ class POKESCRIPTING_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static MapTrainerTeamMemberWrapper* create(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent)
-        {
-            if (!m_instances.contains(teamMember->id()))
-                m_instances[teamMember->id()] = new MapTrainerTeamMemberWrapper(teamMember, parent);
-            return qobject_cast<MapTrainerTeamMemberWrapper*>(m_instances[teamMember->id()]);
-        }
-    public slots:
-        SpeciesWrapper* species();
-        int level() const;
-        QList<AbilityWrapper*> abilities();
-        QList<ItemWrapper*> items();
-        QList<MoveWrapper*> moves();
-        QList<NatureWrapper*> natures();
+        static MapTrainerTeamMemberWrapper* create(const Pokemod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent);
+        
+        Q_SCRIPTABLE SpeciesWrapper* species();
+        Q_SCRIPTABLE int level() const;
+        Q_SCRIPTABLE QList<AbilityWrapper*> abilities();
+        Q_SCRIPTABLE QList<ItemWrapper*> items();
+        Q_SCRIPTABLE QList<MoveWrapper*> moves();
+        Q_SCRIPTABLE QList<NatureWrapper*> natures();
     private:
-        MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent);
+        MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent);
         MapTrainerTeamMemberWrapper& operator=(const MapTrainerTeamMemberWrapper& rhs);
         
         const Pokemod::MapTrainerTeamMember* m_teamMember;