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 --- .../compat/kpixmapregionselectorwidget.cpp | 2 +- kopete/libkopete/kabcpersistence.cpp | 10 ++--- kopete/libkopete/kautoconfig.cpp | 6 +-- kopete/libkopete/kopeteaccountmanager.cpp | 4 +- kopete/libkopete/kopeteblacklister.cpp | 2 +- kopete/libkopete/kopetechatsession.cpp | 12 +++--- kopete/libkopete/kopetechatsessionmanager.cpp | 4 +- kopete/libkopete/kopetecommandhandler.cpp | 6 +-- kopete/libkopete/kopetecontact.cpp | 2 +- kopete/libkopete/kopetecontactlist.cpp | 18 ++++---- kopete/libkopete/kopetecontactlistelement.cpp | 6 +-- kopete/libkopete/kopeteglobal.cpp | 8 ++-- kopete/libkopete/kopetegroup.cpp | 2 +- kopete/libkopete/kopetemessage.cpp | 50 +++++++++++----------- kopete/libkopete/kopetemetacontact.cpp | 24 +++++------ kopete/libkopete/kopetenotifydataobject.cpp | 4 +- kopete/libkopete/kopeteonlinestatusmanager.cpp | 4 +- kopete/libkopete/kopetepluginmanager.cpp | 6 +-- kopete/libkopete/kopeteprefs.cpp | 8 ++-- kopete/libkopete/kopeteproperties.h | 2 +- kopete/libkopete/kopeteprotocol.cpp | 4 +- kopete/libkopete/private/kopetecommand.cpp | 4 +- kopete/libkopete/private/kopeteemoticons.cpp | 6 +-- kopete/libkopete/private/kopeteviewmanager.cpp | 8 ++-- kopete/libkopete/tests/kopeteemoticontest.cpp | 6 +-- kopete/libkopete/tests/kopetemessage_test.cpp | 6 +-- kopete/libkopete/ui/addressbookselectorwidget.cpp | 2 +- kopete/libkopete/ui/kopetelistviewitem.cpp | 4 +- kopete/libkopete/ui/metacontactselectorwidget.cpp | 4 +- 29 files changed, 112 insertions(+), 112 deletions(-) (limited to 'kopete/libkopete') diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 0468acdf..2b2ef9ba 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -223,7 +223,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQCursor cursor; - if ( m_selectedRegion.tqcontains( mev->pos() ) + if ( m_selectedRegion.contains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index f1acaea1..b68533b9 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -53,7 +53,7 @@ static TQString unionContents( TQString arg1, TQString arg2 ) TQStringList outList = TQStringList::split( separator, arg1 ); TQStringList arg2List = TQStringList::split( separator, arg2 ); for ( TQStringList::iterator it = arg2List.begin(); it != arg2List.end(); ++it ) - if ( !outList.tqcontains( *it ) ) + if ( !outList.contains( *it ) ) outList.append( *it ); TQString out = outList.join( separator ); return out; @@ -173,7 +173,7 @@ void KABCPersistence::write( MetaContact * mc ) void KABCPersistence::writeAddressBook( const KABC::Resource * res) { - if ( !s_pendingResources.tqcontainsRef( res ) ) + if ( !s_pendingResources.containsRef( res ) ) s_pendingResources.append( res ); if ( !s_addrBookWritePending ) { @@ -305,7 +305,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // Is it in the contact list? // First discard anything after an 0xE120, this is used by IRC to separate nick and server group name, but // IRC doesn't support this properly yet, so the user will have to select an appropriate account manually - int separatorPos = (*it).tqfind( TQChar( 0xE120 ) ); + int separatorPos = (*it).find( TQChar( 0xE120 ) ); if ( separatorPos != -1 ) *it = (*it).left( separatorPos ); @@ -420,12 +420,12 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // FIXME: Remove when IM address API is in KABC (KDE 4) void KABCPersistence::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.tqfind( ':' ); + int colon = str.find( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.tqfind( '-' ); + int dash = tmp.find( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index fd7bb7a8..64907727 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -367,7 +367,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, continue; } TQWidget *childWidget = (TQWidget *)object; - if(d->ignore.tqcontainsRef(childWidget)){ + if(d->ignore.containsRef(childWidget)){ continue; } @@ -408,7 +408,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, propertyMap->setProperty(childWidget, setting); valueChanged = true; } - if(trackChanges && changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) != + if(trackChanges && changedMap.find(TQString::tqfromLatin1(childWidget->className())) != changedMap.end()) { connect(childWidget, changedMap[TQString::tqfromLatin1(childWidget->className())], @@ -416,7 +416,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, } #ifndef NDEBUG else if(trackChanges && - changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) + changedMap.find(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) { // Without a signal kautoconfigdialog could incorectly // enable/disable the buttons diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index f3671d10..69bf272a 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -220,7 +220,7 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const Account* AccountManager::registerAccount( Account *account ) { - if( !account || d->accounts.tqcontains( account ) ) + if( !account || d->accounts.contains( account ) ) return account; if( account->accountId().isEmpty() ) @@ -314,7 +314,7 @@ void AccountManager::removeAccount( Account *account ) Group* group = mc->groups().first(); TQPtrList groupMembers = group->members(); ContactList::self()->removeMetaContact( mc ); - if ( groupMembers.count() == 1 && groupMembers.tqfindRef( mc ) != -1 ) + if ( groupMembers.count() == 1 && groupMembers.findRef( mc ) != -1 ) ContactList::self()->removeGroup( group ); } } diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index cf6ff95e..b85eef03 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -53,7 +53,7 @@ BlackLister::~BlackLister() bool BlackLister::isBlocked(const TQString &contactId) { - return (d->blacklist.tqfind( contactId ) != d->blacklist.end() ); + return (d->blacklist.find( contactId ) != d->blacklist.end() ); } bool BlackLister::isBlocked(Contact *contact) diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index f396a659..9c19ebb5 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -118,7 +118,7 @@ void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const { - if ( d->contacttqStatus.tqcontains( contact ) ) + if ( d->contacttqStatus.contains( contact ) ) return d->contacttqStatus[ contact ]; return contact->onlinetqStatus(); @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().tqcontains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) + msg.plainBody().contains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } @@ -296,7 +296,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress ) { - if( !d->contacttqStatus.tqcontains(c) ) + if( !d->contacttqStatus.contains(c) ) d->contacttqStatus[ c ] = initialtqStatus; addContact( c, suppress ); } @@ -304,7 +304,7 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::On void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) { //kdDebug( 14010 ) << k_funcinfo << endl; - if ( d->mContactList.tqcontains( c ) ) + if ( d->mContactList.contains( c ) ) { kdDebug( 14010 ) << k_funcinfo << "Contact already exists" <mContactList.tqcontains( c ) ) + if ( !c || !d->mContactList.contains( c ) ) return; if ( d->mContactList.count() == 1 ) @@ -472,7 +472,7 @@ void Kopete::ChatSession::slotContactDestroyed( Kopete::Contact *contact ) if(contact == myself()) deleteLater(); - if( !contact || !d->mContactList.tqcontains( contact ) ) + if( !contact || !d->mContactList.contains( contact ) ) return; //This is a workaround to prevent crash if the contact get deleted. diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 24029604..5c7388e3 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -81,7 +81,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, Contact *tmpContact; for (tmpContact = contactlist.first(); tmpContact && halfMatch; tmpContact = contactlist.next()) { - if ( !chatContacts.tqcontainsRef( tmpContact ) ) + if ( !chatContacts.containsRef( tmpContact ) ) halfMatch = false; } @@ -91,7 +91,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, bool fullMatch = true; for (tmpContact = chatContacts.first(); tmpContact && fullMatch; tmpContact = chatContacts.next()) { - if ( !contactlist.tqcontainsRef( tmpContact ) ) + if ( !contactlist.containsRef( tmpContact ) ) fullMatch = false; } // We have a winner diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index a01d06e4..c182a495 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -168,7 +168,7 @@ void Kopete::CommandHandler::registerCommand( TQObject *tqparent, const TQString void Kopete::CommandHandler::unregisterCommand( TQObject *tqparent, const TQString &command ) { - if( p->pluginCommands[ tqparent ].tqfind(command) ) + if( p->pluginCommands[ tqparent ].find(command) ) p->pluginCommands[ tqparent ].remove( command ); } @@ -184,7 +184,7 @@ void Kopete::CommandHandler::registerAlias( TQObject *tqparent, const TQString & void Kopete::CommandHandler::unregisterAlias( TQObject *tqparent, const TQString &alias ) { - if( p->pluginCommands[ tqparent ].tqfind(alias) ) + if( p->pluginCommands[ tqparent ].find(alias) ) p->pluginCommands[ tqparent ].remove( alias ); } @@ -470,7 +470,7 @@ void Kopete::CommandHandler::slotViewCreated( KopeteView *view ) void Kopete::CommandHandler::slotPluginLoaded( Kopete::Plugin *plugin ) { connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); - if( !p->pluginCommands.tqcontains( plugin ) ) + if( !p->pluginCommands.contains( plugin ) ) { //Create a TQDict optomized for a larger # of commands, and case insensitive CommandList mCommands(31, false); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 5dc2871d..029565d0 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -575,7 +575,7 @@ TQStringList Contact::properties() const bool Contact::hasProperty(const TQString &key) const { - return d->properties.tqcontains(key); + return d->properties.contains(key); } const ContactProperty &Contact::property(const TQString &key) const diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 65960dcf..421354a6 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -218,7 +218,7 @@ TQPtrList ContactList::selectedGroups() const void ContactList::addMetaContact( MetaContact *mc ) { - if ( d->contacts.tqcontains( mc ) ) + if ( d->contacts.contains( mc ) ) return; d->contacts.append( mc ); @@ -232,13 +232,13 @@ void ContactList::addMetaContact( MetaContact *mc ) void ContactList::removeMetaContact(MetaContact *m) { - if ( !d->contacts.tqcontains(m) ) + if ( !d->contacts.contains(m) ) { kdDebug(14010) << k_funcinfo << "Trying to remove a not listed MetaContact." << endl; return; } - if ( d->selectedMetaContacts.tqcontains( m ) ) + if ( d->selectedMetaContacts.contains( m ) ) { d->selectedMetaContacts.remove( m ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -259,7 +259,7 @@ void ContactList::removeMetaContact(MetaContact *m) void ContactList::addGroup( Group * g ) { - if(!d->groups.tqcontains(g) ) + if(!d->groups.contains(g) ) { d->groups.append( g ); emit groupAdded( g ); @@ -269,7 +269,7 @@ void ContactList::addGroup( Group * g ) void ContactList::removeGroup( Group *g ) { - if ( d->selectedGroups.tqcontains( g ) ) + if ( d->selectedGroups.contains( g ) ) { d->selectedGroups.remove( g ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -396,7 +396,7 @@ void ContactList::loadXML() TQString versionString = list.attribute( TQString::tqfromLatin1( "version" ), TQString() ); uint version = 0; if( TQRegExp( TQString::tqfromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) - version = versionString.tqreplace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); + version = versionString.replace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); if( version < Private::ContactListVersion ) { @@ -542,7 +542,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { app = id; key = TQString::tqfromLatin1( "All" ); - val = data.tqreplace( separator, TQChar( 0xE000 ) ); + val = data.replace( separator, TQChar( 0xE000 ) ); } if( !app.isEmpty() ) @@ -668,8 +668,8 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // Unescape '||' for( TQStringList::iterator it = strList.begin(); it != strList.end(); ++it ) { - ( *it ).tqreplace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). - tqreplace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); + ( *it ).replace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). + replace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); } uint idx = 0; diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index b876c791..28766a0b 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -72,7 +72,7 @@ void ContactListElement::setPluginData( Plugin *p, const TQString &key, const TQ TQMap ContactListElement::pluginData( Plugin *plugin ) const { - if ( !d->pluginData.tqcontains( plugin->pluginId() ) ) + if ( !d->pluginData.contains( plugin->pluginId() ) ) return TQMap(); return d->pluginData[ plugin->pluginId() ]; @@ -80,7 +80,7 @@ TQMap ContactListElement::pluginData( Plugin *plugin ) const TQString ContactListElement::pluginData( Plugin *plugin, const TQString &key ) const { - if ( !d->pluginData.tqcontains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].tqcontains( key ) ) + if ( !d->pluginData.contains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].contains( key ) ) return TQString(); return d->pluginData[ plugin->pluginId() ][ key ]; @@ -222,7 +222,7 @@ bool ContactListElement::fromXML( const TQDomElement& element ) TQString ContactListElement::icon( ContactListElement::IconState state ) const { - if ( d->icons.tqcontains( state ) ) + if ( d->icons.contains( state ) ) return d->icons[state]; return d->icons[ None ]; diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 2dae6117..e7643142 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -69,7 +69,7 @@ Properties::~Properties() const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const { - if(d->mTemplates.tqcontains(key)) + if(d->mTemplates.contains(key)) { /*kdDebug(14000) << k_funcinfo << "Found template for key = '" << key << "'" << endl;*/ @@ -82,7 +82,7 @@ const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const bool Properties::registerTemplate(const TQString &key, const ContactPropertyTmpl &tmpl) { - if(d->mTemplates.tqcontains(key)) + if(d->mTemplates.contains(key)) { kdDebug(14000) << k_funcinfo << "Called for EXISTING key = '" << key << "'" << endl; @@ -103,7 +103,7 @@ void Properties::unregisterTemplate(const TQString &key) bool Properties::isRegistered(const TQString &key) { - return d->mTemplates.tqcontains(key); + return d->mTemplates.contains(key); } const ContactPropertyTmpl &Properties::fullName() const @@ -197,7 +197,7 @@ const ContactPropertyTmpl &Properties::createProp(const TQString &key, /*kdDebug(14000) << k_funcinfo << "key = " << key << ", label = " << label << endl;*/ - if(!d->mTemplates.tqcontains(key)) + if(!d->mTemplates.contains(key)) { /* kdDebug(14000) << k_funcinfo << "CREATING NEW ContactPropertyTmpl WITH key = " << key << diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index ac221223..fc1290ba 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -93,7 +93,7 @@ TQPtrList Group::members() const // members is a *copy* of the meta contacts, so using first(), next() and remove() is fine. for( members.first(); members.current(); ) { - if ( members.current()->groups().tqcontains( this ) ) + if ( members.current()->groups().contains( this ) ) members.next(); else members.remove(); diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index db3b24ef..0dfedd69 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -199,20 +199,20 @@ void Message::doSetBody( const TQString &_body, Message::MessageFormat f ) { //This is coming from the RichTextEditor component. //Strip off the containing HTML document - body.tqreplace( TQRegExp( TQString::tqfromLatin1(".*]*>(.*).*") ), TQString::tqfromLatin1("\\1") ); + body.replace( TQRegExp( TQString::tqfromLatin1(".*]*>(.*).*") ), TQString::tqfromLatin1("\\1") ); //Strip

tags - body.tqreplace( TQString::tqfromLatin1("

"), TQString() ); + body.replace( TQString::tqfromLatin1("

"), TQString() ); //Replace

with a
- body.tqreplace( TQString::tqfromLatin1("

"), TQString::tqfromLatin1("
") ); + body.replace( TQString::tqfromLatin1("

"), TQString::tqfromLatin1("
") ); //Remove trailing
if ( body.endsWith( TQString::tqfromLatin1("
") ) ) body.truncate( body.length() - 5 ); body.remove( TQString::tqfromLatin1("\n") ); - body.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); + body.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); } /* else if( f == ParsedHTML ) @@ -255,23 +255,23 @@ TQString Message::unescape( const TQString &xml ) data.simplifyWhiteSpace(); int pos; - while ( ( pos = data.tqfind( '<' ) ) != -1 ) + while ( ( pos = data.find( '<' ) ) != -1 ) { - int endPos = data.tqfind( '>', pos + 1 ); + int endPos = data.find( '>', pos + 1 ); if( endPos == -1 ) break; // No more complete elements left // Take the part between < and >, and extract the element name from that int matchWidth = endPos - pos + 1; TQString match = data.mid( pos + 1, matchWidth - 2 ).simplifyWhiteSpace(); - int elemEndPos = match.tqfind( ' ' ); + int elemEndPos = match.find( ' ' ); TQString elem = ( elemEndPos == -1 ? match.lower() : match.left( elemEndPos ).lower() ); if ( elem == TQString::tqfromLatin1( "img" ) ) { // Replace smileys with their original text' const TQString attrTitle = TQString::tqfromLatin1( "title=\"" ); - int titlePos = match.tqfind( attrTitle, elemEndPos ); - int titleEndPos = match.tqfind( '"', titlePos + attrTitle.length() ); + int titlePos = match.find( attrTitle, elemEndPos ); + int titleEndPos = match.find( '"', titlePos + attrTitle.length() ); if( titlePos == -1 || titleEndPos == -1 ) { // Not a smiley but a normal @@ -282,7 +282,7 @@ TQString Message::unescape( const TQString &xml ) { TQString orig = match.mid( titlePos + attrTitle.length(), titleEndPos - titlePos - attrTitle.length() ); - data.tqreplace( pos, matchWidth, orig ); + data.replace( pos, matchWidth, orig ); pos += orig.length(); } } @@ -290,7 +290,7 @@ TQString Message::unescape( const TQString &xml ) elem == TQString::tqfromLatin1( "br" ) ) { // Replace paragraph, div and line breaks with a newline - data.tqreplace( pos, matchWidth, '\n' ); + data.replace( pos, matchWidth, '\n' ); pos++; } else @@ -302,12 +302,12 @@ TQString Message::unescape( const TQString &xml ) } // Replace stuff starting with '&' - data.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - data.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - data.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - data.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; + data.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + data.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + data.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + data.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; return data; } @@ -316,13 +316,13 @@ TQString Message::escape( const TQString &text ) { TQString html = TQStyleSheet::escape( text ); //Replace carriage returns inside the text - html.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "
" ) ); + html.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "
" ) ); //Replace a tab with 4 spaces - html.tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "    " ) ); + html.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "    " ) ); //Replace multiple spaces with   //do not replace every space so we break the linebreak - html.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); + html.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); return html; } @@ -403,7 +403,7 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) { TQString curr = *it; // > in HTML means start-of-tag if and only if it's the first one after a < - int tagclose = curr.tqfind( TQChar('>') ); + int tagclose = curr.find( TQChar('>') ); // no >: the HTML is broken, but we can cope if ( tagclose == -1 ) continue; @@ -425,24 +425,24 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), TQString::tqfromLatin1("\\1\\2\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), TQString::tqfromLatin1("\\1\\2\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), TQString::tqfromLatin1("\\1\\2\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself // the trailing   is included in the url. - result.tqreplace( TQRegExp( TQString::tqfromLatin1("(contacts.tqcontains( c ) ) + if( d->contacts.contains( c ) ) { kdWarning(14010) << "Ignoring attempt to add duplicate contact " << c->contactId() << "!" << endl; } @@ -193,7 +193,7 @@ void MetaContact::updateOnlineStatus() void MetaContact::removeContact(Contact *c, bool deleted) { - if( !d->contacts.tqcontains( c ) ) + if( !d->contacts.contains( c ) ) { kdDebug(14010) << k_funcinfo << " Contact is not in this metaContact " << endl; } @@ -640,7 +640,7 @@ TQString MetaContact::displayName() const TQString nameFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.tqcontains(':') ) + if ( ! id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -666,7 +666,7 @@ TQString nameFromContact( Kopete::Contact *c) /*const*/ contactName = c->property( Global::Properties::self()->nickName()).value().toString(); //the replace is there to workaround the Bug 95444 - return contactName.isEmpty() ? c->contactId() : contactName.tqreplace('\n',TQString::fromUtf8("")); + return contactName.isEmpty() ? c->contactId() : contactName.replace('\n',TQString::fromUtf8("")); } KURL MetaContact::customPhoto() const @@ -739,7 +739,7 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/ TQImage photoFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.tqcontains(':') ) + if ( ! id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -859,14 +859,14 @@ void MetaContact::slotPropertyChanged( Contact* subcontact, const TQString &key, void MetaContact::moveToGroup( Group *from, Group *to ) { - if ( !from || !groups().tqcontains( from ) ) + if ( !from || !groups().contains( from ) ) { // We're adding, not moving, because 'from' is illegal addToGroup( to ); return; } - if ( !to || groups().tqcontains( to ) ) + if ( !to || groups().contains( to ) ) { // We're removing, not moving, because 'to' is illegal removeFromGroup( from ); @@ -890,7 +890,7 @@ void MetaContact::moveToGroup( Group *from, Group *to ) void MetaContact::removeFromGroup( Group *group ) { - if ( !group || !groups().tqcontains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) + if ( !group || !groups().contains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) { return; } @@ -912,13 +912,13 @@ void MetaContact::removeFromGroup( Group *group ) void MetaContact::addToGroup( Group *to ) { - if ( !to || groups().tqcontains( to ) ) + if ( !to || groups().contains( to ) ) return; if ( d->temporary && to->type() != Group::Temporary ) return; - if ( d->groups.tqcontains( Group::topLevel() ) ) + if ( d->groups.contains( Group::topLevel() ) ) { d->groups.remove( Group::topLevel() ); emit removedFromGroup( this, Group::topLevel() ); @@ -1058,7 +1058,7 @@ bool MetaContact::fromXML( const TQDomElement& element ) // return false; //the replace is there to workaround the Bug 95444 - d->displayName = contactElement.text().tqreplace('\n',TQString::fromUtf8("")); + d->displayName = contactElement.text().replace('\n',TQString::fromUtf8("")); if ( contactElement.hasAttribute(NSCID_ELEM) && contactElement.hasAttribute(NSPID_ELEM) && contactElement.hasAttribute(NSAID_ELEM)) { @@ -1291,7 +1291,7 @@ void MetaContact::slotUpdateAddressBookPicture() { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); TQString id = metaContactId(); - if ( !id.isEmpty() && !id.tqcontains(':') ) + if ( !id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 9cde4133..16ec1889 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -39,13 +39,13 @@ Kopete::NotifyDataObject::~NotifyDataObject() Kopete::NotifyEvent * Kopete::NotifyDataObject::notifyEvent( const TQString &event ) const { - Kopete::NotifyEvent *evt = d->events.tqfind( event ); + Kopete::NotifyEvent *evt = d->events.find( event ); return evt; } void Kopete::NotifyDataObject::setNotifyEvent( const TQString& event, Kopete::NotifyEvent *notifyEvent ) { - d->events.tqreplace( event, notifyEvent ); + d->events.replace( event, notifyEvent ); } bool Kopete::NotifyDataObject::removeNotifyEvent( const TQString &event ) diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index c0cef12f..e94f92d8 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -151,7 +151,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQString fp = fingerprint( statusFor, icon, size, color, idle ); // look it up in the cache - TQPixmap *theIcon= d->iconCache.tqfind( fp ); + TQPixmap *theIcon= d->iconCache.find( fp ); if ( !theIcon ) { // cache miss @@ -165,7 +165,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQPixmap OnlineStatusManager::cacheLookupByMimeSource( const TQString &mimeSource ) { // look it up in the cache - const TQPixmap *theIcon= d->iconCache.tqfind( mimeSource ); + const TQPixmap *theIcon= d->iconCache.find( mimeSource ); if ( !theIcon ) { // need to return an invalid pixmap diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 06176178..8595cb94 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -282,7 +282,7 @@ void PluginManager::loadAllPlugins() continue; TQString pluginName = (*it2)->pluginName(); - bool inMap = pluginsMap.tqcontains( pluginName ); + bool inMap = pluginsMap.contains( pluginName ); if ( (inMap && pluginsMap[pluginName]) || (!inMap && (*it2)->isPluginEnabledByDefault()) ) { if ( !plugin( pluginName ) ) @@ -372,7 +372,7 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) return 0L; } - if ( d->loadedPlugins.tqcontains( info ) ) + if ( d->loadedPlugins.contains( info ) ) return d->loadedPlugins[ info ]; int error = 0; @@ -479,7 +479,7 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const if ( !info ) return 0L; - if ( d->loadedPlugins.tqcontains( info ) ) + if ( d->loadedPlugins.contains( info ) ) return d->loadedPlugins[ info ]; else return 0L; diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index c9805f9a..644ded69 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -128,10 +128,10 @@ void KopetePrefs::load() config->setGroup("ContactList"); setThemeURL(config->readEntry("ThemeURL")); - int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default")); mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() ); - n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + n = tqmetaObject()->findProperty( "contactListIconMode" ); value = config->readEntry("IconMode", TQString::tqfromLatin1("IconDefault")); mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() ); @@ -229,9 +229,9 @@ void KopetePrefs::save() config->setGroup("ContactList"); config->writeEntry("ThemeURL", mThemeURL); - int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode )); - n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + n = tqmetaObject()->findProperty( "contactListIconMode" ); config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode )); config->writeEntry("IndentContacts", mContactListIndentContacts); config->writeEntry("UseCustomFonts", mContactListUseCustomFonts); diff --git a/kopete/libkopete/kopeteproperties.h b/kopete/libkopete/kopeteproperties.h index a73a10c7..bb27b82f 100644 --- a/kopete/libkopete/kopeteproperties.h +++ b/kopete/libkopete/kopeteproperties.h @@ -137,7 +137,7 @@ public: * name their custom data differently. Names are bound by the same rules as are laid out * for naming properties in PropertyBase::name. */ - void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.tqreplace( name, data ); } + void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.replace( name, data ); } /** * Gets the stored property data with name @p name. Returns a null diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index 3677cbe3..f471d577 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -197,7 +197,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. - if( serializedData.tqcontains( it.key() ) ) + if( serializedData.contains( it.key() ) ) serializedData[ it.key() ] = serializedData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else serializedData[ it.key() ] = it.data(); @@ -205,7 +205,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) for( it = ad.begin(); it != ad.end(); ++it ) { - if( addressBookData.tqcontains( it.key() ) ) + if( addressBookData.contains( it.key() ) ) addressBookData[ it.key() ] = addressBookData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else addressBookData[ it.key() ] = it.data(); diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index f9fef1b6..e80788bf 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -102,8 +102,8 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.tqreplace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); - formatString.tqreplace( TQString::tqfromLatin1("%s"), args ); + formatString.replace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.replace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 9c41d44d..26375517 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -183,7 +183,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint p = c; continue; } /* strict requires space before the emoticon */ - if ( d->emoticonMap.tqcontains( c ) ) + if ( d->emoticonMap.contains( c ) ) { emoticonList = d->emoticonMap[ c ]; bool found = false; @@ -192,7 +192,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint // If this is an HTML, then search for the HTML form of the emoticon. // For instance >o) needle = ( mode & SkipHTML ) ? (*it).matchTextEscaped : (*it).matchText; - if ( ( pos == (size_t)message.tqfind( needle, pos ) ) ) + if ( ( pos == (size_t)message.find( needle, pos ) ) ) { if( mode & StrictParse ) { @@ -214,7 +214,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint { if( inHTMLEntity ){ // If we are in an HTML entitiy such as > - int htmlEnd = message.tqfind( ';', pos ); + int htmlEnd = message.find( ';', pos ); // Search for where it ends if( htmlEnd == -1 ) { diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 4650ffb9..1d6feced 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -110,7 +110,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin { // kdDebug(14000) << k_funcinfo << endl; - if( d->managerMap.tqcontains( session ) && d->managerMap[ session ] ) + if( d->managerMap.contains( session ) && d->managerMap[ session ] ) { return d->managerMap[ session ]; } @@ -161,7 +161,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi bool outgoingMessage = ( msg.direction() == Kopete::Message::Outbound ); - if( !outgoingMessage || d->managerMap.tqcontains( manager ) ) + if( !outgoingMessage || d->managerMap.contains( manager ) ) { d->foreignMessage=!outgoingMessage; //let know for the view we are about to create manager->view(true,msg.requestedPlugin())->appendMessage( msg ); @@ -329,7 +329,7 @@ void KopeteViewManager::slotViewDestroyed( KopeteView *closingView ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( closingView->msgManager() ) ) + if( d->managerMap.contains( closingView->msgManager() ) ) { d->managerMap.remove( closingView->msgManager() ); // closingView->msgManager()->setCanBeDeleted( true ); @@ -343,7 +343,7 @@ void KopeteViewManager::slotChatSessionDestroyed( Kopete::ChatSession *manager ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( manager ) ) + if( d->managerMap.contains( manager ) ) { KopeteView *v=d->managerMap[ manager ]; v->closeView( true ); diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index ab0ee31a..e8ada405 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -71,7 +71,7 @@ void KopeteEmoticonTest::testEmoticonParser() TQString fileName = *it; kdDebug() << "testcase: " << fileName << endl; TQString outputFileName = fileName; - outputFileName.tqreplace("input","output"); + outputFileName.replace("input","output"); // open the input file TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); @@ -94,10 +94,10 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).tqreplace( "smile.png", TQString() ); + TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); Kopete::Emoticons::self(); - TQString result = emo.parse( inputData ).tqreplace( path, TQString() ); + TQString result = emo.parse( inputData ).replace( path, TQString() ); // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 55a44f87..5603b911 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -259,7 +259,7 @@ void KopeteMessage_Test::testLinkParser() { TQString fileName = *it; TQString outputFileName = fileName; - outputFileName.tqreplace("input","output"); + outputFileName.replace("input","output"); // open the input file TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); @@ -283,8 +283,8 @@ void KopeteMessage_Test::testLinkParser() expectedFile.close(); // use a concrete url - inputData.tqreplace( "$URL","http://www.kde.org" ); - expectedData.tqreplace( "$URL","http://www.kde.org" ); + inputData.replace( "$URL","http://www.kde.org" ); + expectedData.replace( "$URL","http://www.kde.org" ); // set message format for parsing according to textcase filename convention Kopete::Message::MessageFormat format; diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index d67c3671..a0ce53af 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -154,7 +154,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() Kopete::KABCPersistence::self()->writeAddressBook( 0 ); slotLoadAddressees(); // select the addressee we just added - TQListViewItem * added = addresseeListView->tqfindItem( addresseeName, 1 ); + TQListViewItem * added = addresseeListView->findItem( addresseeName, 1 ); kListViewSearchLine->clear(); kListViewSearchLine->updateSearch(); addresseeListView->setSelected( added, true ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 1f23da15..b4c156fb 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -76,7 +76,7 @@ Component *ComponentBase::componentAt( const TQPoint &pt ) { for ( uint n = 0; n < components(); ++n ) { - if ( component( n )->rect().tqcontains( pt ) ) + if ( component( n )->rect().contains( pt ) ) { if ( Component *comp = component( n )->componentAt( pt ) ) return comp; @@ -117,7 +117,7 @@ void ComponentBase::componentResized( Component * ) std::pair ComponentBase::toolTip( const TQPoint &relativePos ) { for ( uint n = 0; n < components(); ++n ) - if ( component( n )->rect().tqcontains( relativePos ) ) + if ( component( n )->rect().contains( relativePos ) ) return component( n )->toolTip( relativePos ); return std::make_pair( TQString(), TQRect() ); diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 61a4f14e..6da2b351 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -244,7 +244,7 @@ void MetaContactSelectorWidget::selectMetaContact( Kopete::MetaContact *mc ) void MetaContactSelectorWidget::excludeMetaContact( Kopete::MetaContact *mc ) { - if( d->excludedMetaContacts.tqfindIndex(mc) == -1 ) + if( d->excludedMetaContacts.findIndex(mc) == -1 ) { d->excludedMetaContacts.append(mc); } @@ -264,7 +264,7 @@ void MetaContactSelectorWidget::slotLoadMetaContacts() TQPtrList metaContacts = Kopete::ContactList::self()->metaContacts(); for( Kopete::MetaContact *mc = metaContacts.first(); mc ; mc = metaContacts.next() ) { - if( !mc->isTemporary() && (d->excludedMetaContacts.tqfindIndex(mc) == -1) ) + if( !mc->isTemporary() && (d->excludedMetaContacts.findIndex(mc) == -1) ) { new MetaContactSelectorWidgetLVI(mc, d->widget->metaContactListView); } -- cgit v1.2.1