summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/skin.h16
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
@@ -21,6 +21,7 @@
*/
#include "skin.h"
+#include "singleton.h"
#include <qpe/resource.h>
#include <qpe/config.h>
@@ -38,6 +39,21 @@ struct SkinData
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 )
{
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<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: