author | simon <simon> | 2002-12-09 22:26:11 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 22:26:11 (UTC) |
commit | 8bf05369dcdf93a712607aab6dacf407dcce5142 (patch) (unidiff) | |
tree | f11dcac538e4ad930335bcab2e4068721d167415 /noncore/multimedia | |
parent | 5a08075743a50a63eaad9c80884f4c2f4c69579b (diff) | |
download | opie-8bf05369dcdf93a712607aab6dacf407dcce5142.zip opie-8bf05369dcdf93a712607aab6dacf407dcce5142.tar.gz opie-8bf05369dcdf93a712607aab6dacf407dcce5142.tar.bz2 |
- work around gcc2's stupid STL that requires libstdc++ in the default
allocator
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 3b3a263..df03b22 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "playlistwidget.h" | 30 | #include "playlistwidget.h" |
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
33 | #include <memory> | ||
33 | 34 | ||
34 | class MediaWidget : public QWidget | 35 | class MediaWidget : public QWidget |
35 | { | 36 | { |
@@ -51,7 +52,13 @@ public: | |||
51 | QPixmap pixUp; | 52 | QPixmap pixUp; |
52 | QPixmap pixDown; | 53 | QPixmap pixDown; |
53 | }; | 54 | }; |
55 | #if defined( _CC_GNU_ ) | ||
56 | // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because | ||
57 | // in the BAD_ALLOC macro it uses std::cerr and friends :-( | ||
58 | typedef std::vector<Button, std::__allocator<Button, std::__new_alloc> > ButtonVector; | ||
59 | #else | ||
54 | typedef std::vector<Button> ButtonVector; | 60 | typedef std::vector<Button> ButtonVector; |
61 | #endif | ||
55 | 62 | ||
56 | struct SkinButtonInfo | 63 | struct SkinButtonInfo |
57 | { | 64 | { |
@@ -60,9 +67,6 @@ public: | |||
60 | ButtonType type; | 67 | ButtonType type; |
61 | }; | 68 | }; |
62 | 69 | ||
63 | typedef std::vector<QBitmap> MaskVector; | ||
64 | typedef std::vector<QPixmap> PixmapVector; | ||
65 | |||
66 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 70 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
67 | virtual ~MediaWidget(); | 71 | virtual ~MediaWidget(); |
68 | 72 | ||