-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 | |||
@@ -33,15 +33,4 @@ | |||
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 | ||
@@ -66,11 +55,5 @@ public: | |||
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 |
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 | |||
@@ -18,5 +18,5 @@ TARGET = opieplayer2 | |||
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH += $(OPIEDIR)/include | 19 | DEPENDPATH += $(OPIEDIR)/include |
20 | LIBS += -lqpe -lpthread -lopie -lxine | 20 | LIBS += -lqpe -lpthread -lopie -lxine -lstdc++ |
21 | MOC_DIR = qpeobj | 21 | MOC_DIR = qpeobj |
22 | OBJECTS_DIR = qpeobj | 22 | OBJECTS_DIR = qpeobj |