diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-27 04:26:53 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-27 04:26:53 +0000 |
| commit | 1fe11fc794783370d8a03a93979b27508278b113 (patch) | |
| tree | 3cadc4423a209b203f5d37e6756cb87ca99c3876 /pokescripting | |
| parent | 31601349dff4b78a03bda0912d8d79b43eae42b0 (diff) | |
| download | sigen-1fe11fc794783370d8a03a93979b27508278b113.tar.gz sigen-1fe11fc794783370d8a03a93979b27508278b113.tar.xz sigen-1fe11fc794783370d8a03a93979b27508278b113.zip | |
[FIX] Fixed method in SoundWrapper to be more accurate
[FIX] QImage is now used internally instead of QPixmap
[FIX] Template specialization moved to header file for Object (makes MinGW happy)
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@246 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokescripting')
| -rw-r--r-- | pokescripting/SoundWrapper.cpp | 2 | ||||
| -rw-r--r-- | pokescripting/SoundWrapper.h | 2 | ||||
| -rw-r--r-- | pokescripting/SpriteWrapper.cpp | 2 | ||||
| -rw-r--r-- | pokescripting/SpriteWrapper.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pokescripting/SoundWrapper.cpp b/pokescripting/SoundWrapper.cpp index 7754048d..ebecdfc2 100644 --- a/pokescripting/SoundWrapper.cpp +++ b/pokescripting/SoundWrapper.cpp @@ -60,7 +60,7 @@ Pokemod::Sound::Type Pokescripting::SoundWrapper::type() const return m_sound->type(); } -Phonon::MediaObject* Pokescripting::SoundWrapper::data() +Phonon::MediaObject* Pokescripting::SoundWrapper::audio() { Phonon::MediaObject* media = new Phonon::MediaObject(this); QBuffer* buffer = new QBuffer(media); diff --git a/pokescripting/SoundWrapper.h b/pokescripting/SoundWrapper.h index b6209d96..54ac3f38 100644 --- a/pokescripting/SoundWrapper.h +++ b/pokescripting/SoundWrapper.h @@ -43,7 +43,7 @@ class POKESCRIPTING_EXPORT SoundWrapper : public ObjectWrapper Q_SCRIPTABLE QString name() const; Q_SCRIPTABLE Pokemod::Sound::Type type() const; - Q_SCRIPTABLE Phonon::MediaObject* data(); + Q_SCRIPTABLE Phonon::MediaObject* audio(); private: SoundWrapper(const Pokemod::Sound* sound, PokemodWrapper* parent); SoundWrapper& operator=(const SoundWrapper& rhs); diff --git a/pokescripting/SpriteWrapper.cpp b/pokescripting/SpriteWrapper.cpp index 47fd585b..0233e996 100644 --- a/pokescripting/SpriteWrapper.cpp +++ b/pokescripting/SpriteWrapper.cpp @@ -39,7 +39,7 @@ QString Pokescripting::SpriteWrapper::name() const return m_sprite->name(); } -QPixmap Pokescripting::SpriteWrapper::sprite() const +QImage Pokescripting::SpriteWrapper::sprite() const { return m_sprite->sprite(); } diff --git a/pokescripting/SpriteWrapper.h b/pokescripting/SpriteWrapper.h index cae7ae1f..77db2e47 100644 --- a/pokescripting/SpriteWrapper.h +++ b/pokescripting/SpriteWrapper.h @@ -34,7 +34,7 @@ class POKESCRIPTING_EXPORT SpriteWrapper : public ObjectWrapper static SpriteWrapper* create(const Pokemod::Sprite* sprite, PokemodWrapper* parent); Q_SCRIPTABLE QString name() const; - Q_SCRIPTABLE QPixmap sprite() const; + Q_SCRIPTABLE QImage sprite() const; private: SpriteWrapper(const Pokemod::Sprite* sprite, PokemodWrapper* parent); SpriteWrapper& operator=(const SpriteWrapper& rhs); |