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/MapWarpWrapper.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'pokescripting/MapWarpWrapper.h') diff --git a/pokescripting/MapWarpWrapper.h b/pokescripting/MapWarpWrapper.h index aefbd18b..02988a39 100644 --- a/pokescripting/MapWarpWrapper.h +++ b/pokescripting/MapWarpWrapper.h @@ -26,25 +26,23 @@ namespace Pokescripting { +// Forward declartions +class MapWrapper; + class POKESCRIPTING_EXPORT MapWarpWrapper : public ObjectWrapper { Q_OBJECT public: - static MapWarpWrapper* create(const Pokemod::MapWarp* warp, QObject* parent) - { - if (!m_instances.contains(warp->id())) - m_instances[warp->id()] = new MapWarpWrapper(warp, parent); - return qobject_cast(m_instances[warp->id()]); - } - public slots: - QString name() const; - QPoint coordinate() const; - int type() const; - MapWarpWrapper* toWarp(); - Pokemod::Script script() const; + static MapWarpWrapper* create(const Pokemod::MapWarp* warp, MapWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE QPoint coordinate() const; + Q_SCRIPTABLE Pokemod::MapWarp::Type type() const; + Q_SCRIPTABLE MapWarpWrapper* toWarp(); + Q_SCRIPTABLE Pokemod::Script script() const; private: - MapWarpWrapper(const Pokemod::MapWarp* warp, QObject* parent); + MapWarpWrapper(const Pokemod::MapWarp* warp, MapWrapper* parent); MapWarpWrapper& operator=(const MapWarpWrapper& rhs); const Pokemod::MapWarp* m_warp; -- cgit