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

59 files changed, 327 insertions, 327 deletions

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index f3be66d8..db0a7b77 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -151,7 +151,7 @@ bool ResourceKABC::doLoad()
       bool hasCategory = false;
       TQStringList categories = (*it).categories();
       for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt )
-        if ( categories.tqcontains( *strIt ) ) {
+        if ( categories.contains( *strIt ) ) {
           hasCategory = true;
           break;
         }
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 20a9aaf4..1f55138f 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -92,7 +92,7 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
     const TQStringList categories = res->categories();
     TQListViewItemIterator it( mCategoryView );
     while ( it.current() ) {
-      if ( categories.tqcontains( it.current()->text( 0 ) ) ) {
+      if ( categories.contains( it.current()->text( 0 ) ) ) {
         TQCheckListItem *item = static_cast<TQCheckListItem*>( it.current() );
         item->setOn( true );
       }
diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp
index c5e3c4a6..5cdeec25 100644
--- a/kresources/blogging/API_Blogger.cpp
+++ b/kresources/blogging/API_Blogger.cpp
@@ -299,8 +299,8 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQ
     TQString titleTagOpen = mTemplate.titleTagOpen();
     TQString titleTagClose = mTemplate.titleTagClose();
 
-    int catStart = contents.tqfind( catTagOpen, 0, false ) + catTagOpen.length();
-    int catEnd = contents.tqfind( catTagClose, 0, false );
+    int catStart = contents.find( catTagOpen, 0, false ) + catTagOpen.length();
+    int catEnd = contents.find( catTagClose, 0, false );
 kdDebug() << "  catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClose << ", start - end : " << catStart <<" - " << catEnd << endl;
     if ( catEnd > catStart ) {
       category = contents.mid( catStart, catEnd - catStart );
@@ -308,8 +308,8 @@ kdDebug() << "  catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClos
       contents = contents.remove( catStart - catTagOpen.length(),
               catEnd - catStart + catTagClose.length() + catTagOpen.length() );
     }
-    int titleStart = contents.tqfind( titleTagOpen, 0, false ) + titleTagOpen.length();
-    int titleEnd = contents.tqfind( titleTagClose, 0, false );
+    int titleStart = contents.find( titleTagOpen, 0, false ) + titleTagOpen.length();
+    int titleEnd = contents.find( titleTagClose, 0, false );
 kdDebug() << "  titleTagOpen = " << titleTagOpen << ", titleTagClose = " << titleTagClose << ", start - end : " << titleStart <<" - " << titleEnd << endl;
     kdDebug() << "Title start and end: " << titleStart << ", " << titleEnd << endl;
     if ( titleEnd > titleStart ) {
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index f20dff87..9a89cf5a 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -337,7 +337,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl;
   else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) {
 
     TQString text( typeElement.text() );
-    if ( text.tqfind( TQRegExp("^[0-9]{8,8}T") ) >= 0 ) {
+    if ( text.find( TQRegExp("^[0-9]{8,8}T") ) >= 0 ) {
       // It's in the format 20041120T...., so adjust it to correct
       // ISO 8601 Format 2004-11-20T..., else TQDateTime::fromString won't work:
       text = text.insert( 6, '-' );
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 11de07e9..6eb87e45 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -218,16 +218,16 @@ TQString CalDavPrefs::getFullUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.tqfind("@") + 1;
-    while (safeURL.tqfind("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
+    firstAt = safeURL.find("@") + 1;
+    while (safeURL.find("@", firstAt) != -1) {
+        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.tqreplace("%40", "@");
+    safeURL.replace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.tqreplace(" ", "%20");
+    safeURL.replace(" ", "%20");
 
     return safeURL;
 }
@@ -245,16 +245,16 @@ TQString CalDavPrefs::getFullTasksUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.tqfind("@") + 1;
-    while (safeURL.tqfind("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
+    firstAt = safeURL.find("@") + 1;
+    while (safeURL.find("@", firstAt) != -1) {
+        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.tqreplace("%40", "@");
+    safeURL.replace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.tqreplace(" ", "%20");
+    safeURL.replace(" ", "%20");
 
     return safeURL;
 }
@@ -272,16 +272,16 @@ TQString CalDavPrefs::getFullJournalsUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.tqfind("@") + 1;
-    while (safeURL.tqfind("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
+    firstAt = safeURL.find("@") + 1;
+    while (safeURL.find("@", firstAt) != -1) {
+        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.tqreplace("%40", "@");
+    safeURL.replace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.tqreplace(" ", "%20");
+    safeURL.replace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index d828037b..db4546d8 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -403,8 +403,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.tqreplace('\r', '\n');
+            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.replace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
@@ -451,8 +451,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            tasksData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            tasksData.tqreplace('\r', '\n');
+            tasksData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            tasksData.replace('\r', '\n');
 
             log("trying to parse...");
             if (parseTasksData(tasksData)) {
@@ -499,8 +499,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            journalsData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            journalsData.tqreplace('\r', '\n');
+            journalsData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            journalsData.replace('\r', '\n');
 
             log("trying to parse...");
             if (parseJournalsData(journalsData)) {
@@ -726,7 +726,7 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
 
     // Get the iCal header and footer
     header = ical.toString(&loc);
-    int location = header.tqfind("END:VCALENDAR", 0, true);
+    int location = header.find("END:VCALENDAR", 0, true);
     footer = header.mid(location, 0xffffffff);
     header.remove("END:VCALENDAR");
 
@@ -740,13 +740,13 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
     data = data + footer;
 
     // Remove any line feeds/carriage returns/white spaces from the UID field as they WILL break libcaldav
-    int uidPos = data.tqfind("UID:", 0) + 4;
-    int nextPos = data.tqfindRev("\n", data.tqfind(":", uidPos));
+    int uidPos = data.find("UID:", 0) + 4;
+    int nextPos = data.findRev("\n", data.find(":", uidPos));
     TQString uidField = data.mid(uidPos, nextPos-uidPos);
     data.remove(uidPos, nextPos-uidPos);
-    uidField.tqreplace("\n", "");
-    uidField.tqreplace("\r", "");
-    uidField.tqreplace(" ", "");
+    uidField.replace("\n", "");
+    uidField.replace("\r", "");
+    uidField.replace(" ", "");
     data.insert(uidPos, uidField);
     return data;
 }
@@ -888,11 +888,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsAdded = "";
         t->journalsChanged = "";
         t->journalsDeleted = "";
-        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
           t->added = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
           t->tasksAdded = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
           t->journalsAdded = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -916,11 +916,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
           t->changed = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
           t->tasksChanged = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
           t->journalsChanged = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -944,11 +944,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
           t->deleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
           t->tasksDeleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNALS") > 0)
+        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNALS") > 0)
           t->journalsDeleted = getICalString(currentIncidence);
 
         writingQueuePush(t);
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index 6511cfcb..cf2cdbc5 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -221,16 +221,16 @@ TQString CardDavPrefs::getFullUrl() {
 
     safeURL = t.toString();
 
-    firstAt = safeURL.tqfind("@") + 1;
-    while (safeURL.tqfind("@", firstAt) != -1) {
-        safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40");
+    firstAt = safeURL.find("@") + 1;
+    while (safeURL.find("@", firstAt) != -1) {
+        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.tqreplace("%40", "@");
+    safeURL.replace("%40", "@");
 
     // Encode any spaces, as libcarddav stupidly fails otherwise
-    safeURL.tqreplace(" ", "%20");
+    safeURL.replace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 9570d2b3..4fb33af5 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -394,8 +394,8 @@ void ResourceCardDav::loadFinished() {
         TQString data = loader->data();
 
         if (!data.isNull() && !data.isEmpty()) {
-            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.tqreplace('\r', '\n');
+            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.replace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
diff --git a/kresources/carddav/writer.cpp b/kresources/carddav/writer.cpp
index aed9ddb6..7141bf30 100644
--- a/kresources/carddav/writer.cpp
+++ b/kresources/carddav/writer.cpp
@@ -58,8 +58,8 @@ int CardDavWriter::runJob(runtime_info* RT) {
             res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT);
         if (OK == res) {
             kdDebug() << "pushing deleted objects";
-            while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
-                int endLocation = mDeleted.tqfind("END:VCARD", 0, TRUE);
+            while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+                int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                 TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                 mDeleted = mDeleted.remove(0, endLocation+9);
                 if (getUseURI() == false)
@@ -82,8 +82,8 @@ int CardDavWriter::runJob(runtime_info* RT) {
                 res = pushObjects(mChanged, carddav_add_object, OK, RT);
             if (OK == res) {
                 kdDebug() << "pushing deleted objects";
-                while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
-                    int endLocation = mDeleted.tqfind("END:VCARD", 0, TRUE);
+                while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+                    int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                     TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                     mDeleted = mDeleted.remove(0, endLocation+9);
                     if (getUseURI() == false)
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 1660c85e..57a6479f 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -109,9 +109,9 @@ void DebugDialog::slotUser2()
 void DebugDialog::addText( const TQString &text, Type type )
 {
   TQString htmlCode( text );
-  htmlCode.tqreplace( "<", "&lt;" );
-  htmlCode.tqreplace( ">", "&gt;" );
-  htmlCode.tqreplace( "\n", "<br>" );
+  htmlCode.replace( "<", "&lt;" );
+  htmlCode.replace( ">", "&gt;" );
+  htmlCode.replace( "\n", "<br>" );
 
   mMessages.append( text );
   if ( type == Input )
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 2e505324..a02f568a 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -479,7 +479,7 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::ConstIterator it = mCategoryMap.tqfind( *catIt );
+    TQMap<TQString, int>::ConstIterator it = mCategoryMap.find( *catIt );
     if ( it == mCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -575,9 +575,9 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVari
   const TQStringList customFields = addr.customs();
   TQStringList::ConstIterator it;
   for ( it = customFields.begin(); it != customFields.end(); ++it ) {
-    int colon = (*it).tqfind( ":" );
+    int colon = (*it).find( ":" );
     TQString identifier = (*it).left( colon );
-    int dash = identifier.tqfind( "-" );
+    int dash = identifier.find( "-" );
     TQString app = identifier.left( dash );
     TQString name = identifier.mid( dash + 1 );
     TQString value = (*it).mid( colon + 1 );
@@ -752,7 +752,7 @@ void ResourceXMLRPC::loadCategoriesFinished( const TQValueList<TQVariant> &mapLi
     mCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
     TQStringList categories = prefs->customCategories();
-    if ( categories.tqfind( it.data().toString() ) == categories.end() )
+    if ( categories.find( it.data().toString() ) == categories.end() )
       categories.append( it.data().toString() );
 
     prefs->mCustomCategories = categories;
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 177ce9de..25f4c1f2 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -651,7 +651,7 @@ void ResourceXMLRPC::loadEventCategoriesFinished( const TQValueList<TQVariant> &
   for ( it = map.begin(); it != map.end(); ++it ) {
     mEventCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -756,7 +756,7 @@ void ResourceXMLRPC::loadTodoCategoriesFinished( const TQValueList<TQVariant> &m
   for ( it = map.begin(); it != map.end(); ++it ) {
     mTodoCategoryMap.insert( it.data().toString(), it.key().toInt() );
 
-    if ( prefs.mCustomCategories.tqfind( it.data().toString() ) == prefs.mCustomCategories.end() )
+    if ( prefs.mCustomCategories.find( it.data().toString() ) == prefs.mCustomCategories.end() )
       prefs.mCustomCategories.append( it.data().toString() );
   }
 
@@ -964,7 +964,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args
   TQMap<TQString, TQVariant> catMap;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mEventCategoryMap.tqfind( *catIt );
+    TQMap<TQString, int>::Iterator it = mEventCategoryMap.find( *catIt );
     if ( it == mEventCategoryMap.end() ) // new category
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
@@ -1099,7 +1099,7 @@ void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
   TQStringList::ConstIterator catIt;
   int counter = 0;
   for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
-    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.tqfind( *catIt );
+    TQMap<TQString, int>::Iterator it = mTodoCategoryMap.find( *catIt );
     if ( it == mTodoCategoryMap.end() )
       catMap.insert( TQString::number( counter-- ), *catIt );
     else
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 2539d23a..ed87e9db 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -114,7 +114,7 @@ void TodoStateMapper::addTodoState( const TQString &uid, int localState, const T
 
 TQString TodoStateMapper::remoteState( const TQString &uid, int localState )
 {
-  if ( mTodoStateMap.tqfind( uid ) == mTodoStateMap.end() )
+  if ( mTodoStateMap.find( uid ) == mTodoStateMap.end() )
     kdError() << "TodoStateMapper: no entry for " << uid << " found" << endl;
 
   TodoStateMapEntry entry = mTodoStateMap[ uid ];
@@ -139,7 +139,7 @@ int TodoStateMapper::toLocal( const TQString &remoteState )
     return 100;
   else {
     TQString number( remoteState );
-    number.tqreplace( "%", "" );
+    number.replace( "%", "" );
     return number.toInt();
   }
 }
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 4a46a37e..59b467bb 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -202,10 +202,10 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::CString:
         {
         TQString result = arg.toString();
-        result = result.tqreplace( "&", "&amp;" );
-        result = result.tqreplace( "\"", "&quot;" );
-        result = result.tqreplace( "<", "&lt;" );
-        result = result.tqreplace( ">", "&gt;" );
+        result = result.replace( "&", "&amp;" );
+        result = result.replace( "\"", "&quot;" );
+        result = result.replace( "<", "&lt;" );
+        result = result.replace( ">", "&gt;" );
         return "<value><string>" + result + "</string></value>\r\n";
         }
       case TQVariant::Int:
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index e6393afa..b2622902 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -48,7 +48,7 @@ void DateSet::add( TQDate const& date )
     mDates->insert( 0, new TQPair<TQDate,TQDate>( date, date ) );
     return;
   } 
-  int i = tqfind( date );
+  int i = find( date );
   mDates->insert( i, new TQPair<TQDate,TQDate>( date, date ) );
   tryMerge( i );
   tryMerge( i-1 );
@@ -60,7 +60,7 @@ void DateSet::add( TQDate const& from, TQDate const& to )
     mDates->insert( 0, new TQPair<TQDate,TQDate>( from, to ) );
     return;
   } 
-  uint i = tqfind( from );
+  uint i = find( from );
   kdDebug() << "Adding range at position " << i << endl;
   mDates->insert( i, new TQPair<TQDate,TQDate>( from, to ) );
 
@@ -87,7 +87,7 @@ void DateSet::remove( TQDate const& date )
     return;
   } 
 
-  uint i = tqfind( date );
+  uint i = find( date );
   if ( i == mDates->count() )
     return;
 
@@ -117,7 +117,7 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
     return;
   } 
   
-  uint i = tqfind( from );
+  uint i = find( from );
   if ( i == mDates->count() )
     return;
   
@@ -155,13 +155,13 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
   }
 }
 
-bool DateSet::tqcontains( TQDate const& date )
+bool DateSet::contains( TQDate const& date )
 {
   if (mDates->isEmpty()) {
     return false;
   } 
 
-  uint i = tqfind( date );
+  uint i = find( date );
 //  kdDebug() << "contains looking for " << date.toString() << " at range " << i << endl;
   if ( i == mDates->count() )
     return false;
@@ -172,13 +172,13 @@ bool DateSet::tqcontains( TQDate const& date )
 }
 
 // returns true if and only if the whole range is in the set
-bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
+bool DateSet::contains( TQDate const& from, TQDate const& to )
 {
   if (mDates->isEmpty()) {
     return false;
   } 
 
-  uint i = tqfind( from );
+  uint i = find( from );
   if ( i == mDates->count() )
     return false;
 
@@ -192,7 +192,7 @@ bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
 // If mDates is empty, return 0.
 // If date is later than the last item in mDates, return mDates->count()
 
-int DateSet::tqfind( TQDate const& date )
+int DateSet::find( TQDate const& date )
 {
   if ( mDates->isEmpty() )
     return 0;
diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h
index 99c02a5c..693aa4a3 100644
--- a/kresources/exchange/dateset.h
+++ b/kresources/exchange/dateset.h
@@ -34,8 +34,8 @@ class DateRange {
     DateRange( TQDate const& from, TQDate const& to )
 	    : mFrom( from ), mTo( to ) { }
     bool operator< ( const DateRange& r ) { return mFrom < r.from(); }
-    bool tqcontains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
-    bool tqcontains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
+    bool contains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
+    bool contains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
 
     TQDate from() { return mFrom; }
     TQDate to() { return mTo; }
@@ -68,11 +68,11 @@ class DateSet {
     void remove( TQDate const& date );
     void remove( TQDate const& from, TQDate const& to );
     
-    bool tqcontains( TQDate const& date );
+    bool contains( TQDate const& date );
     // returns true if and only if the whole range is in the set
-    bool tqcontains( TQDate const& from, TQDate const& to );
+    bool contains( TQDate const& from, TQDate const& to );
 
-    int tqfind( TQDate const &date );
+    int find( TQDate const &date );
     void print();
 
   protected:
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index de915875..b58a750f 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -233,7 +233,7 @@ void ResourceExchange::slotMonitorNotify( const TQValueList<long>& IDs, const TQ
    * 3. Event modified that we have in cache
    * 4. Something else happened that isn't relevant to us
    * Update cache, then notify whoever's watching us
-   * We may be able to tqfind (1) and (3) by looking at the
+   * We may be able to find (1) and (3) by looking at the
    *   DAV:getlastmodified property
    * (2) is trickier: we might have to resort to checking
    * all uids in the cache
@@ -298,7 +298,7 @@ void ResourceExchange::changeIncidence( Incidence *incidence )
   kdDebug() << "ResourceExchange::changeIncidence(): "
             << incidence->summary() << endl;
 
-  if ( mChangedIncidences.tqfind( incidence ) == mChangedIncidences.end() ) {
+  if ( mChangedIncidences.find( incidence ) == mChangedIncidences.end() ) {
     mChangedIncidences.append( incidence );
   }
 }
@@ -481,7 +481,7 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
   // kdDebug() << "Now is " << now.toString() << endl;
   // kdDebug() << "mDates: " << mDates << endl;
   TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month
-  if ( mDates && ( !mDates->tqcontains( start ) ||
+  if ( mDates && ( !mDates->contains( start ) ||
                    (*mCacheDates)[start].secsTo( now ) > mCachedSeconds ) ) {
     TQDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month
     // Get events that occur in this period from the cache
@@ -505,7 +505,7 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
     // are really new.
     Event::List eventsAfter = mCache->rawEvents();
     for ( it = eventsAfter.begin(); it != eventsAfter.end(); ++it ) {
-      if ( eventsBefore.tqfind( *it ) == eventsBefore.end() ) {
+      if ( eventsBefore.find( *it ) == eventsBefore.end() ) {
         // it's a new event downloaded by downloadSynchronous -> install observer
         (*it)->registerObserver( this );
       }
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index 692a8584..e108247f 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -119,7 +119,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories,
       Todo *todo = new Todo;
 
       TQString summary = f->summary();
-      int pos = summary.tqfind( '\n' );
+      int pos = summary.find( '\n' );
       if ( pos > 0 ) summary = summary.left( pos ) + "...";
       todo->setSummary( summary );
       
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index ed1ad09b..10716000 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -96,7 +96,7 @@ bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:displayname" );
   WebdavHandler::addElement( doc, prop, "d:resourcetype" );
@@ -110,7 +110,7 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
 KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "propfind" );
   TQDomElement prop = WebdavHandler::addDavElement(  doc, root, "prop" );
   WebdavHandler::addDavElement( doc, prop, "getetag" );
 //  WebdavHandler::addDavElement( doc, prop, "getcontenttype" );
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index 7232fd1e..efdc7ec4 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -193,7 +193,7 @@ void ResourceGroupwareConfig::updateAddressBookView()
   Groupware::AddressBook::List::ConstIterator abIt;
   for ( abIt = addressBooks.begin(); abIt != addressBooks.end(); ++abIt ) {
     AddressBookItem *item = new AddressBookItem( mAddressBookView, *abIt );
-    if ( selectedRead.tqfind( (*abIt).id ) != selectedRead.end() )
+    if ( selectedRead.find( (*abIt).id ) != selectedRead.end() )
       item->setOn( true );
 
     mAddressBookBox->insertItem( (*abIt).name );
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 6ac8a880..e6570b46 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -665,13 +665,13 @@ bool ResourceGroupwise::shouldFetchSystemAddressBook()
 {
   
   TQStringList ids = mPrefs->readAddressBooks();
-  return ( appIsWhiteListedForSAB() && ids.tqfind( mPrefs->systemAddressBook() ) != ids.end() );
+  return ( appIsWhiteListedForSAB() && ids.find( mPrefs->systemAddressBook() ) != ids.end() );
 }
 
 bool ResourceGroupwise::shouldFetchUserAddressBooks()
 {
   TQStringList ids = mPrefs->readAddressBooks();
-  return ( ids.count() > 1 || ids.tqfind( mPrefs->systemAddressBook() ) == ids.end() );
+  return ( ids.count() > 1 || ids.find( mPrefs->systemAddressBook() ) == ids.end() );
 }
 
 KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, unsigned long lastSequenceNumber, unsigned long lastPORebuildTime )
@@ -732,7 +732,7 @@ void ResourceGroupwise::storeDeltaInfo()
 
 bool ResourceGroupwise::appIsWhiteListedForSAB()
 {
-  if ( !mPrefs->systemAddressBookWhiteList().tqcontains( tqApp->argv()[ 0 ] ) )
+  if ( !mPrefs->systemAddressBookWhiteList().contains( tqApp->argv()[ 0 ] ) )
   {
     kdDebug() << "Application " << tqApp->argv()[ 0 ] << " is _blacklisted_ to load the SAB" << endl;
     return false;
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index a5ccb74f..22076907 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -168,7 +168,7 @@ void ResourceGroupwiseConfig::saveAddressBookSettings()
   // if so, clear the resource to clear the SAB data that is no longer required.
   // also, set the sequence numbers to 0 so that we know the SAB should be re-fetched in its entirety the next time we do load it
   TQString sab = mResource->prefs()->systemAddressBook();
-  if ( ( mReadAddressBookIds.tqfind( sab ) != mReadAddressBookIds.end() ) && ( selectedRead.tqfind( sab ) == selectedRead.end() ) )
+  if ( ( mReadAddressBookIds.find( sab ) != mReadAddressBookIds.end() ) && ( selectedRead.find( sab ) == selectedRead.end() ) )
   {
     mResource->clearCache();
     mResource->prefs()->setLastSequenceNumber( 0 );
@@ -195,14 +195,14 @@ void ResourceGroupwiseConfig::updateAddressBookView()
   GroupWise::AddressBook::List::ConstIterator abIt;
   for ( abIt = addressBooks.begin(); abIt != addressBooks.end(); ++abIt ) {
     AddressBookItem *item = new AddressBookItem( mAddressBookView, *abIt );
-    if ( selectedRead.tqfind( (*abIt).id ) != selectedRead.end() )
+    if ( selectedRead.find( (*abIt).id ) != selectedRead.end() )
       item->setOn( true );
 
     mAddressBookBox->insertItem( (*abIt).name );
     mWriteAddressBookIds.append( (*abIt).id );
   }
 
-  int index = mWriteAddressBookIds.tqfindIndex( mResource->prefs()->writeAddressBook() );
+  int index = mWriteAddressBookIds.findIndex( mResource->prefs()->writeAddressBook() );
   mAddressBookBox->setCurrentItem( index );
 }
 
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 8689309b..6ea0c8ed 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -106,12 +106,12 @@ void Groupwise::get( const KURL &url )
   TQString path = url.path();
   debugMessage( "Path: " + path );
 
-  if ( path.tqcontains( "/freebusy" ) ) {
+  if ( path.contains( "/freebusy" ) ) {
     getFreeBusy( url );
-  } else if ( path.tqcontains( "/calendar" ) ) {
+  } else if ( path.contains( "/calendar" ) ) {
     getCalendar( url );
-  } else if ( path.tqcontains( "/addressbook" ) ) {
-    if ( url.query().tqcontains( "update=true" ) )
+  } else if ( path.contains( "/addressbook" ) ) {
+    if ( url.query().contains( "update=true" ) )
       updateAddressbook( url );
     else
       getAddressbook( url );
@@ -169,8 +169,8 @@ void Groupwise::getFreeBusy( const KURL &url )
 
     // Sanitise local Nuernberg email addresses
     kdDebug() << "Email before sanitizing: " << email << endl;
-    email = email.tqreplace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
-    email = email.tqreplace(TQRegExp("\\.Suse.INTERNET" ), "" );
+    email = email.replace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
+    email = email.replace(TQRegExp("\\.Suse.INTERNET" ), "" );
     kdDebug() << "Email after sanitizing: " << email << endl;
 
     TQString u = soapUrl( url );
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 605d14d6..d4ab5f6a 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -313,7 +313,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
        std::vector<std::string> list = contact->emailList->email;
        std::vector<std::string>::const_iterator it;
        for ( it = list.begin(); it != list.end(); ++it ) {
-         if ( emails.tqfind( stringToTQString( *it ) ) == emails.end() )
+         if ( emails.find( stringToTQString( *it ) ) == emails.end() )
            emails.append( stringToTQString( *it ) );
        }
      }
@@ -618,12 +618,12 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
 
 void ContactConverter::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/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 3aee8487..93a3f0a2 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -60,7 +60,7 @@ static TQMap<struct soap *,GroupwiseServer *> mServerMap;
 int myOpen( struct soap *soap, const char *endpoint, const char *host, int port )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.tqfind( soap );
+  it = mServerMap.find( soap );
   if ( it == mServerMap.end() ) {
     soap->error = SOAP_FAULT;
     return SOAP_INVALID_SOCKET;
@@ -72,7 +72,7 @@ int myOpen( struct soap *soap, const char *endpoint, const char *host, int port
 int myClose( struct soap *soap )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.tqfind( soap );
+  it = mServerMap.find( soap );
   if ( it == mServerMap.end() ) return SOAP_FAULT;
 
   return (*it)->gSoapClose( soap );
@@ -81,7 +81,7 @@ int myClose( struct soap *soap )
 int mySendCallback( struct soap *soap, const char *s, size_t n )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.tqfind( soap );
+  it = mServerMap.find( soap );
   if ( it == mServerMap.end() ) return SOAP_FAULT;
 
   return (*it)->gSoapSendCallback( soap, s, n );
@@ -90,7 +90,7 @@ int mySendCallback( struct soap *soap, const char *s, size_t n )
 size_t myReceiveCallback( struct soap *soap, char *s, size_t n )
 {
   TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
-  it = mServerMap.tqfind( soap );
+  it = mServerMap.find( soap );
   if ( it == mServerMap.end() ) {
     kdDebug() << "No soap object found" << endl;
     soap->error = SOAP_FAULT;
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 7a95cf6e..6f591859 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -84,7 +84,7 @@ void ReadAddressBooksJob::run()
       } else {
         TQString id = GWConverter::stringToTQString( (*it)->id );
         kdDebug() << "Reading ID: " << id << endl;
-        if ( mAddressBookIds.tqfind( id ) != mAddressBookIds.end() ) {
+        if ( mAddressBookIds.find( id ) != mAddressBookIds.end() ) {
           readAddressBook( *(*it)->id );
           mProgress += 100;
         }
@@ -438,7 +438,7 @@ void ReadCalendarJob::run()
   // perform consistency checks
   kdDebug() << "Total count of items of all types in folders we read: " << totalItems << endl;
   kdDebug() << "Folders we read contained " << totals.appointments << " appointments, " << totals.notes << " notes, and " << totals.tasks << " tasks." << endl;
-  kdDebug() << "Local calendar now tqcontains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
+  kdDebug() << "Local calendar now contains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
   if ( totals.appointments == mCalendar->rawEvents().count() )
     kdDebug() << "All events accounted for." << endl;
   else
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index c0770879..30e8bb64 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -150,12 +150,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
 
 bool KSSLSocket::hasMetaData( const TQString &key )
 {
-	return d->metaData.tqcontains(key);
+	return d->metaData.contains(key);
 }
 
 TQString KSSLSocket::metaData( const TQString &key )
 {
-	if( d->metaData.tqcontains(key) )
+	if( d->metaData.contains(key) )
 		return d->metaData[key];
 	return TQString();
 }
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index 17c52d60..b446bc4b 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -12992,7 +12992,7 @@ static const struct soap_code_map soap_codes_ngwt__FilterOp[] =
 	{ (long)lt, "lt" },
 	{ (long)gte, "gte" },
 	{ (long)lte, "lte" },
-	{ (long)tqcontains, "tqcontains" },
+	{ (long)contains, "contains" },
 	{ (long)containsWord, "containsWord" },
 	{ (long)begins, "begins" },
 	{ (long)exists, "exists" },
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index 7ba6692e..829237fd 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -115,7 +115,7 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
 /* ngwt:FilterOp */
-enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
+enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, contains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderACLtqStatus
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 3a337402..603d4def 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -1257,8 +1257,8 @@ struct soap_dom_element
   struct soap_dom_element &add(struct soap_dom_attribute&);
   soap_dom_iterator begin();
   soap_dom_iterator end();
-  soap_dom_iterator tqfind(const char *nstr, const char *name);
-  soap_dom_iterator tqfind(int type);
+  soap_dom_iterator find(const char *nstr, const char *name);
+  soap_dom_iterator find(int type);
   void unlink();
   soap_dom_element();
   soap_dom_element(struct soap *soap);
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 474eafa3..b75355f5 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -1115,16 +1115,16 @@ void Contact::setFields( const KABC::Addressee* addressee )
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
     // The format is "app-name:value".
-    int pos = (*it).tqfind( '-' );
+    int pos = (*it).find( '-' );
     if ( pos == -1 ) continue;
     TQString app = (*it).left( pos );
     if ( app == "KOLAB" ) continue;
     TQString name = (*it).mid( pos + 1 );
-    pos = name.tqfind( ':' );
+    pos = name.find( ':' );
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
-    if ( !knownCustoms.tqcontains( name ) ) {
+    if ( !knownCustoms.contains( name ) ) {
       //kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
       Custom c;
       if ( app != "KADDRESSBOOK" ) // that's the default
@@ -1162,8 +1162,8 @@ void Contact::saveTo( KABC::Addressee* addressee )
     for ( ; mit != mDistrListMembers.end(); ++mit ) {
       TQString displayName = (*mit).displayName;
       // fixup the display name DistributionList::assumes neither ',' nor ';' is present
-      displayName.tqreplace( ',', ' ' );
-      displayName.tqreplace( ';', ' ' );
+      displayName.replace( ',', ' ' );
+      displayName.replace( ';', ' ' );
       distrList.insertEntry( displayName, (*mit).email );
     }
     addressee->insertCustom( "KADDRESSBOOK", "DistributionList", distrList.custom( "KADDRESSBOOK", "DistributionList" ) );
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index 0acabb09..ff19fb50 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -335,7 +335,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
+  if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -398,7 +398,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
+    // mAddrMap.find(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -416,7 +416,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.tqcontains( uid ) ) {
+  if ( mUidMap.contains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -431,7 +431,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
 void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -468,8 +468,8 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.tqcontains( uid )
-       && !mUidsPendingUpdate.tqcontains( uid ) ) {
+  if ( !mUidsPendingAdding.contains( uid )
+       && !mUidsPendingUpdate.contains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -490,9 +490,9 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
+  if ( mUidsPendingDeletion.contains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
+  } else if ( mUidsPendingUpdate.contains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
     // replace it, so let's just sit tight.
   } else {
@@ -523,7 +523,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.tqcontains( subResource ) )
+  if ( mSubResources.contains( subResource ) )
     // Already registered
     return;
 
@@ -540,7 +540,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.tqcontains( subResource ) )
+  if ( !mSubResources.contains( subResource ) )
     // Not registered
     return;
 
@@ -597,7 +597,7 @@ TQStringList KABC::ResourceKolab::subresources() const
 
 bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -609,7 +609,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 
 bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -617,7 +617,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
 
 int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -628,7 +628,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
 
 TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -638,7 +638,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -657,7 +657,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
 
 void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index da2cee41..2107642b 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -285,7 +285,7 @@ void ResourceKolab::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -310,7 +310,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   const TQString uid = incidencebase->uid();
   //kdDebug() << k_funcinfo << uid << endl;
 
-  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
+  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
@@ -336,7 +336,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
     if ( i ) {
       bool ignoreThisUpdate = false;
 
-      if ( !mLastKnownRevisions.tqcontains( uid ) ) {
+      if ( !mLastKnownRevisions.contains( uid ) ) {
         mLastKnownRevisions[uid] = i->revision();
       }
 
@@ -355,7 +355,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
 
   TQString subResource;
   TQ_UINT32 sernum = 0;
-  if ( mUidMap.tqcontains( uid ) ) {
+  if ( mUidMap.contains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -543,7 +543,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders, attURLs, attMimeTypes, attNames, deletedAtts );
   // update the serial number
-  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
+  if ( mUidMap.contains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
 
@@ -629,7 +629,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
       // Lets not warn the user 100 times that there's no writable resource
       // and not ask 100 times which resource to use
-      if ( !mBatchAddingInProgress || !mLastUsedResources.tqcontains( type ) ) {
+      if ( !mBatchAddingInProgress || !mLastUsedResources.contains( type ) ) {
         subResource = findWritableResource( type, *map, text );
         mLastUsedResources[type] = subResource;
       } else {
@@ -676,7 +676,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
   } else { /* KMail told us */
-    const bool ourOwnUpdate = mUidsPendingUpdate.tqcontains(  uid );
+    const bool ourOwnUpdate = mUidsPendingUpdate.contains(  uid );
     kdDebug( 5650 ) << "addIncidence: ourOwnUpdate " << ourOwnUpdate << endl;
     /* Check if we updated this one, which means kmail deleted and added it.
      * We know the new state, so lets just not do much at all. The old incidence
@@ -692,7 +692,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.tqcontains( uid ) ) {
+      if ( mUidMap.contains( uid ) ) {
         if ( mUidMap[ uid ].resource() == subResource ) {
           if ( (*map)[ subResource ].writable() ) {
             kdDebug( 5650 ) << "lets resolve the conflict " << endl;
@@ -716,7 +716,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
+      if ( !mUidsPendingAdding.contains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -726,14 +726,14 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
+      if ( !mUidsPendingAdding.contains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -752,7 +752,7 @@ bool ResourceKolab::addEvent( KCal::Event *event )
 
 bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 {
-  if ( mUidMap.tqcontains( event->uid() ) ) {
+  if ( mUidMap.contains( event->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( event, subResource, 0 );
@@ -776,7 +776,7 @@ bool ResourceKolab::deleteIncidence( KCal::Incidence* incidence )
   }
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
+  if( !mUidMap.contains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -832,7 +832,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo )
 
 bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 {
-  if ( mUidMap.tqcontains( todo->uid() ) ) {
+  if ( mUidMap.contains( todo->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( todo, subResource, 0 );
@@ -876,7 +876,7 @@ bool ResourceKolab::addJournal( KCal::Journal *journal )
 
 bool ResourceKolab::addJournal( KCal::Journal *journal, const TQString &subResource )
 {
-  if ( mUidMap.tqcontains( journal->uid() ) )
+  if ( mUidMap.contains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, subResource, 0 );
@@ -921,12 +921,12 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
     KCal::Alarm *a = (*it);
     ++it;
     const TQString &uid = a->tqparent()->uid();
-     if ( mUidMap.tqcontains( uid ) ) {
+     if ( mUidMap.contains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
-       if ( mEventSubResources.tqcontains( sr ) )
+       if ( mEventSubResources.contains( sr ) )
           subResource = &( mEventSubResources[ sr ] );
-       else if ( mTodoSubResources.tqcontains( sr ) )
+       else if ( mTodoSubResources.contains( sr ) )
           subResource = &( mTodoSubResources[ sr ] );
        assert( subResource );
        if ( subResource->alarmRelevant() )
@@ -1009,16 +1009,16 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.tqfind( uid ) != mUidsPendingDeletion.end() ) {
-    mUidsPendingDeletion.remove( mUidsPendingDeletion.tqfind( uid ) );
-  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
+  if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
+    mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
+  } else if ( mUidsPendingUpdate.contains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
     // replace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
     TQPair<TQString, TQString> p( uid, subResource );
-    if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
+    if ( mOriginalUID2fakeUID.contains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
       uidToUse = mOriginalUID2fakeUID[p];
@@ -1073,7 +1073,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->tqcontains( subResource ) )
+  if ( map->contains( subResource ) )
     // Already registered
     return;
 
@@ -1093,7 +1093,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->tqcontains( subResource ) )
+  if ( map->contains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -1122,11 +1122,11 @@ TQStringList ResourceKolab::subresources() const
 const TQString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
@@ -1146,11 +1146,11 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -1163,15 +1163,15 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
   const char* mimeType = 0;
-  if ( mEventSubResources.tqcontains( subresource ) ) {
+  if ( mEventSubResources.contains( subresource ) ) {
      map = &mEventSubResources;
      mimeType = eventAttachmentMimeType;
   }
-  if ( mTodoSubResources.tqcontains( subresource ) ) {
+  if ( mTodoSubResources.contains( subresource ) ) {
      map = &mTodoSubResources;
      mimeType = todoAttachmentMimeType;
   }
-  if ( mJournalSubResources.tqcontains( subresource ) ) {
+  if ( mJournalSubResources.contains( subresource ) ) {
      map = &mJournalSubResources;
      mimeType = journalAttachmentMimeType;
   }
@@ -1194,11 +1194,11 @@ bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
     return mEventSubResources[ subresource ].writable();
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
     return mTodoSubResources[ subresource ].writable();
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
     return mJournalSubResources[ subresource ].writable();
 
   return false; //better a safe default
@@ -1236,11 +1236,11 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& tq
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
    if ( !tqparent.isEmpty() ) {
-     if ( mEventSubResources.tqcontains( tqparent ) )
+     if ( mEventSubResources.contains( tqparent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.tqcontains( tqparent ) )
+     else if ( mTodoSubResources.contains( tqparent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.tqcontains( tqparent ) )
+     else if ( mJournalSubResources.contains( tqparent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1269,10 +1269,10 @@ bool ResourceKolab::removeSubresource( const TQString& resource )
 TQString ResourceKolab::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.tqcontains( uid ) )
+  if ( mUidMap.contains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.tqcontains( uid ) )
+    if ( mNewIncidencesMap.contains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
@@ -1311,11 +1311,11 @@ bool ResourceKolab::unloadSubResource( const TQString& subResource )
 
 TQString ResourceKolab::subresourceType( const TQString &resource )
 {
-  if ( mEventSubResources.tqcontains( resource ) )
+  if ( mEventSubResources.contains( resource ) )
     return "event";
-  if ( mTodoSubResources.tqcontains( resource ) )
+  if ( mTodoSubResources.contains( resource ) )
     return "todo";
-  if ( mJournalSubResources.tqcontains( resource ) )
+  if ( mJournalSubResources.contains( resource ) )
     return "journal";
   return TQString();
 }
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index cf386218..132decdf 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -178,12 +178,12 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   Q_ASSERT( journal );
 
   bool addedOk = journal &&
-                 !mUidMap.tqcontains( journal->uid() ) &&
+                 !mUidMap.contains( journal->uid() ) &&
                  addNote( journal, subresource, sernum );
 
   // for debugging
-  if ( journal && mUidMap.tqcontains( journal->uid() ) ) {
-    kdDebug(5500) << "mUidMap already tqcontains " << journal->uid() << endl;
+  if ( journal && mUidMap.contains( journal->uid() ) ) {
+    kdDebug(5500) << "mUidMap already contains " << journal->uid() << endl;
   }
 
   if ( !addedOk ) {
@@ -232,7 +232,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource
 bool ResourceKolab::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.tqcontains( uid ) )
+  if ( !mUidMap.contains( uid ) )
     // Odd
     return false;
 
@@ -271,7 +271,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.tqcontains( i->uid() ) ) {
+  if ( mUidMap.contains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -352,7 +352,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.tqcontains( subResource ) )
+  if ( mSubResources.contains( subResource ) )
     // Already registered
     return;
 
@@ -372,7 +372,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.tqcontains( subResource ) )
+  if ( !mSubResources.contains( subResource ) )
     // Not registered
     return;
 
@@ -440,7 +440,7 @@ TQStringList ResourceKolab::subresources() const
 
 bool ResourceKolab::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.tqcontains( res ) ) {
+  if ( mSubResources.contains( res ) ) {
     return mSubResources[ res ].active();
   }
 
@@ -452,7 +452,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const
 
 bool ResourceKolab::subresourceWritable( const TQString& res ) const
 {
-  if ( mSubResources.tqcontains( res ) ) {
+  if ( mSubResources.contains( res ) ) {
     return mSubResources[ res ].writable();
   }
 
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index d9ffd98d..8e584fb2 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -82,10 +82,10 @@ bool KMailConnection::connectToKMail()
       // someone, probably ourselves, already offers the interface, if not stop here
       const QCStringList services = kapp->dcopClient()->registeredApplications();
       for ( uint i = 0; i < services.count(); ++i ) {
-        if ( services[i].tqfind( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
+        if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
-        if ( objs.tqcontains( dcopObjectId ) ) {
+        if ( objs.contains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
         }
diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp
index 9c6084b9..88685bdf 100644
--- a/kresources/lib/calendaradaptor.cpp
+++ b/kresources/lib/calendaradaptor.cpp
@@ -75,11 +75,11 @@ bool CalendarAdaptor::localItemHasChanged( const TQString &localId )
   if ( !i ) return false;
 
   if ( !mResource->deletedIncidences().isEmpty() &&
-      mResource->deletedIncidences().tqfind( i )
+      mResource->deletedIncidences().find( i )
    != mResource->deletedIncidences().end() )
     return true;
   if ( !mResource->changedIncidences().isEmpty() &&
-       mResource->changedIncidences().tqfind( i )
+       mResource->changedIncidences().find( i )
     != mResource->changedIncidences().end() )
     return true;
 
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index f8feb456..f5af726a 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -73,12 +73,12 @@ void FolderConfig::setFolderLister( FolderLister *f )
   
   TQValueList<FolderListView::Property> types;
   TQValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() );
-  if ( suptypes.tqcontains( FolderLister::Event ) ) types << FolderListView::Event;
-  if ( suptypes.tqcontains( FolderLister::Todo ) ) types << FolderListView::Todo;
-  if ( suptypes.tqcontains( FolderLister::Journal ) ) types << FolderListView::Journal;
-  if ( suptypes.tqcontains( FolderLister::Contact ) ) types << FolderListView::Contact;
-  if ( suptypes.tqcontains( FolderLister::All ) ) types << FolderListView::All;
-  if ( suptypes.tqcontains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
+  if ( suptypes.contains( FolderLister::Event ) ) types << FolderListView::Event;
+  if ( suptypes.contains( FolderLister::Todo ) ) types << FolderListView::Todo;
+  if ( suptypes.contains( FolderLister::Journal ) ) types << FolderListView::Journal;
+  if ( suptypes.contains( FolderLister::Contact ) ) types << FolderListView::Contact;
+  if ( suptypes.contains( FolderLister::All ) ) types << FolderListView::All;
+  if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
 
   mFolderList->setEnabledTypes( types );
   connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index 9436a6f9..eec969c2 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -50,11 +50,11 @@ void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type,
 
 TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const
 {
-  if ( mWriteDestinationId.tqcontains( type ) ) {
+  if ( mWriteDestinationId.contains( type ) ) {
     return mWriteDestinationId[type];
-  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::All ) ) {
+  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::All ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::All ];
-  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) {
+  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
   } else return TQString();
 }
@@ -151,7 +151,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
     for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
       e.type = (FolderLister::ContentType)( e.type | contentTypeFromString( *it ) );
     }
-    if ( active.tqfind( e.id ) != active.end() ) e.active = true;
+    if ( active.find( e.id ) != active.end() ) e.active = true;
     mFolders.append( e );
   }
 
@@ -196,7 +196,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
 
   TQStringList defaultFolders;
   #define writeDestination(type) \
-    if ( mWriteDestinationId.tqcontains( type ) ) \
+    if ( mWriteDestinationId.contains( type ) ) \
       defaultFolders << mWriteDestinationId[type]; \
     else defaultFolders << TQString();
   writeDestination( KPIM::FolderLister::Event );
@@ -262,7 +262,7 @@ void FolderLister::doRetrieveFolder( const KURL &u )
 
   KURL url( u );
   if ( adaptor() ) adaptor()->adaptDownloadUrl( url );
-  if ( mUrls.tqcontains( url ) || mProcessedPathes.tqcontains( url.path(-1) ) ) {
+  if ( mUrls.contains( url ) || mProcessedPathes.contains( url.path(-1) ) ) {
     kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl;
   } else {
 
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index c6b34cbd..d8ae7ec1 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -54,37 +54,37 @@ void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
 kdDebug() << "FolderListView::setEnabledTypes" << endl;
   for ( int i = 0; i< columns(); ++i ) removeColumn( i );
   mTypes = types;
-  if ( !mTypes.tqcontains( FolderName ) ) mTypes.prepend( FolderName );
+  if ( !mTypes.contains( FolderName ) ) mTypes.prepend( FolderName );
   mColumnMap[FolderName] = addColumn( i18n("Folder") );
   mTypeMap[mColumnMap[FolderName]] = FolderName;
 
 
-  if ( mTypes.tqcontains( Event ) ) {
+  if ( mTypes.contains( Event ) ) {
     mColumnMap[Event] = addColumn( i18n("Short column header meaning default for new events", "Events") );
     mTypeMap[mColumnMap[Event]] = Event;
   } else mColumnMap[Event] = -1;
 
-  if ( mTypes.tqcontains( Todo ) ) {
+  if ( mTypes.contains( Todo ) ) {
     mColumnMap[Todo] = addColumn( i18n("Short column header meaning default for new to-dos", "Todos") );
     mTypeMap[mColumnMap[Todo]] = Todo;
   } else mColumnMap[Todo] = -1;
 
-  if ( mTypes.tqcontains( Journal ) ) {
+  if ( mTypes.contains( Journal ) ) {
     mColumnMap[Journal] = addColumn( i18n("Short column header meaning default for new journals", "Journals") );
     mTypeMap[mColumnMap[Journal]] = Journal;
   } else mColumnMap[Journal] = -1;
 
-  if ( mTypes.tqcontains( Contact ) ) {
+  if ( mTypes.contains( Contact ) ) {
     mColumnMap[Contact] = addColumn( i18n("Short column header meaning default for new contacts", "Contacts") );
     mTypeMap[mColumnMap[Contact]] = Contact;
   } else mColumnMap[Contact] = -1;
 
-  if ( mTypes.tqcontains( All ) ) {
+  if ( mTypes.contains( All ) ) {
     mColumnMap[All] = addColumn( i18n("Short column header meaning default for all items", "All") );
     mTypeMap[mColumnMap[All]] = All;
   } else mColumnMap[All] = -1;
 
-  if ( mTypes.tqcontains( Unknown ) ) {
+  if ( mTypes.contains( Unknown ) ) {
     mColumnMap[Unknown] = addColumn( i18n("Short column header meaning default for unknown new items", "Unknown") );
     mTypeMap[mColumnMap[Unknown]] = Unknown;
   } else mColumnMap[Unknown] = -1;
@@ -103,27 +103,27 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
   m.setItemChecked( id, i->isOn() );
   m.insertSeparator();
 
-  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.tqcontains( Event ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
     id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
     m.setItemChecked( id, i->isDefault( Event ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.tqcontains( Todo ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
     id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
     m.setItemChecked( id, i->isDefault( Todo ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.tqcontains( Journal ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
     id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
     m.setItemChecked( id, i->isDefault( Journal ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.tqcontains( Contact ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
     id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
     m.setItemChecked( id, i->isDefault( Contact ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.tqcontains( All ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
     id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
     m.setItemChecked( id, i->isDefault( All ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.tqcontains( Unknown ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
     id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
     m.setItemChecked( id, i->isDefault( Unknown ) );
   }
@@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const TQPoint &localPos )
     default:
       return;
   }
-  if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) )
+  if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) )
     changeProperty( prop );
 }
 
@@ -293,4 +293,4 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
 //END
 
 #include "folderlistview.moc"
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index e4d5a56d..0c99d913 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -55,8 +55,8 @@ class FolderListView : public KListView
     void emitChanged() { emit changed(); };
     void setEnabledTypes( const TQValueList<Property> &types );
 
-    int columnForType( Property prop ) const { if ( mColumnMap.tqcontains(prop) ) return mColumnMap[prop]; else return -1;}
-    Property typeForColumn( int col ) const { if ( mTypeMap.tqcontains( col ) ) return mTypeMap[col]; else return Unknown; }
+    int columnForType( Property prop ) const { if ( mColumnMap.contains(prop) ) return mColumnMap[prop]; else return -1;}
+    Property typeForColumn( int col ) const { if ( mTypeMap.contains( col ) ) return mTypeMap[col]; else return Unknown; }
 
   private slots:
     /* Display a popupmenu for item i at item position */
@@ -127,4 +127,4 @@ class FolderListItem : public TQCheckListItem
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index 88ca09c1..d77c0e55 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -78,7 +78,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
     TQString header;
-    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -96,7 +96,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
     TQString header;
-    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -262,7 +262,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString
 TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
-  if ( mJobUIDMap.tqcontains( job ) ) {
+  if ( mJobUIDMap.contains( job ) ) {
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 2216fa56..203c6278 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -241,7 +241,7 @@ Q_OBJECT
     virtual FolderLister::Entry::List defaultFolders();
     virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0;
     virtual bool supports( FolderLister::ContentType type ) {
-      return supportedTypes().tqcontains( type );
+      return supportedTypes().contains( type );
     }
 
 
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 5cf494b9..f363dbc2 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -229,9 +229,9 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 {
   KURL url( remoteURL );
   adaptor()->adaptDownloadUrl( url );
-  if ( !mItemsForDownload.tqcontains( url ) &&
-       !mItemsDownloading.tqcontains( url ) &&
-       !mItemsDownloaded.tqcontains( url ) ) {
+  if ( !mItemsForDownload.contains( url ) &&
+       !mItemsDownloading.contains( url ) &&
+       !mItemsDownloaded.contains( url ) ) {
     mItemsForDownload.insert( url, type );
   }
 }
@@ -240,7 +240,7 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 void GroupwareDownloadJob::slotItemOnServer( const KURL &remoteURL )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" << endl;
-  if ( !mCurrentlyOnServer.tqcontains( remoteURL ) ) {
+  if ( !mCurrentlyOnServer.contains( remoteURL ) ) {
     mCurrentlyOnServer.append( remoteURL );
   }
 }
@@ -249,9 +249,9 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")"
 void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ )
 {
   // TODO: Error handling!
-  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
+  if ( mItemsDownloading.contains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsDownloading[ remoteURL ];
-  } else if ( mItemsForDownload.tqcontains( remoteURL ) ) {
+  } else if ( mItemsForDownload.contains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsForDownload[ remoteURL ];
   }
 }
@@ -261,15 +261,15 @@ void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID,
          const KURL &remoteURL, const TQString &fingerprint )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl;
-  if ( mItemsForDownload.tqcontains( remoteURL ) ) {
+  if ( mItemsForDownload.contains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsForDownload[ remoteURL ];
     mItemsForDownload.remove( remoteURL );
   }
-  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
+  if ( mItemsDownloading.contains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsDownloading[ remoteURL ];
     mItemsDownloading.remove( remoteURL );
   }
-  if ( !mItemsDownloaded.tqcontains( remoteURL ) ) {
+  if ( !mItemsDownloaded.contains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = KPIM::FolderLister::Unknown;
   }
   adaptor()->idMapper()->setRemoteId( localID, remoteURL.path() );
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index 9ae500e5..18074066 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -154,10 +154,10 @@ bool WebdavHandler::extractStringList( const TQDomElement &node, const TQString
 
 const TQString WebdavHandler::getEtagFromHeaders( const TQString& headers )
 {
-  int start = headers.tqfind( "etag:", 0, false );
+  int start = headers.find( "etag:", 0, false );
   if ( start < 0 ) return TQString();
   start += 6;
-  return headers.mid( start, headers.tqfind( "\n", start ) - start );
+  return headers.mid( start, headers.find( "\n", start ) - start );
 }
 
 //TODO: should not call libical functions directly -- better to make
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index 3ff05eef..d093faf1 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -432,7 +432,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
           continue;
         }
         TQString uid = uidElement.text();
-        if ( ! m_uids.tqcontains( uid ) ) {
+        if ( ! m_uids.contains( uid ) ) {
           m_uids[uid] = 1;
           handleRecurrence(uid);
           successCount++;
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 40e0498a..1c2828c1 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -461,7 +461,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
 
   TQStringList emails = addr.emails();
   TQString prefemail = addr.preferredEmail();
-  if ( emails.tqcontains( prefemail ) )
+  if ( emails.contains( prefemail ) )
     emails.remove( prefemail );
   emails.prepend( prefemail );
   if ( emails.count() > 0 ) {
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index b1730238..ef27580f 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -90,7 +90,7 @@ bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
 KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:displayname" );
   WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -104,7 +104,7 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
 KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
 {
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement(  doc, doc, "d:propfind" );
   TQDomElement prop = WebdavHandler::addElement(  doc, root, "d:prop" );
   WebdavHandler::addElement( doc, prop, "d:getetag" );
   WebdavHandler::addElement( doc, prop, "d:contentclass" );
@@ -126,7 +126,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
   // Don't use an <allprop/> request!
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
   TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
   TQDomAttr att_h = doc.createAttribute( "xmlns:h" );
   att_h.setValue( "urn:schemas:mailheader:" );
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index e9193c4b..94cec32a 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -317,7 +317,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.tqfind( uid ) != mUidMap.end() ) {
+  if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
       kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
@@ -359,7 +359,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
     kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl;
     mUidMap[ uid ] = StorageReference( subResource, sernum );
     // This is ugly, but it's faster than doing
-    // mAddrMap.tqfind(addr.uid()), which would give the same :-(
+    // mAddrMap.find(addr.uid()), which would give the same :-(
     // Reason for this: The Changed attribute of Addressee should
     // be mutable
     const_cast<Addressee&>(addr).setChanged( false );
@@ -377,7 +377,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.tqcontains( uid ) ) {
+  if ( mUidMap.contains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -392,7 +392,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
 void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
-  if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return;
+  if ( mUidMap.find( uid ) == mUidMap.end() ) return;
   //kdDebug(5650) << k_funcinfo << uid << endl;
   const TQString resource = mUidMap[ uid ].resource();
   if ( !subresourceWritable( resource ) ) {
@@ -429,8 +429,8 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.tqcontains( uid )
-       && !mUidsPendingUpdate.tqcontains( uid ) ) {
+  if ( !mUidsPendingAdding.contains( uid )
+       && !mUidsPendingUpdate.contains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -451,9 +451,9 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
+  if ( mUidsPendingDeletion.contains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
+  } else if ( mUidsPendingUpdate.contains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
     // replace it, so let's just sit tight.
   } else {
@@ -483,7 +483,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.tqcontains( subResource ) )
+  if ( mSubResources.contains( subResource ) )
     // Already registered
     return;
 
@@ -500,7 +500,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.tqcontains( subResource ) )
+  if ( !mSubResources.contains( subResource ) )
     // Not registered
     return;
 
@@ -557,7 +557,7 @@ TQStringList KABC::ResourceScalix::subresources() const
 
 bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -569,7 +569,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons
 
 bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -577,7 +577,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co
 
 int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -588,7 +588,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour
 
 TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -598,7 +598,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
 
 void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -617,7 +617,7 @@ TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
 
 void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.tqcontains( subresource ) ) {
+  if ( mSubResources.contains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index a67585ee..2848a353 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -249,7 +249,7 @@ void ResourceScalix::removeIncidences( const TQCString& incidenceType )
     // better call event(uid), todo(uid) etc. directly.
 
     // A  faster but hackish way would probably be to check the type of the resource,
-    // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ?
+    // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
     const TQString& uid = it.key();
     if ( incidenceType == "Event" && mCalendar.event( uid ) )
       mUidMap.remove( it );
@@ -276,17 +276,17 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 
   const TQString uid = incidencebase->uid();
 
-  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
+  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
-    mPendingUpdates.tqreplace( uid, incidencebase );
+    mPendingUpdates.replace( uid, incidencebase );
     return;
   }
 
   TQString subResource;
   TQ_UINT32 sernum = 0;
-  if ( mUidMap.tqcontains( uid ) ) {
+  if ( mUidMap.contains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -390,7 +390,7 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders );
   // update the serial number
-  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
+  if ( mUidMap.contains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
   return rc;
@@ -450,7 +450,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
      * We know the new state, so lets just not do much at all. The old incidence
      * in the calendar remains valid, but the serial number changed, so we need to
      * update that */
-    if ( ourOwnUpdate = mUidsPendingUpdate.tqcontains( uid ) ) {
+    if ( ourOwnUpdate = mUidsPendingUpdate.contains( uid ) ) {
       mUidsPendingUpdate.remove( uid );
       mUidMap.remove( uid );
       mUidMap[ uid ] = StorageReference( subResource, sernum );
@@ -460,7 +460,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.tqcontains( uid )
+      if ( mUidMap.contains( uid )
           && ( mUidMap[ uid ].resource() == subResource ) ) {
         if ( (*map)[ subResource ].writable() ) {
           resolveConflict( incidence, subResource, sernum );
@@ -472,7 +472,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
+      if ( !mUidsPendingAdding.contains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -482,14 +482,14 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
     }
     /* Check if there are updates for this uid pending and if so process them. */
-    if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) {
+    if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) {
       mSilent = false; // we do want to tell KMail
       mPendingUpdates.remove( uid );
       incidenceUpdated( update );
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
+      if ( !mUidsPendingAdding.contains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -504,7 +504,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
 
 bool ResourceScalix::addEvent( KCal::Event* event )
 {
-  if ( mUidMap.tqcontains( event->uid() ) )
+  if ( mUidMap.contains( event->uid() ) )
     return true; //noop
   else
     return addIncidence( event, TQString(), 0 );
@@ -521,7 +521,7 @@ bool ResourceScalix::deleteIncidence( KCal::Incidence* incidence )
   if ( incidence->isReadOnly() ) return false;
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
+  if( !mUidMap.contains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -572,7 +572,7 @@ KCal::Event::List ResourceScalix::rawEvents( const TQDate& start,
 
 bool ResourceScalix::addTodo( KCal::Todo* todo )
 {
-  if ( mUidMap.tqcontains( todo->uid() ) )
+  if ( mUidMap.contains( todo->uid() ) )
     return true; //noop
   else
     return addIncidence( todo, TQString(), 0 );
@@ -606,7 +606,7 @@ KCal::Todo::List ResourceScalix::rawTodosForDate( const TQDate& date )
 
 bool ResourceScalix::addJournal( KCal::Journal* journal )
 {
-  if ( mUidMap.tqcontains( journal->uid() ) )
+  if ( mUidMap.contains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, TQString(), 0 );
@@ -689,9 +689,9 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
+  if ( mUidsPendingDeletion.contains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
+  } else if ( mUidsPendingUpdate.contains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
     // replace it, so let's just sit tight.
   } else {
@@ -741,7 +741,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->tqcontains( subResource ) )
+  if ( map->contains( subResource ) )
     // Already registered
     return;
 
@@ -760,7 +760,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->tqcontains( subResource ) )
+  if ( map->contains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -807,11 +807,11 @@ TQStringList ResourceScalix::subresources() const
 const TQString
 ResourceScalix::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
@@ -819,10 +819,10 @@ ResourceScalix::labelForSubresource( const TQString& subresource ) const
 TQString ResourceScalix::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.tqcontains( uid ) )
+  if ( mUidMap.contains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.tqcontains( uid ) )
+    if ( mNewIncidencesMap.contains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
@@ -843,11 +843,11 @@ bool ResourceScalix::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceScalix*>( this )->doOpen();
 
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -860,11 +860,11 @@ void ResourceScalix::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
 
-  if ( mEventSubResources.tqcontains( subresource ) )
+  if ( mEventSubResources.contains( subresource ) )
      map = &mEventSubResources;
-  if ( mTodoSubResources.tqcontains( subresource ) )
+  if ( mTodoSubResources.contains( subresource ) )
      map = &mTodoSubResources;
-  if ( mJournalSubResources.tqcontains( subresource ) )
+  if ( mJournalSubResources.contains( subresource ) )
      map = &mJournalSubResources;
 
   if ( map && ( ( *map )[ subresource ].active() != v ) ) {
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index d5603af9..36b2aa77 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -73,7 +73,7 @@ void Scalix::get( const KURL &url )
 
   TQString path = url.path();
 
-  if ( path.tqcontains( "/freebusy/" ) ) {
+  if ( path.contains( "/freebusy/" ) ) {
     retrieveFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -84,7 +84,7 @@ void Scalix::put( const KURL& url, int, bool, bool )
 {
   TQString path = url.path();
 
-  if ( path.tqcontains( "/freebusy/" ) ) {
+  if ( path.contains( "/freebusy/" ) ) {
     publishFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -134,12 +134,12 @@ void Scalix::publishFreeBusy( const KURL &url )
   TQString path = url.path();
 
   // extract user name
-  int lastSlash = path.tqfindRev( '/' );
+  int lastSlash = path.findRev( '/' );
   if ( lastSlash != -1 )
     requestUser = path.mid( lastSlash + 1 );
 
   // extract calendar name
-  int secondSlash = path.tqfind( '/', 1 );
+  int secondSlash = path.find( '/', 1 );
   if ( secondSlash != -1 )
     calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 );
 
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index b9d5b54c..69922283 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -166,7 +166,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
   journal = static_cast<KCal::Journal*>( formatter.fromString( data ) );
 
   Q_ASSERT( journal );
-  if( journal && !mUidMap.tqcontains( journal->uid() ) )
+  if( journal && !mUidMap.contains( journal->uid() ) )
     if ( addNote( journal, subresource, sernum ) )
       return journal;
     else
@@ -212,7 +212,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
 bool ResourceScalix::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.tqcontains( uid ) )
+  if ( !mUidMap.contains( uid ) )
     // Odd
     return false;
 
@@ -253,7 +253,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
   TQ_UINT32 sernum;
-  if ( mUidMap.tqcontains( i->uid() ) ) {
+  if ( mUidMap.contains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -327,7 +327,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.tqcontains( subResource ) )
+  if ( mSubResources.contains( subResource ) )
     // Already registered
     return;
 
@@ -347,7 +347,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.tqcontains( subResource ) )
+  if ( !mSubResources.contains( subResource ) )
     // Not registered
     return;
 
@@ -411,7 +411,7 @@ TQStringList ResourceScalix::subresources() const
 
 bool ResourceScalix::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.tqcontains( res ) ) {
+  if ( mSubResources.contains( res ) ) {
     return mSubResources[ res ].active();
   }
 
diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/kresources/scalix/scalixadmin/otherusermanager.cpp
index cacb9474..a3c19de1 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.cpp
+++ b/kresources/scalix/scalixadmin/otherusermanager.cpp
@@ -30,7 +30,7 @@ OtherUserManager::~OtherUserManager()
 
 void OtherUserManager::addOtherUser( const TQString &email )
 {
-  if ( !mOtherUsers.tqcontains( email ) ) {
+  if ( !mOtherUsers.contains( email ) ) {
     mOtherUsers.append( email );
     emit changed();
   }
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 82d5c60a..ba3d4115 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -194,7 +194,7 @@ bool ResourceSlox::asyncLoad()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->folderId() );
@@ -246,7 +246,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
       TQString uid = "kresources_slox_kabc_" + item.sloxId;
       if ( item.status == SloxItem::Delete ) {
         TQMap<TQString,Addressee>::Iterator it;
-        it = mAddrMap.tqfind( uid );
+        it = mAddrMap.find( uid );
         if ( it != mAddrMap.end() ) {
           mAddrMap.remove( it );
           changed = true;
@@ -269,7 +269,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
         a.setResource( this );
         a.setChanged( false );
 
-        mAddrMap.tqreplace( a.uid(), a );
+        mAddrMap.replace( a.uid(), a );
 
         // TODO: Do we need to try to associate addressees with slox accounts?
 
@@ -306,13 +306,13 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
     TQValueList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
-      if ( !item.response.tqcontains( "200" ) ) {
+      if ( !item.response.contains( "200" ) ) {
         savingError( this, item.response + "\n" + item.responseDescription );
         continue;
       }
       if ( item.status == SloxItem::New ) {
         TQMap<TQString,Addressee>::Iterator search_res;
-        search_res = mAddrMap.tqfind( item.clientId );
+        search_res = mAddrMap.find( item.clientId );
         if ( search_res != mAddrMap.end() ) {
           // use the id provided by the server
           Addressee a = *search_res;
@@ -320,7 +320,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
           a.setUid( "kresources_slox_kabc_" + item.sloxId );
           a.setResource( this );
           a.setChanged( false );
-          mAddrMap.tqreplace( a.uid(), a );
+          mAddrMap.replace( a.uid(), a );
           saveCache();
         }
       }
@@ -603,7 +603,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   else
     pnSaveMap = mPhoneNumberSloxMap;
   for ( PhoneNumber::List::ConstIterator it = pnlist.begin() ; it != pnlist.end(); ++it ) {
-    if ( pnSaveMap.tqcontains( (*it).type() ) ) {
+    if ( pnSaveMap.contains( (*it).type() ) ) {
       TQStringList l = pnSaveMap[(*it).type()];
       TQString fn = l.first();
       l.remove( l.begin() );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index 132f19ca..cb477038 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -213,7 +213,7 @@ void KCalResourceSlox::requestEvents()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->calendarFolderId() );
@@ -258,7 +258,7 @@ void KCalResourceSlox::requestTodos()
   }
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
   WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->taskFolderId() );
@@ -1113,7 +1113,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job )
         if ( !status.isNull() ) {
           TQDomElement statusElement = status.toElement();
           TQString response = statusElement.text();
-        if ( !response.tqcontains( "200" ) ) {
+        if ( !response.contains( "200" ) ) {
             TQString error = "'" + mUploadedIncidence->summary() + "'\n";
             error += response;
             TQDomNode dn = propstat.namedItem( "responsedescription" );
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index de694b4f..a32df5fa 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -65,7 +65,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
 {
   kdDebug() << "SloxAccount::insertUser() " << id << endl;
 
-  mUsers.tqreplace( id, a );
+  mUsers.replace( id, a );
 
   TQString email = a.preferredEmail();
 
@@ -78,7 +78,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
 KABC::Addressee SloxAccounts::lookupUser( const TQString &id )
 {
   TQMap<TQString, KABC::Addressee>::ConstIterator it;
-  it = mUsers.tqfind( id );
+  it = mUsers.find( id );
   if ( it == mUsers.end() ) {
     requestAccounts();
     return KABC::Addressee();
@@ -99,7 +99,7 @@ TQString SloxAccounts::lookupId( const TQString &email )
   }
   requestAccounts();
 
-  int pos = email.tqfind( '@' );
+  int pos = email.find( '@' );
   if ( pos < 0 ) return email;
   else return email.left( pos );
 }
@@ -127,7 +127,7 @@ void SloxAccounts::requestAccounts()
     url.setPath( "/servlet/webdav.groupuser/" );
 
     TQDomDocument doc;
-    TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
+    TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
     TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
     WebdavHandler::addSloxElement( mRes, doc, prop, "user", "*" );
     WebdavHandler::addSloxElement( mRes, doc, prop, "group", "*" );
@@ -207,7 +207,7 @@ void SloxAccounts::readAccounts()
       TQDomElement e = n.toElement();
       TQString tag = e.tagName();
       // remove XML namespace
-      tag = tag.right( tag.length() - ( tag.tqfind( ':' ) + 1 ) );
+      tag = tag.right( tag.length() - ( tag.find( ':' ) + 1 ) );
       TQString value = e.text();
       if ( tag == "uid" ) id = value;
       else if ( tag == "mail" ) a.insertEmail( value, true );
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index d58a18e1..f2fe58a9 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -70,7 +70,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
     return;
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
-  if( mManager->folders().tqcontains( folder->parentId() ) ) {
+  if( mManager->folders().contains( folder->parentId() ) ) {
     SloxFolder *tqparent = mManager->folders()[folder->parentId()];
     createFolderViewItem( tqparent );
     if ( tqparent->item )
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index 7894ec93..41864caf 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -65,7 +65,7 @@ void SloxFolderManager::requestFolders()
   url.setPath( "/servlet/webdav.folders/file.xml" );
 
   TQDomDocument doc;
-  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "proptqfind" );
+  TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
   TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
   WebdavHandler::addSloxElement( mRes, doc, prop, "objectmode", "NEW_AND_MODIFIED" );
   WebdavHandler::addSloxElement( mRes, doc, prop, "lastsync", "0" );
diff --git a/kresources/tvanytime/COPYING b/kresources/tvanytime/COPYING
index 2ad70b8b..c13faf0d 100644
--- a/kresources/tvanytime/COPYING
+++ b/kresources/tvanytime/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/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 2ce2e9e4..6ee6dd1c 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -288,8 +288,8 @@ bool ResourceTVAnytime::readServiceInformation( const TQDomDocument & serviceInf
           Service s;
           TQDomElement e3 = n3.toElement();
           if (s.loadXML( e3 ) ) {
-            s.setActive( mActiveServices.tqcontains( s.id() ) );
-            bool newService = !mServiceMap.tqcontains( s.id() );   
+            s.setActive( mActiveServices.contains( s.id() ) );
+            bool newService = !mServiceMap.contains( s.id() );   
             if ( newService )
             {
               mServiceMap.insert( s.id(), s );
@@ -331,7 +331,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
       if ( entryDate < TQDate::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) )
         continue;
 
-      if ( !dates.tqcontains( re.cap( 1 ) ) )
+      if ( !dates.contains( re.cap( 1 ) ) )
         dates.append( re.cap( 1 ) );
     }
   }
@@ -454,7 +454,7 @@ bool ResourceTVAnytime::subresourceActive( const TQString & subresource ) const
 
 void ResourceTVAnytime::setSubresourceActive( const TQString & subresource, bool active )
 {
-  if ( mServiceMap.tqcontains( subresource ) )
+  if ( mServiceMap.contains( subresource ) )
   {
     Service s = mServiceMap[ subresource ];
     if ( s.active() != active )