author | zecke <zecke> | 2002-11-03 11:08:07 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-03 11:08:07 (UTC) |
commit | 2ddf0a555fc848930de8b0f7b237bbd7f2a028ca (patch) (unidiff) | |
tree | ae30e333c5c1ee830e46f7f868c5e56876f7e93c | |
parent | 207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (diff) | |
download | opie-2ddf0a555fc848930de8b0f7b237bbd7f2a028ca.zip opie-2ddf0a555fc848930de8b0f7b237bbd7f2a028ca.tar.gz opie-2ddf0a555fc848930de8b0f7b237bbd7f2a028ca.tar.bz2 |
Nice to see more kde dudes here!
A patch from jowenn to make Opie compile with gcc3 again
No default arguments!
Some namespace issues
-rw-r--r-- | core/launcher/launcherview.cpp | 5 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 2a051a6..95a1d4a 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -42,8 +42,9 @@ | |||
42 | #include <qregexp.h> | 42 | #include <qregexp.h> |
43 | #include <qtoolbutton.h> | 43 | #include <qtoolbutton.h> |
44 | #include <qimage.h> | 44 | #include <qimage.h> |
45 | 45 | ||
46 | #include <cstdlib> | ||
46 | 47 | ||
47 | class BgPixmap | 48 | class BgPixmap |
48 | { | 49 | { |
49 | public: | 50 | public: |
@@ -89,9 +90,9 @@ public: | |||
89 | } | 90 | } |
90 | 91 | ||
91 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } | 92 | void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } |
92 | 93 | ||
93 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } | 94 | QPixmap* busyPixmap() const { return (QPixmap*)&bpm[abs(busystate)]; } |
94 | QIconViewItem* busyItem() const { return bsy; } | 95 | QIconViewItem* busyItem() const { return bsy; } |
95 | void setBigIcons( bool bi ) { bigIcns = bi; } | 96 | void setBigIcons( bool bi ) { bigIcns = bi; } |
96 | 97 | ||
97 | void updateCategoriesAndMimeTypes(); | 98 | void updateCategoriesAndMimeTypes(); |
@@ -130,9 +131,9 @@ public: | |||
130 | rgb = img.colorTable(); | 131 | rgb = img.colorTable(); |
131 | count = img.numColors(); | 132 | count = img.numColors(); |
132 | } | 133 | } |
133 | int rc, gc, bc; | 134 | int rc, gc, bc; |
134 | int bs = ::abs ( i * 10 ) + 25; | 135 | int bs = abs ( i * 10 ) + 25; |
135 | colorGroup().highlight().rgb( &rc, &gc, &bc ); | 136 | colorGroup().highlight().rgb( &rc, &gc, &bc ); |
136 | rc = rc * bs / 100; | 137 | rc = rc * bs / 100; |
137 | gc = gc * bs / 100; | 138 | gc = gc * bs / 100; |
138 | bc = bc * bs / 100; | 139 | bc = bc * bs / 100; |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index aaa4425..cbda247 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -993,9 +993,9 @@ void ServerPI::timerEvent( QTimerEvent * ) | |||
993 | connectionClosed(); | 993 | connectionClosed(); |
994 | } | 994 | } |
995 | 995 | ||
996 | 996 | ||
997 | ServerDTP::ServerDTP( QObject *parent = 0, const char* name = 0) | 997 | ServerDTP::ServerDTP( QObject *parent, const char* name) |
998 | : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), | 998 | : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), |
999 | retrieveTargzProc( 0 ), gzipProc( 0 ) | 999 | retrieveTargzProc( 0 ), gzipProc( 0 ) |
1000 | { | 1000 | { |
1001 | 1001 | ||