summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 22:26:11 (UTC)
committer simon <simon>2002-12-09 22:26:11 (UTC)
commit8bf05369dcdf93a712607aab6dacf407dcce5142 (patch) (side-by-side diff)
treef11dcac538e4ad930335bcab2e4068721d167415
parent5a08075743a50a63eaad9c80884f4c2f4c69579b (diff)
downloadopie-8bf05369dcdf93a712607aab6dacf407dcce5142.zip
opie-8bf05369dcdf93a712607aab6dacf407dcce5142.tar.gz
opie-8bf05369dcdf93a712607aab6dacf407dcce5142.tar.bz2
- work around gcc2's stupid STL that requires libstdc++ in the default
allocator
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h10
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
@@ -25,16 +25,17 @@
#include <qwidget.h>
#include <qmap.h>
#include "mediaplayerstate.h"
#include "playlistwidget.h"
#include <vector>
+#include <memory>
class MediaWidget : public QWidget
{
Q_OBJECT
public:
enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined };
enum ButtonType { NormalButton, ToggleButton };
@@ -46,28 +47,31 @@ public:
ButtonType type; // this should be part of the bitfield but gcc2 is too buggy to support this :-(
bool isDown : 1;
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:
virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
virtual void setLength( long length ) = 0;
virtual void setPlaying( bool playing ) = 0;