1 files changed, 20 insertions, 20 deletions

diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index f6ad54752..4293fb5a1 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() {
     while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
         readLockout = true;
         sleep(1);
-        qApp->processEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() {
     mLoader->setParent(this);
     mLoader->setType(0);
 
-    TQDateTime dt(TQDate::currentDate());
+    TQDateTime dt(TQDate::tqcurrentDate());
     mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
     //mLoader->setGetAll();
 
@@ -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.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.replace('\r', '\n');
+            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.tqreplace('\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.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            tasksData.replace('\r', '\n');
+            tasksData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            tasksData.tqreplace('\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.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            journalsData.replace('\r', '\n');
+            journalsData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            journalsData.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseJournalsData(journalsData)) {
@@ -744,9 +744,9 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
     int nextPos = data.findRev("\n", data.find(":", uidPos));
     TQString uidField = data.mid(uidPos, nextPos-uidPos);
     data.remove(uidPos, nextPos-uidPos);
-    uidField.replace("\n", "");
-    uidField.replace("\r", "");
-    uidField.replace(" ", "");
+    uidField.tqreplace("\n", "");
+    uidField.tqreplace("\r", "");
+    uidField.tqreplace(" ", "");
     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).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->added = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksAdded = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("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).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->changed = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksChanged = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("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).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->deleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksDeleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNALS") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNALS") > 0)
           t->journalsDeleted = getICalString(currentIncidence);
 
         writingQueuePush(t);