[FIX] SoundUI widget has a better layout

[FIX] Sound playback works in SoundUI
[FIX] SoundWrapper returns a Phonon object for playback in scripts now
[FIX] Wrapper classes now won't be duplicated (persistent storage is possible now)
[FIX] Linking to libraries is fixed for RPM
[FIX] Pokemod Macros.h is hidden if not compiling pokemod
[FIX] make-tarball script is simpler now (and works as upstream, not local copy)
[FIX] Cleaned up spec file per review request for Fedora

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@236 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 10 insertions, 4 deletions

diff --git a/pokescripting/MapTrainerTeamMemberWrapper.h b/pokescripting/MapTrainerTeamMemberWrapper.h
index b8495745..c0330469 100644
--- a/pokescripting/MapTrainerTeamMemberWrapper.h
+++ b/pokescripting/MapTrainerTeamMemberWrapper.h
@@ -36,15 +36,21 @@ class POKESCRIPTING_EXPORT MapTrainerTeamMemberWrapper : public ObjectWrapper
     Q_OBJECT
     
     public:
-        MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent);
+        static MapTrainerTeamMemberWrapper* create(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent)
+        {
+            if (!m_instances.contains(teamMember->id()))
+                m_instances[teamMember->id()] = new MapTrainerTeamMemberWrapper(teamMember, parent);
+            return qobject_cast<MapTrainerTeamMemberWrapper*>(m_instances[teamMember->id()]);
+        }
     public slots:
-        const SpeciesWrapper* species() const;
+        SpeciesWrapper* species();
         int level() const;
         bool ability(const int ability) const;
         bool item(const int item) const;
         bool move(const int move) const;
         bool nature(const int nature) const;
     private:
+        MapTrainerTeamMemberWrapper(const Pokemod::MapTrainerTeamMember* teamMember, QObject* parent);
         MapTrainerTeamMemberWrapper& operator=(const MapTrainerTeamMemberWrapper& rhs);
         
         const Pokemod::MapTrainerTeamMember* m_teamMember;
@@ -56,9 +62,9 @@ inline MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const Pokemod::M
 {
 }
 
-inline const SpeciesWrapper* MapTrainerTeamMemberWrapper::species() const
+inline SpeciesWrapper* MapTrainerTeamMemberWrapper::species()
 {
-    return new SpeciesWrapper(pokemod()->speciesById(m_teamMember->species()), const_cast<MapTrainerTeamMemberWrapper*>(this));
+    return SpeciesWrapper::create(pokemod()->speciesById(m_teamMember->species()), this);
 }
 
 inline int MapTrainerTeamMemberWrapper::level() const