From 937b2991d8e78166eea904c80ad04d34607017a4 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- kopete/protocols/msn/msncontact.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kopete/protocols/msn/msncontact.cpp') 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( account() )->m_groupList.tqcontains(Gid) ) + if( !static_cast( 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::Iterator it = m_serverGroups.begin();(count > 1 && it != m_serverGroups.end()); ++it ) { - if( !static_cast( account() )->m_groupList.tqcontains(it.key()) ) + if( !static_cast( 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( 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(); } -- cgit v1.2.1