[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

1 files changed, 3 insertions, 3 deletions

diff --git a/pokemodr/SpriteUI.cpp b/pokemodr/SpriteUI.cpp
index 08aab17b..6fd80b1e 100644
--- a/pokemodr/SpriteUI.cpp
+++ b/pokemodr/SpriteUI.cpp
@@ -39,9 +39,9 @@ Pokemodr::SpriteUI::~SpriteUI()
 
 void Pokemodr::SpriteUI::setGui()
 {
-    const QPixmap sprite = qobject_cast<Pokemod::Sprite*>(modified())->sprite();
+    const QImage sprite = qobject_cast<Pokemod::Sprite*>(modified())->sprite();
     varName->setText(qobject_cast<Pokemod::Sprite*>(modified())->name());
-    varSprite->setIcon(sprite);
+    varSprite->setIcon(QPixmap::fromImage(sprite));
     varSprite->setMinimumSize(sprite.size());
 }
 
@@ -73,7 +73,7 @@ void Pokemodr::SpriteUI::on_varSprite_pressed()
     dialog->setPreviewWidget(new KImageFilePreview);
     if (dialog->exec() == QDialog::Accepted)
     {
-        qobject_cast<Pokemod::Sprite*>(modified())->setSprite(QPixmap(dialog->selectedFile()));
+        qobject_cast<Pokemod::Sprite*>(modified())->setSprite(QImage(dialog->selectedFile()));
         setGui();
     }
     delete dialog;