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/CoinListObjectWrapper.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'pokescripting/CoinListObjectWrapper.h') diff --git a/pokescripting/CoinListObjectWrapper.h b/pokescripting/CoinListObjectWrapper.h index 1b86840f..f8de0489 100644 --- a/pokescripting/CoinListObjectWrapper.h +++ b/pokescripting/CoinListObjectWrapper.h @@ -27,6 +27,7 @@ namespace Pokescripting { // Forward declarations +class CoinListWrapper; class ItemWrapper; class SpeciesWrapper; @@ -35,20 +36,15 @@ class POKESCRIPTING_EXPORT CoinListObjectWrapper : public ObjectWrapper Q_OBJECT public: - static CoinListObjectWrapper* create(const Pokemod::CoinListObject* object, QObject* parent) - { - if (!m_instances.contains(object->id())) - m_instances[object->id()] = new CoinListObjectWrapper(object, parent); - return qobject_cast(m_instances[object->id()]); - } - public slots: - int type() const; - ItemWrapper* itemObject(); - SpeciesWrapper* speciesObject(); - int amount() const; - int cost() const; + static CoinListObjectWrapper* create(const Pokemod::CoinListObject* object, CoinListWrapper* parent); + + Q_SCRIPTABLE Pokemod::CoinListObject::Type type() const; + Q_SCRIPTABLE ItemWrapper* itemObject(); + Q_SCRIPTABLE SpeciesWrapper* speciesObject(); + Q_SCRIPTABLE int amount() const; + Q_SCRIPTABLE int cost() const; private: - CoinListObjectWrapper(const Pokemod::CoinListObject* object, QObject* parent); + CoinListObjectWrapper(const Pokemod::CoinListObject* object, CoinListWrapper* parent); CoinListObjectWrapper& operator=(const CoinListObjectWrapper& rhs); const Pokemod::CoinListObject* m_object; -- cgit