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

44 files changed, 121 insertions, 121 deletions

diff --git a/korganizer/COPYING b/korganizer/COPYING
index b55fa146..54754ab4 100644
--- a/korganizer/COPYING
+++ b/korganizer/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index ad6c7e36..cbb4e42f 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -314,7 +314,7 @@ void ActionManager::initActions()
                                mACollection, "edit_delete" );
   if ( mIsPart ) {
     KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
-                      mACollection, "korganizer_tqfind" );
+                      mACollection, "korganizer_find" );
   } else {
     KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
                       mACollection );
@@ -402,7 +402,7 @@ void ActionManager::initActions()
 
 
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  // TODO: try to tqfind / create better icons for the following 4 actions
+  // TODO: try to find / create better icons for the following 4 actions
   new KAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0,
                     mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ),
                     mACollection, "zoom_in_horizontally" );
@@ -998,7 +998,7 @@ bool ActionManager::saveURL()
     if ( result != KMessageBox::Continue ) return false;
 
     TQString filename = mURL.fileName();
-    filename.tqreplace( filename.length() - 4, 4, ".ics" );
+    filename.replace( filename.length() - 4, 4, ".ics" );
     mURL.setFileName( filename );
     if ( mURL.isLocalFile() ) {
       mFile = mURL.path();
@@ -1708,11 +1708,11 @@ void ActionManager::openEventEditor( const TQString & summary,
           return;
         // due to kmime shortcomings in KDE3, we need to assemble the result manually
         int begin = 0;
-        int end = head.tqfind( '\n' );
+        int end = head.find( '\n' );
         bool skipFolded = false;
         while ( end >= 0 && end > begin ) {
-          if ( head.tqfind( "Content-Type:", begin, false ) != begin &&
-                head.tqfind( "Content-Transfer-Encoding:", begin, false ) != begin &&
+          if ( head.find( "Content-Type:", begin, false ) != begin &&
+                head.find( "Content-Transfer-Encoding:", begin, false ) != begin &&
                 !(skipFolded && (head[begin] == ' ' || head[end] == '\t')) ) {
             TQCString line = head.mid( begin, end - begin );
             tf.file()->writeBlock( line.data(), line.length() );
@@ -1723,7 +1723,7 @@ void ActionManager::openEventEditor( const TQString & summary,
           }
 
           begin = end + 1;
-          end = head.tqfind( '\n', begin );
+          end = head.find( '\n', begin );
           if ( end < 0 && begin < (int)head.length() )
             end = head.length() - 1;
         }
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 115be5ff..e5203ae1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -364,7 +364,7 @@ TQPair<ResourceCalendar *, TQString> CalendarView::viewSubResourceCalendar()
 
 KOIncidenceEditor *CalendarView::editorDialog( Incidence *incidence ) const
 {
-  if (mDialogList.tqfind(incidence) != mDialogList.end ())
+  if (mDialogList.find(incidence) != mDialogList.end ())
     return mDialogList[incidence];
   else return 0;
 }
@@ -631,7 +631,7 @@ void CalendarView::readFilterSettings( KConfig *config )
   }
 
   config->setGroup( "General" );
-  int pos = filterList.tqfindIndex( currentFilter );
+  int pos = filterList.findIndex( currentFilter );
   mCurrentFilter = 0;
   if ( pos>=0 ) {
     mCurrentFilter = mFilters.at( pos );
@@ -1976,7 +1976,7 @@ void CalendarView::updateFilter()
   TQStringList filters;
   CalFilter *filter;
 
-  int pos = mFilters.tqfind( mCurrentFilter );
+  int pos = mFilters.find( mCurrentFilter );
   if ( pos < 0 ) {
     mCurrentFilter = 0;
   }
@@ -2563,7 +2563,7 @@ void CalendarView::updateCategories()
   allCats.sort();
   TQStringList categories( KOPrefs::instance()->mCustomCategories );
   for ( TQStringList::ConstIterator si = allCats.constBegin(); si != allCats.constEnd(); ++si ) {
-    if ( categories.tqfind( *si ) == categories.end() ) {
+    if ( categories.find( *si ) == categories.end() ) {
       categories.append( *si );
     }
   }
@@ -2797,7 +2797,7 @@ void CalendarView::getIncidenceHierarchy( Incidence *inc,
                                           Incidence::List &tqchildren )
 {
   // protecion against looping hierarchies
-  if ( inc && !tqchildren.tqcontains( inc ) ) {
+  if ( inc && !tqchildren.contains( inc ) ) {
     Incidence::List::ConstIterator it;
     Incidence::List immediateChildren = inc->relations();
     for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index cd04ee98..2c5aeec5 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -261,7 +261,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /**
       Add an incidence to the active calendar.
       @param ical A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which tqcontains
+                  calendar must consist of a VCALENDAR component which contains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h
index 48530155..ecf09812 100644
--- a/korganizer/customlistviewitem.h
+++ b/korganizer/customlistviewitem.h
@@ -44,7 +44,7 @@ class CustomListViewItem : public KListViewItem
 
     TQString key(int column, bool) const
     {
-      TQMap<int,TQString>::ConstIterator it = mKeyMap.tqfind(column);
+      TQMap<int,TQString>::ConstIterator it = mKeyMap.find(column);
       if (it == mKeyMap.end()) return text(column);
       else return *it;
     }
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 0f7dfc33..1738380b 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -190,7 +190,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
     uids << (*it)->uid();
   }
   for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) {
-    if ( !uids.tqcontains( (*it)->uid() ) ) {
+    if ( !uids.contains( (*it)->uid() ) ) {
       archiveCalendar.deleteIncidence( *it );
     }
   }
@@ -247,7 +247,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate
   }
 
   // This TQList is only to prevent infinit recursion
-  if ( checkedUids.tqcontains( todo->uid() ) ) {
+  if ( checkedUids.contains( todo->uid() ) ) {
     // Probably will never happen, calendar.cpp checks for this
     kdWarning() << "To-do hierarchy loop detected!";
     return false;
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 5309050e..7093b5f0 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -252,12 +252,12 @@ void FreeBusyManager::publishFreeBusy()
 
 //   // Substitute %u and %d [FIXME]
 //   TQString defaultEmail = KOCore()::self()->email();
-//   int emailpos = defaultEmail.tqfind( '@' );
+//   int emailpos = defaultEmail.find( '@' );
 //   if (emailpos != -1) {
 //     const TQString emailName = defaultEmail.left( emailpos );
 //     const TQString emailHost = defaultEmail.mid( emailpos + 1 );
-//     targetURL = targetURL.url().tqreplace("%25u", emailName, true);
-//     targetURL = targetURL.url().tqreplace("%25d", emailHost, true);
+//     targetURL = targetURL.url().replace("%25u", emailName, true);
+//     targetURL = targetURL.url().replace("%25d", emailHost, true);
 //   }
   targetURL.setUser( KOPrefs::instance()->mFreeBusyPublishUser );
   targetURL.setPass( KOPrefs::instance()->mFreeBusyPublishPassword );
@@ -280,7 +280,7 @@ void FreeBusyManager::publishFreeBusy()
 
   // We need to massage the list a bit so that Outlook understands
   // it.
-  messageText = messageText.tqreplace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
+  messageText = messageText.replace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
                                      "ORGANIZER:" );
 
   // Create a local temp file and save the message to it
@@ -292,7 +292,7 @@ void FreeBusyManager::publishFreeBusy()
 
 #if 0
     TQString defaultEmail = KOCore()::self()->email();
-    TQString emailHost = defaultEmail.mid( defaultEmail.tqfind( '@' ) + 1 );
+    TQString emailHost = defaultEmail.mid( defaultEmail.find( '@' ) + 1 );
 
     // Put target string together
     KURL targetURL;
@@ -309,7 +309,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setHost( server );
 
       TQString fbname = KOPrefs::instance()->mPublishUserName;
-      int at = fbname.tqfind('@');
+      int at = fbname.find('@');
       if( at > 1 && fbname.length() > (uint)at ) {
 	fbname = fbname.left(at);
       }
@@ -318,7 +318,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
     } else {
       // we use something else
-      targetURL = KOPrefs::instance()->mPublishAnyURL.tqreplace( "%SERVER%",
+      targetURL = KOPrefs::instance()->mPublishAnyURL.replace( "%SERVER%",
                                                                emailHost );
       targetURL.setUser( KOPrefs::instance()->mPublishUserName );
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
@@ -441,16 +441,16 @@ void FreeBusyManager::cancelRetrieval()
 KURL replaceVariablesURL( const KURL &url, const TQString &email )
 {
   TQString emailName, emailHost;
-  int emailpos = email.tqfind( '@' );
+  int emailpos = email.find( '@' );
   if( emailpos >= 0 ) {
     emailName = email.left( emailpos );
     emailHost = email.mid( emailpos + 1 );
   }
 
   TQString saveStr = url.path();
-  saveStr.tqreplace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
-  saveStr.tqreplace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
-  saveStr.tqreplace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
+  saveStr.replace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
+  saveStr.replace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
+  saveStr.replace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
 
   KURL retUrl( url );
   retUrl.setPath( saveStr );
@@ -468,7 +468,7 @@ bool fbExists( const KURL &url )
   TQByteArray data;
   if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) {
     TQString dataStr ( data );
-    if ( dataStr.tqcontains( "BEGIN:VCALENDAR" ) ) {
+    if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) {
       return true;
     }
   }
@@ -522,7 +522,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
 
   // Sanity check: Don't download if it's not a correct email
   // address (this also avoids downloading for "(empty email)").
-  int emailpos = email.tqfind( '@' );
+  int emailpos = email.find( '@' );
   if( emailpos == -1 ) {
     return KURL();
   }
@@ -548,7 +548,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     }
   }
 
-  if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
+  if ( sourceURL.url().contains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
     // do variable string replacements to the URL (MS Outlook style)
     KURL fullpathURL = replaceVariablesURL( sourceURL, email );
 
@@ -557,10 +557,10 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL!
     // In that case, just pass it on through with substitution for %u and %d
     // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this
-    if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
+    if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
       // A generic URL, substitute %u and %d
-      fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true);
-      fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true);
+      fullpathURL = fullpathURL.url().replace("%25u", emailName, true);
+      fullpathURL = fullpathURL.url().replace("%25d", emailHost, true);
     }
     else {
       // This is (probably) a Kolab URL!
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index ee83b1f5..bff67c76 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -111,7 +111,7 @@ void JournalDateEntry::clear()
 // should only be called by the KOJournalView now.
 void JournalDateEntry::addJournal( Journal *j )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( j );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( j );
   if ( pos != mEntries.end() ) return;
 
   JournalEntry *entry = new JournalEntry( j, this );
@@ -156,7 +156,7 @@ void JournalDateEntry::emitNewJournal()
 
 void JournalDateEntry::journalEdited( Journal *journal )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( journal );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( journal );
   if ( pos == mEntries.end() ) return;
 
   pos.data()->setJournal( journal );
@@ -165,7 +165,7 @@ void JournalDateEntry::journalEdited( Journal *journal )
 
 void JournalDateEntry::journalDeleted( Journal *journal )
 {
-  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.tqfind( journal );
+  TQMap<Journal*,JournalEntry*>::Iterator pos = mEntries.find( journal );
   if ( pos == mEntries.end() ) return;
 
   delete pos.data();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 8a49360f..f9a1236e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1002,7 +1002,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
             // erase current item (i.e. remove it from the multiItem list)
             firstItem = moveItem->nextMultiItem();
             moveItem->hide();
-            mItems.take( mItems.tqfind( moveItem ) );
+            mItems.take( mItems.find( moveItem ) );
             removeChild( moveItem );
             mActionItem->removeMoveItem(moveItem);
             moveItem=firstItem;
@@ -1019,7 +1019,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos)
             // erase current item
             lastItem = moveItem->prevMultiItem();
             moveItem->hide();
-            mItems.take( mItems.tqfind(moveItem) );
+            mItems.take( mItems.find(moveItem) );
             removeChild( moveItem );
             moveItem->removeMoveItem( moveItem );
             moveItem = lastItem;
@@ -1557,7 +1557,7 @@ TQMemArray<int> KOAgenda::minContentsY()
     int ymin = item->cellYTop();
     int index = item->cellXLeft();
     if ( index>=0 && index<(int)(mSelectedDates.count()) ) {
-      if ( ymin < minArray[index] && mItemsToDelete.tqfindRef( item ) == -1 )
+      if ( ymin < minArray[index] && mItemsToDelete.findRef( item ) == -1 )
         minArray[index] = ymin;
     }
   }
@@ -1574,7 +1574,7 @@ TQMemArray<int> KOAgenda::maxContentsY()
     int ymax = item->cellYBottom();
     int index = item->cellXLeft();
     if ( index>=0 && index<(int)(mSelectedDates.count()) ) {
-      if ( ymax > maxArray[index] && mItemsToDelete.tqfindRef( item ) == -1 )
+      if ( ymax > maxArray[index] && mItemsToDelete.findRef( item ) == -1 )
         maxArray[index] = ymax;
     }
   }
@@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem )
 
   agendaItem->hide();
   addChild( agendaItem );
-  if ( !mItems.tqcontainsRef( agendaItem ) ) {
+  if ( !mItems.containsRef( agendaItem ) ) {
     mItems.append( agendaItem );
   }
   placeSubCells( agendaItem );
@@ -1785,7 +1785,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item )
   TQPtrList<KOAgendaItem> conflictItems = thisItem->conflictItems();
   removeChild( thisItem );
 
-  int pos = mItems.tqfind( thisItem );
+  int pos = mItems.find( thisItem );
   if ( pos >= 0 ) {
     mItems.take( pos );
     taken = true;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index b9558c39..86dc54a7 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -624,7 +624,7 @@ void KOAgendaItem::setConflictItems( TQPtrList<KOAgendaItem> ci )
 
 void KOAgendaItem::addConflictItem( KOAgendaItem *ci )
 {
-  if ( mConflictItems.tqfind( ci ) < 0 ) mConflictItems.append( ci );
+  if ( mConflictItems.find( ci ) < 0 ) mConflictItems.append( ci );
 }
 
 TQString KOAgendaItem::label() const
@@ -986,7 +986,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   p.setBackgroundColor( bgColor );
   p.setPen( textColor );
   TQString ws = ww->wrappedString();
-  if ( ws.left( ws.length()-1 ).tqfind( '\n' ) >= 0 )
+  if ( ws.left( ws.length()-1 ).find( '\n' ) >= 0 )
     ww->drawText( &p, eventX, y,
                   TQt::AlignAuto | KWordWrap::FadeOut );
   else
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 526f1f61..ef884b84 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1754,8 +1754,8 @@ bool KOAgendaView::filterByResource( Incidence *incidence )
     if ( resourceCalendar()->subresourceType( subRes ) == "todo" ) {
       TQString calmatch = "/.INBOX.directory/Calendar";
       TQString i18nmatch = "/.INBOX.directory/" + i18n( "Calendar" );
-      if ( subResourceCalendar().tqcontains( calmatch ) ||
-           subResourceCalendar().tqcontains( i18nmatch ) ) {
+      if ( subResourceCalendar().contains( calmatch ) ||
+           subResourceCalendar().contains( i18nmatch ) ) {
         return true;
       }
     }
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 51f83857..15493ef9 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -250,7 +250,7 @@ void KOAttendeeEditor::fillOrganizerCombo()
   const TQStringList lst = KOPrefs::instance()->fullEmails();
   TQStringList uniqueList;
   for( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
-    if ( uniqueList.tqfind( *it ) == uniqueList.end() )
+    if ( uniqueList.find( *it ) == uniqueList.end() )
       uniqueList << *it;
   }
   mOrganizerCombo->insertStringList( uniqueList );
@@ -566,7 +566,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text )
   TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit;
   for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
     KABC::Addressee a = (*eit).addressee;
-    if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
+    if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
       aList.append( a ) ;
     }
   }
@@ -581,7 +581,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text )
       TQValueList<KABC::DistributionList::Entry>::ConstIterator eit;
       for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
         KABC::Addressee a = (*eit).addressee;
-        if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) {
+        if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
           aList.append( a ) ;
         }
       }
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 51e43628..ce5d0c25 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -237,7 +237,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg )
 KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 {
   TQWidget *topLevel = wdg->tqtopLevelWidget();
-  TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.tqfind( topLevel );
+  TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel );
   if ( it != mXMLGUIClients.end() )
     return it.data();
 
@@ -279,7 +279,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations()
     for( it = plugins.begin(); it != plugins.end(); ++it ) {
       if ( (*it)->hasServiceType("Calendar/Decoration") ) {
         TQString name = (*it)->desktopEntryName();
-        if ( selectedPlugins.tqfind( name ) != selectedPlugins.end() ) {
+        if ( selectedPlugins.find( name ) != selectedPlugins.end() ) {
           KOrg::CalendarDecoration *d = loadCalendarDecoration(*it);
           mCalendarDecorations.append( d );
         }
@@ -300,7 +300,7 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *tqparent )
   KTrader::OfferList plugins = availableParts();
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
-    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
       KOrg::Part *part = loadPart( *it, tqparent );
       if ( part ) {
@@ -326,7 +326,7 @@ KOrg::PrintPlugin::List KOCore::loadPrintPlugins()
   KTrader::OfferList plugins = availablePrintPlugins();
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
-    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
       KOrg::PrintPlugin *part = loadPrintPlugin( *it );
       if ( part ) loadedPlugins.append( part );
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 0672ba09..d6534db3 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -330,7 +330,7 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* tqparent )
 
 KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
 {
-  if ( mTempFiles.tqcontains( attachment ) ) {
+  if ( mTempFiles.contains( attachment ) ) {
     return mTempFiles[attachment];
   }
   TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns();
@@ -606,7 +606,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
     for ( KURL::List::ConstIterator it = urls.constBegin();
           it != urls.constEnd(); ++it ) {
       TQString label = (*jt++);
-      if ( mAttachments->tqfindItem( label ) ) {
+      if ( mAttachments->findItem( label ) ) {
         label += '~' + randomString( 3 );
       }
       addUriAttachment( (*it).url(), TQString(), label, true );
@@ -619,7 +619,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
         if ( label.isEmpty() ) {
           label = (*it).prettyURL();
         }
-        if ( mAttachments->tqfindItem( label ) ) {
+        if ( mAttachments->findItem( label ) ) {
           label += '~' + randomString( 3 );
         }
         addUriAttachment( (*it).url(), TQString(), label, true );
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index fab93719..36250993 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -92,7 +92,7 @@ class FreeBusyItem : public KDGanttViewTaskItem
 
     TQString key( int column, bool ) const
     {
-      TQMap<int,TQString>::ConstIterator it = mKeyMap.tqfind( column );
+      TQMap<int,TQString>::ConstIterator it = mKeyMap.find( column );
       if ( it == mKeyMap.end() ) return listViewText( column );
       else return *it;
     }
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 67b2a971..d55dfa3a 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -632,7 +632,7 @@ void ExceptionsWidget::addException()
 {
   TQDate date = mExceptionDateEdit->date();
   TQString dateStr = KGlobal::locale()->formatDate( date );
-  if( !mExceptionList->tqfindItem( dateStr ) ) {
+  if( !mExceptionList->findItem( dateStr ) ) {
     mExceptionDates.append( date );
     mExceptionList->insertItem( dateStr );
   }
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 73857fd6..d7c1b1aa 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -230,9 +230,9 @@ void KOEventEditor::setDates( const TQDateTime &from, const TQDateTime &to, bool
 
 void KOEventEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.tqcontains("\n") ) {
+  if ( description.isEmpty() && summary.contains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.tqfind( "\n" );
+    int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9d321221..ec391c9e 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -196,8 +196,8 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type )
   TQStringList list = KGlobal::dirs()->findAllResources( "data",
     "korganizer/designer/" + type + "/*.ui", true, true );
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) {
-    const TQString &fn = (*it).mid( (*it).tqfindRev('/') + 1 );
-    if ( activePages.tqfind( fn ) != activePages.end() ) {
+    const TQString &fn = (*it).mid( (*it).findRev('/') + 1 );
+    if ( activePages.find( fn ) != activePages.end() ) {
       addDesignerTab( *it );
     }
   }
@@ -316,7 +316,7 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i )
   if ( !mAttachedDesignerFields.isEmpty() ) {
     for ( TQPtrList<TQWidget>::Iterator it = mAttachedDesignerFields.begin();
           it != mAttachedDesignerFields.end(); ++it ) {
-      if ( mDesignerFieldForWidget.tqcontains( *it ) ) {
+      if ( mDesignerFieldForWidget.contains( *it ) ) {
         mDesignerFields.remove( mDesignerFieldForWidget[ *it ] );
       }
     }
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index 3570f6ec..23bdbe8f 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -118,9 +118,9 @@ void KOJournalEditor::newJournal()
 
 void KOJournalEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.tqcontains("\n") ) {
+  if ( description.isEmpty() && summary.contains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.tqfind( "\n" );
+    int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 412ef5a7..b5742e47 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -64,7 +64,7 @@ KOJournalView::~KOJournalView()
 void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
 {
   JournalDateEntry *entry = 0;
-  if ( mEntries.tqcontains( dt ) ) {
+  if ( mEntries.contains( dt ) ) {
     entry = mEntries[dt];
   } else {
     entry = new JournalDateEntry( calendar(), mVBox );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 09dc07da..2bad209b 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -352,7 +352,7 @@ void KOListView::addIncidences( const Incidence::List &incidenceList, const TQDa
 
 void KOListView::addIncidence( Incidence *incidence, const TQDate &date )
 {
-  if ( mUidDict.tqfind( incidence->uid() ) ) {
+  if ( mUidDict.find( incidence->uid() ) ) {
     return;
   }
 
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 42322597..b664e68f 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -253,10 +253,10 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
       if (!kMailOpenComposer(to,cc,bcc ? from : "",subject,body,0,KURL())) return false;
     } else {
       TQString meth;
-      int idx = attachment.tqfind("METHOD");
+      int idx = attachment.find("METHOD");
       if (idx>=0) {
-        idx = attachment.tqfind(':',idx)+1;
-        const int newline = attachment.tqfind('\n',idx);
+        idx = attachment.find(':',idx)+1;
+        const int newline = attachment.find('\n',idx);
         meth = attachment.mid(idx, newline - idx - 1);
         meth = meth.lower().stripWhiteSpace();
       } else {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index dc52c312..5b431f8e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -262,7 +262,7 @@ void KOPrefs::usrWriteConfig()
 
 void KOPrefs::setCategoryColor( const TQString &cat, const TQColor & color)
 {
-  mCategoryColors.tqreplace( cat, new TQColor( color ) );
+  mCategoryColors.replace( cat, new TQColor( color ) );
 }
 
 TQColor *KOPrefs::categoryColor( const TQString &cat )
@@ -285,7 +285,7 @@ void KOPrefs::setResourceColor ( const TQString &cal, const TQColor &color )
 {
   // kdDebug(5850)<<"KOPrefs::setResourceColor: " << cal << " color: "<<
   // color.name()<<endl;
-  mResourceColors.tqreplace( cal, new TQColor( color ) );
+  mResourceColors.replace( cal, new TQColor( color ) );
 }
 
 TQColor* KOPrefs::resourceColor( const TQString &cal )
@@ -418,14 +418,14 @@ bool KOPrefs::thatIsMe( const TQString& _email )
     if ( email == (*it).primaryEmailAddress() )
       return true;
     const TQStringList & aliases = (*it).emailAliases();
-    if ( aliases.tqfind( email ) != aliases.end() )
+    if ( aliases.find( email ) != aliases.end() )
         return true;
   }
 
-  if ( mAdditionalMails.tqfind( email ) != mAdditionalMails.end() )
+  if ( mAdditionalMails.find( email ) != mAdditionalMails.end() )
     return true;
   TQStringList lst = mMyAddrBookMails;
-  if ( lst.tqfind( email ) != lst.end() )
+  if ( lst.find( email ) != lst.end() )
     return true;
   return false;
 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index d454cdfe..35b67fed 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -212,7 +212,7 @@ class KOPrefsDialogTime : public KPrefsModule
       // Read all system time zones
     #if defined(USE_SOLARIS)       // MARCO
         snprintf(buf, MAXPATHLEN,
-               "/bin/tqfind %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-",
+               "/bin/find %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-",
                ZONEINFODIR, strlen(ZONEINFODIR) + 2);
 
         if (f = popen(buf, "r"))
@@ -454,7 +454,7 @@ class KOPrefsDialogTime : public KPrefsModule
                    const TQStringList *tags = 0 )
     {
       if (tags) {
-        int i = tags->tqfindIndex(text);
+        int i = tags->findIndex(text);
         if (i > 0) combo->setCurrentItem(i);
       } else {
         for(int i=0;i<combo->count();++i) {
@@ -774,14 +774,14 @@ void KOPrefsDialogColors::updateCategories()
 
 void KOPrefsDialogColors::setCategoryColor()
 {
-  mCategoryDict.tqreplace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
+  mCategoryDict.replace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
   slotWidChanged();
 }
 
 void KOPrefsDialogColors::updateCategoryColor()
 {
   TQString cat = mCategoryCombo->currentText();
-  TQColor *color = mCategoryDict.tqfind(cat);
+  TQColor *color = mCategoryDict.find(cat);
   if (!color) {
     color = KOPrefs::instance()->categoryColor(cat);
   }
@@ -823,7 +823,7 @@ void KOPrefsDialogColors::setResourceColor()
 {
   kdDebug( 5850) << "KOPrefsDialogColors::setResorceColor()" << endl;
 
-  mResourceDict.tqreplace( mResourceIdentifier[mResourceCombo->currentItem()],
+  mResourceDict.replace( mResourceIdentifier[mResourceCombo->currentItem()],
     new TQColor( mResourceButton->color() ) );
   slotWidChanged();
 }
@@ -832,7 +832,7 @@ void KOPrefsDialogColors::updateResourceColor()
 {
   kdDebug( 5850 ) << "KOPrefsDialogColors::updateResourceColor()" << endl;
   TQString res= mResourceIdentifier[mResourceCombo->currentItem()];
-  TQColor *color = mCategoryDict.tqfind(res);
+  TQColor *color = mCategoryDict.find(res);
   if( !color )  {
     color = KOPrefs::instance()->resourceColor( res );
   }
@@ -1150,7 +1150,7 @@ void KOPrefsDialogPlugins::usrReadConfig()
   KTrader::OfferList::ConstIterator it;
   for( it = plugins.begin(); it != plugins.end(); ++it ) {
     TQCheckListItem *item = new PluginItem( mListView, *it );
-    if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) !=
+    if ( selectedPlugins.find( (*it)->desktopEntryName() ) !=
                                selectedPlugins.end() ) {
       item->setOn( true );
     }
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 1a6c4dbe..f629a15a 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -192,7 +192,7 @@ static TQString cleanSummary( const TQString &summary )
 {
   uint maxLen = 45;
   TQString retStr = summary;
-  retStr.tqreplace( '\n', ' ' );
+  retStr.replace( '\n', ' ' );
   if ( retStr.length() > maxLen ) {
     maxLen -= etc.length();
     retStr = retStr.left( maxLen );
diff --git a/korganizer/korganizer_part.rc b/korganizer/korganizer_part.rc
index 5115d226..da92935a 100644
--- a/korganizer/korganizer_part.rc
+++ b/korganizer/korganizer_part.rc
@@ -39,7 +39,7 @@
       <Separator/>
       <Action name="edit_delete" append="edit_paste_merge"/>
       <Separator/>
-      <Action name="korganizer_tqfind"/>
+      <Action name="korganizer_find"/>
     </Menu>
     <Menu name="view"><text>&amp;View</text>
       <Action name="view_whatsnext"/>
diff --git a/korganizer/korganizeriface.h b/korganizer/korganizeriface.h
index 225f0f2d..88ab61d5 100644
--- a/korganizer/korganizeriface.h
+++ b/korganizer/korganizeriface.h
@@ -48,7 +48,7 @@ class KOrganizerIface : virtual public DCOPObject
     /**
       Add an incidence to the active calendar.
       @param iCal A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which tqcontains
+                  calendar must consist of a VCALENDAR component which contains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
diff --git a/korganizer/korganizerui.rc b/korganizer/korganizerui.rc
index 5ece25d3..82e97f71 100644
--- a/korganizer/korganizerui.rc
+++ b/korganizer/korganizerui.rc
@@ -122,7 +122,7 @@
     <Action name="edit_copy"/>
     <Action name="edit_paste"/>
     <Separator/>
-    <Action name="edit_tqfind"/>
+    <Action name="edit_find"/>
     <Separator/>
     <Action name="go_previous"/>
     <Action name="go_next"/>
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index 93296daa..072ea31f 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -293,7 +293,7 @@ void KOTimelineView::insertIncidence(KCal::Incidence * incidence)
   for ( TQDate day = mStartDate; day <= mEndDate; day = day.addDays( 1 ) ) {
     Event::List events = calendar()->events( day, EventSortStartDate, SortDirectionAscending );
     for ( Event::List::ConstIterator it = events.constBegin(); it != events.constEnd(); ++it ) {
-      if ( events.tqcontains( event ) )
+      if ( events.contains( event ) )
         insertIncidence( *it, day );
     }
   }
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index cbf15d28..8da491fb 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -172,9 +172,9 @@ void KOTodoEditor::newTodo()
 
 void KOTodoEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.tqcontains("\n") ) {
+  if ( description.isEmpty() && summary.contains("\n") ) {
     mGeneral->setDescription( summary );
-    int pos = summary.tqfind( "\n" );
+    int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
   } else {
     mGeneral->setSummary( summary );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 6b511f79..ecd68054 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -263,7 +263,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e )
           TQStringList emails = KPIM::splitEmailAddrList( text );
           for(TQStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
             kdDebug(5850) << " Email: " << (*it) << endl;
-            int pos = (*it).tqfind("<");
+            int pos = (*it).find("<");
             TQString name = (*it).left(pos);
             TQString email = (*it).mid(pos);
             if (!email.isEmpty() && todoi) {
@@ -563,7 +563,7 @@ void KOTodoView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.tqcontains( *it ) ) {
+    if ( !mTodoMap.contains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -603,7 +603,7 @@ TQMap<Todo *,KOTodoViewItem *>::ConstIterator
 
 //    kdDebug(5850) << "  has Related" << endl;
     TQMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
-    itemIterator = mTodoMap.tqfind(relatedTodo);
+    itemIterator = mTodoMap.find(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug(5850) << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
@@ -635,7 +635,7 @@ void KOTodoView::removeTodoItems()
   KOTodoViewItem *item;
   for ( item = mItemsToDelete.first(); item; item = mItemsToDelete.next() ) {
     Todo *todo = item->todo();
-    if ( todo && mTodoMap.tqcontains( todo ) ) {
+    if ( todo && mTodoMap.contains( todo ) ) {
       mTodoMap.remove( todo );
     }
     delete item;
@@ -691,7 +691,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
   Todo *todo = static_cast<Todo *>(incidence);
   if ( todo ) {
     KOTodoViewItem *todoItem = 0;
-    if ( mTodoMap.tqcontains( todo ) ) {
+    if ( mTodoMap.contains( todo ) ) {
       todoItem = mTodoMap[todo];
     }
     switch ( action ) {
@@ -705,7 +705,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
             // correctly update changes in relations
             Todo*tqparent = dynamic_cast<Todo*>( todo->relatedTo() );
             KOTodoViewItem*parentItem = 0;
-            if ( tqparent && mTodoMap.tqcontains(tqparent) ) {
+            if ( tqparent && mTodoMap.contains(tqparent) ) {
               parentItem = mTodoMap[ tqparent ];
             }
             if ( todoItem->tqparent() != parentItem ) {
@@ -1011,7 +1011,7 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem )
         ++it ) {
     int index = tempMenu->insertItem( *it );
     mCategory[ index ] = *it;
-    if ( checkedCategories.tqfind( *it ) != checkedCategories.end() )
+    if ( checkedCategories.find( *it ) != checkedCategories.end() )
       tempMenu->setItemChecked( index, true );
   }
 
@@ -1030,7 +1030,7 @@ void KOTodoView::changedCategories(int index)
     Todo *oldTodo = todo->clone();
 
     TQStringList categories = todo->categories ();
-    if ( categories.tqfind( mCategory[index] ) != categories.end() )
+    if ( categories.find( mCategory[index] ) != categories.end() )
       categories.remove( mCategory[index] );
     else
       categories.insert( categories.end(), mCategory[index] );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 47aeb02b..02369d91 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -168,7 +168,7 @@ void KOTodoViewItem::construct()
   // Find sort id in description. It's the text behind the last '#' character
   // found in the description. White spaces are removed from beginning and end
   // of sort id.
-  int pos = mTodo->description().tqfindRev('#');
+  int pos = mTodo->description().findRev('#');
   if (pos < 0) {
     setText( KOTodoView::eDescriptionColumn, "" );
   } else {
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4f7c52fe..14e2f80a 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -302,7 +302,7 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
 
 void KOWhatsNextView::appendTodo( Incidence *ev )
 {
-  if ( mTodos.tqfind( ev ) != mTodos.end() ) return;
+  if ( mTodos.find( ev ) != mTodos.end() ) return;
 
   mTodos.append( ev );
 
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index b7b5ba69..f810e984 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -122,7 +122,7 @@ TQPtrList<ScheduleMessage> MailScheduler::retrieveTransactions()
         TQTextStream t( &f );
         t.setEncoding( TQTextStream::Latin1 );
         TQString messageString = t.read();
-        messageString.tqreplace( TQRegExp( "\n[ \t]"), "" );
+        messageString.replace( TQRegExp( "\n[ \t]"), "" );
         messageString = TQString::fromUtf8( messageString.latin1() );
         ScheduleMessage *mess = mFormat->parseScheduleMessage( mCalendar,
                                                                messageString );
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index c559a696..3c7678e1 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -188,7 +188,7 @@ void KOProjectView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.tqcontains( *it ) ) {
+    if ( !mTodoMap.contains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -202,7 +202,7 @@ TQMap<Todo *,KGanttItem *>::ConstIterator
   if (relatedTodo) {
 //    kdDebug(5850) << "  has Related" << endl;
     TQMap<Todo *,KGanttItem *>::ConstIterator itemIterator;
-    itemIterator = mTodoMap.tqfind(relatedTodo);
+    itemIterator = mTodoMap.find(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug(5850) << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index 6fe3a5e3..1e162ece 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -52,7 +52,7 @@
 static TQString cleanString( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.tqreplace( '\n', ' ' );
+  return ret.replace( '\n', ' ' );
 }
 
 /**************************************************************
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 54aacd18..4097f1ed 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -255,7 +255,7 @@ void CalPrintDialog::setOrientation( CalPrinter::ePrintOrientation orientation )
 KOrg::PrintPlugin *CalPrintDialog::selectedPlugin()
 {
   int id = mTypeGroup->selectedId();
-  if ( mPluginIDs.tqcontains( id ) ) {
+  if ( mPluginIDs.contains( id ) ) {
     return mPluginIDs[id];
   } else {
     return 0;
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 3df99652..63eb25f8 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -46,7 +46,7 @@ inline int round(const double x)
 static TQString cleanStr( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.tqreplace( '\n', ' ' );
+  return ret.replace( '\n', ' ' );
 }
 
 /******************************************************************
@@ -1602,7 +1602,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast<Todo *>( *it );
-    if (subtodo && todoList.tqcontains( subtodo ) ) {
+    if (subtodo && todoList.contains( subtodo ) ) {
       drawTodo( count, subtodo, p, connectSubTodos, strikeoutCompleted,
                 desc, posPriority, posSummary, posDueDt, posPercentComplete,
                 level+1, x, y, width, pageHeight, todoList, &startpt );
@@ -1619,7 +1619,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast<Todo *>( *it );
-    if ( subtodo && todoList.tqcontains( subtodo ) ) {
+    if ( subtodo && todoList.contains( subtodo ) ) {
       t.append( subtodo );
     }
   }
diff --git a/korganizer/printing/cellitem.cpp b/korganizer/printing/cellitem.cpp
index 4dfc882f..9551ac8a 100644
--- a/korganizer/printing/cellitem.cpp
+++ b/korganizer/printing/cellitem.cpp
@@ -65,7 +65,7 @@ TQPtrList<CellItem> CellItem::placeItem( TQPtrList<CellItem> cells,
     int i;
     for( i = 0; i < maxSubCells; ++i ) {
       kdDebug(5855) << "  Trying subcell " << i << endl;
-      if ( !subCellDict.tqfind( i ) ) {
+      if ( !subCellDict.find( i ) ) {
         kdDebug(5855) << "  Use subcell " << i << endl;
         placeItem->setSubCell( i );
         break;
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 6c0bda0f..9058df86 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -83,7 +83,7 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
 static TQString labelFromIdentifier( ResourceCalendar *resource, const TQString &identifier )
 {
   TQString subResLabel;
-  if ( identifier.tqcontains( "/.INBOX.directory/" ) ) { // my subresource
+  if ( identifier.contains( "/.INBOX.directory/" ) ) { // my subresource
     TQString subResName = identifier;
     subResName.remove( TQRegExp( "^.*/\\.INBOX\\.directory/" ) );
     subResLabel = labelFromSubResName( resource, subResName );
@@ -391,7 +391,7 @@ void ResourceView::addResource()
     return;
   }
 
-  TQString type = types[ descs.tqfindIndex( desc ) ];
+  TQString type = types[ descs.findIndex( desc ) ];
 
   // Create new resource
   ResourceCalendar *resource = manager->createResource( type );
@@ -477,7 +477,7 @@ void ResourceView::slotSubresourceAdded( ResourceCalendar *resource,
 {
   Q_UNUSED( type );
 
-  TQListViewItem *lvitem = mListView->tqfindItem( resource->resourceName(), 0 );
+  TQListViewItem *lvitem = mListView->findItem( resource->resourceName(), 0 );
   if ( !lvitem )
     // Not found
     return;
@@ -508,7 +508,7 @@ void ResourceView::slotSubresourceRemoved( ResourceCalendar *resource,
 
 void ResourceView::closeResource( ResourceCalendar *resource )
 {
-  if ( mResourcesToClose.tqfind( resource ) >= 0 ) {
+  if ( mResourcesToClose.find( resource ) >= 0 ) {
     resource->close();
     mResourcesToClose.remove( resource );
   }
@@ -595,7 +595,7 @@ void ResourceView::editResource()
   if ( item->isSubresource() ) {
     if ( resource->type() == "imap" || resource->type() == "scalix" ) {
       TQString identifier = item->resourceIdentifier();
-      if ( !identifier.tqcontains( "/.INBOX.directory/" ) ) {
+      if ( !identifier.contains( "/.INBOX.directory/" ) ) {
         KMessageBox::sorry(
           this,
           i18n( "Cannot rename someone else's calendar folder." ) );
@@ -708,7 +708,7 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
 
     if ( item->isSubresource() &&
          ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
-      if ( item->resourceIdentifier().tqcontains( "/.INBOX.directory/" ) ) {
+      if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
         menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
       }
     } else {
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 03079cc9..a5a11134 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -47,7 +47,7 @@
 
 SearchDialog::SearchDialog(Calendar *calendar,TQWidget *tqparent)
   : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,tqparent,0,false,false,
-                KGuiItem( i18n("&Find"), "tqfind") )
+                KGuiItem( i18n("&Find"), "find") )
 {
   mCalendar = calendar;
 
diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp
index e6ee19da..f610a2fd 100644
--- a/korganizer/templatemanagementdialog.cpp
+++ b/korganizer/templatemanagementdialog.cpp
@@ -72,7 +72,7 @@ void TemplateManagementDialog::slotAddTemplate()
                                        i18n("Please enter a name for the new template:"),
                                        i18n("New Template"), &ok );
   if ( newTemplate.isEmpty() || !ok ) return;
-  if ( m_templates.tqfind( newTemplate) != m_templates.end() ) {
+  if ( m_templates.find( newTemplate) != m_templates.end() ) {
     int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite"));
     if ( rc == KMessageBox::Cancel ) {
       TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) );
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index 134211c4..0a8fadf0 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -57,7 +57,7 @@ Q_OBJECT
     /* Emitted whenever the user wants to add teh current incidence as a template
     with the given name. */
     void saveTemplate( const TQString& templateName );
-    /* Emitted when the dialog changed the list of templates. Calling code can the tqreplace
+    /* Emitted when the dialog changed the list of templates. Calling code can the replace
        the list that was handed in with the one this signal transports. */
     void templatesChanged( const TQStringList& templates );
     
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index 7caad0e3..a9eb31ba 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -80,10 +80,10 @@ bool UriHandler::process( TQWidget *tqparent, const TQString &uri )
     kapp->startServiceByDesktopPath("kmail");
 
     // parse string, show
-    int colon = uri.tqfind( ':' );
+    int colon = uri.find( ':' );
     // extract 'number' from 'kmail:<number>/<id>'
     TQString serialNumberStr = uri.mid( colon + 1 );
-    serialNumberStr = serialNumberStr.left( serialNumberStr.tqfind( '/' ) );
+    serialNumberStr = serialNumberStr.left( serialNumberStr.find( '/' ) );
 
     KMailIface_stub kmailIface( "kmail", "KMailIface" );
     kmailIface.showMail( serialNumberStr.toUInt(), TQString() );