[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

1 files changed, 5 insertions, 10 deletions

diff --git a/pokescripting/StoreWrapper.h b/pokescripting/StoreWrapper.h
index c6ee315c..caf458b3 100644
--- a/pokescripting/StoreWrapper.h
+++ b/pokescripting/StoreWrapper.h
@@ -34,17 +34,12 @@ class POKESCRIPTING_EXPORT StoreWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static StoreWrapper* create(const Pokemod::Store* store, QObject* parent)
-        {
-            if (!m_instances.contains(store->id()))
-                m_instances[store->id()] = new StoreWrapper(store, parent);
-            return qobject_cast<StoreWrapper*>(m_instances[store->id()]);
-        }
-    public slots:
-        QString name() const;
-        QList<ItemWrapper*> items();
+        static StoreWrapper* create(const Pokemod::Store* store, PokemodWrapper* parent);
+        
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE QList<ItemWrapper*> items();
     private:
-        StoreWrapper(const Pokemod::Store* store, QObject* parent);
+        StoreWrapper(const Pokemod::Store* store, PokemodWrapper* parent);
         StoreWrapper& operator=(const StoreWrapper& rhs);
         
         const Pokemod::Store* m_store;