From c1793a87ebea8c8e1bb2d5d1a409d105bfae3871 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 18 Aug 2008 18:51:31 +0000 Subject: [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 --- pokescripting/BadgeWrapper.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'pokescripting/BadgeWrapper.h') diff --git a/pokescripting/BadgeWrapper.h b/pokescripting/BadgeWrapper.h index fa518e7a..6aafd808 100644 --- a/pokescripting/BadgeWrapper.h +++ b/pokescripting/BadgeWrapper.h @@ -34,20 +34,15 @@ class POKESCRIPTING_EXPORT BadgeWrapper : public ObjectWrapper Q_OBJECT public: - static BadgeWrapper* create(const Pokemod::Badge* badge, QObject* parent) - { - if (!m_instances.contains(badge->id())) - m_instances[badge->id()] = new BadgeWrapper(badge, parent); - return qobject_cast(m_instances[badge->id()]); - } - public slots: - QString name() const; - SpriteWrapper* face(); - SpriteWrapper* badge(); - int obey() const; - Pokemod::Fraction stat(const int stat) const; + static BadgeWrapper* create(const Pokemod::Badge* badge, PokemodWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE SpriteWrapper* face(); + Q_SCRIPTABLE SpriteWrapper* badge(); + Q_SCRIPTABLE int obey() const; + Q_SCRIPTABLE Pokemod::Fraction stat(const Pokemod::Stat stat) const; private: - BadgeWrapper(const Pokemod::Badge* badge, QObject* parent); + BadgeWrapper(const Pokemod::Badge* badge, PokemodWrapper* parent); BadgeWrapper& operator=(const BadgeWrapper& rhs); const Pokemod::Badge* m_badge; -- cgit