[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, 6 insertions, 11 deletions

diff --git a/pokescripting/TimeWrapper.h b/pokescripting/TimeWrapper.h
index 9337f80d..d234d9f5 100644
--- a/pokescripting/TimeWrapper.h
+++ b/pokescripting/TimeWrapper.h
@@ -31,18 +31,13 @@ class POKESCRIPTING_EXPORT TimeWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        static TimeWrapper* create(const Pokemod::Time* time, QObject* parent)
-        {
-            if (!m_instances.contains(time->id()))
-                m_instances[time->id()] = new TimeWrapper(time, parent);
-            return qobject_cast<TimeWrapper*>(m_instances[time->id()]);
-        }
-    public slots:
-        QString name() const;
-        int hour() const;
-        int minute() const;
+        static TimeWrapper* create(const Pokemod::Time* time, PokemodWrapper* parent);
+        
+        Q_SCRIPTABLE QString name() const;
+        Q_SCRIPTABLE int hour() const;
+        Q_SCRIPTABLE int minute() const;
     private:
-        TimeWrapper(const Pokemod::Time* time, QObject* parent);
+        TimeWrapper(const Pokemod::Time* time, PokemodWrapper* parent);
         TimeWrapper& operator=(const TimeWrapper& rhs);
         
         const Pokemod::Time* m_time;