author | simon <simon> | 2003-02-03 11:05:53 (UTC) |
---|---|---|
committer | simon <simon> | 2003-02-03 11:05:53 (UTC) |
commit | 0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6 (patch) (unidiff) | |
tree | a1679fb241c3a37041c550fb9464dd2c4a755eed /noncore/multimedia | |
parent | f2e80c39e5861f12e1c08e548ebff33ecb0d6ea6 (diff) | |
download | opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.zip opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.tar.gz opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.tar.bz2 |
- link in libstdc++
- removed std::vector custom allocator hack for gcc2. we always pull in
libstdc++ now.
-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 @@ | |||
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
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 | ||
48 | class MediaWidget : public QWidget | 37 | class MediaWidget : public QWidget |
49 | { | 38 | { |
@@ -64,15 +53,9 @@ public: | |||
64 | QBitmap mask; | 53 | QBitmap mask; |
65 | QPixmap pixUp; | 54 | QPixmap pixUp; |
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 |
77 | { | 60 | { |
78 | Command command; | 61 | 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 \ | |||
16 | skin.cpp | 16 | skin.cpp |
17 | TARGET = opieplayer2 | 17 | 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 |
23 | 23 | ||
24 | #INCLUDEPATH += $(OPIEDIR)/include | 24 | #INCLUDEPATH += $(OPIEDIR)/include |