From b8db7cfea977d20f2d491b0a208a237efb15019a Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 11 Dec 2002 18:34:16 +0000 Subject: - moved the skin cache into the .cpp file --- (limited to 'noncore/multimedia') 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 @@ -21,6 +21,7 @@ */ #include "skin.h" +#include "singleton.h" #include #include @@ -38,6 +39,21 @@ struct SkinData ButtonMaskImageMap buttonMasks; }; +class SkinCache : public Singleton +{ +public: + SkinCache(); + + QImage loadImage( const QString &name ); + +private: + typedef QDict ImageCache; + + ImageCache m_cache; + + ThreadUtil::Mutex m_cacheGuard; +}; + Skin::Skin( const QString &name, 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 @@ -30,7 +30,6 @@ #include "mediawidget.h" #include "threadutil.h" -#include "singleton.h" struct SkinData; @@ -67,21 +66,6 @@ private: Skin &operator=( const Skin & ); }; -class SkinCache : public Singleton -{ -public: - SkinCache(); - - QImage loadImage( const QString &name ); - -private: - typedef QDict ImageCache; - - ImageCache m_cache; - - ThreadUtil::Mutex m_cacheGuard; -}; - class SkinLoader : public ThreadUtil::Thread { public: -- cgit v0.9.0.2