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/qftp.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/qftp.cpp')
| -rw-r--r-- | src/network/qftp.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index cb7af95a5..222c2a594 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -92,18 +92,18 @@ public: TQString errorMessage() const; void clearError(); - void connectToHost( const TQString & host, Q_UINT16 port ) + void connectToHost( const TQString & host, TQ_UINT16 port ) { socket.connectToHost( host, port ); } TQSocket::State socketState() const { return socket.state(); } - Q_ULONG bytesAvailable() const + TQ_ULONG bytesAvailable() const { return socket.bytesAvailable(); } - Q_LONG readBlock( char *data, Q_ULONG maxlen ) + TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) { - Q_LONG read = socket.readBlock( data, maxlen ); + TQ_LONG read = socket.readBlock( data, maxlen ); bytesDone += read; return read; } @@ -163,7 +163,7 @@ class TQFtpPI : public TQObject public: TQFtpPI( TQObject *parent = 0 ); - void connectToHost( const TQString &host, Q_UINT16 port ); + void connectToHost( const TQString &host, TQ_UINT16 port ); bool sendCommands( const TQStringList &cmds ); bool sendCommand( const TQString &cmd ) @@ -338,7 +338,7 @@ void TQFtpDTP::writeData() const int blockSize = 16*1024; char buf[blockSize]; while ( !data.dev->atEnd() && socket.bytesToWrite()==0 ) { - Q_LONG read = data.dev->readBlock( buf, blockSize ); + TQ_LONG read = data.dev->readBlock( buf, blockSize ); #if defined(TQFTPDTP_DEBUG) tqDebug( "TQFtpDTP::writeData: writeBlock() of size %d bytes", (int)read ); #endif @@ -562,7 +562,7 @@ void TQFtpDTP::socketReadyRead() } else { if ( !is_ba && data.dev ) { TQByteArray ba( socket.bytesAvailable() ); - Q_LONG bytesRead = socket.readBlock( ba.data(), ba.size() ); + TQ_LONG bytesRead = socket.readBlock( ba.data(), ba.size() ); if ( bytesRead < 0 ) { // ### error handling return; @@ -654,7 +654,7 @@ TQFtpPI::TQFtpPI( TQObject *parent ) : SLOT(dtpConnectState(int)) ); } -void TQFtpPI::connectToHost( const TQString &host, Q_UINT16 port ) +void TQFtpPI::connectToHost( const TQString &host, TQ_UINT16 port ) { emit connectState( TQFtp::HostLookup ); commandSocket.connectToHost( host, port ); @@ -884,7 +884,7 @@ bool TQFtpPI::processReply() } else { TQStringList lst = addrPortPattern.capturedTexts(); TQString host = lst[1] + "." + lst[2] + "." + lst[3] + "." + lst[4]; - Q_UINT16 port = ( lst[5].toUInt() << 8 ) + lst[6].toUInt(); + TQ_UINT16 port = ( lst[5].toUInt() << 8 ) + lst[6].toUInt(); waitForDtpToConnect = TRUE; dtp.connectToHost( host, port ); } @@ -1448,7 +1448,7 @@ void TQFtp::init() \sa stateChanged() commandStarted() commandFinished() */ -int TQFtp::connectToHost( const TQString &host, Q_UINT16 port ) +int TQFtp::connectToHost( const TQString &host, TQ_UINT16 port ) { TQStringList cmds; cmds << host; @@ -1761,7 +1761,7 @@ int TQFtp::rawCommand( const TQString &command ) \sa get() readyRead() readBlock() readAll() */ -Q_ULONG TQFtp::bytesAvailable() const +TQ_ULONG TQFtp::bytesAvailable() const { TQFtpPrivate *d = ::d( this ); return d->pi.dtp.bytesAvailable(); @@ -1773,7 +1773,7 @@ Q_ULONG TQFtp::bytesAvailable() const \sa get() readyRead() bytesAvailable() readAll() */ -Q_LONG TQFtp::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG TQFtp::readBlock( char *data, TQ_ULONG maxlen ) { TQFtpPrivate *d = ::d( this ); return d->pi.dtp.readBlock( data, maxlen ); |