summaryrefslogtreecommitdiff
path: root/core
authorzecke <zecke>2002-11-03 11:08:07 (UTC)
committer zecke <zecke>2002-11-03 11:08:07 (UTC)
commit2ddf0a555fc848930de8b0f7b237bbd7f2a028ca (patch) (unidiff)
treeae30e333c5c1ee830e46f7f868c5e56876f7e93c /core
parent207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (diff)
downloadopie-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
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcherview.cpp5
-rw-r--r--core/launcher/transferserver.cpp2
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
@@ -38,16 +38,17 @@
38#include <qfileinfo.h> 38#include <qfileinfo.h>
39#include <qhbox.h> 39#include <qhbox.h>
40#include <qiconview.h> 40#include <qiconview.h>
41#include <qpainter.h> 41#include <qpainter.h>
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
47class BgPixmap 48class BgPixmap
48{ 49{
49public: 50public:
50 BgPixmap( const QPixmap &p ) : pm(p), ref(1) {} 51 BgPixmap( const QPixmap &p ) : pm(p), ref(1) {}
51 QPixmap pm; 52 QPixmap pm;
52 int ref; 53 int ref;
53}; 54};
@@ -85,17 +86,17 @@ public:
85 ++it; 86 ++it;
86 //qDebug("%p: hidden (should remove)",l); 87 //qDebug("%p: hidden (should remove)",l);
87 } 88 }
88#endif 89#endif
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();
98 99
99 void doAutoScroll() 100 void doAutoScroll()
100 { 101 {
101 // We don't want rubberbanding (yet) 102 // We don't want rubberbanding (yet)
@@ -126,17 +127,17 @@ public:
126 if ( img.depth() == 32 ) { 127 if ( img.depth() == 32 ) {
127 rgb = (QRgb*)img.bits(); 128 rgb = (QRgb*)img.bits();
128 count = img.bytesPerLine()/sizeof(QRgb)*img.height(); 129 count = img.bytesPerLine()/sizeof(QRgb)*img.height();
129 } else { 130 } else {
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;
139 140
140 for ( int r = 0; r < count; r++, rgb++ ) { 141 for ( int r = 0; r < count; r++, rgb++ ) {
141 int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100; 142 int ri = rc + qRed ( *rgb ) * ( 100 - bs ) / 100;
142 int gi = gc + qGreen ( *rgb ) * ( 100 - bs ) / 100; 143 int gi = gc + qGreen ( *rgb ) * ( 100 - 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
@@ -989,17 +989,17 @@ QString ServerPI::absFilePath( const QString& file )
989 989
990 990
991void ServerPI::timerEvent( QTimerEvent * ) 991void ServerPI::timerEvent( QTimerEvent * )
992{ 992{
993 connectionClosed(); 993 connectionClosed();
994} 994}
995 995
996 996
997ServerDTP::ServerDTP( QObject *parent = 0, const char* name = 0) 997ServerDTP::ServerDTP( QObject *parent, const char* name)
998 : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), 998 : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
999retrieveTargzProc( 0 ), gzipProc( 0 ) 999retrieveTargzProc( 0 ), gzipProc( 0 )
1000{ 1000{
1001 1001
1002 connect( this, SIGNAL( connected() ), SLOT( connected() ) ); 1002 connect( this, SIGNAL( connected() ), SLOT( connected() ) );
1003 connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) ); 1003 connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
1004 connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) ); 1004 connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
1005 connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) ); 1005 connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );