summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/desktop.cpp4
-rw-r--r--core/launcher/qcopbridge.cpp10
-rw-r--r--core/launcher/transferserver.cpp10
3 files changed, 14 insertions, 10 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 43006f1..d5c16b3 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -136,8 +136,8 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
136 136
137 137
138 138
139DesktopApplication::DesktopApplication( int& argc, char **argv, Type t ) 139DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
140 : QPEApplication( argc, argv, t ) 140 : QPEApplication( argc, argv, appType )
141{ 141{
142 142
143 QTimer *t = new QTimer( this ); 143 QTimer *t = new QTimer( this );
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index c8af919..2d084fc 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -33,7 +33,11 @@
33#include <qregexp.h> 33#include <qregexp.h>
34#include <qcopchannel_qws.h> 34#include <qcopchannel_qws.h>
35 35
36// actually this is wrong, _XOPEN_SOURCE should get defined on the commandline
37// and it should have a proper value assigned. (Simon)
38#if !defined(_XOPEN_SOURCE)
36#define _XOPEN_SOURCE 39#define _XOPEN_SOURCE
40#endif
37#include <pwd.h> 41#include <pwd.h>
38#include <sys/types.h> 42#include <sys/types.h>
39#include <unistd.h> 43#include <unistd.h>
@@ -46,8 +50,8 @@
46 50
47const int block_size = 51200; 51const int block_size = 51200;
48 52
49QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent = 0, 53QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
50 const char* name = 0) 54 const char* name )
51 : QServerSocket( port, 1, parent, name ), 55 : QServerSocket( port, 1, parent, name ),
52 desktopChannel( 0 ), 56 desktopChannel( 0 ),
53 cardChannel( 0 ) 57 cardChannel( 0 )
@@ -169,7 +173,7 @@ void QCopBridge::timerEvent( QTimerEvent * )
169} 173}
170 174
171 175
172QCopBridgePI::QCopBridgePI( int socket, QObject *parent = 0, const char* name = 0 ) 176QCopBridgePI::QCopBridgePI( int socket, QObject *parent, const char* name )
173 : QSocket( parent, name ) 177 : QSocket( parent, name )
174{ 178{
175 setSocket( socket ); 179 setSocket( socket );
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 87a49eb..7294f9c 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -36,17 +36,17 @@
36#include <qfileinfo.h> 36#include <qfileinfo.h>
37#include <qregexp.h> 37#include <qregexp.h>
38//#include <qpe/qcopchannel_qws.h> 38//#include <qpe/qcopchannel_qws.h>
39#include <qpe/qprocess.h>
40#include <qpe/process.h> 39#include <qpe/process.h>
41#include <qpe/config.h> 40#include <qpe/config.h>
42#include <qpe/qcopenvelope_qws.h> 41#include <qpe/qcopenvelope_qws.h>
43 42
44#include "transferserver.h" 43#include "transferserver.h"
44#include "qprocess.h"
45 45
46const int block_size = 51200; 46const int block_size = 51200;
47 47
48TransferServer::TransferServer( Q_UINT16 port, QObject *parent = 0, 48TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
49 const char* name = 0) 49 const char* name )
50 : QServerSocket( port, 1, parent, name ) 50 : QServerSocket( port, 1, parent, name )
51{ 51{
52 if ( !ok() ) 52 if ( !ok() )
@@ -81,7 +81,7 @@ bool accessAuthorized(QHostAddress peeraddress)
81 return ok; 81 return ok;
82} 82}
83 83
84ServerPI::ServerPI( int socket, QObject *parent = 0, const char* name = 0 ) 84ServerPI::ServerPI( int socket, QObject *parent, const char* name )
85 : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ) 85 : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 )
86{ 86{
87 state = Connected; 87 state = Connected;
@@ -852,7 +852,7 @@ void ServerPI::timerEvent( QTimerEvent * )
852} 852}
853 853
854 854
855ServerDTP::ServerDTP( QObject *parent = 0, const char* name = 0) 855ServerDTP::ServerDTP( QObject *parent, const char* name )
856 : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), 856 : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
857retrieveTargzProc( 0 ), gzipProc( 0 ) 857retrieveTargzProc( 0 ), gzipProc( 0 )
858{ 858{