| author | zecke <zecke> | 2002-11-03 11:08:07 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-11-03 11:08:07 (UTC) |
| commit | 2ddf0a555fc848930de8b0f7b237bbd7f2a028ca (patch) (side-by-side diff) | |
| 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 @@ #include <qregexp.h> #include <qtoolbutton.h> #include <qimage.h> +#include <cstdlib> class BgPixmap { public: @@ -89,9 +90,9 @@ public: } void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; } - QPixmap* busyPixmap() const { return (QPixmap*)&bpm[::abs(busystate)]; } + QPixmap* busyPixmap() const { return (QPixmap*)&bpm[abs(busystate)]; } QIconViewItem* busyItem() const { return bsy; } void setBigIcons( bool bi ) { bigIcns = bi; } void updateCategoriesAndMimeTypes(); @@ -130,9 +131,9 @@ public: rgb = img.colorTable(); count = img.numColors(); } int rc, gc, bc; - int bs = ::abs ( i * 10 ) + 25; + int bs = abs ( i * 10 ) + 25; colorGroup().highlight().rgb( &rc, &gc, &bc ); rc = rc * bs / 100; gc = gc * bs / 100; 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 * ) connectionClosed(); } -ServerDTP::ServerDTP( QObject *parent = 0, const char* name = 0) +ServerDTP::ServerDTP( QObject *parent, const char* name) : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), retrieveTargzProc( 0 ), gzipProc( 0 ) { |