author | simon <simon> | 2002-04-30 14:19:15 (UTC) |
---|---|---|
committer | simon <simon> | 2002-04-30 14:19:15 (UTC) |
commit | aa2118f85ef44f5eb22babe5cc53421d7d981a94 (patch) (side-by-side diff) | |
tree | 9bf42c8750d0ad5efb789e5fb3e1b2c43cdea25d /core/launcher/qcopbridge.cpp | |
parent | 19d341250ca5c5f21ea278ebdc7050c5400e951f (diff) | |
download | opie-aa2118f85ef44f5eb22babe5cc53421d7d981a94.zip opie-aa2118f85ef44f5eb22babe5cc53421d7d981a94.tar.gz opie-aa2118f85ef44f5eb22babe5cc53421d7d981a94.tar.bz2 |
- 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
-rw-r--r-- | core/launcher/qcopbridge.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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 @@ #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> @@ -46,8 +50,8 @@ 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 ) @@ -169,7 +173,7 @@ 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 ) { setSocket( socket ); |