summaryrefslogtreecommitdiffstats
path: root/kresources/carddav
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kresources/carddav
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-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/carddav')
-rw-r--r--kresources/carddav/config.cpp2
-rw-r--r--kresources/carddav/configwidgets.cpp4
-rw-r--r--kresources/carddav/preferences.cpp6
-rw-r--r--kresources/carddav/resource.cpp6
-rw-r--r--kresources/carddav/writer.cpp4
5 files changed, 11 insertions, 11 deletions
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index fb1ade761..e8d7e25a0 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -158,7 +158,7 @@ void ResourceCardDavConfig::setupUI() {
label->hide();
mPassword->hide();
- // combining layouts
+ // combining tqlayouts
vertical->addLayout(mainLayout);
vertical->addLayout(horizontal);
}
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index 90da1831c..fbec299ad 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( 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);
@@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( 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/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index cf2cdbc5a..61d17e30d 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -223,14 +223,14 @@ TQString CardDavPrefs::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 libcarddav stupidly fails otherwise
- safeURL.replace(" ", "%20");
+ safeURL.tqreplace(" ", "%20");
return safeURL;
}
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index a5172d9e5..53bbf034c 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() {
while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
readLockout = true;
sleep(1);
- qApp->processEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->processEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -394,8 +394,8 @@ void ResourceCardDav::loadFinished() {
TQString data = loader->data();
if (!data.isNull() && !data.isEmpty()) {
- 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)) {
diff --git a/kresources/carddav/writer.cpp b/kresources/carddav/writer.cpp
index 7141bf303..837fca663 100644
--- a/kresources/carddav/writer.cpp
+++ b/kresources/carddav/writer.cpp
@@ -58,7 +58,7 @@ 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.contains("BEGIN:VCARD", TRUE) > 0) {
+ while (mDeleted.tqcontains("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);
@@ -82,7 +82,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
res = pushObjects(mChanged, carddav_add_object, OK, RT);
if (OK == res) {
kdDebug() << "pushing deleted objects";
- while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+ while (mDeleted.tqcontains("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);