- 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
@@ -138,4 +138,4 @@ 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 )
 {
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
@@ -35,3 +35,7 @@
 
+// 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>
@@ -48,4 +52,4 @@ 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 ),
@@ -171,3 +175,3 @@ void QCopBridge::timerEvent( QTimerEvent * )
 
-QCopBridgePI::QCopBridgePI( int socket, QObject *parent = 0, const char* name = 0 )
+QCopBridgePI::QCopBridgePI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) 
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
@@ -38,3 +38,2 @@
 //#include <qpe/qcopchannel_qws.h>
-#include <qpe/qprocess.h>
 #include <qpe/process.h>
@@ -44,2 +43,3 @@
 #include "transferserver.h"
+#include "qprocess.h"
 
@@ -47,4 +47,4 @@ 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 )
@@ -83,3 +83,3 @@ bool accessAuthorized(QHostAddress peeraddress)
 
-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 )
@@ -854,3 +854,3 @@ void ServerPI::timerEvent( QTimerEvent * )
 
-ServerDTP::ServerDTP( QObject *parent = 0, const char* name = 0)
+ServerDTP::ServerDTP( QObject *parent, const char* name )
   : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),