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/CoinListWrapper.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'pokescripting/CoinListWrapper.h') diff --git a/pokescripting/CoinListWrapper.h b/pokescripting/CoinListWrapper.h index 9b9bc63e..d702d585 100644 --- a/pokescripting/CoinListWrapper.h +++ b/pokescripting/CoinListWrapper.h @@ -19,7 +19,6 @@ #define __POKESCRIPTING_COINLISTWRAPPER__ // Pokescripting includes -#include "CoinListObjectWrapper.h" #include "ObjectWrapper.h" // Pokemod includes @@ -27,25 +26,24 @@ namespace Pokescripting { +// Forward declarations +class CoinListObjectWrapper; +class PokemodWrapper; + class POKESCRIPTING_EXPORT CoinListWrapper : public ObjectWrapper { Q_OBJECT public: - static CoinListWrapper* create(const Pokemod::CoinList* coinList, QObject* parent) - { - if (!m_instances.contains(coinList->id())) - m_instances[coinList->id()] = new CoinListWrapper(coinList, parent); - return qobject_cast(m_instances[coinList->id()]); - } - public slots: - QString name() const; - Pokemod::Script script() const; + static CoinListWrapper* create(const Pokemod::CoinList* coinList, PokemodWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE Pokemod::Script script() const; - CoinListObjectWrapper* object(const int index); - int objectCount() const; + Q_SCRIPTABLE CoinListObjectWrapper* object(const int index); + Q_SCRIPTABLE int objectCount() const; private: - CoinListWrapper(const Pokemod::CoinList* coinList, QObject* parent); + CoinListWrapper(const Pokemod::CoinList* coinList, PokemodWrapper* parent); CoinListWrapper& operator=(const CoinListWrapper& rhs); const Pokemod::CoinList* m_coinList; -- cgit