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/GlobalScriptWrapper.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'pokescripting/GlobalScriptWrapper.h') diff --git a/pokescripting/GlobalScriptWrapper.h b/pokescripting/GlobalScriptWrapper.h index 00496e77..739cc60b 100644 --- a/pokescripting/GlobalScriptWrapper.h +++ b/pokescripting/GlobalScriptWrapper.h @@ -31,17 +31,12 @@ class POKESCRIPTING_EXPORT GlobalScriptWrapper : public ObjectWrapper Q_OBJECT public: - static GlobalScriptWrapper* create(const Pokemod::GlobalScript* globalScript, QObject* parent) - { - if (!m_instances.contains(globalScript->id())) - m_instances[globalScript->id()] = new GlobalScriptWrapper(globalScript, parent); - return qobject_cast(m_instances[globalScript->id()]); - } - public slots: - QString name() const; - Pokemod::Script script() const; + static GlobalScriptWrapper* create(const Pokemod::GlobalScript* globalScript, PokemodWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE Pokemod::Script script() const; private: - GlobalScriptWrapper(const Pokemod::GlobalScript* globalScript, QObject* parent); + GlobalScriptWrapper(const Pokemod::GlobalScript* globalScript, PokemodWrapper* parent); GlobalScriptWrapper& operator=(const GlobalScriptWrapper& rhs); const Pokemod::GlobalScript* m_globalScript; -- cgit