[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, 30 insertions, 30 deletions

diff --git a/pokescripting/PokemodWrapper.h b/pokescripting/PokemodWrapper.h
index f30891b4..27dc56e0 100644
--- a/pokescripting/PokemodWrapper.h
+++ b/pokescripting/PokemodWrapper.h
@@ -58,7 +58,7 @@ class POKESCRIPTING_EXPORT PokemodWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        PokemodWrapper(const Pokemod::Pokemod* pokemod, QObject* parent);
+        PokemodWrapper(const Pokemod::Pokemod* pokemod);
         
         Pokemod::Hat<NatureWrapper*> natureHat();
         
@@ -84,36 +84,36 @@ class POKESCRIPTING_EXPORT PokemodWrapper : public ObjectWrapper
         TrainerWrapper* trainer(const int id);
         TypeWrapper* type(const int id);
         WeatherWrapper* weather(const int id);
-    public slots:
-        QString title() const;
-        QString version() const;
-        QString description() const;
-        MapWarpWrapper* startWarp();
-        Pokemod::Fraction effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const;
-        RulesWrapper* rules();
         
-        AbilityWrapper* ability(const QString& name);
-        AuthorWrapper* author(const QString& name);
-        BadgeWrapper* badge(const QString& name);
-        CoinListWrapper* coinList(const QString& name);
-        EggGroupWrapper* eggGroup(const QString& name);
-        GlobalScriptWrapper* globalScript(const QString& name);
-        ItemWrapper* item(const QString& name);
-        ItemTypeWrapper* itemType(const QString& name);
-        MapWrapper* map(const QString& name);
-        MoveWrapper* move(const QString& name);
-        NatureWrapper* nature(const QString& name);
-        SkinWrapper* skin(const QString& name);
-        SoundWrapper* sound(const QString& name);
-        SpeciesWrapper* species(const QString& name);
-        SpriteWrapper* sprite(const QString& name);
-        StatusWrapper* status(const QString& name);
-        StoreWrapper* store(const QString& name);
-        TileWrapper* tile(const QString& name);
-        TimeWrapper* time(const QString& name);
-        TrainerWrapper* trainer(const QString& name);
-        TypeWrapper* type(const QString& name);
-        WeatherWrapper* weather(const QString& name);
+        Q_SCRIPTABLE QString title() const;
+        Q_SCRIPTABLE QString version() const;
+        Q_SCRIPTABLE QString description() const;
+        Q_SCRIPTABLE MapWarpWrapper* startWarp();
+        Q_SCRIPTABLE Pokemod::Fraction effectiveness(const TypeWrapper* attacker, const TypeWrapper* defender) const;
+        Q_SCRIPTABLE RulesWrapper* rules();
+        
+        Q_SCRIPTABLE AbilityWrapper* ability(const QString& name);
+        Q_SCRIPTABLE AuthorWrapper* author(const QString& name);
+        Q_SCRIPTABLE BadgeWrapper* badge(const QString& name);
+        Q_SCRIPTABLE CoinListWrapper* coinList(const QString& name);
+        Q_SCRIPTABLE EggGroupWrapper* eggGroup(const QString& name);
+        Q_SCRIPTABLE GlobalScriptWrapper* globalScript(const QString& name);
+        Q_SCRIPTABLE ItemWrapper* item(const QString& name);
+        Q_SCRIPTABLE ItemTypeWrapper* itemType(const QString& name);
+        Q_SCRIPTABLE MapWrapper* map(const QString& name);
+        Q_SCRIPTABLE MoveWrapper* move(const QString& name);
+        Q_SCRIPTABLE NatureWrapper* nature(const QString& name);
+        Q_SCRIPTABLE SkinWrapper* skin(const QString& name);
+        Q_SCRIPTABLE SoundWrapper* sound(const QString& name);
+        Q_SCRIPTABLE SpeciesWrapper* species(const QString& name);
+        Q_SCRIPTABLE SpriteWrapper* sprite(const QString& name);
+        Q_SCRIPTABLE StatusWrapper* status(const QString& name);
+        Q_SCRIPTABLE StoreWrapper* store(const QString& name);
+        Q_SCRIPTABLE TileWrapper* tile(const QString& name);
+        Q_SCRIPTABLE TimeWrapper* time(const QString& name);
+        Q_SCRIPTABLE TrainerWrapper* trainer(const QString& name);
+        Q_SCRIPTABLE TypeWrapper* type(const QString& name);
+        Q_SCRIPTABLE WeatherWrapper* weather(const QString& name);
     private:
         PokemodWrapper& operator=(const PokemodWrapper& rhs);