- no default args in method impls

- don't unconditionally define _XOPEN_SOURCE (added comment about this
  being wrong)
- fixed parameter shadowing problem in DesktopApplication ctor

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
@@ -135,10 +135,10 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 }
 
 
 
-DesktopApplication::DesktopApplication( int& argc, char **argv, Type t )
-    : QPEApplication( argc, argv, t )
+DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
+    : QPEApplication( argc, argv, appType )
 {
 
     QTimer *t = new QTimer( this );
     connect( t, SIGNAL(timeout()), this, SLOT(psTimeout()) );
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
@@ -32,9 +32,13 @@
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qcopchannel_qws.h>
 
+// actually this is wrong, _XOPEN_SOURCE should get defined on the commandline
+// and it should have a proper value assigned. (Simon)
+#if !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE
+#endif
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -45,10 +49,10 @@
 //#define INSECURE
 
 const int block_size = 51200;
 
-QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent = 0,
-        const char* name = 0)
+QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
+        const char* name )
     : QServerSocket( port, 1, parent, name ),
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
@@ -168,9 +172,9 @@ void QCopBridge::timerEvent( QTimerEvent * )
     killTimers();
 }
 
 
-QCopBridgePI::QCopBridgePI( int socket, QObject *parent = 0, const char* name = 0 )
+QCopBridgePI::QCopBridgePI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) 
 {
     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
@@ -35,19 +35,19 @@
 #include <qstringlist.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //#include <qpe/qcopchannel_qws.h>
-#include <qpe/qprocess.h>
 #include <qpe/process.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "transferserver.h"
+#include "qprocess.h"
 
 const int block_size = 51200;
 
-TransferServer::TransferServer( Q_UINT16 port, QObject *parent = 0,
-        const char* name = 0)
+TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
+        const char* name )
     : QServerSocket( port, 1, parent, name )
 {
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
@@ -80,9 +80,9 @@ bool accessAuthorized(QHostAddress peeraddress)
     */
     return ok;
 }
 
-ServerPI::ServerPI( int socket, QObject *parent = 0, const char* name = 0 )
+ServerPI::ServerPI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 )
 {
     state = Connected;
 
@@ -851,9 +851,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 )
 {