| -rw-r--r-- | core/launcher/desktop.cpp | 4 | ||||
| -rw-r--r-- | core/launcher/qcopbridge.cpp | 10 | ||||
| -rw-r--r-- | core/launcher/transferserver.cpp | 10 |
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 @@ -137,6 +137,6 @@ 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 @@ -34,5 +34,9 @@ #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> @@ -47,6 +51,6 @@ 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 ), @@ -170,5 +174,5 @@ 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 @@ -37,5 +37,4 @@ #include <qregexp.h> //#include <qpe/qcopchannel_qws.h> -#include <qpe/qprocess.h> #include <qpe/process.h> #include <qpe/config.h> @@ -43,9 +42,10 @@ #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 ) { @@ -82,5 +82,5 @@ 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 ) { @@ -853,5 +853,5 @@ 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 ), retrieveTargzProc( 0 ), gzipProc( 0 ) |