- moved the skin cache into the .cpp file

2 files changed, 16 insertions, 16 deletions

diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 9ad5f3f..06453f9 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -16,16 +16,17 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 #include "skin.h"
+#include "singleton.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <assert.h>
 
 struct SkinData
 {
@@ -33,16 +34,31 @@ struct SkinData
 
     QImage backgroundImage;
     QImage buttonUpImage;
     QImage buttonDownImage;
     QImage buttonMask;
     ButtonMaskImageMap buttonMasks;
 };
 
+class SkinCache : public Singleton<SkinCache>
+{
+public:
+    SkinCache();
+
+    QImage loadImage( const QString &name );
+
+private:
+    typedef QDict<QImage> ImageCache;
+
+    ImageCache m_cache;
+
+    ThreadUtil::Mutex m_cacheGuard;
+};
+
 Skin::Skin( const QString &name, const QString &fileNameInfix )
     : m_fileNameInfix( fileNameInfix )
 {
     init( name );
 }
 
 Skin::Skin( const QString &fileNameInfix )
     : m_fileNameInfix( fileNameInfix )
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 5ab6574..060ff73 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -25,17 +25,16 @@
 
 #include <qstring.h>
 #include <qimage.h>
 #include <qmap.h>
 #include <qdict.h>
 
 #include "mediawidget.h"
 #include "threadutil.h"
-#include "singleton.h"
 
 struct SkinData;
 
 class Skin
 {
 public:
     Skin( const QString &name, const QString &fileNameInfix );
     Skin( const QString &fileNameInfix );
@@ -62,31 +61,16 @@ private:
     QString m_skinPath;
 
     SkinData *d;
 
     Skin( const Skin & );
     Skin &operator=( const Skin & );
 };
 
-class SkinCache : public Singleton<SkinCache>
-{
-public:
-    SkinCache();
-
-    QImage loadImage( const QString &name );
-
-private:
-    typedef QDict<QImage> ImageCache;
-
-    ImageCache m_cache;
-
-    ThreadUtil::Mutex m_cacheGuard;
-};
-
 class SkinLoader : public ThreadUtil::Thread
 {
 public:
     SkinLoader();
 
     void schedule( const QString &skinName, const QString &fileNameInfix, 
                    const MediaWidget::SkinButtonInfo *skinButtonInfo, const uint buttonCount );