Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 45c46ea..8c3a467 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -29,23 +29,12 @@ | |||
29 | #include "mediaplayerstate.h" | 29 | #include "mediaplayerstate.h" |
30 | #include "playlistwidget.h" | 30 | #include "playlistwidget.h" |
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
33 | #include <memory> | 33 | #include <memory> |
34 | 34 | ||
35 | namespace | ||
36 | { | ||
37 | struct simpleAndStupidAllocator | ||
38 | { | ||
39 | static void *allocate( size_t amount ) | ||
40 | { return ::operator new( amount ); } | ||
41 | static void deallocate( void *p, size_t ) | ||
42 | { ::operator delete( p ); } | ||
43 | }; | ||
44 | } | ||
45 | |||
46 | class Skin; | 35 | class Skin; |
47 | 36 | ||
48 | class MediaWidget : public QWidget | 37 | class MediaWidget : public QWidget |
49 | { | 38 | { |
50 | Q_OBJECT | 39 | Q_OBJECT |
51 | public: | 40 | public: |
@@ -62,19 +51,13 @@ public: | |||
62 | bool isDown : 1; | 51 | bool isDown : 1; |
63 | 52 | ||
64 | QBitmap mask; | 53 | QBitmap mask; |
65 | QPixmap pixUp; | 54 | QPixmap pixUp; |
66 | QPixmap pixDown; | 55 | QPixmap pixDown; |
67 | }; | 56 | }; |
68 | #if defined( _CC_GNU_ ) | ||
69 | // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because | ||
70 | // in the BAD_ALLOC macro it uses std::cerr and friends :-( | ||
71 | typedef std::vector<Button, std::__allocator<Button, simpleAndStupidAllocator> > ButtonVector; | ||
72 | #else | ||
73 | typedef std::vector<Button> ButtonVector; | 57 | typedef std::vector<Button> ButtonVector; |
74 | #endif | ||
75 | 58 | ||
76 | struct SkinButtonInfo | 59 | struct SkinButtonInfo |
77 | { | 60 | { |
78 | Command command; | 61 | Command command; |
79 | const char *fileName; | 62 | const char *fileName; |
80 | ButtonType type; | 63 | ButtonType type; |