1 files changed, 15 insertions, 15 deletions

diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index 1962557bb..af50e8cef 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -80,7 +80,7 @@ public:
     TQString errorString;
 
     TQString hostname;
-    Q_UINT16 port;
+    TQ_UINT16 port;
 
     TQByteArray buffer;
     TQIODevice* toDevice;
@@ -88,7 +88,7 @@ public:
 
     uint bytesDone;
     uint bytesTotal;
-    Q_LONG chunkedSize;
+    TQ_LONG chunkedSize;
 
     TQHttpRequestHeader header;
 
@@ -278,7 +278,7 @@ void TQHttpPGHRequest::start( TQHttp *http )
 class TQHttpSetHostRequest : public TQHttpRequest
 {
 public:
-    TQHttpSetHostRequest( const TQString &h, Q_UINT16 p ) :
+    TQHttpSetHostRequest( const TQString &h, TQ_UINT16 p ) :
 	hostname(h), port(p)
     { }
 
@@ -291,7 +291,7 @@ public:
 
 private:
     TQString hostname;
-    Q_UINT16 port;
+    TQ_UINT16 port;
 };
 
 void TQHttpSetHostRequest::start( TQHttp *http )
@@ -1208,7 +1208,7 @@ TQHttp::TQHttp( TQObject* parent, const char* name )
 
     \sa setHost()
 */
-TQHttp::TQHttp( const TQString &hostname, Q_UINT16 port, TQObject* parent, const char* name )
+TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* parent, const char* name )
 {
     if ( parent )
 	parent->insertChild( this );
@@ -1432,7 +1432,7 @@ void TQHttp::abort()
 
     \sa get() post() request() readyRead() readBlock() readAll()
 */
-Q_ULONG TQHttp::bytesAvailable() const
+TQ_ULONG TQHttp::bytesAvailable() const
 {
 #if defined(TQHTTP_DEBUG)
     tqDebug( "TQHttp::bytesAvailable(): %d bytes", (int)d->rba.size() );
@@ -1446,7 +1446,7 @@ Q_ULONG TQHttp::bytesAvailable() const
 
     \sa get() post() request() readyRead() bytesAvailable() readAll()
 */
-Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG TQHttp::readBlock( char *data, TQ_ULONG maxlen )
 {
     if ( data == 0 && maxlen != 0 ) {
 #if defined(QT_CHECK_NULL)
@@ -1472,9 +1472,9 @@ Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen )
 */
 TQByteArray TQHttp::readAll()
 {
-    Q_ULONG avail = bytesAvailable();
+    TQ_ULONG avail = bytesAvailable();
     TQByteArray tmp( avail );
-    Q_LONG read = readBlock( tmp.data(), avail );
+    TQ_LONG read = readBlock( tmp.data(), avail );
     tmp.resize( read );
     return tmp;
 }
@@ -1591,7 +1591,7 @@ void TQHttp::clearPendingRequests()
 
     \sa get() post() head() request() requestStarted() requestFinished() done()
 */
-int TQHttp::setHost(const TQString &hostname, Q_UINT16 port )
+int TQHttp::setHost(const TQString &hostname, TQ_UINT16 port )
 {
     return addRequest( new TQHttpSetHostRequest( hostname, port ) );
 }
@@ -1998,7 +1998,7 @@ void TQHttp::slotReadyRead()
 	if ( currentRequest().method() == "HEAD" ) {
 	    everythingRead = TRUE;
 	} else {
-	    Q_ULONG n = d->socket.bytesAvailable();
+	    TQ_ULONG n = d->socket.bytesAvailable();
 	    TQByteArray *arr = 0;
 	    if ( d->chunkedSize != -1 ) {
 		// transfer-encoding is chunked
@@ -2039,19 +2039,19 @@ void TQHttp::slotReadyRead()
 		    n = d->socket.bytesAvailable();
 		    if ( n == 0 )
 			break;
-		    if ( (Q_LONG)n == d->chunkedSize || (Q_LONG)n == d->chunkedSize+1 ) {
+		    if ( (TQ_LONG)n == d->chunkedSize || (TQ_LONG)n == d->chunkedSize+1 ) {
 			n = d->chunkedSize - 1;
 			if ( n == 0 )
 			    break;
 		    }
 
 		    // read data
-		    uint toRead = TQMIN( (Q_LONG)n, (d->chunkedSize < 0 ? (Q_LONG)n : d->chunkedSize) );
+		    uint toRead = TQMIN( (TQ_LONG)n, (d->chunkedSize < 0 ? (TQ_LONG)n : d->chunkedSize) );
 		    if ( !arr )
 			arr = new TQByteArray( 0 );
 		    uint oldArrSize = arr->size();
 		    arr->resize( oldArrSize + toRead );
-		    Q_LONG read = d->socket.readBlock( arr->data()+oldArrSize, toRead );
+		    TQ_LONG read = d->socket.readBlock( arr->data()+oldArrSize, toRead );
 		    arr->resize( oldArrSize + read );
 
 		    d->chunkedSize -= read;
@@ -2071,7 +2071,7 @@ void TQHttp::slotReadyRead()
 		n = TQMIN( d->response.contentLength() - d->bytesDone, n );
 		if ( n > 0 ) {
 		    arr = new TQByteArray( n );
-		    Q_LONG read = d->socket.readBlock( arr->data(), n );
+		    TQ_LONG read = d->socket.readBlock( arr->data(), n );
 		    arr->resize( read );
 		}
 		if ( d->bytesDone + bytesAvailable() + n == d->response.contentLength() )