| -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 @@ -29,8 +29,9 @@ #include "mediaplayerstate.h" #include "playlistwidget.h" #include <vector> +#include <memory> class MediaWidget : public QWidget { Q_OBJECT @@ -50,20 +51,23 @@ public: QBitmap mask; QPixmap pixUp; QPixmap pixDown; }; +#if defined( _CC_GNU_ ) + // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because + // in the BAD_ALLOC macro it uses std::cerr and friends :-( + typedef std::vector<Button, std::__allocator<Button, std::__new_alloc> > ButtonVector; +#else typedef std::vector<Button> ButtonVector; +#endif struct SkinButtonInfo { Command command; const char *fileName; ButtonType type; }; - typedef std::vector<QBitmap> MaskVector; - typedef std::vector<QPixmap> PixmapVector; - MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); virtual ~MediaWidget(); public slots: |