diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
tree | b910be3588cb706defc00c31aefa850bb2312784 /src/network/qserversocket.cpp | |
parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/network/qserversocket.cpp')
-rw-r--r-- | src/network/qserversocket.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp index 840ee231c..97dd95594 100644 --- a/src/network/qserversocket.cpp +++ b/src/network/qserversocket.cpp @@ -94,7 +94,7 @@ public: value larger than 0. */ -TQServerSocket::TQServerSocket( Q_UINT16 port, int backlog, +TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog, TQObject *parent, const char *name ) : TQObject( parent, name ) { @@ -116,7 +116,7 @@ TQServerSocket::TQServerSocket( Q_UINT16 port, int backlog, value larger than 0. */ -TQServerSocket::TQServerSocket( const TQHostAddress & address, Q_UINT16 port, +TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog, TQObject *parent, const char *name ) : TQObject( parent, name ) @@ -157,7 +157,7 @@ bool TQServerSocket::ok() const /* The common bit of the constructors. */ -void TQServerSocket::init( const TQHostAddress & address, Q_UINT16 port, int backlog ) +void TQServerSocket::init( const TQHostAddress & address, TQ_UINT16 port, int backlog ) { d->s = new TQSocketDevice( TQSocketDevice::Stream, address.isIPv4Address() ? TQSocketDevice::IPv4 : TQSocketDevice::IPv6, 0 ); @@ -224,7 +224,7 @@ void TQServerSocket::incomingConnection( int ) \sa address() TQSocketDevice::port() */ -Q_UINT16 TQServerSocket::port() const +TQ_UINT16 TQServerSocket::port() const { if ( !d || !d->s ) return 0; |