diff options
Diffstat (limited to 'kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp')
-rw-r--r-- | kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 4c811eba..e48bf368 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -50,7 +50,7 @@ //#define GW_COREPROTOCOL_DEBUG -QCString +TQCString url_escape_string( const char *src) { uint escape = 0; @@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes ) while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) ) { transferCount++; - debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) ); + debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) ); int size = m_in.size(); if ( parsedBytes < size ) { @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) ); + CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -213,7 +213,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) 0, NMFIELD_TYPE_UTF8, request->transactionId() ); fields.append( fld ); - // convert to QByteArray + // convert to TQByteArray TQByteArray bytesOut; TQTextStream dout( bytesOut, IO_WriteOnly ); dout.setEncoding( TQTextStream::Latin1 ); @@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) command = "login"; host = request->command().section( ':', 1, 1 ).ascii(); port = request->command().section( ':', 2, 2 ).ascii(); - debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) ); + debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) ); } else command = request->command().ascii(); @@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) else dout << "\r\n"; - debug( TQString( "data out: %1" ).arg( bytesOut.data() ) ); + debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) ); emit outgoingData( bytesOut ); // now convert @@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) continue; // GAIM writes these tags to the secure socket separately - if we can't connect, check here - // NM Protocol 1 writes them in an apparently arbitrary order + // NM Protocol 1 writes them in an aptqparently arbitrary order // tag //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout << field->tag(); @@ -286,7 +286,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) // method //dout.writeRawBytes( GW_URLVAR_METHOD, sizeof( GW_URLVAR_METHOD ) ); // char methodChar = encode_method( field->method() ); - //dout << (Q_UINT8)methodChar; + //dout << (TQ_UINT8)methodChar; // value //dout.writeRawBytes( GW_URLVAR_VAL, sizeof( GW_URLVAR_VAL ) ); @@ -300,7 +300,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) //debug( " - it's a single string" ); const Field::SingleField *sField = static_cast<const Field::SingleField*>( field ); // TQString encoded = KURL::encode_string( sField->value().toString(), 106 /* UTF-8 */); -// encoded.replace( "%20", "+" ); +// encoded.tqreplace( "%20", "+" ); // dout << encoded.ascii(); snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() ); @@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) + GW_URLVAR_VAL + (const char *)valString + GW_URLVAR_TYPE + typeString; - debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) ); + debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) ); dout.writeRawBytes( outgoing.data(), outgoing.length() ); // write what we have so far, we may be calling this function recursively //kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl; @@ -375,14 +375,14 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) m_din->setByteOrder( TQDataStream::LittleEndian ); // look at first four bytes and decide what to do with the chunk - Q_UINT32 val; + TQ_UINT32 val; if ( okToProceed() ) { *m_din >> val; // if is 'HTTP', it's a Response. PTTH it is after endian conversion - if ( !qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || - !qstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) + if ( !tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || + !tqstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) ) { Transfer * t = m_responseProtocol->parse( wire, bytesParsed ); if ( t ) @@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) } else // otherwise -> Event code { - debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) ); Transfer * t = m_eventProtocol->parse( wire, bytesParsed ); if ( t ) { m_inTransfer = t; - debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) ); m_state = Available; emit incomingData(); } @@ -423,7 +423,7 @@ void CoreProtocol::reset() m_in.resize( 0 ); } -TQChar CoreProtocol::encode_method( Q_UINT8 method ) +TQChar CoreProtocol::encode_method( TQ_UINT8 method ) { TQChar str; @@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( Q_UINT8 method ) void CoreProtocol::slotOutgoingData( const TQCString &out ) { - debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out ) ); + debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) ); } bool CoreProtocol::okToProceed() |