rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

37 files changed, 139 insertions, 139 deletions

diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 60c1f2a6f..61b8ec90b 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -617,7 +617,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
     new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
     box->setChecked( type & mTypeList[ i ] );
   }
 }
@@ -630,7 +630,7 @@ int AddressTypeDialog::type() const
 {
   int type = 0;
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 1ea2e77f8..da551648d 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
 
   const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
-    if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
+    if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
       continue;
 
     ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 548990d16..15bfe7a00 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -94,7 +94,7 @@ TQString AddViewDialog::viewName()const
 TQString AddViewDialog::viewType()const
 {
   // we missuse the name property for storing the type
-  return mTypeGroup->tqfind( mTypeId )->name();
+  return mTypeGroup->find( mTypeId )->name();
 }
 
 void AddViewDialog::clicked( int id )
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index c5de16adf..f4f08fe5b 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
   }
 
 #if KDE_VERSION >= 319
-  return urlTemplate.tqreplace( "%s", addr.street() ).
-                     tqreplace( "%r", addr.region() ).
-                     tqreplace( "%l", addr.locality() ).
-                     tqreplace( "%z", addr.postalCode() ).
-                     tqreplace( "%c", addr.countryToISO( addr.country() ) );
+  return urlTemplate.replace( "%s", addr.street() ).
+                     replace( "%r", addr.region() ).
+                     replace( "%l", addr.locality() ).
+                     replace( "%z", addr.postalCode() ).
+                     replace( "%c", addr.countryToISO( addr.country() ) );
 #else
-  return urlTemplate.tqreplace( "%s", addr.street() ).
-                     tqreplace( "%r", addr.region() ).
-                     tqreplace( "%l", addr.locality() ).
-                     tqreplace( "%z", addr.postalCode() ).
-                     tqreplace( "%c", "" );
+  return urlTemplate.replace( "%s", addr.street() ).
+                     replace( "%r", addr.region() ).
+                     replace( "%l", addr.locality() ).
+                     replace( "%z", addr.postalCode() ).
+                     replace( "%c", "" );
 #endif
 }
 
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index f22160d7b..d78c48c61 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const
 TQString AddFieldDialog::identifier() const
 {
   TQString id = mTitle->text().lower();
-  return id.tqreplace( ",", "_" ).tqreplace( " ", "_" );
+  return id.replace( ",", "_" ).replace( " ", "_" );
 }
 
 TQString AddFieldDialog::type() const
@@ -547,12 +547,12 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
 
 void 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/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 5810276e6..9b4d3f727 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
         if ( name.isEmpty() )
             return;
 
-        validName = !listNames.tqcontains( name );
+        validName = !listNames.contains( name );
 
         if ( validName )
         {
@@ -107,7 +107,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
             m_book->insertAddressee( list );
 
             m_listBox->insertItem( name );
-            TQListBoxItem* item = m_listBox->tqfindItem( name );
+            TQListBoxItem* item = m_listBox->findItem( name );
             m_listBox->setSelected( item, true );
         }
         else
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index aa3a9a484..1d64c5b98 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -50,7 +50,7 @@ IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *>
 
   mProtocols = protocols;
   populateProtocols();
-  cmbProtocol->setCurrentItem( mProtocols.tqfindIndex( protocol ) );
+  cmbProtocol->setCurrentItem( mProtocols.findIndex( protocol ) );
 
   edtAddress->setText( address.section( TQChar( 0xE120 ), 0, 0 ) );
   edtNetwork->setText( address.section( TQChar( 0xE120 ), 1 ) );
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index d74f51c14..0c4717b95 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -166,7 +166,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM,
   //mWidget->btnUp->setEnabled( false );
   //mWidget->btnDown->setEnabled( false );
   mPreferred = preferredIM;
-  mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
+  mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
   mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
 
   // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
@@ -351,7 +351,7 @@ void IMEditorWidget::slotAdd()
       mPreferred = addressWid->address();
     }
 
-    if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() )
+    if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() )
       mChangedProtocols.append( addressWid->protocol() );
 
     mWidget->lvAddresses->sort();
@@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit()
       }
 
       // the entry for the protocol of the current address has changed
-      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) {
+      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) {
         mChangedProtocols.append( current->protocol() );
       }
       // update protocol - has another protocol gained an address?
@@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit()
         modified = true;
         // this proto is losing an entry
         current->setProtocol( addressWid->protocol() );
-        if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
+        if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
           mChangedProtocols.append( current->protocol() );
       }
 
@@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete()
   while( it.current() ) {
     if ( it.current()->isSelected() ) {
       IMAddressLVI * current = static_cast<IMAddressLVI*>( *it );
-      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
+      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
         mChangedProtocols.append( current->protocol() );
 
       if ( current->preferred() )
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
 TQString IMEditorWidget::preferred() const
 {
   TQString retval( mPreferred );
-  return retval.tqreplace( TQChar( 0xE120 ), " on " );
+  return retval.replace( TQChar( 0xE120 ), " on " );
 }
 
 
@@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c
 
 void IMEditorWidget::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/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 1496be517..77f53a976 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings()
 
   typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator;
   for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
-    if ( activeExtensions.tqcontains( it.data().identifier ) ) {
+    if ( activeExtensions.contains( it.data().identifier ) ) {
       KToggleAction *action = static_cast<KToggleAction*>( it.data().action );
       if ( action )
         action->setChecked( true );
@@ -102,20 +102,20 @@ void ExtensionManager::reconfigure()
 
 bool ExtensionManager::isQuickEditVisible() const
 {
-  return mActiveExtensions.tqcontains( "contact_editor" );
+  return mActiveExtensions.contains( "contact_editor" );
 }
 
 void ExtensionManager::setSelectionChanged()
 {
   for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
-    if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget )
+    if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
       mExtensionMap[*it].widget->contactsSelectionChanged();
   }
 }
 
 void ExtensionManager::activationToggled( const TQString &extid )
 {
-  if ( !mExtensionMap.tqcontains( extid ) )
+  if ( !mExtensionMap.contains( extid ) )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   const bool activated = data.action->isChecked();
@@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid )
 
 void ExtensionManager::setExtensionActive( const TQString& extid, bool active )
 {
-  if ( !mExtensionMap.tqcontains( extid ) )
+  if ( !mExtensionMap.contains( extid ) )
     return;
-  if ( mActiveExtensions.tqcontains( extid ) == active )
+  if ( mActiveExtensions.contains( extid ) == active )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   if ( active ) {
@@ -174,7 +174,7 @@ void ExtensionManager::createActions()
     mMapper->setMapping( data.action, data.identifier );
     mActionList.append( data.action );
 
-    if ( mActiveExtensions.tqcontains( data.identifier ) )
+    if ( mActiveExtensions.contains( data.identifier ) )
       data.action->setChecked( true );
   }
 
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 7ce25beb7..fc8af3abd 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged()
 bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
 {
 #ifdef KDEPIM_NEW_DISTRLISTS
-  return core()->distributionListNames().tqcontains( distrListName );
+  return core()->distributionListNames().contains( distrListName );
 #else
-  return mManager->listNames().tqcontains( distrListName );
+  return mManager->listNames().contains( distrListName );
 #endif
 }
 
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index edbb37a08..0629052ab 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -241,7 +241,7 @@ void ResourceSelection::add()
   if ( !ok )
     return;
 
-  TQString type = types[ descs.tqfindIndex( desc ) ];
+  TQString type = types[ descs.findIndex( desc ) ];
 
   // Create new resource
   KABC::Resource *resource = mManager->createResource( type );
@@ -410,7 +410,7 @@ void ResourceSelection::slotSubresourceAdded( KPIM::ResourceABC *resource,
                                               const TQString& subResource )
 {
   kdDebug(5720) << k_funcinfo << resource->resourceName() << " " << subResource << endl;
-  TQListViewItem *i = mListView->tqfindItem( resource->resourceName(), 0 );
+  TQListViewItem *i = mListView->findItem( resource->resourceName(), 0 );
   if ( !i )
     // Not found
     return;
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 7428b3638..bb9e255b3 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -71,7 +71,7 @@ void FilterEditDialog::setFilter( const Filter &filter )
   TQStringList categories = filter.categories();
   TQListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
-    if ( categories.tqcontains( item->text( 0 ) ) ) {
+    if ( categories.contains( item->text( 0 ) ) ) {
       TQCheckListItem *checkItem = static_cast<TQCheckListItem*>( item );
       checkItem->setOn( true );
     }
@@ -102,7 +102,7 @@ Filter FilterEditDialog::filter()
   }
   filter.setCategories( categories );
 
-  if ( mMatchRuleGroup->tqfind( 0 )->isOn() )
+  if ( mMatchRuleGroup->find( 0 )->isOn() )
     filter.setMatchRule( Filter::Matching );
   else
     filter.setMatchRule( Filter::NotMatching );
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 5dc432868..2b9b32c96 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -404,13 +404,13 @@ void GeoDialog::loadCityList()
       pos = name.search(line, pos);
       if ( pos > 0 ) {
         n = line.mid( pos, name.matchedLength() ).stripWhiteSpace();
-        n.tqreplace( '_', " " );
+        n.replace( '_', " " );
       }
 
       if ( !c.isEmpty() && !n.isEmpty() ) {
-        pos = c.tqfind( "+", 1 );
+        pos = c.find( "+", 1 );
         if ( pos < 0 )
-          pos = c.tqfind( "-", 1 );
+          pos = c.find( "-", 1 );
         if ( pos > 0 ) {
           GeoData data;
           data.latitude = calculateCoordinate( c.left( pos ) );
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 1af942b2d..e4a712a9d 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -121,7 +121,7 @@ void JumpButtonBar::updateButtons()
       return;
     }
 
-    if ( !character.isEmpty() && !characters.tqcontains( character ) )
+    if ( !character.isEmpty() && !characters.contains( character ) )
       characters.append( character );
   }
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 23ebc277b..db10f8f96 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -778,7 +778,7 @@ void KABCore::addEmail( const TQString &aStr )
   const KABC::AddressBook::Iterator endIt( mAddressBook->end() );
   for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) {
     emailList = (*it).emails();
-    if ( emailList.tqcontains( email ) > 0 ) {
+    if ( emailList.contains( email ) > 0 ) {
       found = true;
       (*it).setNameFromString( fullName );
       editContact( (*it).uid() );
@@ -831,7 +831,7 @@ void KABCore::editContact( const TQString &uid )
 
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
   if ( !addr.isEmpty() ) {
-    AddresseeEditorDialog *dialog = mEditorDict.tqfind( addr.uid() );
+    AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
     if ( !dialog ) {
 
       if ( !addr.resource()->readOnly() )
@@ -1005,7 +1005,7 @@ TQString KABCore::getNameByPhone( const TQString &phone )
     const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
     for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
-      if ( (*phoneIter).number().tqreplace( r, "" ) == localPhone.tqreplace( r, "" ) ) {
+      if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
         ownerName = (*iter).realName();
         found = true;
       }
@@ -1406,7 +1406,7 @@ void KABCore::initActions()
   action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
 
   // misc
-  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "tqfind", 0,
+  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
 
@@ -1449,7 +1449,7 @@ void KABCore::updateCategories()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( customCategories.end() );
   for ( it = customCategories.begin(); it != endIt; ++it ) {
-    if ( categories.tqfind( *it ) == categories.end() ) {
+    if ( categories.find( *it ) == categories.end() ) {
       categories.append( *it );
     }
   }
@@ -1477,7 +1477,7 @@ TQStringList KABCore::allCategories() const
     categories = (*it).categories();
     const TQStringList::ConstIterator catEndIt( categories.end() );
     for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-      if ( !allCategories.tqcontains( *catIt ) )
+      if ( !allCategories.contains( *catIt ) )
         allCategories.append( *catIt );
 	}
   }
@@ -1519,7 +1519,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
         TQStringList::ConstIterator catIt;
         const TQStringList::ConstIterator catEndIt( categories.end() );
         for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-          if ( !addrCategories.tqcontains( *catIt ) )
+          if ( !addrCategories.contains( *catIt ) )
             addrCategories.append( *catIt );
         }
         addr.setCategories( addrCategories );
diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp
index 259ee70da..9444df472 100644
--- a/kaddressbook/kablock.cpp
+++ b/kaddressbook/kablock.cpp
@@ -65,7 +65,7 @@ KABLock *KABLock::self( KABC::AddressBook *ab )
 
 bool KABLock::lock( KABC::Resource *resource )
 {
-  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // not locked yet
+  if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet
     KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource );
     if ( !ticket ) {
       return false;
@@ -89,7 +89,7 @@ bool KABLock::unlock( KABC::Resource *resource )
   if ( resource == 0 )
     resource = wrapper->getStandardResource();
 
-  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // hmm, not good...
+  if ( mLocks.find( resource ) == mLocks.end() ) { // hmm, not good...
     return false;
   } else {
     LockEntry &entry = mLocks[ resource ];
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 31d7f3684..3efa42772 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
   uint number = 0;
   do {
     name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf";
-    name.tqreplace( ' ', '_' );
-    name.tqreplace( '/', '_' );
+    name.replace( ' ', '_' );
+    name.replace( '/', '_' );
 
     ++number;
     uniquePart = TQString( "_%1" ).tqarg( number );
-  } while ( existingFiles.tqcontains( name ) );
+  } while ( existingFiles.contains( name ) );
 
   existingFiles.append( name );
 
@@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::Address::List::ConstIterator addrIt( addresses.begin() );
     const KABC::Address::List::ConstIterator addrEndIt( addresses.end() );
     for ( ; addrIt != addrEndIt; ++addrIt ) {
-      if ( !masterAddresses.tqcontains( *addrIt ) )
+      if ( !masterAddresses.contains( *addrIt ) )
         masterAddressee.insertAddress( *addrIt );
     }
 
@@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList::ConstIterator it( categories.begin() );
     TQStringList::ConstIterator endIt( categories.end() );
     for ( it = categories.begin(); it != endIt; ++it )
-      if ( !masterCategories.tqcontains( *it ) )
+      if ( !masterCategories.contains( *it ) )
         newCategories.append( *it );
     masterAddressee.setCategories( newCategories );
 
@@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     const TQStringList masterEmails = masterAddressee.emails();
     endIt = emails.end();
     for ( it = emails.begin(); it != endIt; ++it )
-      if ( !masterEmails.tqcontains( *it ) )
+      if ( !masterEmails.contains( *it ) )
         masterAddressee.insertEmail( *it, false );
 
     // FN
@@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
     const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
     for ( ; phoneIt != phoneEndIt; ++phoneIt )
-      if ( !masterPhones.tqcontains( *phoneIt ) )
+      if ( !masterPhones.contains( *phoneIt ) )
         masterAddressee.insertPhoneNumber( *phoneIt );
 
     // TITLE
@@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList newCustoms( masterCustoms );
     endIt = customs.end();
     for ( it = customs.begin(); it != endIt; ++it )
-      if ( !masterCustoms.tqcontains( *it ) )
+      if ( !masterCustoms.contains( *it ) )
         newCustoms.append( *it );
     masterAddressee.setCustoms( newCustoms );
   }
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index e007f2b52..2d29acdf0 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=tqfind
+Icon=find
 Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 3541ddf1d..1b6e77440 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -98,7 +98,7 @@ void KeyWidget::addKey()
   KABC::Key::TypeList::ConstIterator it;
   for ( it = typeList.begin(); it != typeList.end(); ++it ) {
     if ( (*it) != KABC::Key::Custom &&
-         !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) {
+         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
       keyMap.insert( KABC::Key::typeLabel( *it ), *it );
       keyTypeNames.append( KABC::Key::typeLabel( *it ) );
     }
@@ -110,7 +110,7 @@ void KeyWidget::addKey()
     return;
 
   int type = keyMap[ name ];
-  if ( !keyTypeNames.tqcontains( name ) )
+  if ( !keyTypeNames.contains( name ) )
     type = KABC::Key::Custom;
 
   KURL url = KFileDialog::getOpenURL();
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index fc05df184..4a394621b 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -68,7 +68,7 @@ PhoneTypeCombo::~PhoneTypeCombo()
 
 void PhoneTypeCombo::setType( int type )
 {
-  if ( !mTypeList.tqcontains( type ) )
+  if ( !mTypeList.contains( type ) )
     mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), type );
 
   mType = type;
@@ -97,7 +97,7 @@ void PhoneTypeCombo::update()
     }
   }
 
-  setCurrentItem( mLastSelected = mTypeList.tqfindIndex( mType ) );
+  setCurrentItem( mLastSelected = mTypeList.findIndex( mType ) );
 
   blockSignals( blocked );
 }
@@ -117,7 +117,7 @@ void PhoneTypeCombo::otherSelected()
   PhoneTypeDialog dlg( mType, this );
   if ( dlg.exec() ) {
     mType = dlg.type();
-    if ( !mTypeList.tqcontains( mType ) )
+    if ( !mTypeList.contains( mType ) )
       mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), mType );
   } else {
     setType( mTypeList[ mLastSelected ] );
@@ -315,7 +315,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
     new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
     box->setChecked( mType & mTypeList[ i ] );
   }
 
@@ -327,7 +327,7 @@ int PhoneTypeDialog::type() const
   int type = 0;
 
   for ( int i = 0; i < mGroup->count(); ++i ) {
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
     if ( box->isChecked() )
       type += mTypeList[ i ];
   }
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index 356b53dfb..91bf9f342 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -139,7 +139,7 @@ int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p )
   int count = 0;
 
   for ( pos = list.begin(); pos != list.end(); ++pos ) {
-    if ( (*pos).tqcontains( p ) )
+    if ( (*pos).contains( p ) )
       return count;
 
     ++count;
@@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   if ( !( addr.prefix().isEmpty() ) )
     y += fmBody.lineSpacing() / 2;
 
-  // fill the parts stringlist, it tqcontains "parts" (printable areas)
+  // fill the parts stringlist, it contains "parts" (printable areas)
   // that will be combined to fill the page as effectively as possible:
   // Email addresses:
   if ( !addr.emails().isEmpty() && mShowEmails ) {
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 63cfdcfd0..2301bb16c 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
 
   // Determine which half of the fields is higher
   for ( int i = 0; i < numFields / 2; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
 
   height = halfHeight;
 
   // now the second half
   halfHeight = 0;
   for ( int i = numFields / 2; i < numFields; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
 
   height = TQMAX( height, halfHeight );
 
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 949ebd519..e42621dee 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -186,7 +186,7 @@ void PrintingWizard::print()
         const TQStringList tmp( (*it).categories() );
         TQStringList::ConstIterator tmpIt;
         for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-          if ( categories.tqcontains( *tmpIt ) ) {
+          if ( categories.contains( *tmpIt ) ) {
             list.append( *it );
             break;
           }
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 02e563eea..1c0c79710 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -76,7 +76,7 @@ PrintingWizard *PrintStyle::wizard()
 
 void PrintStyle::addPage( TQWidget *page, const TQString &title )
 {
-  if ( mPageList.tqfind( page ) == -1 ) { // not yet in the list
+  if ( mPageList.find( page ) == -1 ) { // not yet in the list
     mPageList.append( page );
     mPageTitles.append( title );
   }
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 32b898cd8..7a24e1b9d 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -117,7 +117,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
         mContacts.append( *it );
         found = true;
         break;
-      } else if ( type == Contains && (*fieldIt)->value( *it ).tqfind( pattern, 0, false ) != -1 ) {
+      } else if ( type == Contains && (*fieldIt)->value( *it ).find( pattern, 0, false ) != -1 ) {
         mContacts.append( *it );
         found = true;
         break;
@@ -135,7 +135,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
       TQStringList::ConstIterator customIt( customs.begin() );
       const TQStringList::ConstIterator customEndIt( customs.end() );
       for ( ; customIt != customEndIt; ++customIt ) {
-        int pos = (*customIt).tqfind( ':' );
+        int pos = (*customIt).find( ':' );
         if ( pos != -1 ) {
           const TQString value = (*customIt).mid( pos + 1 );
           if ( type == StartsWith && value.tqstartsWith( pattern, false ) ) {
@@ -144,7 +144,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
           } else if ( type == EndsWith && value.tqendsWith( pattern, false ) ) {
             mContacts.append( *it );
             break;
-          } else if ( type == Contains && value.tqfind( pattern, 0, false ) != -1 ) {
+          } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) {
             mContacts.append( *it );
             break;
           } else if ( type == Equals && value.localeAwareCompare( pattern ) == 0 ) {
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index eb6b76700..3216ea733 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -130,7 +130,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
   TQStringList phoneNumbers;
   for (unsigned int no=0; no<pnList.count(); ++no) {
     TQString pn = pnList[no].number().simplifyWhiteSpace();
-    if (!pn.isEmpty() && !phoneNumbers.tqcontains(pn))
+    if (!pn.isEmpty() && !phoneNumbers.contains(pn))
       phoneNumbers.append(pn);
   }
   if ( !phoneNumbers.isEmpty() )
@@ -207,7 +207,7 @@ bool VCard_LDIFCreator::createImageSmall()
       // after starting a new line, we also jump to the next
       // physical newline in the file if we don't come from one
       if ( !newLine ) {
-        int pos = text.tqfind( '\n', i );
+        int pos = text.find( '\n', i );
         if ( pos > (int) i )
           i = pos +1;
       }
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index 7280b5c7d..29266fa82 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -86,7 +86,7 @@ void TypeCombo<T>::updateTypes()
     int type = ( mTypeList[ i ].type() & ~( T::Pref ) );
     TQString label = mTypeList[ i ].typeLabel( type );
     int count = 1;
-    if ( labelCount.tqcontains( type ) ) {
+    if ( labelCount.contains( type ) ) {
       count = labelCount[ type ] + 1;
     }
     labelCount[ type ] = count;
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 23b1a4cc2..646fbbae9 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -195,7 +195,7 @@ void ViewManager::setActiveView( const TQString &name )
   // we can't find it, it means it hasn't been instantiated, so we will
   // create it on demand.
 
-  view = mViewDict.tqfind( name );
+  view = mViewDict.find( name );
 
   // Check if we found the view. If we didn't, then we need to create it
   if ( view == 0 ) {
@@ -205,7 +205,7 @@ void ViewManager::setActiveView( const TQString &name )
 
     kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl;
 
-    ViewFactory *factory = mViewFactoryDict.tqfind( type );
+    ViewFactory *factory = mViewFactoryDict.find( type );
     if ( factory )
       view = factory->view( mCore, mViewWidgetStack );
 
@@ -265,7 +265,7 @@ void ViewManager::editView()
   if ( !mActiveView )
     return;
 
-  ViewFactory *factory = mViewFactoryDict.tqfind( mActiveView->type() );
+  ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() );
   ViewConfigureWidget *wdg = 0;
 
   if ( factory ) {
@@ -342,7 +342,7 @@ void ViewManager::addView()
     // Check for name conflicts
     bool firstConflict = true;
     int numTries = 1;
-    while ( mViewNameList.tqcontains( newName ) > 0 ) {
+    while ( mViewNameList.contains( newName ) > 0 ) {
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
@@ -363,7 +363,7 @@ void ViewManager::addView()
 
     // try to set the active view
     mActionSelectView->setItems( mViewNameList );
-    mActionSelectView->setCurrentItem( mViewNameList.tqfindIndex( newName ) );
+    mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) );
     setActiveView( newName );
 
     editView();
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9b0784d89..b790b0c3f 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -61,7 +61,7 @@ class CardViewTip : public TQLabel
 };
 
 //
-// Warning: make sure you use tqfindRef() instead of tqfind() to find an
+// Warning: make sure you use findRef() instead of find() to find an
 //          item! Only the pointer value is unique in the list.
 //
 class CardViewItemList : public TQPtrList<CardViewItem>
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
   for ( iter.toFirst(); iter.current(); ++iter ) {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = TQMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
+    lines = TQMIN( (*iter)->second.contains( '\n' ) + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;
   }
 
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     Field *_f;
     for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
       if ( se || ! _f->second.isEmpty() )
-        y += ( TQMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
+        y += ( TQMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2;
 
     if ( isLabel && itempos.y() > y + fh )
       return;
@@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
       TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, TQt::AlignTop|TQt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height() / fh >  TQMIN( s.tqcontains( '\n' ) + 1, maxLines );
+      trimmed = r.width() > mw || r.height() / fh >  TQMIN( s.contains( '\n' ) + 1, maxLines );
     }
   }
 
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += (TQMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
+      ypos += (TQMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2;
     if ( iy <= ypos )
       break;
   }
@@ -616,7 +616,7 @@ void CardView::takeItem( CardViewItem *item )
 {
   if ( d->mCurrentItem == item )
     d->mCurrentItem = item->nextItem();
-  d->mItemList.take( d->mItemList.tqfindRef( item ) );
+  d->mItemList.take( d->mItemList.findRef( item ) );
 
   setLayoutDirty( true );
 }
@@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   bool found = false;
   for ( iter.toFirst(); iter.current() && !found; ++iter ) {
     item = *iter;
-    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) )
+    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) )
       found = true;
   }
 
@@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     item = *iter;
     cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 
-    if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) {
+    if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) {
       // Tell the card to paint
       p->save();
       p->translate( cardRect.x(), cardRect.y() );
@@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     sep = *sepIter;
     sepRect = sep->mRect;
 
-    if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) {
+    if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) {
       p->save();
       p->translate( sepRect.x(), sepRect.y() );
       sep->paintSeparator( p, cg );
@@ -953,7 +953,7 @@ void CardView::calcLayout()
 
 CardViewItem *CardView::itemAfter( const CardViewItem *item ) const
 {
-  d->mItemList.tqfindRef( item );
+  d->mItemList.findRef( item );
   return d->mItemList.next();
 }
 
@@ -1070,8 +1070,8 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       }
 
       int from, to, a, b;
-      a = d->mItemList.tqfindRef( item );
-      b = d->mItemList.tqfindRef( other );
+      a = d->mItemList.findRef( item );
+      b = d->mItemList.findRef( other );
       from = a < b ? a : b;
       to = a > b ? a : b;
 
@@ -1218,7 +1218,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
     return;
   }
 
-  uint pos = d->mItemList.tqfindRef( d->mCurrentItem );
+  uint pos = d->mItemList.findRef( d->mCurrentItem );
   CardViewItem *aItem = 0;
   CardViewItem *old = d->mCurrentItem;
 
@@ -1347,8 +1347,8 @@ void CardView::keyPressEvent( TQKeyEvent *e )
         // otherwise, ??????
         bool s = ! aItem->isSelected();
         int from, to, a, b;
-        a = d->mItemList.tqfindRef( aItem );
-        b = d->mItemList.tqfindRef( old );
+        a = d->mItemList.findRef( aItem );
+        b = d->mItemList.findRef( old );
         from = a < b ? a : b;
         to = a > b ? a : b;
 
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 03962d3a0..aa2d76539 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -123,7 +123,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
       if ( !first )
         t << ",";
 
-      t << "\"" << (*fieldIter)->value( addr ).tqreplace( "\n", "\\n" ) << "\"";
+      t << "\"" << (*fieldIter)->value( addr ).replace( "\n", "\\n" ) << "\"";
       first = false;
     }
 
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 1120e4f06..9e2b8d6f6 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -854,7 +854,7 @@ void CSVImportDialog::saveTemplate()
   if ( fileName.isEmpty() )
     return;
 
-  if ( !fileName.tqcontains( ".desktop" ) )
+  if ( !fileName.contains( ".desktop" ) )
     fileName += ".desktop";
 
   if( TQFileInfo(fileName).exists() ) {                                                                                                   
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index 9844b5507..bed374339 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -124,22 +124,22 @@ TQString EudoraXXPort::key( const TQString& line) const
 {
   int e;
   TQString result;
-  int b = line.tqfind( '\"', 0 );
+  int b = line.find( '\"', 0 );
 
   if ( b == -1 ) {
-    b = line.tqfind( ' ' );
+    b = line.find( ' ' );
     if ( b == -1 )
       return result;
 
     b++;
-    e = line.tqfind( ' ', b );
+    e = line.find( ' ', b );
     result = line.mid( b, e - b );
 
     return result;
   }
 
   b++;
-  e = line.tqfind( '\"', b );
+  e = line.find( '\"', b );
   if ( e == -1 )
     return result;
 
@@ -152,9 +152,9 @@ TQString EudoraXXPort::email( const TQString& line ) const
 {
   int b;
   TQString result;
-  b = line.tqfindRev( '\"' );
+  b = line.findRev( '\"' );
   if ( b == -1 ) {
-    b = line.tqfindRev( ' ' );
+    b = line.findRev( ' ' );
     if ( b == -1 )
       return result;
   }
@@ -168,9 +168,9 @@ TQString EudoraXXPort::comment( const TQString& line ) const
   int b;
   TQString result;
   uint i;
-  b = line.tqfindRev( '>' );
+  b = line.findRev( '>' );
   if ( b == -1 ) {
-    b = line.tqfindRev( '\"' );
+    b = line.findRev( '\"' );
     if ( b == -1 )
       return result;
   }
@@ -191,12 +191,12 @@ TQString EudoraXXPort::get( const TQString& line, const TQString& key ) const
   uint i;
 
   // Find formatted key, return on error
-  b = line.tqfind( fd );
+  b = line.find( fd );
   if ( b == -1 )
     return TQString();
 
   b += fd.length();
-  e = line.tqfind( '>', b );
+  e = line.find( '>', b );
   if ( e == -1 )
     return TQString();
 
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index e8dcf939a..de2b47845 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -44,7 +44,7 @@ class EudoraXXPort : public KAB::XXPort
     TQString comment( const TQString& line ) const;
     TQString email( const TQString& line ) const;
     TQString key( const TQString& line ) const;
-    int tqfind( const TQString& key ) const;
+    int find( const TQString& key ) const;
 };
 
 #endif
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 564fcf5fb..2d18cef7c 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -94,7 +94,7 @@ static TQString makeValidPhone( const TQString &number )
 	TQString num = number.simplifyWhiteSpace();
 	TQString allowed("0123456789*+#pw");
 	for (unsigned int i=num.length(); i>=1; i--)
-		if (allowed.tqfind(num[i-1])==-1)
+		if (allowed.find(num[i-1])==-1)
 			num.remove(i-1,1);
 	if (num.isEmpty())
 		num = "0";
@@ -242,7 +242,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.tqfind(',') == -1) {
+		if (s.find(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -482,13 +482,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		TQStringList a;
 		TQChar sem(';');
 		TQString sem_repl(TQString::tqfromLatin1(","));
-      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
-		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
-		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
+      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
+		a.append( Addr->extended()     .replace( sem, sem_repl ) );
+		a.append( Addr->street()       .replace( sem, sem_repl ) );
+		a.append( Addr->locality()     .replace( sem, sem_repl ) );
+		a.append( Addr->region()       .replace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
+		a.append( Addr->country()      .replace( sem, sem_repl ) );
 		s = a.join(sem);
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
 			GN_PHONEBOOK_ENTRY_Postal, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
@@ -639,7 +639,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	if (memstat.free >= (int) list.count()) {
 		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>tqreplace</b> all "
+			     "the current mobile phonebook or should they <b>replace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
 			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
@@ -1015,7 +1015,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(entry.name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.tqfind(',') == -1) {
+		if (s.find(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -1264,13 +1264,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		TQStringList a;
 		TQChar sem(';');
 		TQString sem_repl(TQString::tqfromLatin1(","));
-      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
-		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
-		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
+      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
+		a.append( Addr->extended()     .replace( sem, sem_repl ) );
+		a.append( Addr->street()       .replace( sem, sem_repl ) );
+		a.append( Addr->locality()     .replace( sem, sem_repl ) );
+		a.append( Addr->region()       .replace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
+		a.append( Addr->country()      .replace( sem, sem_repl ) );
 		s = a.join(sem);
 		strncpy(subentry->data.number, GN_TO(s), sizeof(subentry->data.number)-1);
 		entry.subentries_count++;
@@ -1430,7 +1430,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	if (memstat.free >= (int) list.count()) {
 		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>tqreplace</b> all "
+			     "the current mobile phonebook or should they <b>replace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
 			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 59fd52eaa..593960e83 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -84,7 +84,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
     }
 
     if ( parseContact == true ) {
-      int sep = line.tqfind( '=' );
+      int sep = line.find( '=' );
       key = line.left( sep ).lower();
       value = line.mid( sep + 1 );
       if ( key == TQString::tqfromLatin1( "name" ) )
@@ -105,10 +105,10 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
                               KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
       else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) {
         KABC::Address address( KABC::Address::Home );
-        address.setLabel( value.tqreplace( separator, "\n" ) );
+        address.setLabel( value.replace( separator, "\n" ) );
         addr.insertAddress( address );
       } else if ( key == TQString::tqfromLatin1( "description" ) )
-        addr.setNote( value.tqreplace( separator, "\n" ) );
+        addr.setNote( value.replace( separator, "\n" ) );
       else if ( key == TQString::tqfromLatin1( "url" ) )
         addr.setUrl( KURL( value ) );
       else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) {
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index d917292f7..9dedae791 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -239,7 +239,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 
             // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1()
             // and hope that are fields are encoded correctly.
-            if ( TQString::tqfromLatin1( rawData ).lower().tqcontains( "version:3.0" ) ) {
+            if ( TQString::tqfromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
               vCardText = TQString::fromUtf8( rawData );
             } else {
               vCardText = TQString::tqfromLatin1( rawData );
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index f65348cfe..c90de6ca3 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -119,7 +119,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
       const TQStringList tmp( (*it).categories() );
       TQStringList::ConstIterator tmpIt;
       for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-        if ( categorieList.tqcontains( *tmpIt ) ) {
+        if ( categorieList.contains( *tmpIt ) ) {
           list.append( *it );
           break;
         }