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/ObjectWrapper.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'pokescripting/ObjectWrapper.h') diff --git a/pokescripting/ObjectWrapper.h b/pokescripting/ObjectWrapper.h index 69a15150..648b693b 100644 --- a/pokescripting/ObjectWrapper.h +++ b/pokescripting/ObjectWrapper.h @@ -28,22 +28,34 @@ // Qt includes #include #include +#include namespace Pokescripting { +// Forward declarations +class PokemodWrapper; + class POKESCRIPTING_EXPORT ObjectWrapper : public Config { Q_OBJECT Q_PROPERTY(int id READ id) public: - ObjectWrapper(const Pokemod::Object* object, QObject* parent); + typedef QPair Signiture; + + ObjectWrapper(const Pokemod::Object* object, ObjectWrapper* parent); int id() const; - const Pokemod::Pokemod* pokemod() const; + + const ObjectWrapper* parent() const; + ObjectWrapper* parent(); + + const PokemodWrapper* pokemod() const; + PokemodWrapper* pokemod(); protected: - static QMap m_instances; + static QMap m_instances; private: + ObjectWrapper* m_parent; const Pokemod::Object* m_object; }; } -- cgit