diff options
Diffstat (limited to 'src/network/qsocketdevice_unix.cpp')
-rw-r--r-- | src/network/qsocketdevice_unix.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index 2d359f218..827cc349b 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -91,7 +91,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol) static inline void qt_socket_getportaddr( struct sockaddr *sa, - Q_UINT16 *port, TQHostAddress *addr ) + TQ_UINT16 *port, TQHostAddress *addr ) { #if !defined(QT_NO_IPV6) if ( sa->sa_family == AF_INET6 ) { @@ -402,7 +402,7 @@ void TQSocketDevice::setOption( Option opt, int v ) sockets; this just means that you can call connect() again in a little while and it'll probably succeed. */ -bool TQSocketDevice::connect( const TQHostAddress &addr, Q_UINT16 port ) +bool TQSocketDevice::connect( const TQHostAddress &addr, TQ_UINT16 port ) { if ( !isValid() ) return FALSE; @@ -493,7 +493,7 @@ bool TQSocketDevice::connect( const TQHostAddress &addr, Q_UINT16 port ) bind() is used by servers for setting up incoming connections. Call bind() before listen(). */ -bool TQSocketDevice::bind( const TQHostAddress &address, Q_UINT16 port ) +bool TQSocketDevice::bind( const TQHostAddress &address, TQ_UINT16 port ) { if ( !isValid() ) return FALSE; @@ -671,7 +671,7 @@ int TQSocketDevice::accept() data on the socket is to read it using readBlock(). TQSocket has workarounds to deal with this problem. */ -Q_LONG TQSocketDevice::bytesAvailable() const +TQ_LONG TQSocketDevice::bytesAvailable() const { if ( !isValid() ) return -1; @@ -695,7 +695,7 @@ Q_LONG TQSocketDevice::bytesAvailable() const // gives shorter than true amounts on Unix domain sockets. if ( ::ioctl(fd, FIONREAD, (char*)&nbytes) < 0 ) return -1; - return (Q_LONG) *((int *) &nbytes); + return (TQ_LONG) *((int *) &nbytes); } @@ -717,7 +717,7 @@ Q_LONG TQSocketDevice::bytesAvailable() const \sa bytesAvailable() */ -Q_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const +TQ_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const { if ( !isValid() ) return -1; @@ -756,7 +756,7 @@ Q_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const host closes the connection. For Datagram sockets, 0 is a valid datagram size. */ -Q_LONG TQSocketDevice::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG TQSocketDevice::readBlock( char *data, TQ_ULONG maxlen ) { #if defined(QT_CHECK_NULL) if ( data == 0 && maxlen != 0 ) { @@ -847,7 +847,7 @@ Q_LONG TQSocketDevice::readBlock( char *data, Q_ULONG maxlen ) This is used for \c TQSocketDevice::Stream sockets. */ -Q_LONG TQSocketDevice::writeBlock( const char *data, Q_ULONG len ) +TQ_LONG TQSocketDevice::writeBlock( const char *data, TQ_ULONG len ) { if ( data == 0 && len != 0 ) { #if defined(QT_CHECK_NULL) || defined(TQSOCKETDEVICE_DEBUG) @@ -934,8 +934,8 @@ Q_LONG TQSocketDevice::writeBlock( const char *data, Q_ULONG len ) This is used for \c TQSocketDevice::Datagram sockets. You must specify the \a host and \a port of the destination of the data. */ -Q_LONG TQSocketDevice::writeBlock( const char * data, Q_ULONG len, - const TQHostAddress & host, Q_UINT16 port ) +TQ_LONG TQSocketDevice::writeBlock( const char * data, TQ_ULONG len, + const TQHostAddress & host, TQ_UINT16 port ) { if ( t != Datagram ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) @@ -1077,7 +1077,7 @@ void TQSocketDevice::fetchConnectionParameters() Note that for Datagram sockets, this is the source port of the last packet received, and that it is in native byte order. */ -Q_UINT16 TQSocketDevice::peerPort() const +TQ_UINT16 TQSocketDevice::peerPort() const { return pp; } |