diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kresources/caldav | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/caldav')
-rw-r--r-- | kresources/caldav/config.cpp | 2 | ||||
-rw-r--r-- | kresources/caldav/configwidgets.cpp | 4 | ||||
-rw-r--r-- | kresources/caldav/preferences.cpp | 18 | ||||
-rw-r--r-- | kresources/caldav/resource.cpp | 40 |
4 files changed, 32 insertions, 32 deletions
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index 84a4798c6..578fd1bba 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -190,7 +190,7 @@ void ResourceCalDavConfig::setupUI() { label->hide(); mPassword->hide(); - // combining layouts + // combining tqlayouts vertical->addLayout(mainLayout); vertical->addLayout(horizontal); } diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index b5ef0f496..594edd00f 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setEnabled( false ); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); vbox->addWidget(automaticReloadOnStartup); @@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalBox->hide(); groupBox->setColumnLayout(1, Qt::Vertical); - TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); + TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); vbox->addWidget(delay); vbox->addWidget(every); vbox->addWidget(intervalRadio); diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp index 6eb87e450..5259d9877 100644 --- a/kresources/caldav/preferences.cpp +++ b/kresources/caldav/preferences.cpp @@ -220,14 +220,14 @@ TQString CalDavPrefs::getFullUrl() { firstAt = safeURL.find("@") + 1; while (safeURL.find("@", firstAt) != -1) { - safeURL.replace(safeURL.find("@", firstAt), 1, "%40"); + safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 - safeURL.replace("%40", "@"); + safeURL.tqreplace("%40", "@"); // Encode any spaces, as libcaldav stupidly fails otherwise - safeURL.replace(" ", "%20"); + safeURL.tqreplace(" ", "%20"); return safeURL; } @@ -247,14 +247,14 @@ TQString CalDavPrefs::getFullTasksUrl() { firstAt = safeURL.find("@") + 1; while (safeURL.find("@", firstAt) != -1) { - safeURL.replace(safeURL.find("@", firstAt), 1, "%40"); + safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 - safeURL.replace("%40", "@"); + safeURL.tqreplace("%40", "@"); // Encode any spaces, as libcaldav stupidly fails otherwise - safeURL.replace(" ", "%20"); + safeURL.tqreplace(" ", "%20"); return safeURL; } @@ -274,14 +274,14 @@ TQString CalDavPrefs::getFullJournalsUrl() { firstAt = safeURL.find("@") + 1; while (safeURL.find("@", firstAt) != -1) { - safeURL.replace(safeURL.find("@", firstAt), 1, "%40"); + safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 - safeURL.replace("%40", "@"); + safeURL.tqreplace("%40", "@"); // Encode any spaces, as libcaldav stupidly fails otherwise - safeURL.replace(" ", "%20"); + safeURL.tqreplace(" ", "%20"); return safeURL; } 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); |