diff options
Diffstat (limited to 'pokescripting/GlobalScriptWrapper.h')
| -rw-r--r-- | pokescripting/GlobalScriptWrapper.h | 15 |
1 files changed, 5 insertions, 10 deletions
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<GlobalScriptWrapper*>(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; |
