summaryrefslogtreecommitdiffstats
path: root/kresources/carddav
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/carddav')
-rw-r--r--kresources/carddav/config.cpp2
-rw-r--r--kresources/carddav/configwidgets.cpp6
-rw-r--r--kresources/carddav/job.cpp2
-rw-r--r--kresources/carddav/resource.cpp18
4 files changed, 14 insertions, 14 deletions
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index a836de3a4..390e3adc7 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -26,7 +26,7 @@
#include <kurlrequester.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
/*=========================================================================
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index e21f75b0e..b159a0211 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -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/job.cpp b/kresources/carddav/job.cpp
index 994964afb..a842b00a4 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -69,7 +69,7 @@ void CardDavJob::processError(const carddav_error* err) {
if (-401 == code) { // unauthorized
error_string = i18n("Unauthorized. Username or password incorrect.");
} else if (-599 <= code && code <= -300) {
- error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").arg(-code);
+ error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index a708eef02..4fb33af55 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);
- tqApp->processEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -144,7 +144,7 @@ bool ResourceCardDav::load() {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}
- log(TQString("doLoad(%1)").arg(syncCache));
+ log(TQString("doLoad(%1)").tqarg(syncCache));
// FIXME KABC
//clearCache();
@@ -166,7 +166,7 @@ bool ResourceCardDav::load() {
bool ResourceCardDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").arg(syncCache));
+ log(TQString("doSave(%1)").tqarg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -372,7 +372,7 @@ void ResourceCardDav::loadFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
@@ -382,12 +382,12 @@ void ResourceCardDav::loadFinished() {
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful load");
@@ -641,7 +641,7 @@ void ResourceCardDav::writingFinished() {
TQCString newpass;
if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
@@ -651,12 +651,12 @@ void ResourceCardDav::writingFinished() {
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-28 20:55:51 +0000