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/SoundWrapper.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'pokescripting/SoundWrapper.h') diff --git a/pokescripting/SoundWrapper.h b/pokescripting/SoundWrapper.h index 7ad98e49..3af17f0c 100644 --- a/pokescripting/SoundWrapper.h +++ b/pokescripting/SoundWrapper.h @@ -37,17 +37,13 @@ class POKESCRIPTING_EXPORT SoundWrapper : public ObjectWrapper Q_OBJECT public: - static SoundWrapper* create(const Pokemod::Sound* sound, QObject* parent) - { - if (!m_instances.contains(sound->id())) - m_instances[sound->id()] = new SoundWrapper(sound, parent); - return qobject_cast(m_instances[sound->id()]); - } - public slots: - QString name() const; - Phonon::MediaObject* data(); + static SoundWrapper* create(const Pokemod::Sound* sound, PokemodWrapper* parent); + + Q_SCRIPTABLE QString name() const; + Q_SCRIPTABLE Pokemod::Sound::Type type() const; + Q_SCRIPTABLE Phonon::MediaObject* data(); private: - SoundWrapper(const Pokemod::Sound* sound, QObject* parent); + SoundWrapper(const Pokemod::Sound* sound, PokemodWrapper* parent); SoundWrapper& operator=(const SoundWrapper& rhs); const Pokemod::Sound* m_sound; -- cgit