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

3 files changed, 11 insertions, 11 deletions

diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index 6511cfcb6..cf2cdbc5a 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 9570d2b3c..4fb33af55 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 aed9ddb66..7141bf303 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)