Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 16 |
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 @@ -18,12 +18,13 @@ 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> @@ -35,12 +36,27 @@ struct SkinData 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 ); } 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 @@ -27,13 +27,12 @@ #include <qimage.h> #include <qmap.h> #include <qdict.h> #include "mediawidget.h" #include "threadutil.h" -#include "singleton.h" struct SkinData; class Skin { public: @@ -64,27 +63,12 @@ private: 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, |