| -rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 17 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 2 |
2 files changed, 1 insertions, 18 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 @@ -31,19 +31,8 @@ #include <vector> #include <memory> -namespace -{ - struct simpleAndStupidAllocator - { - static void *allocate( size_t amount ) - { return ::operator new( amount ); } - static void deallocate( void *p, size_t ) - { ::operator delete( p ); } - }; -} - class Skin; class MediaWidget : public QWidget { @@ -64,15 +53,9 @@ 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, simpleAndStupidAllocator> > ButtonVector; -#else typedef std::vector<Button> ButtonVector; -#endif struct SkinButtonInfo { Command command; diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 44af25f..a739692 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro @@ -16,9 +16,9 @@ SOURCES = main.cpp \ skin.cpp TARGET = opieplayer2 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lpthread -lopie -lxine +LIBS += -lqpe -lpthread -lopie -lxine -lstdc++ MOC_DIR = qpeobj OBJECTS_DIR = qpeobj #INCLUDEPATH += $(OPIEDIR)/include |