diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 937b2991d8e78166eea904c80ad04d34607017a4 (patch) | |
| tree | 2accb8161eab09df5d7a5484ea9ea080ad123168 /kopete/protocols | |
| parent | dba26cb985af370c33d1767037851705cc561726 (diff) | |
| download | tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.tar.gz tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols')
202 files changed, 739 insertions, 739 deletions
diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index e1eb5487..e100af2e 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -51,7 +51,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name ) s = GaduProtocol::protocol()->statusToWithDescription( ks ); if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { - ui_->statusGroup_->tqfind( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); + ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR ); } else { diff --git a/kopete/protocols/gadu/gaducontactlist.cpp b/kopete/protocols/gadu/gaducontactlist.cpp index 9c003751..67050bce 100644 --- a/kopete/protocols/gadu/gaducontactlist.cpp +++ b/kopete/protocols/gadu/gaducontactlist.cpp @@ -45,7 +45,7 @@ GaduContactsList::GaduContactsList( TQString sList ) return; } - if ( ( !sList.tqcontains( '\n' ) && sList.tqcontains( ';' ) ) || !sList.tqcontains( ';' ) ) { + if ( ( !sList.contains( '\n' ) && sList.contains( ';' ) ) || !sList.contains( ';' ) ) { return; } diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index 6e5b416a..b44ba883 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -78,7 +78,7 @@ GaduDCC::unregisterAccount( unsigned int id ) return false; } - if ( !accounts.tqcontains( id ) ) { + if ( !accounts.contains( id ) ) { kdDebug(14100) << "attempt to unregister not registered account" << endl; initmutex.unlock(); return false; @@ -118,7 +118,7 @@ GaduDCC::registerAccount( GaduAccount* account ) aid = account->accountId().toInt(); - if ( accounts.tqcontains( aid ) ) { + if ( accounts.contains( aid ) ) { kdDebug(14100) << "attempt to register already registered account" << endl; initmutex.unlock(); return false; @@ -168,7 +168,7 @@ GaduDCC::slotIncoming( gg_dcc* incoming, bool& handled ) GaduDCC::~GaduDCC() { - if ( accounts.tqcontains( accountId ) ) { + if ( accounts.contains( accountId ) ) { kdDebug( 14100 ) << "unregister account " << accountId << " in destructor " << endl; unregisterAccount( accountId ); } diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index f152b942..e95f80d1 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -384,7 +384,7 @@ GaduDCCTransaction::watcher() { return; break; case GG_EVENT_DCC_NEED_FILE_INFO: - if (gaduDCC_->requests.tqcontains(dccSock_->peer_uin)) { + if (gaduDCC_->requests.contains(dccSock_->peer_uin)) { TQString filePath = gaduDCC_->requests[dccSock_->peer_uin]; kdDebug() << "Callback request found. Sending " << filePath << endl; gaduDCC_->requests.remove(dccSock_->peer_uin); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 9e46b967..9dcdbc21 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -150,7 +150,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) output->rtf.resize(0); // test first if there is any HTML formating in it - if( htmlString.tqfind( TQString::tqfromLatin1("</span") ) > -1 ) { + if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) { TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); int pos = 0; @@ -199,7 +199,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) } TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement ); - htmlString.tqreplace( findTags.pos( 0 ), rep.length(), replacement ); + htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); output->message += replacement; @@ -245,7 +245,7 @@ GaduRichTextFormat::unescapeGaduMessage( TQString& ns ) { TQString s; s = Kopete::Message::unescape( ns ); - s.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + s.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); return s; } @@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position) TQString GaduRichTextFormat::escapeBody( TQString& input ) { - input.tqreplace( '<', TQString::tqfromLatin1("<") ); - input.tqreplace( '>', TQString::tqfromLatin1(">") ); - input.tqreplace( '\n', TQString::tqfromLatin1( "<br />" ) ); - input.tqreplace( '\t', TQString::tqfromLatin1( " " ) ); - input.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + input.replace( '<', TQString::tqfromLatin1("<") ); + input.replace( '>', TQString::tqfromLatin1(">") ); + input.replace( '\n', TQString::tqfromLatin1( "<br />" ) ); + input.replace( '\t', TQString::tqfromLatin1( " " ) ); + input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); return input; } diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index f7fe5970..6490a1e3 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -265,7 +265,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } else { sendMsg = msg.plainBody(); - sendMsg.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + sendMsg.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); cpMsg = textcodec->fromUnicode( sendMsg ); return gg_send_message( session_, msgClass, recipient, (const unsigned char *)cpMsg.data() ); diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index ddcf1918..f034cea7 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -1059,7 +1059,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st c->setProperty( protocol()->propAwayMessage, awayMessage ); } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't tqfind " << contactId << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; } void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) @@ -1377,7 +1377,7 @@ void GroupWiseAccount::slotLeavingConference( GroupWiseChatSession * sess ) if( isConnected () ) m_client->leaveConference( sess->guid() ); m_chatSessions.remove( sess ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now tqcontains:" << m_chatSessions.count() << " managers" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now contains:" << m_chatSessions.count() << " managers" << endl; Kopete::ContactPtrList members = sess->members(); for ( Kopete::Contact * contact = members.first(); contact; contact = members.next() ) { diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 0dd78a71..06ac510f 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -52,7 +52,7 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn : Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { - if ( dn.tqfind( '=' ) != -1 ) + if ( dn.find( '=' ) != -1 ) { m_dn = dn; } @@ -96,17 +96,17 @@ void GroupWiseContact::updateDetails( const ContactDetails & details ) TQMap<TQString, TQString>::Iterator it; // work phone number - if ( ( it = m_serverProperties.tqfind( "telephoneNumber" ) ) + if ( ( it = m_serverProperties.find( "telephoneNumber" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneWork, it.data() ); // mobile phone number - if ( ( it = m_serverProperties.tqfind( "mobile" ) ) + if ( ( it = m_serverProperties.find( "mobile" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneMobile, it.data() ); // email - if ( ( it = m_serverProperties.tqfind( "Internet EMail Address" ) ) + if ( ( it = m_serverProperties.find( "Internet EMail Address" ) ) != m_serverProperties.end() ) setProperty( protocol()->propEmail, it.data() ); diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index 03e66f45..306a457c 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -199,7 +199,7 @@ void GWFolder::dump( unsigned int depth ) { TQString s; s.fill( ' ', ++depth * 2 ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " tqcontains: " << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " contains: " << endl; const TQObjectList l = childrenListObject(); if ( !l.isEmpty() ) { diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index c45371b9..a9f0c816 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -307,7 +307,7 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() TQDictIterator<Kopete::Contact> it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 4abdab9f..0a9e09ee 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -264,7 +264,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) { TQRegExp rx("[a-zA-Z]*=(.*)$", false ); - if( !dn.tqfind( '=' ) ) // if it's not a DN, return it unprocessed + if( !dn.find( '=' ) ) // if it's not a DN, return it unprocessed return dn; // split the dn into elements diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 87333c41..d285b8af 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -29,7 +29,7 @@ #include "chatroommanager.h" ChatroomManager::ChatroomManager( Client * tqparent, const char *name) - : TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false ) + : TQObject(tqparent, name), m_client( tqparent ), m_replace( false ) { } @@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms() void ChatroomManager::getChatrooms( bool refresh ) { - m_tqreplace = !refresh; + m_replace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); @@ -62,7 +62,7 @@ void ChatroomManager::slotGotChatroomList() SearchChatTask * sct = (SearchChatTask *)sender(); if ( sct ) { - if ( m_tqreplace ) + if ( m_replace ) m_rooms.clear(); TQValueList<ChatroomSearchResult> roomsFound = sct->results(); @@ -94,7 +94,7 @@ void ChatroomManager::slotGotChatCounts() const TQMap< TQString, int >::iterator end = newCounts.end(); for ( ; it != end; ++it ) - if ( m_rooms.tqcontains( it.key() ) ) + if ( m_rooms.contains( it.key() ) ) m_rooms[ it.key() ].participantsCount = it.data(); } emit updated(); @@ -102,7 +102,7 @@ void ChatroomManager::slotGotChatCounts() void ChatroomManager::requestProperties( const TQString & displayName ) { - if ( 0 /*m_rooms.tqcontains( displayName ) */) + if ( 0 /*m_rooms.contains( displayName ) */) emit gotProperties( m_rooms[ displayName ] ); else { diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h index 60f55b01..2cb73cbf 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h @@ -61,7 +61,7 @@ class ChatroomManager : public TQObject private: Client * m_client; GroupWise::ChatroomMap m_rooms; - bool m_tqreplace; + bool m_replace; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index c91f652d..e7395157 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent ) // we can drop these once the server reenables the sending of unformatted text // redundant linebreak at the end of the message TQRegExp rx(" </span> </span> </span><br>$"); - transformedEvent.message.tqreplace( rx, "</span></span></span>" ); + transformedEvent.message.replace( rx, "</span></span></span>" ); // missing linebreak after first line of an encrypted message TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>"); - transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); + transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); emit messageReceived( transformedEvent ); } diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 7b071f35..79ecf419 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -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.tqreplace( "%20", "+" ); +// encoded.replace( "%20", "+" ); // dout << encoded.ascii(); snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() ); diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index f08e350e..b55ba48e 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h @@ -58,11 +58,11 @@ public: EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); ~EventTransfer(); /** - * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it tqcontains + * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it contains */ TQ_UINT32 contents(); /** - * Convenience accessors to see what the transfer tqcontains + * Convenience accessors to see what the transfer contains */ bool hasEventType(); bool hasSource(); diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index e2e5269a..8b5f9708 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes ) { //#define GW_CLIENTSTREAM_DEBUG 1 #ifdef GW_CLIENTSTREAM_DEBUG - CoreProtocol::debug( TQString( "tqcontains: %1 bytes " ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp index 94f82937..a89f2057 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp @@ -36,16 +36,16 @@ FieldList::~FieldList() { } -FieldListIterator FieldList::tqfind( TQCString tag ) +FieldListIterator FieldList::find( TQCString tag ) { FieldListIterator it = begin(); - return tqfind( it, tag ); + return find( it, tag ); } -FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag ) +FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag ) { FieldListIterator theEnd = end(); - //cout << "FieldList::tqfind() looking for " << tag.data() << endl; + //cout << "FieldList::find() looking for " << tag.data() << endl; for ( ; it != theEnd; ++it ) { //cout << " - on " << (*it)->tag().data() << endl; @@ -113,7 +113,7 @@ SingleField * FieldList::findSingleField( TQCString tag ) SingleField * FieldList::findSingleField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = tqfind( it, tag ); + FieldListIterator found = find( it, tag ); if ( found == end() ) return 0; else @@ -128,7 +128,7 @@ MultiField * FieldList::findMultiField( TQCString tag ) MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = tqfind( it, tag ); + FieldListIterator found = find( it, tag ); if ( found == end() ) return 0; else diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 6d3cb5a9..4e1b1f94 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.h +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h @@ -194,18 +194,18 @@ namespace Field */ virtual ~FieldList(); /** - * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::tqfind(). + * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::find(). * @param tag The tag name of the field to search for. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator tqfind( TQCString tag ); + FieldListIterator find( TQCString tag ); /** * Locate the first occurrence of a given field in the list, starting at the supplied iterator * @param tag The tag name of the field to search for. * @param it An iterator within the list, to start searching from. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator tqfind( FieldListIterator &it, TQCString tag ); + FieldListIterator find( FieldListIterator &it, TQCString tag ); /** * Get the index of the first occurrence of tag, or -1 if not found */ diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index a887c8cc..4960310a 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -59,21 +59,21 @@ bool PrivacyManager::isPrivacyLocked() bool PrivacyManager::isBlocked( const TQString & dn ) { if ( m_defaultDeny ) - return !m_allowList.tqcontains( dn ); + return !m_allowList.contains( dn ); else - return m_denyList.tqcontains( dn ); + return m_denyList.contains( dn ); } void PrivacyManager::setAllow( const TQString & dn ) { if ( m_defaultDeny ) { - if ( !m_allowList.tqcontains( dn ) ) + if ( !m_allowList.contains( dn ) ) addAllow( dn ); } else { - if ( m_denyList.tqcontains( dn ) ) + if ( m_denyList.contains( dn ) ) removeDeny( dn ); } } @@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn ) { if ( m_defaultDeny ) { - if ( m_allowList.tqcontains( dn ) ) + if ( m_allowList.contains( dn ) ) removeAllow( dn ); } else { - if ( !m_denyList.tqcontains( dn ) ) + if ( !m_denyList.contains( dn ) ) addDeny( dn ); } } @@ -243,7 +243,7 @@ TQStringList PrivacyManager::difference( const TQStringList & lhs, const TQStrin const TQStringList::ConstIterator rhsEnd = rhs.end(); for ( TQStringList::ConstIterator lhsIt = lhs.begin(); lhsIt != lhsEnd; ++lhsIt ) { - if ( rhs.tqfind( *lhsIt ) == rhsEnd ) + if ( rhs.find( *lhsIt ) == rhsEnd ) diff.append( *lhsIt ); } return diff; diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 652cd5f2..c455eaec 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -53,8 +53,8 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( !readGroupWiseLine( headerFirst ) ) return 0; // pull out the HTTP return code - int firstSpace = headerFirst.tqfind( ' ' ); - TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) ); + int firstSpace = headerFirst.find( ' ' ); + TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) ); bool ok = true; int rtnCode; int packetState = -1; @@ -116,7 +116,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) int resultCode = 0; Field::FieldListIterator it; Field::FieldListIterator end = m_collatingFields.end(); - it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID ); + it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); @@ -128,7 +128,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) delete sf; } } - it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE ); + it = m_collatingFields.find( NM_A_SZ_RESULT_CODE ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index 35fea9d1..afe7b18e 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -1732,17 +1732,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.tqreplace(TQRegExp("&"), "&"); - str.tqreplace(TQRegExp("<"), "<"); - str.tqreplace(TQRegExp(">"), ">"); - str.tqreplace(TQRegExp("\""), """); - str.tqreplace(TQRegExp("\r"), ""); + str.replace(TQRegExp("&"), "&"); + str.replace(TQRegExp("<"), "<"); + str.replace(TQRegExp(">"), ">"); + str.replace(TQRegExp("\""), """); + str.replace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(TQRegExp("\n"), "<br>\n"); + str.replace(TQRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(TQRegExp("\n"), "<br/>\n"); + str.replace(TQRegExp("\n"), "<br/>\n"); break; default: break; @@ -1759,7 +1759,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 70d4daa5..7f2f1841 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.tqreplace(QRegExp("&"), "&"); - str.tqreplace(QRegExp("<"), "<"); - str.tqreplace(QRegExp(">"), ">"); - str.tqreplace(QRegExp("\""), """); - str.tqreplace(QRegExp("\r"), ""); + str.replace(QRegExp("&"), "&"); + str.replace(QRegExp("<"), "<"); + str.replace(QRegExp(">"), ">"); + str.replace(QRegExp("\""), """); + str.replace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(QRegExp("\n"), "<br>\n"); + str.replace(QRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(QRegExp("\n"), "<br/>\n"); + str.replace(QRegExp("\n"), "<br/>\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp index 08f04b40..fa28ece0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp @@ -59,9 +59,9 @@ bool ChatCountsTask::take( Transfer * transfer ) } Field::FieldList counts = resultsArray->fields(); const Field::FieldListIterator end = counts.end(); - for ( Field::FieldListIterator it = counts.tqfind( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT ); it != end; - it = counts.tqfind( ++it, NM_A_FA_CHAT ) ) + it = counts.find( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp index 8af45d93..6d252a4d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp @@ -40,7 +40,7 @@ bool EventTask::forMe( Transfer * transfer, EventTransfer*& event ) const { // see if we are supposed to handle this kind of event // consider speeding this up by having 1 handler per event - return ( m_eventCodes.tqfind( event->eventType() ) != m_eventCodes.end() ); + return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() ); } return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 81898ca2..1c8e1d39 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -72,9 +72,9 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT ); it != end; - it = matches.tqfind( ++it, NM_A_FA_CHAT ) ) + it = matches.find( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp index 27a0c7f0..5f2cbe18 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp @@ -58,9 +58,9 @@ bool GetDetailsTask::take( Transfer * transfer ) // parse received details and signal like billio Field::MultiField * container = 0; Field::FieldListIterator end = detailsFields.end(); - for ( Field::FieldListIterator it = detailsFields.tqfind( NM_A_FA_RESULTS ); + for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS ); it != end; - it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) ) + it = detailsFields.find( ++it, NM_A_FA_RESULTS ) ) { container = static_cast<Field::MultiField *>( *it ); ContactDetails cd = extractUserDetails( container ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp index 35fab516..d8a4c709 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp @@ -59,9 +59,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -83,9 +83,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index 63a57fda..9ab94d0d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -59,9 +59,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -85,9 +85,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index 2474aaaa..a3a0f556 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer ) Field::FieldList contactListFields = contactList->fields(); Field::MultiField * container; // read folders - for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER ); + for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER ); it != contactListFields.end(); - it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) ) + it = contactListFields.find( ++it, NM_A_FA_FOLDER ) ) { container = static_cast<Field::MultiField *>( *it ); extractFolder( container ); } // read contacts - for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT ); it != contactListFields.end(); - it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) ) + it = contactListFields.find( ++it, NM_A_FA_CONTACT ) ) { container = static_cast<Field::MultiField *>( *it ); extractContact( container ); @@ -241,12 +241,12 @@ void LoginTask::extractPrivacy( Field::FieldList & fields ) TQStringList denyList; // read blocking // may be a single field or may be an array - Field::FieldListIterator it = fields.tqfind( NM_A_LOCKED_ATTR_LIST ); + Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) { - if ( sf->value().toString().tqfind( NM_A_BLOCKING ) ) + if ( sf->value().toString().find( NM_A_BLOCKING ) ) privacyLocked = true; } else if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -284,7 +284,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis { TQStringList items; - Field::FieldListIterator it = fields.tqfind( tag ); + Field::FieldListIterator it = fields.find( tag ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) @@ -308,7 +308,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis void LoginTask::extractCustomStatuses( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.tqfind( NM_A_FA_CUSTOM_STATUSES ); + Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES ); if ( it != fields.end() ) { if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) void LoginTask::extractKeepalivePeriod( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE ); + Field::FieldListIterator it = fields.find( NM_A_UD_KEEPALIVE ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index 1cc33e75..3fadb5a5 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -69,9 +69,9 @@ bool PollSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT ); it != end; - it = matches.tqfind( ++it, NM_A_FA_CONTACT ) ) + it = matches.find( ++it, NM_A_FA_CONTACT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList contact = mf->fields(); @@ -79,7 +79,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - // first field: NM_A_SZ_STATUS tqcontains + // first field: NM_A_SZ_STATUS contains #define SEARCH_PENDING 0 #define SEARCH_INPROGRESS 1 #define SEARCH_COMPLETED 2 diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 69cd1991..0eb61409 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -11,12 +11,12 @@ int main() { buildFakeContactList(); // look for a field in the list -/* if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() ) +/* if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() ) printf( "Found a field, where there was supposed to be one :)\n" ); else printf( "Didn't find a field, where there was supposed to be one :(\n" ); Field::FieldListIterator it; - if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) + if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) printf( "Found a field, where there was NOT supposed to be one :(\n" ); else printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/ @@ -26,19 +26,19 @@ int main() printf( "\nNow testing find routines.\n"); // find the field containing the contact list - Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) ); + Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) ); if ( clf ) { Field::FieldList cl = clf->fields(); // look for a folder in the list - Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER ); + Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER ); if ( it != cl.end() ) printf( "Found the first folder :)\n"); else printf( "Didn't find the first folder, where did it go? :(\n"); printf( "Looking for a second folder :)\n"); - it = cl.tqfind( ++it, NM_A_FA_FOLDER ); + it = cl.find( ++it, NM_A_FA_FOLDER ); if ( it == cl.end() ) printf( "Didn't find a second folder :)\n" ); else diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index 315a60d0..c10fda5c 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn ) { if ( dn == m_client->userDN() ) return true; - // TODO: replace with m_detailsMap.tqcontains( dn ); - TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn ); + // TODO: replace with m_detailsMap.contains( dn ); + TQStringList::Iterator found = m_detailsMap.keys().find( dn ); // we always know the local user's details, so don't look them up return ( found !=m_detailsMap.keys().end() ); } @@ -85,7 +85,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU // don't request details we already have unless the caller specified this if ( onlyUnknown && known( *it ) ) break; - TQStringList::Iterator found = m_pendingDNs.tqfind( *it ); + TQStringList::Iterator found = m_pendingDNs.find( *it ); if ( found == m_pendingDNs.end() ) { m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) ); diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 508f4015..e6c6a2f6 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -84,7 +84,7 @@ <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -104,7 +104,7 @@ <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -129,7 +129,7 @@ <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -168,7 +168,7 @@ <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -209,7 +209,7 @@ <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 1835bb4b..45121c34 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -329,7 +329,7 @@ void IRCChannelContact::slotIncomingUserIsAway( const TQString &nick, const TQSt if( nick.lower() == account->mySelf()->nickName().lower() ) { IRCUserContact *c = account->mySelf(); - if (manager() && manager()->members().tqcontains(c)) + if (manager() && manager()->members().contains(c)) { Kopete::OnlineStatus status = manager()->contactOnlineStatus(c); if (status == m_protocol->m_UserStatusOp) diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 93888b55..7df5894c 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -229,7 +229,7 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *) // Two-liner in color: // <span style="color:#403897">Hello<br />World</span> - if (htmlString.tqfind(TQString::tqfromLatin1("</span")) > -1) + if (htmlString.find(TQString::tqfromLatin1("</span")) > -1) { TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); @@ -363,7 +363,7 @@ bool IRCContact::isChatting(const Kopete::ChatSession *avoid) const for (TQValueList<Kopete::ChatSession*>::Iterator it= sessions.begin(); it!=sessions.end() ; ++it) { if( (*it) != avoid && (*it)->account() == account && - (*it)->members().tqcontains(this) ) + (*it)->members().contains(this) ) { return true; } @@ -413,7 +413,7 @@ void IRCContact::receivedMessage( KIRC::Engine::ServerMessageType type, const KIRC::EntityPtrList &to, const TQString &msg) { - if (to.tqcontains(m_entity)) + if (to.contains(m_entity)) { IRCContact *fromContact = ircAccount()->getContact(from); Kopete::Message message(fromContact, manager()->members(), msg, Kopete::Message::Inbound, diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index f304a2ed..fb49e08e 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -260,7 +260,7 @@ void IRCContactManager::slotContactAdded( Kopete::MetaContact *contact ) void IRCContactManager::addToNotifyList(const TQString &nick) { - if (!m_NotifyList.tqcontains(nick.lower())) + if (!m_NotifyList.contains(nick.lower())) { m_NotifyList.append(nick); checkOnlineNotifyList(); @@ -269,7 +269,7 @@ void IRCContactManager::addToNotifyList(const TQString &nick) void IRCContactManager::removeFromNotifyList(const TQString &nick) { - if (m_NotifyList.tqcontains(nick.lower())) + if (m_NotifyList.contains(nick.lower())) m_NotifyList.remove(nick.lower()); } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index a3182a14..e30bfa90 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -376,7 +376,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg ) TQString messageText = msg.escapedBody(); //Add right click for channels, only replace text not in HTML tags - messageText.tqreplace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); + messageText.replace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); msg.setBody( messageText, Kopete::Message::RichText ); } @@ -807,7 +807,7 @@ void IRCProtocol::editNetworks( const TQString &networkName ) connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) - netConf->networkList->setSelected( netConf->networkList->tqfindItem( networkName ), true ); + netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); //slotUpdateNetworkConfig(); // unnecessary, setSelected emits selectionChanged @@ -952,7 +952,7 @@ void IRCProtocol::slotDeleteHost() { disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -972,13 +972,13 @@ void IRCProtocol::slotNewNetwork() IRCNetwork *net = new IRCNetwork; // give it the name of 'New Network' (incrementing number if needed) TQString netName = TQString::tqfromLatin1( "New Network" ); - if ( m_networks.tqfind( netName ) ) + if ( m_networks.find( netName ) ) { int newIdx = 1; do { netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ ); } - while ( m_networks.tqfind( netName ) && newIdx < 100 ); + while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case return; } @@ -986,7 +986,7 @@ void IRCProtocol::slotNewNetwork() // and add it to the networks dict and list m_networks.insert( net->name, net ); netConf->networkList->insertItem( net->name ); - TQListBoxItem * justAdded = netConf->networkList->tqfindItem( net->name ); + TQListBoxItem * justAdded = netConf->networkList->findItem( net->name ); netConf->networkList->setSelected( justAdded, true ); netConf->networkList->setBottomItem( netConf->networkList->index( justAdded ) ); } @@ -1022,7 +1022,7 @@ void IRCProtocol::slotNewHost() TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); netConf->hostList->insertItem( entryText ); // select it in the gui - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->setSelected( justAdded, true ); //netConf->hostList->setBottomItem( netConf->hostList->index( justAdded ) ); } @@ -1056,7 +1056,7 @@ void IRCProtocol::slotRenameNetwork() m_networks.remove( m_uiCurrentNetworkSelection ); m_networks.insert( net->name, net ); // ui - int idx = netConf->networkList->index( netConf->networkList->tqfindItem( m_uiCurrentNetworkSelection ) ); + int idx = netConf->networkList->index( netConf->networkList->findItem( m_uiCurrentNetworkSelection ) ); m_uiCurrentNetworkSelection = net->name; netConf->networkList->changeItem( net->name, idx ); // changes the selection!!! netConf->networkList->sort(); @@ -1190,7 +1190,7 @@ void IRCProtocol::slotMoveServerUp() if( !selectedNetwork || !selectedHost ) return; - TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( pos != selectedNetwork->hosts.begin() ) { TQValueList<IRCHost*>::iterator lastPos = pos; @@ -1217,7 +1217,7 @@ void IRCProtocol::slotMoveServerDown() if( !selectedNetwork || !selectedHost ) return; - TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( *pos != selectedNetwork->hosts.back() ) { TQValueList<IRCHost*>::iterator nextPos = selectedNetwork->hosts.remove( pos ); diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 3200d72d..9188963f 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -154,7 +154,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // :Global!service@rizon.net NOTICE foobar :[Logon News - Oct 12 2005] Due to growing problems ... // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello - if (orig.tqcontains('!')) { + if (orig.contains('!')) { ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( orig.section('!', 0, 0), orig.section('!', 1, 1), diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 2c039e94..bec7c4b7 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -504,7 +504,7 @@ void IRCUserContact::updateInfo() void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user, const TQString &host, const TQString &server, bool away, const TQString &flags, uint hops, const TQString &realName ) { - if( !mInfo.channels.tqcontains( channel ) ) + if( !mInfo.channels.contains( channel ) ) mInfo.channels.append( channel ); mInfo.userName = user; diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 7bd9bfe8..88306027 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -70,7 +70,7 @@ TQStringList KCodecAction::supportedEncodings(bool usAscii) { TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); - if (mimeNames.tqfind(mimeName) == mimeNames.end()) + if (mimeNames.find(mimeName) == mimeNames.end()) { encodings.append(KGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index ea7e72cd..79ff605e 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -178,10 +178,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if(!m_attributes.tqcontains(tag)) + if(!m_attributes.contains(tag)) m_attributes.insert(tag, attributes); else if(!attributes.isEmpty()) - m_attributes.tqreplace(tag, attributes); + m_attributes.replace(tag, attributes); res.append("<" + tag); if(!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -205,7 +205,7 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.tqcontains(tag)) + if (!m_tags.contains(tag)) return TQString(); TQString res; @@ -224,7 +224,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag) { - return m_attributes.tqcontains(tag)?popTag(tag):pushTag(tag); + return m_attributes.contains(tag)?popTag(tag):pushTag(tag); } TQString KSParser::popAll() diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 167d7a22..786b4594 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -277,7 +277,7 @@ bool Engine::_bind(TQDict<KIRC::MessageRedirector> &dict, if (!mr) { mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage); - dict.tqreplace(command, mr); + dict.replace(command, mr); } return mr->connect(object, member); diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index e086afc1..ac3fb00c 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -175,7 +175,7 @@ public: { return m_status == Connected; } inline void setCodec( const TQString &nick, const TQTextCodec *codec ) - { codecs.tqreplace( nick, codec ); } + { codecs.replace( nick, codec ); } /* Custom CTCP replies handling */ inline TQString &customCtcp( const TQString &s ) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 83a4257c..05477710 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -143,8 +143,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, { TQFileInfo file(fileName); TQString noWhiteSpace = file.fileName(); - if (noWhiteSpace.tqcontains(' ') > 0) - noWhiteSpace.tqreplace(TQRegExp("\\s+"), "_"); + if (noWhiteSpace.contains(' ') > 0) + noWhiteSpace.replace(TQRegExp("\\s+"), "_"); TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); @@ -284,7 +284,7 @@ void Engine::CtcpReply_ping(Message &msg) if (difference < 1) { diffString = TQString::number(difference); - diffString.remove((diffString.tqfind('.') -1), 2); + diffString.remove((diffString.find('.') -1), 2); diffString.truncate(3); diffString.append("milliseconds"); } @@ -293,7 +293,7 @@ void Engine::CtcpReply_ping(Message &msg) diffString = TQString::number(difference); TQString seconds = diffString.section('.', 0, 0); TQString millSec = diffString.section('.', 1, 1); - millSec.remove(millSec.tqfind('.'), 1); + millSec.remove(millSec.find('.'), 1); millSec.truncate(3); diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); } diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 0c1d3ef0..6f45b0c1 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -201,10 +201,10 @@ TQString Message::quote(const TQString &str) { TQString tmp = str; TQChar q('\020'); - tmp.tqreplace(q, q+TQString(q)); - tmp.tqreplace(TQChar('\r'), q+TQString::tqfromLatin1("r")); - tmp.tqreplace(TQChar('\n'), q+TQString::tqfromLatin1("n")); - tmp.tqreplace(TQChar('\0'), q+TQString::tqfromLatin1("0")); + tmp.replace(q, q+TQString(q)); + tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r")); + tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n")); + tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0")); return tmp; } @@ -216,13 +216,13 @@ TQString Message::unquote(const TQString &str) char b[3] = { 020, 020, '\0' }; const char b2[2] = { 020, '\0' }; - tmp.tqreplace( b, b2 ); + tmp.replace( b, b2 ); b[1] = 'r'; - tmp.tqreplace( b, "\r"); + tmp.replace( b, "\r"); b[1] = 'n'; - tmp.tqreplace( b, "\n"); + tmp.replace( b, "\n"); b[1] = '0'; - tmp.tqreplace( b, "\0"); + tmp.replace( b, "\0"); return tmp; } @@ -230,16 +230,16 @@ TQString Message::unquote(const TQString &str) TQString Message::ctcpQuote(const TQString &str) { TQString tmp = str; - tmp.tqreplace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); - tmp.tqreplace( (char)1, TQString::tqfromLatin1("\\1")); + tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); + tmp.replace( (char)1, TQString::tqfromLatin1("\\1")); return tmp; } TQString Message::ctcpUnquote(const TQString &str) { TQString tmp = str; - tmp.tqreplace("\\\\", "\\"); - tmp.tqreplace("\\1", "\1" ); + tmp.replace("\\\\", "\\"); + tmp.replace("\\1", "\1" ); return tmp; } @@ -276,7 +276,7 @@ bool Message::matchForIRCRegExp(TQRegExp ®exp, const TQTextCodec *codec, cons msg.m_ctcpMessage = new Message(); msg.m_ctcpMessage->m_raw = codec->fromUnicode(ctcpUnquote(msg.m_ctcpRaw)); - int space = ctcpRaw.tqfind(' '); + int space = ctcpRaw.find(' '); if (!matchForIRCRegExp(msg.m_ctcpMessage->m_raw, codec, *msg.m_ctcpMessage)) { TQCString command; diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h index 80dcfa79..fb38a476 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.h +++ b/kopete/protocols/irc/libkirc/kircmessage.h @@ -112,7 +112,7 @@ public: inline const TQString &command() const { return m_command; } - /** \brief The number of command arguments this message tqcontains. + /** \brief The number of command arguments this message contains. */ inline size_t argsSize() const { return m_args.size(); } diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index f14f1a3e..4dcf9ce8 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -206,12 +206,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data ) bool KSSLSocket::hasMetaData( const TQString &key ) { - return d->metaData.tqcontains(key); + return d->metaData.contains(key); } TQString KSSLSocket::metaData( const TQString &key ) { - if( d->metaData.tqcontains(key) ) + if( d->metaData.contains(key) ) return d->metaData[key]; return TQString(); } diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index e4e574bc..2d5e0b13 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -315,7 +315,7 @@ void ChannelList::slotChannelListed( const TQString &channel, uint users, const void ChannelList::checkSearchResult( const TQString &channel, uint users, const TQString &topic ) { if( ( mUsers == 0 || mUsers <= users ) && - ( mSearch.isEmpty() || channel.tqcontains( mSearch, false ) || topic.tqcontains( mSearch, false ) ) + ( mSearch.isEmpty() || channel.contains( mSearch, false ) || topic.contains( mSearch, false ) ) ) { new ChannelListItem( mChannelList, channel, TQString::number(users), topic ); diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index a380d3c4..2ee8423e 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) // find all groups our contact is in but that are not in the server side roster for ( unsigned i = 0; i < metaContact()->groups().count (); i++ ) { - if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) + if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) ); } @@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) * risk removing the contact from the visible contact list. In this * case, we need to make sure at least the top level group stays. */ - if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) ) + if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) ) { groupsToRemoveFrom.remove ( Kopete::Group::topLevel () ); } @@ -630,7 +630,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) TQImage contactPhoto; TQString fullJid = mRosterItem.jid().full(); - TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-") +".png"); + TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-") +".png"); // photo() is a TQByteArray if ( !vCard.photo().isEmpty() ) diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 39011f81..5b69d489 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( ) void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) { - if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected()) + if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected()) { return; } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index eb5efabf..6161099e 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -117,7 +117,7 @@ TQStringList JabberCapabilitiesManager::CapabilitiesInformation::jids() const for( ; it != itEnd; ++it) { TQString jid( (*it).first ); - if( !jids.tqcontains(jid) ) + if( !jids.contains(jid) ) jids.push_back(jid); } @@ -163,7 +163,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, { TQPair<TQString,JabberAccount*> jidAccountPair(jid.full(),account); - if( !m_jids.tqcontains(jidAccountPair) ) + if( !m_jids.contains(jidAccountPair) ) { m_jids.push_back(jidAccountPair); updateLastSeen(); @@ -172,7 +172,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& jid) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).tqreplace('%',"%%") << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).replace('%',"%%") << endl; TQValueList<TQPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) @@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const { if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1); requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions()); @@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const else { // Remove all caps specifications - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node).tqarg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl; d->jidCapabilitiesMap.remove( jid.full() ); } @@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished() DiscoItem item = discoInfo->item(); Jid jid = discoInfo->jid(); - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished() TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).tqreplace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() ); } else @@ -563,7 +563,7 @@ void JabberCapabilitiesManager::loadCachedInformation() bool JabberCapabilitiesManager::capabilitiesEnabled(const Jid &jid) const { - return d->jidCapabilitiesMap.tqcontains( jid.full() ); + return d->jidCapabilitiesMap.contains( jid.full() ); } XMPP::Features JabberCapabilitiesManager::features(const Jid& jid) const @@ -599,7 +599,7 @@ TQString JabberCapabilitiesManager::clientName(const Jid& jid) const if (name.startsWith("www.")) name = name.right(name.length() - 4); - int cut_pos = name.tqfind("."); + int cut_pos = name.find("."); if (cut_pos != -1) { name = name.left(cut_pos); } diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 60c109ae..d10f4201 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -253,7 +253,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -270,7 +270,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -286,16 +286,16 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat { TQString xhtmlBody = message.escapedBody(); - // According to JEP-0071 8.9 it is only RECOMMANDED to tqreplace \n with <br/> + // According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with <br/> // which mean that some implementation (gaim 2 beta) may still think that \n are linebreak. // and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it // see Bug 121627 // Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of // linebreak that are not interpreted. - Olivier 2006-31-03 - xhtmlBody.tqreplace("\n",""); + xhtmlBody.replace("\n",""); // is not a valid XML entity - xhtmlBody.tqreplace(" " , " "); + xhtmlBody.replace(" " , " "); // Remove trailing line break xhtmlBody.remove( TQRegExp( "<br/>$" ) ); @@ -358,4 +358,4 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat #include "jabberchatsession.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; tqreplace-tabs off; space-indent off; +// kate: tab-width 4; replace-tabs off; space-indent off; diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 99a768fc..cf37ffd8 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -272,7 +272,7 @@ void JabberClient::addS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.tqcontains ( *it ) ) + if ( !newList.contains ( *it ) ) newList.append ( *it ); } @@ -284,7 +284,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) { TQStringList newList; - TQStringList::iterator it = d->s5bAddressList.tqfind ( address ); + TQStringList::iterator it = d->s5bAddressList.find ( address ); if ( it != d->s5bAddressList.end () ) { d->s5bAddressList.remove ( it ); @@ -300,7 +300,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.tqcontains ( *it ) ) + if ( !newList.contains ( *it ) ) newList.append ( *it ); } @@ -859,8 +859,8 @@ void JabberClient::slotPsiDebug ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "Psi: " + msg ); @@ -870,8 +870,8 @@ void JabberClient::slotIncomingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML IN: " + msg ); @@ -881,8 +881,8 @@ void JabberClient::slotOutgoingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML OUT: " + msg ); diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index f873387f..c6147ae1 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -213,7 +213,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () * and the resources' respective status icons for the rest. */ TQIconSet iconSet ( !i ? - protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.tqfind(*it) ).iconFor ( account () )); + protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); @@ -795,7 +795,7 @@ void JabberContact::slotChatSessionDeleted ( TQObject *sender ) JabberChatSession *manager = static_cast<JabberChatSession *>(sender); - mManagers.remove ( mManagers.tqfind ( manager ) ); + mManagers.remove ( mManagers.find ( manager ) ); } diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 369cb9d9..43724d28 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -93,7 +93,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, JabberTransport *transport=0l; TQString legacyId; //find if the contact should be added to a transport. - if(mAccount->transports().tqcontains(contact.jid().domain())) + if(mAccount->transports().contains(contact.jid().domain())) { transport=mAccount->transports()[contact.jid().domain()]; legacyId=transport->legacyId( contact.jid() ); @@ -222,7 +222,7 @@ void JabberContactPool::slotContactDestroyed ( Kopete::Contact *contact ) else { //this is a legacy contact. we have no way to get the real Jid at this point, we can only guess it. - TQString contactId= contact->contactId().tqreplace('@','%') + "@" + contact->account()->myself()->contactId(); + TQString contactId= contact->contactId().replace('@','%') + "@" + contact->account()->myself()->contactId(); mAccount->resourcePool()->removeAllResources ( XMPP::Jid ( contactId ) ) ; } diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index ff5ae32c..f536a1c9 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -89,7 +89,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -106,7 +106,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index c88b8841..87b797c3 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId) if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) ) return 0L; //the account may already exist if greated just above - int slash=accountId.tqfind('/'); + int slash=accountId.find('/'); if(slash>=0) { TQString realAccountId=accountId.left(slash); diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 8bd9a915..218c9aae 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid ) if(jid.node().isEmpty()) return TQString(); TQString node = jid.node(); - return node.tqreplace("%","@"); + return node.replace("%","@"); } void JabberTransport::jabberAccountRemoved( ) diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 344071c6..594be2d4 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -123,8 +123,8 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) { TQString st(stanza->Str().c_str()); - st.tqreplace("cli:iq","iq"); - st.tqreplace(":cli=","="); + st.replace("cli:iq","iq"); + st.replace(":cli=","="); fprintf(stderr,"bling\n"); voiceCaller_->sendStanza(st.latin1()); fprintf(stderr,"blong\n"); @@ -266,7 +266,7 @@ JingleVoiceCaller::~JingleVoiceCaller() bool JingleVoiceCaller::calling(const Jid& jid) { - return calls_.tqcontains(jid.full()); + return calls_.contains(jid.full()); } void JingleVoiceCaller::call(const Jid& jid) @@ -316,7 +316,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) { qDebug("jinglevoicecaller.cpp: Registering call\n"); kdDebug(14000) << k_funcinfo << jid.full() << endl; - if (!calls_.tqcontains(jid.full())) { + if (!calls_.contains(jid.full())) { calls_[jid.full()] = call; } // else { @@ -340,7 +340,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) if (doc.documentElement().tagName() == "presence") { Jid from = Jid(doc.documentElement().attribute("from")); TQString type = doc.documentElement().attribute("type"); - if (type == "unavailable" && calls_.tqcontains(from.full())) { + if (type == "unavailable" && calls_.contains(from.full())) { qDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); emit terminated(from); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 3f3bd6ca..0225b177 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -93,7 +93,7 @@ public: XMPP::Jid jid(session->remote_address().c_str()); // Do nothing if the session do not contain a peers. - //if( !voiceSession->peers().tqcontains(jid) ) + //if( !voiceSession->peers().contains(jid) ) if( !hasPeer(voiceSession->peers(), jid) ) return; @@ -142,8 +142,8 @@ public: void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza) { TQString irisStanza(buzzStanza->Str().c_str()); - irisStanza.tqreplace("cli:iq","iq"); - irisStanza.tqreplace(":cli=","="); + irisStanza.replace("cli:iq","iq"); + irisStanza.replace(":cli=","="); voiceSession->sendStanza(irisStanza); } diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro index 8482614c..53c8e293 100644 --- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro +++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro @@ -88,7 +88,7 @@ SOURCES += \ $$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \ $$JINGLE_CPP/talk/session/phone/voicechannel.cc -#tqcontains(DEFINES, HAVE_PORTAUDIO) { +#contains(DEFINES, HAVE_PORTAUDIO) { # SOURCES += \ # $$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc #} @@ -128,11 +128,11 @@ SOURCES += \ $$JINGLE_CPP/talk/third_party/mediastreamer/mswrite.c \ $$JINGLE_CPP/talk/third_party/mediastreamer/sndcard.c -tqcontains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { +contains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/alsacard.c } -tqcontains(DEFINES, HAVE_PORTAUDIO) { +contains(DEFINES, HAVE_PORTAUDIO) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/portaudiocard.c } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc index 38e22c2e..f10489f7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc @@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) { void MessageQueueManager::Remove(MessageQueue *message_queue) { CritScope cs(&crit_); std::vector<MessageQueue *>::iterator iter; - iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue); + iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue); if (iter != message_queues_.end()) message_queues_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc index 2ea7530f..5274c29d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc @@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector<Network*>& result) { CreateNetworks(list); for (uint32 i = 0; i < list.size(); ++i) { - NetworkMap::iterator iter = networks_.tqfind(list[i]->name()); + NetworkMap::iterator iter = networks_.find(list[i]->name()); Network* network; if (iter == networks_.end()) { @@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip) } void Network::StartSession(NetworkSession* session) { - assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end()); + assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end()); sessions_.push_back(session); } void Network::StopSession(NetworkSession* session) { - SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session); + SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session); if (iter != sessions_.end()) sessions_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index 5cdc4743..e1f0db4e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, std::string A2 = method + ":" + uri; std::string middle; - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { args["qop"] = "auth"; middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"]; } else { @@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, ss << ", realm=" << Quote(args["realm"]); ss << ", nonce=" << Quote(args["nonce"]); ss << ", uri=" << Quote(uri); - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { ss << ", qop=" << args["qop"]; ss << ", nc=" << ncount; ss << ", cnonce=" << Quote(cnonce); } ss << ", response=\"" << dig_response << "\""; - if (args.tqfind("opaque") != args.end()) { + if (args.find("opaque") != args.end()) { ss << ", opaque=" << Quote(args["opaque"]); } response = ss.str(); @@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, size_t len = password.GetLength()+1; char * sensitive = new char[len]; password.CopyTo(sensitive, true); - std::string::size_type pos = username.tqfind('\\'); + std::string::size_type pos = username.find('\\'); if (pos == std::string::npos) { auth_id.UserLength = static_cast<unsigned long>( _min(sizeof(userbuf) - 1, username.size())); @@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { const char * direction = (input ? " << " : " >> "); std::string str(data, len); while (!str.empty()) { - std::string::size_type pos = str.tqfind('\n'); + std::string::size_type pos = str.find('\n'); std::string substr = str; if (pos == std::string::npos) { substr = str; @@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { } // Filter out any private data - std::string::size_type pos_private = substr.tqfind("Email"); + std::string::size_type pos_private = substr.find("Email"); if (pos_private == std::string::npos) { - pos_private = substr.tqfind("Passwd"); + pos_private = substr.find("Passwd"); } if (pos_private == std::string::npos) { LOG(level_) << label_ << direction << substr; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc index e781b03d..40c1fbfe 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc @@ -350,14 +350,14 @@ void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { (*roster_)[key] = item; } else { Console()->Printf("Removing from roster: %s", key.c_str()); - RosterMap::iterator iter = roster_->tqfind(key); + RosterMap::iterator iter = roster_->find(key); if (iter != roster_->end()) roster_->erase(iter); } } void CallClient::PrintRoster() { - Console()->Printf("Roster tqcontains %d callable", roster_->size()); + Console()->Printf("Roster contains %d callable", roster_->size()); RosterMap::iterator iter = roster_->begin(); while (iter != roster_->end()) { Console()->Printf("%s - %s", diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc index ee14fe94..cee7058a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc @@ -48,7 +48,7 @@ IsXmlSpace(int ch) { static bool ListContainsToken(const std::string & list, const std::string & token) { - size_t i = list.tqfind(token); + size_t i = list.find(token); if (i == std::string::npos || token.empty()) return false; bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1])); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h index 0677932b..2cb80ae2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h @@ -114,12 +114,12 @@ public: // Knowledge of other clients' silly automatic status strings - // Don't show these. std::string QuiettqStatus() const { - if (jid_.resource().tqfind("Psi") != std::string::npos) { + if (jid_.resource().find("Psi") != std::string::npos) { if (status_ == "Online" || - status_.tqfind("Auto tqStatus") != std::string::npos) + status_.find("Auto tqStatus") != std::string::npos) return STR_EMPTY; } - if (jid_.resource().tqfind("Gaim") != std::string::npos) { + if (jid_.resource().find("Gaim") != std::string::npos) { if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc index 492559ae..66191f12 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc @@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism( std::vector<std::string>::const_iterator it; // a token is the weakest auth - 15s, service-limited, so prefer it. - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); + it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); if (it != mechanisms.end()) return "X-GOOGLE-TOKEN"; // a cookie is the next weakest - 14 days - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); + it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); if (it != mechanisms.end()) return "X-GOOGLE-COOKIE"; @@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism( // as a last resort, use plain authentication if (jid_.domain() != "google.com") { - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); + it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it != mechanisms.end()) return "PLAIN"; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc index d07e2e5d..eb53efeb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc @@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate, } if ((origin_port != NULL) && - tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { + find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { if (CreateConnection(origin_port, remote_candidate, origin_port, readable)) created = true; } @@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) { // Remove this connection from the list. std::vector<Connection*>::iterator iter = - tqfind(connections_.begin(), connections_.end(), connection); + find(connections_.begin(), connections_.end(), connection); assert(iter != connections_.end()); connections_.erase(iter); @@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) { assert(worker_thread_ == Thread::Current()); // Remove this port from the list (if we didn't drop it already). - std::vector<Port*>::iterator iter = tqfind(ports_.begin(), ports_.end(), port); + std::vector<Port*>::iterator iter = find(ports_.begin(), ports_.end(), port); if (iter != ports_.end()) ports_.erase(iter); @@ -843,7 +843,7 @@ const std::vector<Connection *>& P2PSocket::connections() { // Set options on ourselves is simply setting options on all of our available // port objects. int P2PSocket::SetOption(Socket::Option opt, int value) { - OptionMap::iterator it = options_.tqfind(opt); + OptionMap::iterator it = options_.find(opt); if (it == options_.end()) { options_.insert(std::make_pair(opt, value)); } else if (it->second == value) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc index c9272597..14549b5b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc @@ -171,7 +171,7 @@ Port::~Port() { } Connection* Port::GetConnection(const SocketAddress& remote_addr) { - AddressMap::const_iterator iter = connections_.tqfind(remote_addr); + AddressMap::const_iterator iter = connections_.find(remote_addr); if (iter != connections_.end()) return iter->second; else @@ -449,7 +449,7 @@ void Port::Start() { } void Port::OnConnectionDestroyed(Connection* conn) { - AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address()); + AddressMap::iterator iter = connections_.find(conn->remote_candidate().address()); assert(iter != connections_.end()); connections_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc index 002033dc..bb52a1d5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc @@ -105,14 +105,14 @@ RelayServer::~RelayServer() { void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) { assert(internal_sockets_.end() == - std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket)); + std::find(internal_sockets_.begin(), internal_sockets_.end(), socket)); internal_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket); } void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket); + std::find(internal_sockets_.begin(), internal_sockets_.end(), socket); assert(iter != internal_sockets_.end()); internal_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) { assert(external_sockets_.end() == - std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket)); + std::find(external_sockets_.begin(), external_sockets_.end(), socket)); external_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket); } void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket); + std::find(external_sockets_.begin(), external_sockets_.end(), socket); assert(iter != external_sockets_.end()); external_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket( // If this did not come from an existing connection, it should be a STUN // allocate request. - ConnectionMap::iterator piter = connections_.tqfind(ap); + ConnectionMap::iterator piter = connections_.find(ap); if (piter == connections_.end()) { HandleStunAllocate(bytes, size, ap, socket); return; @@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket( assert(!ap.destination().IsAny()); // If this connection already exists, then forward the traffic. - ConnectionMap::iterator piter = connections_.tqfind(ap); + ConnectionMap::iterator piter = connections_.find(ap); if (piter != connections_.end()) { // TODO: Check the HMAC. RelayServerConnection* ext_conn = piter->second; @@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket( // TODO: Check the HMAC. // The binding should already be present. - BindingMap::iterator biter = bindings_.tqfind(username); + BindingMap::iterator biter = bindings_.find(username); if (biter == bindings_.end()) { // TODO: Turn this back on. This is the sign of a client bug. //std::cerr << "Dropping packet: no binding with username" << std::endl; @@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate( RelayServerBinding* binding; - BindingMap::iterator biter = bindings_.tqfind(username); + BindingMap::iterator biter = bindings_.find(username); if (biter != bindings_.end()) { binding = biter->second; @@ -453,18 +453,18 @@ void RelayServer::HandleStunSend( } void RelayServer::AddConnection(RelayServerConnection* conn) { - assert(connections_.tqfind(conn->addr_pair()) == connections_.end()); + assert(connections_.find(conn->addr_pair()) == connections_.end()); connections_[conn->addr_pair()] = conn; } void RelayServer::RemoveConnection(RelayServerConnection* conn) { - ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair()); + ConnectionMap::iterator iter = connections_.find(conn->addr_pair()); assert(iter != connections_.end()); connections_.erase(iter); } void RelayServer::RemoveBinding(RelayServerBinding* binding) { - BindingMap::iterator iter = bindings_.tqfind(binding->username()); + BindingMap::iterator iter = bindings_.find(binding->username()); assert(iter != bindings_.end()); bindings_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc index d146d63c..4c1c09d9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc @@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID& void SessionManager::DestroySession(Session *session) { if (session != NULL) { - std::map<SessionID, Session *>::iterator it = session_map_.tqfind(session->id()); + std::map<SessionID, Session *>::iterator it = session_map_.find(session->id()); if (it != session_map_.end()) { SignalSessionDestroy(session); session_map_.erase(it); @@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) { Session *SessionManager::GetSession(const SessionID& id) { // If the id isn't present, the [] operator will make a NULL entry - std::map<SessionID, Session *>::iterator it = session_map_.tqfind(id); + std::map<SessionID, Session *>::iterator it = session_map_.find(id); if (it != session_map_.end()) return (*it).second; return NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc index e0257451..2f0d67b8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc @@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) { // Only if socket exists CritScope cs(&critSM_); std::vector<P2PSocket *>::iterator it; - it = std::tqfind(sockets_.begin(), sockets_.end(), socket); + it = std::find(sockets_.begin(), sockets_.end(), socket); if (it == sockets_.end()) return; sockets_.erase(it); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc index 34a62547..14d64735 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc @@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) { void StunRequestManager::SendDelayed(StunRequest* request, int delay) { request->set_manager(this); - assert(requests_.tqfind(request->id()) == requests_.end()); + assert(requests_.find(request->id()) == requests_.end()); requests_[request->id()] = request; thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL); } void StunRequestManager::Remove(StunRequest* request) { assert(request->manager() == this); - RequestMap::iterator iter = requests_.tqfind(request->id()); + RequestMap::iterator iter = requests_.find(request->id()); if (iter != requests_.end()) { assert(iter->second == request); requests_.erase(iter); @@ -84,7 +84,7 @@ void StunRequestManager::Clear() { } bool StunRequestManager::CheckResponse(StunMessage* msg) { - RequestMap::iterator iter = requests_.tqfind(msg->transaction_id()); + RequestMap::iterator iter = requests_.find(msg->transaction_id()); if (iter == requests_.end()) return false; @@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) { std::string id; id.append(data + 4, 16); - RequestMap::iterator iter = requests_.tqfind(id); + RequestMap::iterator iter = requests_.find(id); if (iter == requests_.end()) return false; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc index 42c4a876..5192595c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc @@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port, void BasicPortAllocatorSession::OnAddressReady(Port *port) { assert(Thread::Current() == network_thread_); - std::vector<PortData>::iterator it = std::tqfind(ports_.begin(), ports_.end(), port); + std::vector<PortData>::iterator it = std::find(ports_.begin(), ports_.end(), port); assert(it != ports_.end()); assert(!it->ready); it->ready = true; @@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot void BasicPortAllocatorSession::OnPortDestroyed(Port* port) { assert(Thread::Current() == network_thread_); std::vector<PortData>::iterator iter = - tqfind(ports_.begin(), ports_.end(), port); + find(ports_.begin(), ports_.end(), port); assert(iter != ports_.end()); ports_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc index 7a79d044..31b12e92 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc @@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) { void Call::AcceptSession(Session *session) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description())); @@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) { void Call::RedirectSession(Session *session, const buzz::Jid &to) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Redirect(to.Str()); @@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) { void Call::RejectSession(Session *session) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Reject(); } void Call::TerminateSession(Session *session) { - assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end()); + assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end()); std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); if (it != sessions_.end()) (*it)->Terminate(); } @@ -127,14 +127,14 @@ void Call::AddSession(Session *session) { void Call::RemoveSession(Session *session) { // Remove session from list std::vector<Session *>::iterator it_session; - it_session = std::tqfind(sessions_.begin(), sessions_.end(), session); + it_session = std::find(sessions_.begin(), sessions_.end(), session); if (it_session == sessions_.end()) return; sessions_.erase(it_session); // Destroy session channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = it_channel->second; channel_map_.erase(it_channel); @@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) { } VoiceChannel* Call::GetChannel(Session* session) { - std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id()); + std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id()); assert(it != channel_map_.end()); return it->second; } @@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) { // Move channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = call->channel_map_.tqfind(session->id()); + it_channel = call->channel_map_.find(session->id()); if (it_channel != call->channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; call->channel_map_.erase(it_channel); @@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) { void Call::StartConnectionMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor); @@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) { void Call::StopConnectionMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopConnectionMonitor(); @@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) { void Call::StartAudioMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor); @@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) { void Call::StopAudioMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopAudioMonitor(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc index e5e6758d..98634b12 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc @@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) { CritScope cs(&crit_); // Destroy voice channel. assert(initialized_); - std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(), + std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(), channels_.end(), voice_channel); assert(it != channels_.end()); if (it == channels_.end()) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc index a8f0a511..46dc7b42 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc @@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { // Remove it from calls_ map and delete - std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id()); + std::map<uint32, Call *>::iterator it = calls_.find(call->id()); if (it != calls_.end()) calls_.erase(it); @@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { void PhoneSessionClient::OnSessionDestroy(Session *session) { // Find the call this session is in, remove it - std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id()); + std::map<SessionID, Call *>::iterator it = session_map_.find(session->id()); assert(it != session_map_.end()); if (it != session_map_.end()) { Call *call = (*it).second; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c index d243bf76..e83eb8dc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c @@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b) static GList *g_list_append_if_new(GList *l,gpointer data) { GList *res=l; - if (g_list_tqfind(res,data)==NULL) + if (g_list_find(res,data)==NULL) res=g_list_append(res,data); return(res); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c index c73081a2..6d410392 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c @@ -419,7 +419,7 @@ GList *filter_list=NULL; void ms_filter_register(MSFilterInfo *info) { gpointer tmp; - tmp=g_list_tqfind(filter_list,info); + tmp=g_list_find(filter_list,info); if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc index 570a8be5..d6d4c7b4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc @@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) { if (last - first > 4) last = first + 3; std::string candidate(AsciiLower(ns.substr(first, last - first))); - if (candidate.tqfind("xml") != 0) + if (candidate.find("xml") != 0) return candidate; break; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc index 48a89504..b742e03a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc @@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) { } // First find the slash and slice of that part - size_t slash = jid_string.tqfind('/'); + size_t slash = jid_string.find('/'); std::string resource_name = (slash == std::string::npos ? STR_EMPTY : jid_string.substr(slash + 1)); // Now look for the node std::string node_name; - size_t at = jid_string.tqfind('@'); + size_t at = jid_string.find('@'); size_t domain_begin; if (at < slash && at != std::string::npos) { node_name = jid_string.substr(0, at); @@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) { // avoid allocating these constants repeatedly std::string domain_name; - if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) { + if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) { domain_name = STR_GMAIL_COM; } - else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) { + else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLEMAIL_COM; } - else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) { + else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLE_COM; } else { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h index 488dc56e..659820f5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h @@ -49,7 +49,7 @@ public: return ""; } - std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); + std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it == mechanisms.end()) { return ""; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index 50ca23c1..38f268b9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -91,7 +91,7 @@ XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos; - pos = std::tqfind(iq_entries_->begin(), + pos = std::find(iq_entries_->begin(), iq_entries_->end(), reinterpret_cast<XmppIqEntry*>(cookie)); diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index ae95eadb..3a8b6d88 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -57,7 +57,7 @@ void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQStri m_host = host; m_port = !port ? 5222 : port; - m_user = TQString(user).tqreplace ( "%", "@" ); + m_user = TQString(user).replace ( "%", "@" ); m_password = pass; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index 2064e4ab..ca3b804c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.tqfind(' '); + int n = line.find(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.tqfind(' ', n); + int n2 = line.find(' ', n); if(n2 == -1) return false; if(code) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index 2e6d0779..fbc9a39f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -229,14 +229,14 @@ void HttpPoll::http_result() // get id and packet TQString id; TQString cookie = d->http.getHeader("Set-Cookie"); - int n = cookie.tqfind("ID="); + int n = cookie.find("ID="); if(n == -1) { reset(); error(ErrRead); return; } n += 3; - int n2 = cookie.tqfind(';', n); + int n2 = cookie.find(';', n); if(n2 != -1) id = cookie.mid(n, n2-n); else @@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.tqfind(' '); + int n = line.find(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.tqfind(' ', n); + int n2 = line.find(' ', n); if(n2 == -1) return false; if(code) @@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const { for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) { const TQString &s = *it; - int n = s.tqfind(": "); + int n = s.find(": "); if(n == -1) continue; TQString v = s.mid(0, n); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index 39fbfdda..b94399ce 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -116,7 +116,7 @@ public: class NDnsManager::Private { public: - Item *tqfind(const NDns *n) + Item *find(const NDns *n) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -126,7 +126,7 @@ public: return 0; } - Item *tqfind(const NDnsWorker *w) + Item *find(const NDnsWorker *w) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name) void NDnsManager::stop(NDns *self) { - Item *i = d->tqfind(self); + Item *i = d->find(self); if(!i) return; // disassociate @@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self) bool NDnsManager::isBusy(const NDns *self) const { - Item *i = d->tqfind(self); + Item *i = d->find(self); return (i ? true: false); } @@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e) NDnsWorkerEvent *we = static_cast<NDnsWorkerEvent*>(e); we->worker->wait(); // ensure that the thread is terminated - Item *i = d->tqfind(we->worker); + Item *i = d->find(we->worker); if(!i) { // should NOT happen return true; diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 12b9ad55..3e52c5d2 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -220,10 +220,10 @@ namespace XMPP ResourceList(); ~ResourceList(); - ResourceList::Iterator tqfind(const TQString &); + ResourceList::Iterator find(const TQString &); ResourceList::Iterator priority(); - ResourceList::ConstIterator tqfind(const TQString &) const; + ResourceList::ConstIterator find(const TQString &) const; ResourceList::ConstIterator priority() const; private: @@ -273,8 +273,8 @@ namespace XMPP Roster(); ~Roster(); - Roster::Iterator tqfind(const Jid &); - Roster::ConstIterator tqfind(const Jid &) const; + Roster::Iterator find(const Jid &); + Roster::ConstIterator find(const Jid &) const; private: class RosterPrivate *d; @@ -711,8 +711,8 @@ namespace XMPP ~LiveRoster(); void flagAllForDelete(); - LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true); - LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const; + LiveRoster::Iterator find(const Jid &, bool compareRes=true); + LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const; private: class LiveRosterPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp index 90cf1364..090cc9df 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp @@ -42,7 +42,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nameprep_table.tqfind(in); + Result *r = that->nameprep_table.find(in); if(r) { if(!r->norm) @@ -78,7 +78,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nodeprep_table.tqfind(in); + Result *r = that->nodeprep_table.find(in); if(r) { if(!r->norm) @@ -114,7 +114,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->resourceprep_table.tqfind(in); + Result *r = that->resourceprep_table.find(in); if(r) { if(!r->norm) @@ -248,7 +248,7 @@ void Jid::set(const TQString &s) { TQString rest, domain, node, resource; TQString norm_domain, norm_node, norm_resource; - int x = s.tqfind('/'); + int x = s.find('/'); if(x != -1) { rest = s.mid(0, x); resource = s.mid(x+1); @@ -262,7 +262,7 @@ void Jid::set(const TQString &s) return; } - x = rest.tqfind('@'); + x = rest.find('@'); if(x != -1) { node = rest.mid(0, x); domain = rest.mid(x+1); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index 80ce5366..3fa7d6c3 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -232,10 +232,10 @@ private: if(mightChangeEncoding) { while(1) { - int n = out.tqfind('<'); + int n = out.find('<'); if(n != -1) { // we need a closing bracket - int n2 = out.tqfind('>', n); + int n2 = out.find('>', n); if(n2 != -1) { ++n2; TQString h = out.mid(n, n2-n); @@ -278,8 +278,8 @@ private: if(h.left(5) != "<?xml") return ""; - int endPos = h.tqfind(">"); - int startPos = h.tqfind("encoding"); + int endPos = h.find(">"); + int startPos = h.find("encoding"); if(startPos < endPos && startPos != -1) { TQString encoding; do { @@ -335,7 +335,7 @@ private: bool checkForBadChars(const TQString &s) { - int len = s.tqfind('<'); + int len = s.find('<'); if(len == -1) len = s.length(); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 5a6bc64f..89c98a91 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe) int minor = 0; TQString verstr = atts.value("version"); if(!verstr.isEmpty()) { - int n = verstr.tqfind('.'); + int n = verstr.find('.'); if(n != -1) { major = verstr.mid(0, n).toInt(); minor = verstr.mid(n+1).toInt(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp index da78fef1..c825a2ca 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp @@ -78,7 +78,7 @@ public: PropList list; int at = 0; while(1) { - int n = str.tqfind('=', at); + int n = str.find('=', at); if(n == -1) break; TQCString var, val; @@ -86,14 +86,14 @@ public: at = n + 1; if(str[at] == '\"') { ++at; - n = str.tqfind('\"', at); + n = str.find('\"', at); if(n == -1) break; val = str.mid(at, n-at); at = n + 1; } else { - n = str.tqfind(',', at); + n = str.find(',', at); if(n != -1) { val = str.mid(at, n-at); at = n; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index fe7275ad..59b28f8b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &) // printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1()); //#endif TQString u = user; - int n = u.tqfind('@'); + int n = u.find('@'); if(n != -1) u.truncate(n); d->srv.user = u; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 5f682371..91111ea9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const } // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline if(clip) { - int n = out.tqfindRev('>'); + int n = out.findRev('>'); out.truncate(n+1); } return out; @@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS } // parse the tags out - int n = str.tqfind('<'); - int n2 = str.tqfind('>', n); + int n = str.find('<'); + int n2 = str.find('>', n); ++n2; *tagOpen = str.mid(n, n2-n); - n2 = str.tqfindRev('>'); - n = str.tqfindRev('<'); + n2 = str.findRev('>'); + n = str.findRev('<'); ++n2; *tagClose = str.mid(n, n2-n); @@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip) for(n = 0; n < al.count(); ++n) { TQDomAttr a = al.item(n).toAttr(); TQString s = a.name(); - int x = s.tqfind(':'); + int x = s.find(':'); if(x != -1) s = s.mid(x+1); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 86a01e60..7b425696 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -790,7 +790,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s) void Client::updateSelfPresence(const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = d->resourceList.tqfind(j.resource()); + ResourceList::Iterator rit = d->resourceList.find(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; // unavailable? remove the resource @@ -822,7 +822,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = i->resourceList().tqfind(j.resource()); + ResourceList::Iterator rit = i->resourceList().find(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; // unavailable? remove the resource @@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item) // Remove if(item.subscription().type() == Subscription::Remove) { - LiveRoster::Iterator it = d->roster.tqfind(item.jid()); + LiveRoster::Iterator it = d->roster.find(item.jid()); if(it != d->roster.end()) { rosterItemRemoved(*it); d->roster.remove(it); @@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item) } // Add/Update else { - LiveRoster::Iterator it = d->roster.tqfind(item.jid()); + LiveRoster::Iterator it = d->roster.find(item.jid()); if(it != d->roster.end()) { LiveRosterItem &i = *it; i.setFlagForDelete(false); @@ -1001,7 +1001,7 @@ void Client::setPresence(const tqStatus &s) // update our resourceList ppPresence(jid(), s); - //ResourceList::Iterator rit = d->resourceList.tqfind(resource()); + //ResourceList::Iterator rit = d->resourceList.find(resource()); //Resource &r = *rit; //r.settqStatus(s); } @@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features) void Client::removeExtension(const TQString& ext) { - if (d->extension_features.tqcontains(ext)) { + if (d->extension_features.contains(ext)) { d->extension_features.remove(ext); d->capsExt = extensions().join(" "); } @@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete() (*it).setFlagForDelete(true); } -LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) +LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) { Iterator it; for(it = begin(); it != end(); ++it) { @@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) return it; } -LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const +LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const { ConstIterator it; for(it = begin(); it != end(); ++it) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index fb9de2e8..522e52f9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -421,12 +421,12 @@ bool Message::containsEvents() const bool Message::containsEvent(MsgEvent e) const { - return d->eventList.tqcontains(e); + return d->eventList.contains(e); } void Message::addEvent(MsgEvent e) { - if (!d->eventList.tqcontains(e)) { + if (!d->eventList.contains(e)) { if (e == CancelEvent || containsEvent(CancelEvent)) d->eventList.clear(); // Reset list d->eventList += e; @@ -1018,10 +1018,10 @@ ResourceList::~ResourceList() { } -ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind) +ResourceList::Iterator ResourceList::find(const TQString & _find) { for(ResourceList::Iterator it = begin(); it != end(); ++it) { - if((*it).name() == _tqfind) + if((*it).name() == _find) return it; } @@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority() return highest; } -ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const +ResourceList::ConstIterator ResourceList::find(const TQString & _find) const { for(ResourceList::ConstIterator it = begin(); it != end(); ++it) { - if((*it).name() == _tqfind) + if((*it).name() == _find) return it; } @@ -1222,7 +1222,7 @@ Roster::~Roster() { } -Roster::Iterator Roster::tqfind(const Jid &j) +Roster::Iterator Roster::find(const Jid &j) { for(Roster::Iterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1232,7 +1232,7 @@ Roster::Iterator Roster::tqfind(const Jid &j) return end(); } -Roster::ConstIterator Roster::tqfind(const Jid &j) const +Roster::ConstIterator Roster::find(const Jid &j) const { for(Roster::ConstIterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const { TQStringList::ConstIterator it = ns.begin(); for ( ; it != ns.end(); ++it) - if ( _list.tqfind( *it ) != _list.end() ) + if ( _list.find( *it ) != _list.end() ) return true; return false; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index bab5665b..45ef7a04 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -35,9 +35,9 @@ using namespace XMPP; static TQString lineEncode(TQString str) { - str.tqreplace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash - str.tqreplace(TQRegExp("\\|"), "\\p"); // pipe to \p - str.tqreplace(TQRegExp("\n"), "\\n"); // newline to \n + str.replace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash + str.replace(TQRegExp("\\|"), "\\p"); // pipe to \p + str.replace(TQRegExp("\n"), "\\n"); // newline to \n return str; } @@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e) } else if (node.startsWith(client()->capsNode() + "#")) { TQString ext = node.right(node.length()-client()->capsNode().length()-1); - if (client()->extensions().tqcontains(ext)) { + if (client()->extensions().contains(ext)) { const TQStringList& l = client()->extension(ext).list(); for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 2fcf782b..489afab4 100644 --- a/kopete/protocols/jabber/libiris/jingle_iris.patch +++ b/kopete/protocols/jabber/libiris/jingle_iris.patch @@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp + +void Client::removeExtension(const QString& ext) +{ -+ if (d->extension_features.tqcontains(ext)) { ++ if (d->extension_features.contains(ext)) { + d->extension_features.remove(ext); + d->capsExt = extensions().join(" "); + } @@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp + } + else if (node.startsWith(client()->capsNode() + "#")) { + QString ext = node.right(node.length()-client()->capsNode().length()-1); -+ if (client()->extensions().tqcontains(ext)) { ++ if (client()->extensions().contains(ext)) { + const QStringList& l = client()->extension(ext).list(); + for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 44278511..e4139786 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -520,7 +520,7 @@ void dlgJabberVCard::slotSelectPhoto() img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height()); } - m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 9a769122..2b5ad749 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig () bool JabberEditAccountWidget::validateData () { - if(!mID->text().tqcontains('@')) + if(!mID->text().contains('@')) { KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. " "Please make sure it is in the form user@server.com, like an email address."), diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index dee7534a..cc7cd0fc 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -58,7 +58,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent mMainWidget = new DlgJabberRegisterAccount ( this ); setMainWidget ( mMainWidget ); - // tqreplace "Ok" button with a "Register" button + // replace "Ok" button with a "Register" button KGuiItem registerButton = KStdGuiItem::ok(); registerButton.setText ( i18n ( "Register" ) ); setButtonOK ( registerButton ); diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index 5f367540..3b880932 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -426,7 +426,7 @@ void MeanwhileSession::syncContactsToServer() if (contactgroup->type() == Kopete::Group::TopLevel) { stgroup = topstgroup; } else { - /* tqfind (or create) a matching sametime list group */ + /* find (or create) a matching sametime list group */ stgroup = mwSametimeList_findGroup(list, contactgroup->displayName().ascii()); if (stgroup == 0L) { @@ -555,10 +555,10 @@ TQString MeanwhileSession::getNickName(struct mwLoginInfo *logininfo) TQString MeanwhileSession::getNickName(TQString name) { - int index = name.tqfind(" - "); + int index = name.find(" - "); if (index != -1) name = name.remove(0, index + 3); - index = name.tqfind('/'); + index = name.find('/'); if (index != -1) name = name.left(index); diff --git a/kopete/protocols/meanwhile/meanwhilesession.h b/kopete/protocols/meanwhile/meanwhilesession.h index 9d583a8b..040d0c2a 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.h +++ b/kopete/protocols/meanwhile/meanwhilesession.h @@ -229,7 +229,7 @@ private: TQString getNickName(struct mwLoginInfo *logininfo); /** - * Resolve a contact to tqfind (and set) the display name. This requires the + * Resolve a contact to find (and set) the display name. This requires the * session to be connected to use the meanwhile resolve service. * @param contact The contact to resolve */ diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 91f3361a..acf9c8db 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -94,7 +94,7 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj TQString context = TQString::fromUtf8(KCodecs::base64Encode(msnObject.utf8())); // NOTE remove the \0 character automatically // appended to a TQCString. - context.tqreplace("=", TQString()); + context.replace("=", TQString()); TQString content = "EUF-GUID: {A4268EEC-FEC5-49E5-95C3-F126696BDBF6}\r\n" "SessionID: " + TQString::number(sessionId) + "\r\n" @@ -247,7 +247,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream return; } - if(m_messageBuffer.tqcontains(receivedMessage.header.identifier)) + if(m_messageBuffer.contains(receivedMessage.header.identifier)) { kdDebug(14140) << k_funcinfo << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier) @@ -282,7 +282,7 @@ void Dispatcher::dispatch(const P2P::Message& message) if(message.header.sessionId > 0) { - if(m_sessions.tqcontains(message.header.sessionId)){ + if(m_sessions.contains(message.header.sessionId)){ messageHandler = m_sessions[message.header.sessionId]; } } @@ -294,7 +294,7 @@ void Dispatcher::dispatch(const P2P::Message& message) if(regex.search(body) > 0) { TQ_UINT32 sessionId = regex.cap(1).toUInt(); - if(m_sessions.tqcontains(sessionId)){ + if(m_sessions.contains(sessionId)){ // Retrieve the message handler associated with the specified session Id. messageHandler = m_sessions[sessionId]; } @@ -303,7 +303,7 @@ void Dispatcher::dispatch(const P2P::Message& message) { // Otherwise, try to retrieve the message handler // based on the acknowlegded unique identifier. - if(m_sessions.tqcontains(message.header.ackUniqueIdentifier)){ + if(m_sessions.contains(message.header.ackUniqueIdentifier)){ messageHandler = m_sessions[message.header.ackUniqueIdentifier]; } @@ -407,7 +407,7 @@ void Dispatcher::dispatch(const P2P::Message& message) m_sessions.insert(sessionId.toUInt(), current); // Determine the display icon being requested. - TQString fileName = objectList.tqcontains(msnobj) + TQString fileName = objectList.contains(msnobj) ? objectList[msnobj] : m_pictureUrl; TQFile *source = new TQFile(fileName); diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 567ff91e..f99117bc 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const m_reverseList = config->readListEntry( "reverseList" ) ; // Load the avatar - m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ); + m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-") +".png" ); resetPictureObject(true); static_cast<MSNContact *>( myself() )->setInfo( "PHH", config->readEntry("PHH") ); @@ -288,7 +288,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS kdDebug( 14140 ) << k_funcinfo << status.description() << endl; // HACK: When changing song, do don't anything while connected - if( reason.tqcontains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) + if( reason.contains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) return; // Only send personal message when logged. @@ -296,7 +296,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS { // Only update the personal/status message, don't change the online status // since it's the same. - if( reason.tqcontains("[Music]") ) + if( reason.contains("[Music]") ) { TQString personalMessage = reason.section("[Music]", 1); setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage ); @@ -359,7 +359,7 @@ void MSNAccount::slotDebugRawCommand() if ( result == TQDialog::Accepted && m_notifySocket ) { m_notifySocket->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().tqreplace( "\n", "\r\n" ).utf8() ); + dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() ); } delete dlg; #endif @@ -503,7 +503,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { // Group can already be in the list since the idle timer does a 'List Groups' // command. Simply return, don't issue a warning. @@ -587,7 +587,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou m_groupList.insert( groupGuid, fallBack ); // We have pending groups that we need add a contact to - if ( tmp_addToNewGroup.tqcontains(groupName) ) + if ( tmp_addToNewGroup.contains(groupName) ) { TQStringList list=tmp_addToNewGroup[groupName]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -601,7 +601,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou { // If we get to here, we're currently adding a new contact, add the groupGUID to the groupList // to add when contact will be added to contactlist. - if( tmp_addNewContactToGroup.tqcontains( contactId ) ) + if( tmp_addNewContactToGroup.contains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupGuid); else tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) ); @@ -613,7 +613,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " id", groupGuid ); m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " displayName", groupName ); @@ -627,7 +627,7 @@ void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& gr void MSNAccount::slotGroupRemoved( const TQString& groupGuid ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap<TQString,TQString>() ); m_groupList.remove( groupGuid ); @@ -638,7 +638,7 @@ void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToA { if ( !contactToAdd.isNull() ) { - if( tmp_addToNewGroup.tqcontains(groupName) ) + if( tmp_addToNewGroup.contains(groupName) ) { tmp_addToNewGroup[groupName].append(contactToAdd); //A group with the same name is about to be added, @@ -664,7 +664,7 @@ void MSNAccount::slotKopeteGroupRenamed( Kopete::Group *g ) { if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() && g->displayName() != g->pluginData( protocol(), accountId() + " displayName" ) && - m_groupList.tqcontains( g->pluginData( protocol(), accountId() + " id" ) ) ) + m_groupList.contains( g->pluginData( protocol(), accountId() + " id" ) ) ) { notifySocket()->renameGroup( g->displayName(), g->pluginData( protocol(), accountId() + " id" ) ); } @@ -683,7 +683,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() ) { TQString groupGuid = g->pluginData( protocol(), accountId() + " id" ); - if ( !m_groupList.tqcontains( groupGuid ) ) + if ( !m_groupList.contains( groupGuid ) ) { // the group is maybe already removed in the server slotGroupRemoved( groupGuid ); @@ -716,7 +716,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) for ( ; it.current(); ++it ) { MSNContact *c = static_cast<MSNContact *>( it.current() ); - if ( c && c->serverGroups().tqcontains( groupGuid ) ) + if ( c && c->serverGroups().contains( groupGuid ) ) { /** don't do that becasue theses may already have been sent m_notifySocket->removeContact( c->contactId(), groupNumber, MSNProtocol::FL ); @@ -804,11 +804,11 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) { TQString newServerGroupID = *it; - if(m_groupList.tqcontains(newServerGroupID)) + if(m_groupList.contains(newServerGroupID)) { Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ; c->contactAddedToGroup( newServerGroupID, newServerGroup ); - if( !c->metaContact()->groups().tqcontains(newServerGroup) ) + if( !c->metaContact()->groups().contains(newServerGroup) ) { // The contact has been added in a group by another client c->metaContact()->addToGroup( newServerGroup ); @@ -822,7 +822,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ if(old_group) { TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id"); - if ( !oldnewID.isEmpty() && contactGroups.tqcontains( oldnewID ) ) + if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) ) continue; //ok, it's correctn no need to do anything. c->metaContact()->removeFromGroup( old_group ); @@ -851,7 +851,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ it != contactGroups.end(); ++it ) { TQString groupGuid = *it; - if(m_groupList.tqcontains(groupGuid)) + if(m_groupList.contains(groupGuid)) { c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); metaContact->addToGroup( m_groupList[ groupGuid ] ); @@ -910,7 +910,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, c->removeProperty( Kopete::Global::Properties::self()->nickName() ); c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); // Add the new contact to the group he belongs. - if ( tmp_addNewContactToGroup.tqcontains(handle) ) + if ( tmp_addNewContactToGroup.contains(handle) ) { TQStringList list = tmp_addNewContactToGroup[handle]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -919,7 +919,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // If the group didn't exist yet (yay for async operations), don't add the contact to the group // Let slotGroupAdded do it. - if( m_groupList.tqcontains(groupGuid) ) + if( m_groupList.contains(groupGuid) ) { kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid << endl; notifySocket()->addContact( handle, MSNProtocol::FL, TQString(), contactGuid, groupGuid ); @@ -955,10 +955,10 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, c->setOnlineStatus( MSNProtocol::protocol()->FLN ); if ( c->metaContact() && c->metaContact()->isTemporary() ) - c->metaContact()->setTemporary( false, m_groupList.tqcontains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); + c->metaContact()->setTemporary( false, m_groupList.contains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); else { - if(m_groupList.tqcontains(groupGuid)) + if(m_groupList.contains(groupGuid)) { if( c->metaContact() ) c->metaContact()->addToGroup( m_groupList[groupGuid] ); @@ -968,7 +968,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, } } - if ( !handle.isEmpty() && !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) + if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl; notifySocket()->addContact(handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); @@ -978,7 +978,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, { if ( contacts()[ handle ] ) static_cast<MSNContact *>( contacts()[ handle ] )->setBlocked( true ); - if ( !m_blockList.tqcontains( handle ) ) + if ( !m_blockList.contains( handle ) ) { m_blockList.append( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; @@ -988,7 +988,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, { if ( contacts()[ handle ] ) static_cast<MSNContact *>( contacts()[ handle ] )->setAllowed( true ); - if ( !m_allowList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) ) { m_allowList.append( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; @@ -1004,7 +1004,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // 'new user' dialog, which makes it impossible to add those here. // Not necessarily bad, but the usability effects need more thought // before I declare it good :- ) - if ( !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { TQString nick; //in most case, the public name is not know if(publicName!=handle) // so we don't whos it if it is not know @@ -1034,7 +1034,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_blockList.remove( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; - if ( !m_allowList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) ) notifySocket()->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); if(c) @@ -1044,7 +1044,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_allowList.remove( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; - if ( !m_blockList.tqcontains( handle ) ) + if ( !m_blockList.contains( handle ) ) notifySocket()->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); if(c) @@ -1118,7 +1118,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis for ( ; it.current(); ++it ) { MSNContact *c2 = static_cast<MSNContact *>( it.current() ); - if ( c2->serverGroups().tqcontains( *stringIt ) ) + if ( c2->serverGroups().contains( *stringIt ) ) { still_have_contact=true; break; @@ -1241,16 +1241,16 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle) if ( !dialog->authorized() ) { - if ( m_allowList.tqcontains( handle ) ) + if ( m_allowList.contains( handle ) ) m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString(), TQString() ); - else if ( !m_blockList.tqcontains( handle ) ) + else if ( !m_blockList.contains( handle ) ) m_notifySocket->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); } else { - if ( m_blockList.tqcontains( handle ) ) + if ( m_blockList.contains( handle ) ) m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString(), TQString() ); - else if ( !m_allowList.tqcontains( handle ) ) + else if ( !m_allowList.contains( handle ) ) m_notifySocket->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); } @@ -1351,7 +1351,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet if( !groupId.isEmpty() ) { // Something got corrupted on contactlist.xml - if( !m_groupList.tqcontains(groupId) ) + if( !m_groupList.contains(groupId) ) { // Clear the group plugin data. group->setPluginData( protocol() , accountId() + " id" , TQString()); @@ -1365,7 +1365,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet else { // Add the group that the contact belong to add it when we will receive the contact GUID. - if( tmp_addNewContactToGroup.tqcontains( contactId ) ) + if( tmp_addNewContactToGroup.contains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupId); else tmp_addNewContactToGroup.insert(contactId, TQStringList(groupId) ); diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6e0bc03e..74c2bd63 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -316,7 +316,7 @@ void MSNChatSession::slotActionInviteAboutToShow() TQDictIterator<Kopete::Contact> it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); @@ -359,7 +359,7 @@ void MSNChatSession::slotInviteOtherContact() if( !ok ) return; - if( handle.tqcontains('@') != 1 || handle.tqcontains('.') <1) + if( handle.contains('@') != 1 || handle.contains('.') <1) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("<qt>You must enter a valid email address.</qt>"), i18n("MSN Plugin")); @@ -399,7 +399,7 @@ void MSNChatSession::sendMessageQueue() void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack) { - if ( !m_messagesSent.tqcontains( id ) ) + if ( !m_messagesSent.contains( id ) ) { // This is maybe a ACK/NAK for a non-messaging message return; @@ -433,14 +433,14 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) rx.search(msg); long unsigned int cookie=rx.cap(1).toUInt(); - if(m_invitations.tqcontains(cookie)) + if(m_invitations.contains(cookie)) { MSNInvitation *msnI=m_invitations[cookie]; msnI->parseInvitation(msg); } - else if( msg.tqcontains("Invitation-Command: INVITE") ) + else if( msg.contains("Invitation-Command: INVITE") ) { - if( msg.tqcontains(MSNFileTransferSocket::applicationID()) ) + if( msg.contains(MSNFileTransferSocket::applicationID()) ) { MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this); connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); @@ -603,7 +603,7 @@ void MSNChatSession::slotDebugRawCommand() if( result == TQDialog::Accepted && m_chatService ) { m_chatService->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().tqreplace("\n","\r\n").utf8() ); + dlg->addId(), dlg->msg().replace("\n","\r\n").utf8() ); } delete dlg; #endif diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 8e7742f0..cb4bfaa6 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -317,7 +317,7 @@ void MSNContact::setClientFlags( uint flags ) setProperty( MSNProtocol::protocol()->propClient , i18n("Windows Mobile") ); else if( flags & MSNProtocol::MSNMobileDevice) setProperty( MSNProtocol::protocol()->propClient , i18n("MSN Mobile") ); - else if( m_obj.tqcontains("kopete") ) + else if( m_obj.contains("kopete") ) setProperty( MSNProtocol::protocol()->propClient , i18n("Kopete") ); } @@ -458,7 +458,7 @@ void MSNContact::sync( unsigned int changed ) if( !group->pluginData( protocol() , account()->accountId() + " id" ).isEmpty() ) { TQString Gid=group->pluginData( protocol(), account()->accountId() + " id" ); - if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(Gid) ) + if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(Gid) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. // This shouln't be possible anymore 2004-06-10 -Olivier @@ -476,7 +476,7 @@ void MSNContact::sync( unsigned int changed ) m_moving=true; } } - else if( !m_serverGroups.tqcontains(Gid) ) + else if( !m_serverGroups.contains(Gid) ) { //Add the contact to the group on the server notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), Gid ); @@ -506,7 +506,7 @@ void MSNContact::sync( unsigned int changed ) for( TQMap<TQString, Kopete::Group*>::Iterator it = m_serverGroups.begin();(count > 1 && it != m_serverGroups.end()); ++it ) { - if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(it.key()) ) + if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(it.key()) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. @@ -523,7 +523,7 @@ void MSNContact::sync( unsigned int changed ) Kopete::Group *group=it.data(); if(!group) //we can't trust the data of it() see in MSNProtocol::deserializeContact why group=static_cast<MSNAccount*>( account() )->m_groupList[it.key()]; - if( !metaContact()->groups().tqcontains(group) ) + if( !metaContact()->groups().contains(group) ) { m_moving=true; notify->removeContact( contactId(), MSNProtocol::FL, guid(), it.key() ); @@ -672,7 +672,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) //copy the temp file somewere else. // in a better world, the file could be dirrectly wrote at the correct location. // but the custom emoticon code is to deeply merged in the display picture code while it could be separated. - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ ); @@ -685,7 +685,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) void MSNContact::slotEmitDisplayPictureChanged() { - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); } diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index c08bd3eb..31d16aeb 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -331,7 +331,7 @@ TQString MSNFileTransferSocket::invitationHead() TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer return TQString( MSNInvitation::invitationHead()+ - "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.tqfindRev( '/' ) - 1 ) +"\r\n" + "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n" "Application-FileSize: "+ TQString::number(size()) +"\r\n\r\n").utf8(); } @@ -340,7 +340,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); TQString command=rx.cap(1); - if( msg.tqcontains("Invitation-Command: INVITE") ) + if( msg.contains("Invitation-Command: INVITE") ) { rx=TQRegExp("Application-File: ([^\\r\\n]*)"); rx.search(msg); @@ -357,7 +357,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); } - else if( msg.tqcontains("Invitation-Command: ACCEPT") ) + else if( msg.contains("Invitation-Command: ACCEPT") ) { if(incoming()) { diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 7db79dd1..41d2d834 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -108,7 +108,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) kdDebug(14140) << k_funcinfo << endl; TQString handle; - if(m_tmpHandles.tqcontains(id)) + if(m_tmpHandles.contains(id)) handle=m_tmpHandles[id]; TQString msg; @@ -465,12 +465,12 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString if( list == "FL" ) { // Removing a contact - if( data.tqcontains( ' ' ) < 2 ) + if( data.contains( ' ' ) < 2 ) { contactGuid = data.section( ' ', 1, 1 ); } // Removing a contact from a group - else if( data.tqcontains( ' ' ) < 3 ) + else if( data.contains( ' ' ) < 3 ) { contactGuid = data.section( ' ', 1, 1 ); groupGuid = data.section( ' ', 2, 2 ); @@ -633,7 +633,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString "<body onload=\"document.pform.submit(); \">\n" "<form name=\"pform\" action=\"" + from_action_url + "\" method=\"POST\">\n" "<input type=\"hidden\" name=\"mode\" value=\"ttl\">\n" - "<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.tqfind('@') ) + "\">\n" + "<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.find('@') ) + "\">\n" "<input type=\"hidden\" name=\"username\" value=\"" + UserID + "\">\n" "<input type=\"hidden\" name=\"sid\" value=\"" + m_sid + "\">\n" "<input type=\"hidden\" name=\"kv\" value=\"" + m_kv + "\">\n" @@ -735,7 +735,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) { TQString msg = TQString::fromUtf8(bytes, bytes.size()); - if(msg.tqcontains("text/x-msmsgsinitialmdatanotification")) + if(msg.contains("text/x-msmsgsinitialmdatanotification")) { //Mail-Data: <MD><E><I>301</I><IU>1</IU><O>4</O><OU>2</OU></E><Q><TQTM>409600</TQTM><TQNM>204800</TQNM></Q></MD> // MD - Mail Data @@ -758,14 +758,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } } - else if(msg.tqcontains("text/x-msmsgsactivemailnotification")) + else if(msg.contains("text/x-msmsgsactivemailnotification")) { //this sends the server if mails are deleted - TQString m = msg.right(msg.length() - msg.tqfind("Message-Delta:") ); - m = m.left(msg.tqfind("\r\n")); - mailCount = mailCount - m.right(m.length() -m.tqfind(" ")-1).toUInt(); + TQString m = msg.right(msg.length() - msg.find("Message-Delta:") ); + m = m.left(msg.find("\r\n")); + mailCount = mailCount - m.right(m.length() -m.find(" ")-1).toUInt(); } - else if(msg.tqcontains("text/x-msmsgsemailnotification")) + else if(msg.contains("text/x-msmsgsemailnotification")) { //this sends the server if a new mail has arrived TQRegExp rx("From-Addr: ([A-Za-z0-9@._\\-]*)"); @@ -779,28 +779,28 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) 0 , 0 , i18n( "Open Inbox..." ) ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } - else if(msg.tqcontains("text/x-msmsgsprofile")) + else if(msg.contains("text/x-msmsgsprofile")) { //Hotmail profile - if(msg.tqcontains("MSPAuth:")) + if(msg.contains("MSPAuth:")) { TQRegExp rx("MSPAuth: ([A-Za-z0-9$!*]*)"); rx.search(msg); m_MSPAuth=rx.cap(1); } - if(msg.tqcontains("sid:")) + if(msg.contains("sid:")) { TQRegExp rx("sid: ([0-9]*)"); rx.search(msg); m_sid=rx.cap(1); } - if(msg.tqcontains("kv:")) + if(msg.contains("kv:")) { TQRegExp rx("kv: ([0-9]*)"); rx.search(msg); m_kv=rx.cap(1); } - if(msg.tqcontains("LoginTime:")) + if(msg.contains("LoginTime:")) { TQRegExp rx("LoginTime: ([0-9]*)"); rx.search(msg); @@ -812,14 +812,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) time(&actualTime); m_loginTime=TQString::number((unsigned long)actualTime); } - if(msg.tqcontains("EmailEnabled:")) + if(msg.contains("EmailEnabled:")) { TQRegExp rx("EmailEnabled: ([0-9]*)"); rx.search(msg); m_isHotmailAccount = (rx.cap(1).toUInt() == 1); emit hotmailSeted(m_isHotmailAccount); } - if(msg.tqcontains("ClientIP:")) + if(msg.contains("ClientIP:")) { TQRegExp rx("ClientIP: ([0-9.]*)"); rx.search(msg); @@ -829,7 +829,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) // We are logged when we receive the initial profile from Hotmail. m_isLogged = true; } - else if (msg.tqcontains("NOTIFICATION")) + else if (msg.contains("NOTIFICATION")) { // MSN alert (i.e. NOTIFICATION) [for docs see http://www.hypothetic.org/docs/msn/client/notification.php] // format of msg is as follows: @@ -849,7 +849,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQString notificationDOMAsString(msg); TQRegExp rx( "&(?!amp;)" ); // match ampersands but not & - notificationDOMAsString.tqreplace(rx, "&"); + notificationDOMAsString.replace(rx, "&"); TQDomDocument alertDOM; alertDOM.setContent(notificationDOMAsString); @@ -1008,7 +1008,7 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement ) currentMedia = format; for(uint i=0; i<formatterStrings.size(); i++) { - currentMedia = currentMedia.tqreplace(TQString("{%1}").tqarg(i), formatterStrings[i]); + currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]); } if( type == TQString::fromUtf8("Music") ) diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 587826ad..4337e9b2 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -104,9 +104,9 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta c->setInfo( "PHM" , serializedData[ "PHM" ] ); c->setProperty( propGuid, contactGuid ); - c->setBlocked( (bool)(lists.tqcontains('B')) ); - c->setAllowed( (bool)(lists.tqcontains('A')) ); - c->setReversed( (bool)(lists.tqcontains('R')) ); + c->setBlocked( (bool)(lists.contains('B')) ); + c->setAllowed( (bool)(lists.contains('A')) ); + c->setReversed( (bool)(lists.contains('R')) ); return c; } @@ -154,7 +154,7 @@ MSNProtocol* MSNProtocol::protocol() bool MSNProtocol::validContactId(const TQString& userid) { - return ( userid.tqcontains('@') ==1 && userid.tqcontains('.') >=1 && userid.tqcontains(' ') == 0); + return ( userid.contains('@') ==1 && userid.contains('.') >=1 && userid.contains(' ') == 0); } TQImage MSNProtocol::scalePicture(const TQImage &picture) diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 681ce8d4..9e28beb2 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -74,7 +74,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob) "OrgVerb=GET," "OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom," "sign-in=" + KURL::encode_string(m_accountId) + - ",pwd=" + KURL::encode_string( m_password ).tqreplace(',',"%2C") + + ",pwd=" + KURL::encode_string( m_password ).replace(',',"%2C") + "," + m_authentification + "\r\n"; // warning, this debug contains the password @@ -105,7 +105,7 @@ void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob) // kdDebug(14140) << k_funcinfo << "HTTP headers: " << httpHeaders << endl; // Check if we get "401 Unauthorized", thats means it's a bad password. - if(httpHeaders.tqcontains(TQString::fromUtf8("401 Unauthorized"))) + if(httpHeaders.contains(TQString::fromUtf8("401 Unauthorized"))) { // kdDebug(14140) << k_funcinfo << "MSN Login Bad password." << endl; emit loginBadPassword(); diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 3e5d84fd..6dc8fa94 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -249,12 +249,12 @@ void MSNSocket::slotDataReceived() // Check if all data has arrived. rawData = TQString(TQCString(buffer, avail + 1)); - bool headers = (rawData.tqfind(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); + bool headers = (rawData.find(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); if(headers) { // The http header packet arrived. - int endOfHeaders = rawData.tqfind("\r\n\r\n"); + int endOfHeaders = rawData.find("\r\n\r\n"); if((endOfHeaders + 4) == avail) { // Only the response headers data is included. @@ -314,17 +314,17 @@ void MSNSocket::slotDataReceived() // Retrieve the X-MSN-Messenger header. TQString header = response.getHeaders()->getValue("X-MSN-Messenger"); - TQStringList parts = TQStringList::split(";", header.tqreplace(" ", "")); + TQStringList parts = TQStringList::split(";", header.replace(" ", "")); if(!header.isNull() && (parts.count() >= 2)) { - if(parts[0].tqfind("SessionID", 0) != -1) + if(parts[0].find("SessionID", 0) != -1) { // Assign the session id. m_sessionId = parts[0].section("=", 1, 1); }else error = true; - if(parts[1].tqfind("GW-IP", 0) != -1) + if(parts[1].find("GW-IP", 0) != -1) { // Assign the gateway IP address. m_gwip = parts[1].section("=", 1, 1); @@ -333,7 +333,7 @@ void MSNSocket::slotDataReceived() if(parts.count() > 2) - if((parts[2].tqfind("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) + if((parts[2].find("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) { // The http session has been closed by the server, disconnect. kdDebug(14140) << k_funcinfo << "Session closed." << endl; @@ -390,7 +390,7 @@ void MSNSocket::slotDataReceived() // all MSN commands start with one or more uppercase characters. // For now just check the first three chars, let's see how accurate it is. // Additionally, if we receive an MSN-P2P packet, strip off anything after the P2P header. - rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().tqreplace( + rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().replace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); bool isBinary = false; @@ -446,7 +446,7 @@ void MSNSocket::slotReadLine() if ( index != -1 ) { TQString command = TQString::fromUtf8( m_buffer.take( index + 2 ), index ); - command.tqreplace( "\r\n", "" ); + command.replace( "\r\n", "" ); //kdDebug( 14141 ) << k_funcinfo << command << endl; // Don't block the GUI while parsing data, only do a single line! @@ -502,7 +502,7 @@ bool MSNSocket::pollReadBlock() void MSNSocket::parseLine( const TQString &str ) { TQString cmd = str.section( ' ', 0, 0 ); - TQString data = str.section( ' ', 2 ).tqreplace( "\r\n" , "" ); + TQString data = str.section( ' ', 2 ).replace( "\r\n" , "" ); bool isNum; uint id = str.section( ' ', 1, 1 ).toUInt( &isNum ); @@ -517,7 +517,7 @@ void MSNSocket::parseLine( const TQString &str ) //kdDebug( 14140 ) << k_funcinfo << "Parsing command " << cmd << " (ID " << id << "): '" << data << "'" << endl; - data.tqreplace( "\r\n", "" ); + data.replace( "\r\n", "" ); bool isError; uint errorCode = cmd.toUInt( &isError ); if ( isError ) @@ -725,7 +725,7 @@ void MSNSocket::slotReadyWrite() // Simple check to avoid dumping the binary data from the icons and emoticons to kdDebug: // When sending an MSN-P2P packet, strip off anything after the P2P header. - TQString debugData = TQString( *it ).stripWhiteSpace().tqreplace( + TQString debugData = TQString( *it ).stripWhiteSpace().replace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); kdDebug( 14141 ) << k_funcinfo << "Sending command: " << debugData << endl; @@ -790,10 +790,10 @@ TQString MSNSocket::unescape( const TQString &str ) { TQString str2 = KURL::decode_string( str, 106 ); //remove msn+ colors code - str2 = str2.tqreplace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors + str2 = str2.replace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors // added by kaoul <erwin.kwolek at gmail.com> - str2 = str2.tqreplace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... - str2 = str2.tqreplace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 + str2 = str2.replace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... + str2 = str2.replace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 return str2; } @@ -1031,7 +1031,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) // Parse the HTTP status header TQRegExp re("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)"); - headerEnd = data.tqfind("\r\n"); + headerEnd = data.find("\r\n"); header = data.left( (headerEnd == -1) ? 20 : headerEnd ); re.search(header); @@ -1039,7 +1039,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) m_statusDescription = re.cap(2); // Remove the web response status header. - data = data.mid(headerEnd + 2, (data.tqfind("\r\n\r\n") + 2) - (headerEnd + 2)); + data = data.mid(headerEnd + 2, (data.find("\r\n\r\n") + 2) - (headerEnd + 2)); // Create a MimeMessage, removing the HTTP status header m_headers = new MimeMessage(data); diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index b0052552..f5cc890a 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -93,8 +93,8 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T m_ID = ID; m_auth = auth; - TQString server = address.left( address.tqfind( ":" ) ); - uint port = address.right( address.length() - address.tqfindRev( ":" ) - 1 ).toUInt(); + TQString server = address.left( address.find( ":" ) ); + uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt(); TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) ); @@ -191,7 +191,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // new user joins the chat, update user in chat list TQString handle = data.section( ' ', 0, 0 ); TQString screenname = unescape(data.section( ' ', 1, 1 )); - if( !m_chatMembers.tqcontains( handle ) ) + if( !m_chatMembers.contains( handle ) ) m_chatMembers.append( handle ); emit userJoined( handle, screenname, false ); } @@ -199,7 +199,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , { // we have joined a multi chat session- this are the users in this chat TQString handle = data.section( ' ', 2, 2 ); - if( !m_chatMembers.tqcontains( handle ) ) + if( !m_chatMembers.contains( handle ) ) m_chatMembers.append( handle ); TQString screenname = unescape(data.section( ' ', 3, 3)); @@ -214,7 +214,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // some has disconnect from chat, update user in chat list cleanQueue(); //in case some message are waiting their emoticons, never mind, send them - TQString handle = data.section( ' ', 0, 0 ).tqreplace( "\r\n" , "" ); + TQString handle = data.section( ' ', 0, 0 ).replace( "\r\n" , "" ); userLeftChat( handle, (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString() ); } else if( cmd == "MSG" ) @@ -265,13 +265,13 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-msmsgscontrol" ) { TQString message; - message = msg.right( msg.length() - msg.tqfindRev( " " ) - 1 ); - message = message.tqreplace( "\r\n" ,"" ); + message = msg.right( msg.length() - msg.findRev( " " ) - 1 ); + message = message.replace( "\r\n" ,"" ); emit receivedTypingMsg( message.lower(), true ); } else if(type == "text/x-msnmsgr-datacast") { - if(msg.tqcontains("ID:")) + if(msg.contains("ID:")) { TQRegExp rx("ID: ([0-9]*)"); rx.search(msg); @@ -293,7 +293,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) TQColor fontColor; TQFont font; - if ( msg.tqcontains( "X-MMS-IM-Format" ) ) + if ( msg.contains( "X-MMS-IM-Format" ) ) { TQString fontName; TQString fontInfo; @@ -329,7 +329,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } } - fontName = parseFontAttr(fontInfo, "FN").tqreplace( "%20" , " " ); + fontName = parseFontAttr(fontInfo, "FN").replace( "%20" , " " ); // Some clients like Trillian and Kopete itself send a font // name of 'MS Serif' since MS changed the server to @@ -343,10 +343,10 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) font = TQFont( fontName, parseFontAttr( fontInfo, "PF" ).toInt(), // font size - ef.tqcontains( 'B' ) ? TQFont::Bold : TQFont::Normal, - ef.tqcontains( 'I' ) ); - font.setUnderline(ef.tqcontains( 'U' )); - font.setStrikeOut(ef.tqcontains( 'S' )); + ef.contains( 'B' ) ? TQFont::Bold : TQFont::Normal, + ef.contains( 'I' ) ); + font.setUnderline(ef.contains( 'U' )); + font.setStrikeOut(ef.contains( 'S' )); } } @@ -359,17 +359,17 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) others.append( m_account->contacts()[ *it2 ] ); } - TQString message=msg.right( msg.length() - msg.tqfind("\r\n\r\n") - 4 ); + TQString message=msg.right( msg.length() - msg.find("\r\n\r\n") - 4 ); //Stupid MSN PLUS colors code. message with incorrect charactere are not showed correctly in the chatwindow. //TODO: parse theses one to show the color too in Kopete - message.tqreplace("\3","").tqreplace("\4","").tqreplace("\2","").tqreplace("\5","").tqreplace("\6","").tqreplace("\7",""); + message.replace("\3","").replace("\4","").replace("\2","").replace("\5","").replace("\6","").replace("\7",""); if(!m_account->contacts()[m_msgHandle]) { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -432,7 +432,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) TQString txt=rx.cap(1); kdDebug(14140) << k_funcinfo << "emoticon: " << txt << " msnobj: " << msnobj<< endl; - if( !m_emoticons.tqcontains(msnobj) || !m_emoticons[msnobj].second ) + if( !m_emoticons.contains(msnobj) || !m_emoticons[msnobj].second ) { m_emoticons.insert(msnobj, tqMakePair(txt,(KTempFile*)0L)); MSNContact *c=static_cast<MSNContact*>(m_account->contacts()[m_msgHandle]); @@ -493,7 +493,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } - else if(type == "image/gif" || msg.tqcontains("Message-ID:")) + else if(type == "image/gif" || msg.contains("Message-ID:")) { // Incoming inkformatgif. TQRegExp regex("Message-ID: \\{([0-9A-F\\-]*)\\}"); @@ -536,7 +536,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!messageId.isNull()) { - if(m_inkMessageBuffer.tqcontains(messageId)) + if(m_inkMessageBuffer.contains(messageId)) { if(chunks.isNull()) { @@ -660,7 +660,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #if 0 //this is to test webcam - if(msg.plainBody().tqcontains("/webcam")) + if(msg.plainBody().contains("/webcam")) { PeerDispatcher()->startWebcam( m_myHandle , m_msgHandle); return -3; @@ -678,7 +678,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { for ( TQStringList::const_iterator itr2 = itr.data().constBegin(); itr2 != itr.data().constEnd(); ++itr2 ) { - if ( msg.plainBody().tqcontains( *itr2 ) ) + if ( msg.plainBody().contains( *itr2 ) ) sendCustomEmoticon( *itr2, itr.key() ); } } @@ -748,7 +748,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) head += "; RL=1"; head += "\r\n"; - TQString message= msg.plainBody().tqreplace( "\n" , "\r\n" ); + TQString message= msg.plainBody().replace( "\n" , "\r\n" ); //-- Check if the message isn't too big, TODO: do that at the libkopete level. int len_H=head.utf8().length(); // != head.length() because i need the size in butes and @@ -888,7 +888,7 @@ void MSNSwitchBoardSocket::userLeftChat(const TQString& handle , const TQString { emit userLeft( handle, reason ); - if( m_chatMembers.tqcontains( handle ) ) + if( m_chatMembers.contains( handle ) ) m_chatMembers.remove( handle ); if(m_chatMembers.isEmpty()) @@ -907,7 +907,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin { kdDebug(14141) << k_funcinfo << msnObj << endl; - if(m_emoticons.tqcontains(msnObj)) + if(m_emoticons.contains(msnObj)) { //it's an emoticon m_emoticons[msnObj].second=file; @@ -941,7 +941,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -976,7 +976,7 @@ void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -1013,7 +1013,7 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms { TQString es=TQStyleSheet::escape(it.data().first); KTempFile *f=it.data().second; - if(message.tqcontains(es) && f) + if(message.contains(es) && f) { TQString imgPath = f->name(); TQImage iconImage(imgPath); @@ -1021,11 +1021,11 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms * emoticons like that. So, in that case, we show like the MSN client */ #if 0 TQString em = TQRegExp::escape( es ); - message.tqreplace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), + message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") + #endif //match any occurence which is not in a html tag. - message.tqreplace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), + message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), TQString::tqfromLatin1("<img align=\"center\" width=\"") + TQString::number(iconImage.width()) + TQString::tqfromLatin1("\" height=\"") + @@ -1060,12 +1060,12 @@ TQString MSNSwitchBoardSocket::parseFontAttr(TQString str, TQString attr) TQString tmp; int pos1=0, pos2=0; - pos1 = str.tqfind(attr + "="); + pos1 = str.find(attr + "="); if (pos1 == -1) return ""; - pos2 = str.tqfind(";", pos1+3); + pos2 = str.find(";", pos1+3); if (pos2 == -1) tmp = str.mid(pos1+3, str.length() - pos1 - 3); diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 6b913816..593cfc74 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -51,7 +51,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans { TransportBridge *bridge = 0l; KInetSocketAddress address; - if (mAddresses.tqcontains(to)) + if (mAddresses.contains(to)) { address = mAddresses[to]; } diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index b165c9f4..aa16e07e 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" ); d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); d->ui->m_displayPicture->setPixmap( d->pictureUrl ); d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" )); @@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply() if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() ) { d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); if ( d->pictureData.save( d->pictureUrl, "PNG" ) ) { static_cast<MSNAccount *>( account() )->setPictureUrl( d->pictureUrl ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 2c2023c2..584ae803 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -312,13 +312,13 @@ void Webcam::processMessage(const Message& message) makeSIPMessage(producerxml); } } - else if(m_content.tqcontains("<producer>") || m_content.tqcontains("<viewer>")) + else if(m_content.contains("<producer>") || m_content.contains("<viewer>")) { TQRegExp rx("<rid>([0-9]*)</rid>.*<session>([0-9]*)</session>"); rx.search(m_content); TQString rid=rx.cap(1); TQString sess=rx.cap(2); - if(m_content.tqcontains("<producer>")) + if(m_content.contains("<producer>")) { TQString viewerxml=xml(sess.toUInt() , rid.toUInt()); @@ -370,7 +370,7 @@ void Webcam::processMessage(const Message& message) while(true) { an++; - if(!m_content.tqcontains( TQString("<tcpipaddress%1>").tqarg(an) )) + if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) )) break; rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an)); rx.search(m_content); @@ -416,7 +416,7 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "connect to " << sock << " - "<< sock->peerAddress().toString() << " ; " << sock->localAddress().toString() << endl; } } - else if(m_content.tqcontains("receivedViewerData")) + else if(m_content.contains("receivedViewerData")) { //I'm happy you received the xml i sent, really. } diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 201d7d01..cc890add 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), TQString::tqfromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), TQString::tqfromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), TQString::tqfromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), TQString::tqfromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), TQString::tqfromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -280,7 +280,7 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) continue; if ( fontEl.hasAttribute( "back" ) ) { - kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to tqreplace. Doing replacement" << endl; + kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to replace. Doing replacement" << endl; TQString backgroundColor = fontEl.attribute( "back" ); backgroundColor.insert( 0, "background-color: " ); backgroundColor.append( ';' ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 7f14d3ba..c71fed4d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -127,16 +127,16 @@ void AIMContact::setAwayMessage(const TQString &message) kdDebug(14152) << k_funcinfo << "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")), TQString::tqfromLatin1("\\1")); - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")), TQString::tqfromLatin1("\\1") ); TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") ); fontRemover.setMinimal(true); - while ( filteredMessage.tqfind( fontRemover ) != -1 ) - filteredMessage.tqreplace( fontRemover, TQString::tqfromLatin1("\\1") ); + while ( filteredMessage.find( fontRemover ) != -1 ) + filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -392,56 +392,56 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), TQString::tqfromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), TQString::tqfromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), TQString::tqfromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), TQString::tqfromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), TQString::tqfromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); // strip left over line break s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$"))); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); // strip left over line break s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) ); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 0808fde9..b3d4205f 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -81,54 +81,54 @@ void AIMProtocolHandler::handleURL(const KURL &url) const TQString command = url.path(); TQString realCommand, firstParam, secondParam; bool needContactAddition = false; - if ( command.tqfind( "goim", 0, false ) != -1 ) + if ( command.find( "goim", 0, false ) != -1 ) { realCommand = "goim"; kdDebug(14152) << k_funcinfo << "Handling send IM request" << endl; command.remove(0,4); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove( 0, 12 ); - int andSign = command.tqfind( "&" ); + int andSign = command.find( "&" ); if ( andSign > 0 ) command = command.left( andSign ); firstParam = command; - firstParam.tqreplace( "+", " " ); + firstParam.replace( "+", " " ); needContactAddition = true; } else - if ( command.tqfind( "addbuddy", 0, false ) != -1 ) + if ( command.find( "addbuddy", 0, false ) != -1 ) { realCommand = "addbuddy"; kdDebug(14152) << k_funcinfo << "Handling AIM add buddy request" << endl; command.remove( 0, 8 ); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove(0, 12); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if ( andSign > 0 ) command = command.left(andSign); - command.tqreplace("+", " "); + command.replace("+", " "); firstParam = command; needContactAddition = true; } else - if ( command.tqfind( "gochat", 0, false ) != -1 ) + if ( command.find( "gochat", 0, false ) != -1 ) { realCommand = "gochat"; kdDebug(14152) << k_funcinfo << "Handling AIM chat room request" << endl; command.remove( 0, 6 ); - if ( command.tqfind( "?RoomName=", 0, false ) == -1 ) + if ( command.find( "?RoomName=", 0, false ) == -1 ) { kdWarning(14152) << "Unhandled AIM URI: " << url.url() << endl; return; @@ -136,7 +136,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if (andSign > 0) // strip off anything else for now { firstParam = command.left(andSign); @@ -146,7 +146,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); //remove "&Exchange=" secondParam = command; kdDebug(14152) << k_funcinfo << firstParam << " " << secondParam << endl; - firstParam.tqreplace("+", " "); + firstParam.replace("+", " "); } Kopete::Account *account = 0; @@ -283,7 +283,7 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.tqcontains( "ssi_type" ) ) + if ( serializedData.contains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; TQString authtqStatus = serializedData["ssi_waitingAuth"]; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index cc016684..767c519d 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -221,4 +221,4 @@ void AIMUserInfoDialog::slotMailClicked(const TQString&, const TQString &address #include "aimuserinfo.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 9b13ab64..59979073 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -936,4 +936,4 @@ void ICQContact::slotVisibleTo() } #endif #include "icqcontact.moc" -//kate: indent-mode csands; tab-width 4; tqreplace-tabs off; space-indent off; +//kate: indent-mode csands; tab-width 4; replace-tabs off; space-indent off; diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index 6184bf9b..59a87d4d 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -153,4 +153,4 @@ private slots: }; #endif -//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index e7a5dc6c..a6888cee 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -673,7 +673,7 @@ void ICQProtocol::setComboFromTable(TQComboBox *box, const TQMap<int, TQString> { // kdDebug(14153) << k_funcinfo << "Called." << endl; TQMap<int, TQString>::ConstIterator it; - it = map.tqfind(value); + it = map.find(value); if (!(*it)) return; @@ -770,21 +770,21 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.tqcontains( "ssi_name" ) ) + if ( serializedData.contains( "ssi_name" ) ) ssiName = serializedData["ssi_name"]; - if ( serializedData.tqcontains( "ssi_waitingAuth" ) ) + if ( serializedData.contains( "ssi_waitingAuth" ) ) { TQString authtqStatus = serializedData["ssi_waitingAuth"]; if ( authtqStatus == "true" ) ssiWaitingAuth = true; } - if ( serializedData.tqcontains( "ssi_gid" ) ) + if ( serializedData.contains( "ssi_gid" ) ) ssiGid = serializedData["ssi_gid"].toUInt(); - if ( serializedData.tqcontains( "ssi_bid" ) ) + if ( serializedData.contains( "ssi_bid" ) ) ssiBid = serializedData["ssi_bid"].toUInt(); - if ( serializedData.tqcontains( "ssi_type" ) ) + if ( serializedData.contains( "ssi_type" ) ) ssiType = serializedData["ssi_type"].toUInt(); Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList<TLV>(), 0 ); diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 05d9eb70..84ce12e7 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -123,4 +123,4 @@ void ICQAddContactPage::searchDialogDestroyed() #include "icqaddcontactpage.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index ba658f94..aebd4afa 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -58,4 +58,4 @@ private: #endif -//kate: space-indent off; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 874c2075..3feb48bf 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -187,4 +187,4 @@ void ICQEditAccountWidget::slotOpenRegister() #include "icqeditaccountwidget.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h index c9affe90..2ef9e703 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h @@ -50,4 +50,4 @@ protected: }; #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index 57c551aa..aabf046d 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -315,6 +315,6 @@ void ICQSearchDialog::newSearch() clearFields(); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; #include "icqsearchdialog.moc" diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h index 2dcdd502..f9bfa81e 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h @@ -67,4 +67,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 3c327198..5c1d4500 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -186,5 +186,5 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) #include "icquserinfowidget.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h index 6fd5d84a..16d1d5d9 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h @@ -56,4 +56,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 56fa497f..74b6b5f9 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -220,7 +220,7 @@ void AimLoginTask::handleLoginResponse() { TQString ip = TQString( server.data ); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << ip << endl; - int index = ip.tqfind( ':' ); + int index = ip.find( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip.left(4); //we only need 4 bytes diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp index b4dfff4a..23231179 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp @@ -147,4 +147,4 @@ void ChangeVisibilityTask::sendEditEnd() send( t5 ); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h index 9d8676b3..33d0c306 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h @@ -55,4 +55,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 53e38ed1..41ee73bd 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -1099,7 +1099,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange, if ( !c ) return; - if ( d->redirectionServices.tqfindIndex( family ) == -1 ) + if ( d->redirectionServices.findIndex( family ) == -1 ) d->redirectionServices.append( family ); //don't add families twice if ( d->currentRedirect != 0 ) @@ -1129,7 +1129,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( o ); //create a new connection and set it up - int colonPos = host.tqfind(':'); + int colonPos = host.find(':'); TQString realHost, realPort; if ( colonPos != -1 ) { @@ -1350,4 +1350,4 @@ bool Client::hasIconConnection( ) const } #include "client.moc" -//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index d85ca4df..4a09f3f9 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -98,7 +98,7 @@ bool CloseConnectionTask::take( Transfer* transfer ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << TQString( server.data ) << endl; TQString ip = server.data; - int index = ip.tqfind( ':' ); + int index = ip.find( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip; diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h index 8bda062f..27830b31 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h @@ -59,4 +59,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tab-width 4; tqreplace-tabs off; +//kate: indent-mode csands; space-indent off; tab-width 4; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp index 03452153..b94a9082 100644 --- a/kopete/protocols/oscar/liboscar/connection.cpp +++ b/kopete/protocols/oscar/liboscar/connection.cpp @@ -96,7 +96,7 @@ void Connection::close() bool Connection::isSupported( int family ) const { - return ( d->familyList.tqfindIndex( family ) != -1 ); + return ( d->familyList.findIndex( family ) != -1 ); } TQValueList<int> Connection::supportedFamilies() const diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp index 3f2c1eff..1cac6611 100644 --- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp +++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp @@ -112,7 +112,7 @@ Connection* ConnectionHandler::defaultConnection() const void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) d->connections.append( c ); ConnectionRoomInfo info = tqMakePair( exchange, room ); @@ -137,7 +137,7 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons TQString ConnectionHandler::chatRoomForConnection( Connection* c ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) return TQString(); TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end(); @@ -156,7 +156,7 @@ TQString ConnectionHandler::chatRoomForConnection( Connection* c ) Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) return 0xFFFF; TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end(); diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 472618fe..638ed6c0 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -152,7 +152,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef OSCAR_COREPROTOCOL_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << "tqcontains: " << bytes.count() << " bytes" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "contains: " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp index ccedd0d9..1c8d98ae 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.cpp +++ b/kopete/protocols/oscar/liboscar/icqtask.cpp @@ -148,4 +148,4 @@ void ICQTask::setRequestSubType( WORD subType ) #include "icqtask.moc" -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.cpp b/kopete/protocols/oscar/liboscar/icquserinfo.cpp index a4a5f78c..bc37d313 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfo.cpp @@ -259,4 +259,4 @@ ICQWPSearchInfo::ICQWPSearchInfo() -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.h b/kopete/protocols/oscar/liboscar/icquserinfo.h index 685859a6..ae51462d 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.h +++ b/kopete/protocols/oscar/liboscar/icquserinfo.h @@ -210,4 +210,4 @@ typedef TQValueList<ICQInfoItem> ICQInfoItemList; */ #endif -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp index 6a915ca8..6e8dd5d7 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp @@ -231,4 +231,4 @@ TQString ICQUserInfoRequestTask::notesInfoFor( const TQString& contact ) #include "icquserinfotask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h index 27aa4a68..437ac4ca 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.h +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h @@ -75,4 +75,4 @@ private: }; #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index e2387368..9c12d473 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "oscarbytestream.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index 3b310eab..bf11446b 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -69,5 +69,5 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 085bac9e..3c2edeaf 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "tqcontains: %i bytes ", bytes.count() ); + qDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 03db367d..9f33eb76 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -105,4 +105,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) #include "oscarconnector.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h index 20a44123..9441c3c6 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.h +++ b/kopete/protocols/oscar/liboscar/oscarconnector.h @@ -67,4 +67,4 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index 7559a253..e9048c21 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -1630,17 +1630,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.tqreplace(TQRegExp("&"), "&"); - str.tqreplace(TQRegExp("<"), "<"); - str.tqreplace(TQRegExp(">"), ">"); - str.tqreplace(TQRegExp("\""), """); - str.tqreplace(TQRegExp("\r"), ""); + str.replace(TQRegExp("&"), "&"); + str.replace(TQRegExp("<"), "<"); + str.replace(TQRegExp(">"), ">"); + str.replace(TQRegExp("\""), """); + str.replace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(TQRegExp("\n"), "<br>\n"); + str.replace(TQRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(TQRegExp("\n"), "<br/>\n"); + str.replace(TQRegExp("\n"), "<br/>\n"); break; default: break; @@ -1657,7 +1657,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index 63c04c96..47d1bdf7 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.tqreplace(QRegExp("&"), "&"); - str.tqreplace(QRegExp("<"), "<"); - str.tqreplace(QRegExp(">"), ">"); - str.tqreplace(QRegExp("\""), """); - str.tqreplace(QRegExp("\r"), ""); + str.replace(QRegExp("&"), "&"); + str.replace(QRegExp("<"), "<"); + str.replace(QRegExp(">"), ">"); + str.replace(QRegExp("\""), """); + str.replace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(QRegExp("\n"), "<br>\n"); + str.replace(QRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(QRegExp("\n"), "<br/>\n"); + str.replace(QRegExp("\n"), "<br/>\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 630b8f6b..45f69340 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -97,7 +97,7 @@ WORD SSIManager::nextContactId() return 0xFFFF; } - if ( d->itemIdList.tqcontains( d->nextContactId ) == 0 ) + if ( d->itemIdList.contains( d->nextContactId ) == 0 ) d->itemIdList.append( d->nextContactId ); return d->nextContactId++; @@ -116,7 +116,7 @@ WORD SSIManager::nextGroupId() return 0xFFFF; } - if ( d->groupIdList.tqcontains( d->nextGroupId ) == 0 ) + if ( d->groupIdList.contains( d->nextGroupId ) == 0 ) d->groupIdList.append( d->nextGroupId ); return d->nextGroupId++; @@ -449,7 +449,7 @@ bool SSIManager::updateGroup( const Oscar::SSI& group ) d->SSIList.remove( oldGroup ); } - if ( d->SSIList.tqfindIndex( group ) != -1 ) + if ( d->SSIList.findIndex( group ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New group is already in list." << endl; return false; @@ -496,7 +496,7 @@ bool SSIManager::removeGroup( const TQString &group ) bool SSIManager::newContact( const Oscar::SSI& contact ) { - if ( d->SSIList.tqfindIndex( contact ) == -1 ) + if ( d->SSIList.findIndex( contact ) == -1 ) { kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl; addID( contact ); @@ -518,7 +518,7 @@ bool SSIManager::updateContact( const Oscar::SSI& contact ) d->SSIList.remove( oldContact ); } - if ( d->SSIList.tqfindIndex( contact ) != -1 ) + if ( d->SSIList.findIndex( contact ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New contact is already in list." << endl; return false; @@ -562,7 +562,7 @@ bool SSIManager::removeContact( const TQString &contact ) bool SSIManager::newItem( const Oscar::SSI& item ) { - if ( d->SSIList.tqfindIndex( item ) != -1 ) + if ( d->SSIList.findIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Item is already in list." << endl; return false; @@ -584,7 +584,7 @@ bool SSIManager::updateItem( const Oscar::SSI& item ) d->SSIList.remove( oldItem ); } - if ( d->SSIList.tqfindIndex( item ) != -1 ) + if ( d->SSIList.findIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New item is already in list." << endl; return false; @@ -614,12 +614,12 @@ void SSIManager::addID( const Oscar::SSI& item ) { if ( item.type() == ROSTER_GROUP ) { - if ( d->groupIdList.tqcontains( item.gid() ) == 0 ) + if ( d->groupIdList.contains( item.gid() ) == 0 ) d->groupIdList.append( item.gid() ); } else { - if ( d->itemIdList.tqcontains( item.bid() ) == 0 ) + if ( d->itemIdList.contains( item.bid() ) == 0 ) d->itemIdList.append( item.bid() ); } } @@ -646,7 +646,7 @@ WORD SSIManager::findFreeId( const TQValueList<WORD>& idList, WORD fromId ) cons { for ( WORD id = fromId; id < 0x8000; id++ ) { - if ( idList.tqcontains( id ) == 0 ) + if ( idList.contains( id ) == 0 ) return id; } diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp index 536f2f39..e69222c1 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp @@ -120,5 +120,5 @@ void TypingNotifyTask::setParams( const TQString& contact, int notifyType ) #include "typingnotifytask.moc" -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h index e99951fc..b815005a 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.h +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h @@ -60,4 +60,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp index 4cda87a0..c91dea47 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp @@ -44,7 +44,7 @@ bool UserInfoTask::forMe( const Transfer * transfer ) const if ( st->snacService() == 0x0002 && st->snacSubtype() == 0x0006 ) { - if ( m_contactSequenceMap.tqfind( st->snacRequest() ) == m_contactSequenceMap.end() ) + if ( m_contactSequenceMap.find( st->snacRequest() ) == m_contactSequenceMap.end() ) return false; else { diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp index a386d8cf..48a5684f 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp +++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp @@ -312,4 +312,4 @@ void UserSearchTask::searchWhitePages( const ICQWPSearchInfo& info ) #include "usersearchtask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp index 00a0294d..d2fb1f83 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.cpp +++ b/kopete/protocols/oscar/liboscar/warningtask.cpp @@ -91,6 +91,6 @@ void WarningTask::onGo() send( t ); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; #include "warningtask.moc" diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h index d5e720be..0ce90cea 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.h +++ b/kopete/protocols/oscar/liboscar/warningtask.h @@ -57,4 +57,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 38d01121..95fd6505 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -644,7 +644,7 @@ void OscarAccount::updateVersionUpdaterStamp() void OscarAccount::ssiContactAdded( const Oscar::SSI& item ) { - if ( d->addContactMap.tqcontains( Oscar::normalize( item.name() ) ) ) + if ( d->addContactMap.contains( Oscar::normalize( item.name() ) ) ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Received confirmation from server. adding " << item.name() << " to the contact list" << endl; diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp index 10f6edb3..d5136a7e 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp @@ -81,7 +81,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, m_encodings.insert(1015, i18n("UTF-16 Unicode")); m_encodingUI->encodingCombo->insertStringList( m_encodings.values() ); - if( (initialEncodingIndex = m_encodings.keys().tqfindIndex(initialEncoding)) == -1 ) + if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 ) { kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding << " not in encoding list - defaulting to first encoding item" @@ -100,7 +100,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, int OscarEncodingSelectionDialog::selectedEncoding() const { TQString encoding = m_encodingUI->encodingCombo->currentText(); - int mib = m_encodings.keys()[ m_encodings.values().tqfindIndex(encoding) ]; + int mib = m_encodings.keys()[ m_encodings.values().findIndex(encoding) ]; if( mib == -1 ) return 0; diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index c2fa021e..1c717e98 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -70,7 +70,7 @@ void OscarVisibilityDialog::slotAddToVisible() TQString contactId = m_contactMap[itm->text()]; m_visibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->visibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) + if ( !m_visibilityUI->visibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->visibleContacts->insertItem( itm->text() ); } @@ -94,7 +94,7 @@ void OscarVisibilityDialog::slotAddToInvisible() TQString contactId = m_contactMap[itm->text()]; m_invisibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->invisibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) + if ( !m_visibilityUI->invisibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->invisibleContacts->insertItem( itm->text() ); } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 35d7c274..82bd0017 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -419,7 +419,7 @@ void GSMLib::customEvent(TQCustomEvent* e) TQString text = ge->Text; // Locate a contact - SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().tqfind( nr )); + SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().find( nr )); if ( contact==NULL ) { // No contact found, make a new one diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index e8650de0..c40f831b 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -280,13 +280,13 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, // for the first call getLine() waits only 3 seconds // because of _timeoutVal = 3 string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { foundOK = true; readTries = 0; // found OK, exit loop } - else if (s.tqfind("ERROR") != string::npos) + else if (s.find("ERROR") != string::npos) readTries = 0; // error, exit loop } @@ -301,8 +301,8 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, while (readTries-- > 0) { string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index c886cb3d..e2f607aa 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -71,7 +71,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p TQStringList args = TQStringList::split(':',s); TQStringList options = TQStringList::split(' ', args[0]); - names.append(options[0].tqreplace(0,1,"")); + names.append(options[0].replace(0,1,"")); bool hidden = false; for(unsigned i = 1; i < options.count(); i++) @@ -92,16 +92,16 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p else values.append(""); - if( args[0].tqcontains("Message") || args[0].tqcontains("message") - || args[0].tqcontains("message") || args[0].tqcontains("nachricht") - || args[0].tqcontains("Msg") || args[0].tqcontains("Mensagem") ) + if( args[0].contains("Message") || args[0].contains("message") + || args[0].contains("message") || args[0].contains("nachricht") + || args[0].contains("Msg") || args[0].contains("Mensagem") ) { for( unsigned i = 0; i < options.count(); i++) { - if (options[i].tqcontains("Size=")) + if (options[i].contains("Size=")) { TQString option = options[i]; - option.tqreplace(0,5,""); + option.replace(0,5,""); m_maxSize = option.toInt(); } } @@ -111,7 +111,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p { for (TQStringList::Iterator it=numberWords.begin(); it != numberWords.end(); ++it) { - if (args[0].tqcontains(*it)) + if (args[0].contains(*it)) { telPos = names.count() - 1; if (args[0] == *it) @@ -119,7 +119,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p // kdDebug(14160) << "Exact match for " << args[0] << endl; exactNumberMatch = true; } -// kdDebug(14160) << "args[0] (" << args[0] << ") tqcontains " << *it << endl; +// kdDebug(14160) << "args[0] (" << args[0] << ") contains " << *it << endl; } } } diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index bc95a458..fcafc9fb 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -72,7 +72,7 @@ void SMSAccount::loadConfig() void SMSAccount::translateNumber(TQString &theNumber) { if(theNumber[0] == TQChar('0') && theSubEnable) - theNumber.tqreplace(0, 1, theSubCode); + theNumber.replace(0, 1, theSubCode); } const bool SMSAccount::splitNowMsgTooLong(int msgLength) diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 497429f9..a3ee592e 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -88,7 +88,7 @@ bool WinPopupLib::checkHost(const TQString &Name) TQMap<TQString, WorkGroup>::Iterator end = theGroups.end(); for(TQMap<TQString, WorkGroup>::Iterator i = theGroups.begin(); i != end && !ret; i++) { - if ((*i).Hosts().tqcontains(Name.upper())) { + if ((*i).Hosts().contains(Name.upper())) { ret = true; break; } @@ -208,7 +208,7 @@ void WinPopupLib::slotReadProcessExited(KProcess *r) TQMap<TQString, TQString>::ConstIterator end = currentGroups.end(); for (TQMap<TQString, TQString>::ConstIterator i = currentGroups.begin(); i != end; i++) { TQString groupMaster = i.data(); - if (!done.tqcontains(groupMaster)) todo += groupMaster; + if (!done.contains(groupMaster)) todo += groupMaster; } } @@ -360,4 +360,4 @@ void WinPopupLib::settingsChanged(const TQString &smbClient, int groupFreq) #include "libwinpopup.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 1392dd46..686252ea 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -90,4 +90,4 @@ signals: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 9366d31f..2b90459e 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -206,4 +206,4 @@ void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQStri #include "wpaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index 19209a65..d11d5885 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -105,4 +105,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index c463cc02..a681f48b 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -112,4 +112,4 @@ bool WPAddContact::apply(Kopete::Account *theAccount, Kopete::MetaContact *theMe #include "wpaddcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h index 1828bcf9..03b3d51d 100644 --- a/kopete/protocols/winpopup/wpaddcontact.h +++ b/kopete/protocols/winpopup/wpaddcontact.h @@ -56,4 +56,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 3e70b349..1fd29905 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -38,7 +38,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons if (theNickName.isEmpty()) { // Construct nickname from hostname with first letter to upper. GF theNickName = newHostName.lower(); - theNickName = theNickName.tqreplace(0, 1, theNickName[0].upper()); + theNickName = theNickName.replace(0, 1, theNickName[0].upper()); } setNickName(theNickName); @@ -186,4 +186,4 @@ void WPContact::slotSendMessage( Kopete::Message& message ) #include "wpcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index c7bc336f..6843d6c2 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -84,4 +84,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 2fa5775c..05312330 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -71,7 +71,7 @@ WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount) if (tmp != 0) { gethostname(tmp, 255); theHostName = tmp; - if (theHostName.tqcontains('.') != 0) theHostName.remove(theHostName.tqfind('.'), theHostName.length()); + if (theHostName.contains('.') != 0) theHostName.remove(theHostName.find('.'), theHostName.length()); theHostName = theHostName.upper(); } @@ -135,4 +135,4 @@ Kopete::Account *WPEditAccount::apply() #include "wpeditaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h index 5817709a..f573c000 100644 --- a/kopete/protocols/winpopup/wpeditaccount.h +++ b/kopete/protocols/winpopup/wpeditaccount.h @@ -55,4 +55,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 66ef7fac..610cb598 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -184,4 +184,4 @@ void WPProtocol::sendMessage(const TQString &Body, const TQString &Destination) #include "wpprotocol.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h index aa7f6955..defd7dc8 100644 --- a/kopete/protocols/winpopup/wpprotocol.h +++ b/kopete/protocols/winpopup/wpprotocol.h @@ -92,4 +92,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 5090836d..d5e01138 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -111,4 +111,4 @@ void WPUserInfo::slotCloseClicked() #include "wpuserinfo.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index c0bd533c..bea23dc8 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -59,4 +59,4 @@ class WPUserInfo : public KDialogBase #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp index c9c5828b..573c5ccf 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp @@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef YAHOO_COREPROTOCOL_DEBUG - kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl; + kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl; TQTextStream s( wire, IO_ReadOnly ); TQString remaining = s.read(); - int pos = remaining.tqfind( "YMSG", bytesParsed ); + int pos = remaining.find( "YMSG", bytesParsed ); if( pos >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp index 10056a61..f48bd52d 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp @@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t ) return; - unsigned int left = url.tqfindRev( '/' ) + 1; - unsigned int right = url.tqfindRev( '?' ); + unsigned int left = url.findRev( '/' ) + 1; + unsigned int right = url.findRev( '?' ); filename = url.mid( left, right - left ); emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() ); diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 439b39f7..7c46229b 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -359,9 +359,9 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString) TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest(); - cryptStringHash = cryptStringHash.tqreplace('+', '.'); - cryptStringHash = cryptStringHash.tqreplace('/', '_'); - cryptStringHash = cryptStringHash.tqreplace('=', '-'); + cryptStringHash = cryptStringHash.replace('+', '.'); + cryptStringHash = cryptStringHash.replace('/', '_'); + cryptStringHash = cryptStringHash.replace('=', '-'); YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect); t->setId( m_sessionID ); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index b456746a..a9916851 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -132,9 +132,9 @@ void ModifyYABTask::slotRead() TQByteArray ar( socket->bytesAvailable() ); socket->readBlock( ar.data (), ar.size () ); TQString data( ar ); - data = data.right( data.length() - data.tqfind("<?xml") ); + data = data.right( data.length() - data.find("<?xml") ); - if( m_data.tqfind("</ab>") < 0 ) + if( m_data.find("</ab>") < 0 ) return; // Need more data m_socket->close(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 1b24b860..f4e8dcf9 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -163,7 +163,7 @@ void SendPictureTask::readResult() TQString buf( ar ); m_socket->close(); - if( buf.tqfind( "error", 0, false ) >= 0 ) + if( buf.find( "error", 0, false ) >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl; setSuccess( false ); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 41d5019d..d50d68b2 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) case UserRequest: { who.append( info->buffer->buffer() ); - who = who.mid( 2, who.tqfind('\n') - 3); - kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl; - if( accessGranted.tqfindIndex( who ) >= 0 ) + who = who.mid( 2, who.find('\n') - 3); + kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl; + if( accessGranted.findIndex( who ) >= 0 ) { grantAccess( who ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index cee71da6..65c48f54 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -36,13 +36,13 @@ void YABEntry::fromTQDomElement( const TQDomElement &e ) privateURL = e.attribute("pu"); title = e.attribute("ti"); corporation = e.attribute("co"); - workAdress = e.attribute("wa").tqreplace( "
", "\n" ); + workAdress = e.attribute("wa").replace( "
", "\n" ); workCity = e.attribute("wc"); workState = e.attribute("ws"); workZIP = e.attribute("wz"); workCountry = e.attribute("wn"); workURL = e.attribute("wu"); - privateAdress = e.attribute("ha").tqreplace( "
", "\n" ); + privateAdress = e.attribute("ha").replace( "
", "\n" ); privateCity = e.attribute("hc"); privateState = e.attribute("hs"); privateZIP = e.attribute("hz"); @@ -55,7 +55,7 @@ void YABEntry::fromTQDomElement( const TQDomElement &e ) additional2 = e.attribute("c2"); additional3 = e.attribute("c3"); additional4 = e.attribute("c4"); - notes = e.attribute("cm").tqreplace( "
", "\n" ); + notes = e.attribute("cm").replace( "
", "\n" ); imAIM = e.attribute("ima"); imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); @@ -86,13 +86,13 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d ) privateURL = d.elementsByTagName("pu").item(0).toElement().text(); title = d.elementsByTagName("ti").item(0).toElement().text(); corporation = d.elementsByTagName("co").item(0).toElement().text(); - workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( "
", "\n" ); + workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( "
", "\n" ); workCity = d.elementsByTagName("wc").item(0).toElement().text(); workState = d.elementsByTagName("ws").item(0).toElement().text(); workZIP = d.elementsByTagName("wz").item(0).toElement().text(); workCountry = d.elementsByTagName("wn").item(0).toElement().text(); workURL = d.elementsByTagName("wu").item(0).toElement().text(); - privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( "
", "\n" ); + privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( "
", "\n" ); privateCity = d.elementsByTagName("hc").item(0).toElement().text(); privateState = d.elementsByTagName("hs").item(0).toElement().text(); privateZIP = d.elementsByTagName("hz").item(0).toElement().text(); @@ -105,7 +105,7 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d ) additional2 = d.elementsByTagName("c2").item(0).toElement().text(); additional3 = d.elementsByTagName("c3").item(0).toElement().text(); additional4 = d.elementsByTagName("c4").item(0).toElement().text(); - notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( "
", "\n" ); + notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "
", "\n" ); imAIM = d.elementsByTagName("ima").item(0).toElement().text(); imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); @@ -135,13 +135,13 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "pu", privateURL ); e.setAttribute( "ti", title ); e.setAttribute( "co", corporation ); - e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', "
" ) ); + e.setAttribute( "wa", TQString( workAdress ).replace( '\n', "
" ) ); e.setAttribute( "wc", workCity ); e.setAttribute( "ws", workState ); e.setAttribute( "wz", workZIP ); e.setAttribute( "wn", workCountry ); e.setAttribute( "wu", workURL ); - e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', "
" ) ); + e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', "
" ) ); e.setAttribute( "hc", privateCity ); e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); @@ -152,7 +152,7 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); e.setAttribute( "c4", additional4 ); - e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', "
" ) ); + e.setAttribute( "cm", TQString( notes ).replace( '\n', "
" ) ); e.setAttribute( "ima", imAIM ); e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 81b2f53e..a317cb12 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl; KIO::TransferJob *transfer; TQString Url = url.url(); - TQString ext = Url.left( Url.tqfindRev( "?" ) ); - ext = ext.right( ext.length() - ext.tqfindRev( "." ) ); + TQString ext = Url.left( Url.findRev( "?" ) ); + ext = ext.right( ext.length() - ext.findRev( "." ) ); transfer = KIO::get( url, false, false ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index ed673c2f..6b69bc70 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "yahoobytestream.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index 4ed96d3a..e84f70b0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -66,4 +66,4 @@ private: #endif // YAHOOBYTESTREAM_H -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 45716e35..3a15b03c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "tqcontains: %i bytes ", bytes.count() ); + qDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 0e0f8436..dc54bf82 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) #include "yahooconnector.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h index 9a33a2e7..667138ed 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h @@ -64,4 +64,4 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index a5f27b86..6291f252 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -65,9 +65,9 @@ void YahooInviteListImpl::addInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_inviteeList.tqfind( *it ) == m_inviteeList.end() ) + if( m_inviteeList.find( *it ) == m_inviteeList.end() ) m_inviteeList.push_back( *it ); - if( m_buddyList.tqfind( *it ) != m_buddyList.end() ) + if( m_buddyList.find( *it ) != m_buddyList.end() ) m_buddyList.remove( *it ); } @@ -80,9 +80,9 @@ void YahooInviteListImpl::removeInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_buddyList.tqfind( *it ) == m_buddyList.end() ) + if( m_buddyList.find( *it ) == m_buddyList.end() ) m_buddyList.push_back( *it ); - if( m_inviteeList.tqfind( *it ) != m_inviteeList.end() ) + if( m_inviteeList.find( *it ) != m_inviteeList.end() ) m_inviteeList.remove( *it ); } diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 536f975b..2b3e357e 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -256,5 +256,5 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) #include "yahoouserinfodialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index a2cff58e..b7f9f3d2 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -54,4 +54,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 315b4d45..93395746 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -167,16 +167,16 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg) TQString filteredMsg = msg; //Handle bold, underline and italic messages - filteredMsg.tqreplace( "\033[1m", "<b>" ); - filteredMsg.tqreplace( "\033[x1m", "</b>" ); - filteredMsg.tqreplace( "\033[2m", "<i>" ); - filteredMsg.tqreplace( "\033[x2m", "</i>" ); - filteredMsg.tqreplace( "\033[4m", "<u>" ); - filteredMsg.tqreplace( "\033[x4m", "</u>" ); + filteredMsg.replace( "\033[1m", "<b>" ); + filteredMsg.replace( "\033[x1m", "</b>" ); + filteredMsg.replace( "\033[2m", "<i>" ); + filteredMsg.replace( "\033[x2m", "</i>" ); + filteredMsg.replace( "\033[4m", "<u>" ); + filteredMsg.replace( "\033[x4m", "</u>" ); //GAIM doesn't check for ^[[3m. Does this ever get sent? - filteredMsg.tqreplace( "\033[3m", "<i>" ); - filteredMsg.tqreplace( "\033[x3m", "</i>" ); + filteredMsg.replace( "\033[3m", "<i>" ); + filteredMsg.replace( "\033[x3m", "</i>" ); //Strip link tags filteredMsg.remove( "\033[lm" ); @@ -196,26 +196,26 @@ TQColor YahooAccount::getMsgColor(const TQString& msg) //kdDebug(YAHOO_GEN_DEBUG) << "msg is " << msg; //Please note that some of the colors are hard-coded to //match the yahoo colors - if ( msg.tqfind("\033[38m") != -1 ) + if ( msg.find("\033[38m") != -1 ) return TQt::red; - if ( msg.tqfind("\033[34m") != -1 ) + if ( msg.find("\033[34m") != -1 ) return TQt::green; - if ( msg.tqfind("\033[31m") != -1 ) + if ( msg.find("\033[31m") != -1 ) return TQt::blue; - if ( msg.tqfind("\033[39m") != -1 ) + if ( msg.find("\033[39m") != -1 ) return TQt::yellow; - if ( msg.tqfind("\033[36m") != -1 ) + if ( msg.find("\033[36m") != -1 ) return TQt::darkMagenta; - if ( msg.tqfind("\033[32m") != -1 ) + if ( msg.find("\033[32m") != -1 ) return TQt::cyan; - if ( msg.tqfind("\033[37m") != -1 ) + if ( msg.find("\033[37m") != -1 ) return TQColor("#FFAA39"); - if ( msg.tqfind("\033[35m") != -1 ) + if ( msg.find("\033[35m") != -1 ) return TQColor("#FFD8D8"); - if ( msg.tqfind("\033[#") != -1 ) + if ( msg.find("\033[#") != -1 ) { - kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.tqfind("\033[#")+2,7) << endl; - return TQColor(msg.mid(msg.tqfind("\033[#")+2,7)); + kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.find("\033[#")+2,7) << endl; + return TQColor(msg.mid(msg.find("\033[#")+2,7)); } //return a default value just in case @@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl; - newMsgText.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsgText.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); // Replace Font tags regExp.setMinimal( true ); @@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); } } @@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("<" ) ); } } regExp.setPattern( "([^\"bui])>" ); @@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1>" ) ); } } // add closing tags when needed regExp.setMinimal( false ); regExp.setPattern( "(<b>.*)(?!</b>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); regExp.setPattern( "(<i>.*)(?!</i>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); regExp.setPattern( "(<u>.*)(?!</u>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); regExp.setPattern( "(<font.*)(?!</font>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); - newMsgText.tqreplace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); + newMsgText.replace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); return newMsgText; } @@ -1208,7 +1208,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo kdDebug(YAHOO_GEN_DEBUG) << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl; kdDebug(YAHOO_GEN_DEBUG) << "Members: " << members << endl; - if( !m_pendingConfInvites.tqcontains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host + if( !m_pendingConfInvites.contains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host m_pendingConfInvites.push_back( room ); else { @@ -1321,7 +1321,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1338,7 +1338,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1355,7 +1355,7 @@ void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) void YahooAccount::slotConfUserLeave( const TQString & who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1390,7 +1390,7 @@ void YahooAccount::slotConfMessage( const TQString &who, const TQString &room, c { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1522,7 +1522,7 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQString& fileName) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_pendingFileTransfers.tqcontains( transfer->info().internalId() ) ) + if( !m_pendingFileTransfers.contains( transfer->info().internalId() ) ) return; m_pendingFileTransfers.remove( transfer->info().internalId() ); @@ -1531,7 +1531,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS //Create directory if it doesn't already exist TQDir dir; TQString path = TQFileInfo( fileName ).dirPath(); - for( int i = 1; i <= path.tqcontains('/'); ++i ) + for( int i = 1; i <= path.contains('/'); ++i ) { if( !dir.exists( path.section( '/', 0, i ) ) ) { @@ -1554,7 +1554,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info ) { - if( !m_pendingFileTransfers.tqcontains( info.internalId() ) ) + if( !m_pendingFileTransfers.contains( info.internalId() ) ) return; m_pendingFileTransfers.remove( info.internalId() ); @@ -1676,7 +1676,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) return; } - if( m_pendingWebcamInvites.tqcontains( who ) ) + if( m_pendingWebcamInvites.contains( who ) ) return; m_pendingWebcamInvites.append( who ); @@ -1723,7 +1723,7 @@ void YahooAccount::slotGotBuddyIconChecksum(const TQString &who, int checksum) } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ) ) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not request it again." << endl; return; @@ -1741,7 +1741,7 @@ void YahooAccount::slotGotBuddyIconInfo(const TQString &who, KURL url, int check } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) )) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) )) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not download it again." << endl; return; diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 5a093872..ac70d510 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -93,7 +93,7 @@ public: /** * Returns true if contact @p id is on the server-side contact list */ - bool isOnServer(const TQString &id) { return IDs.tqcontains(id); } + bool isOnServer(const TQString &id) { return IDs.contains(id); } /** * Returns true if we have the server-side contact list diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index b9b510a9..8d34689b 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -95,7 +95,7 @@ void YahooConferenceChatSession::slotInviteOthers() Kopete::Contact *myself = account()->myself(); for( ; it.current(); ++it ) { - if( (*it) != myself && !members().tqcontains( *it ) ) + if( (*it) != myself && !members().contains( *it ) ) buddies.push_back( (*it)->contactId() ); } diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 377103c8..06559f8f 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); } } @@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); } } @@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); } } @@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); } } @@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); } } @@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); } } @@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\2") ); + newMsg.replace( regExp, TQString::tqfromLatin1("\\2") ); } } // convert escaped chars - newMsg.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + newMsg.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + newMsg.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + newMsg.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + newMsg.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsg.replace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.replace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); return newMsg; } @@ -549,7 +549,7 @@ void YahooContact::setDisplayPicture(const TQByteArray &data, int checksum) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << data.size() << endl; - TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); TQFile f( newlocation ); @@ -590,7 +590,7 @@ const YABEntry *YahooContact::yabEntry() void YahooContact::slotEmitDisplayPictureChanged() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); @@ -838,5 +838,5 @@ void YahooContact::readYABEntry() #include "yahoocontact.moc" // vim: set noet ts=4 sts=4 sw=4: -//kate: space-indent off; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; replace-tabs off; indent-mode csands; |