summaryrefslogtreecommitdiffstats
path: root/kresources/caldav
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/caldav')
-rw-r--r--kresources/caldav/config.cpp2
-rw-r--r--kresources/caldav/configwidgets.cpp6
-rw-r--r--kresources/caldav/job.cpp6
-rw-r--r--kresources/caldav/resource.cpp32
4 files changed, 23 insertions, 23 deletions
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index f3cf57fdc..9f2190520 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -27,7 +27,7 @@
#include <kurlrequester.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
/*=========================================================================
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index 4a7072b5f..34fb5fe6c 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -41,7 +41,7 @@
#include <kdebug.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
d->mIntervalSpin->setEnabled( false );
groupBox->setColumnLayout(1, Qt::Vertical);
- TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
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->tqlayout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(delay);
vbox->addWidget(every);
vbox->addWidget(intervalRadio);
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index c79ef06ac..8e49041f6 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -82,7 +82,7 @@ void CalDavJob::processError(const caldav_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. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
@@ -98,7 +98,7 @@ void CalDavJob::processTasksError(const caldav_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. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
@@ -114,7 +114,7 @@ void CalDavJob::processJournalsError(const caldav_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. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+ error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
} else {
error_string = err->str;
}
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index db4546d82..daf7ebdeb 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);
- tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->processEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() {
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)").tqarg(syncCache));
+ log(TQString("doLoad(%1)").arg(syncCache));
clearCache();
@@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() {
bool ResourceCalDav::doSave() {
bool syncCache = true;
- log(TQString("doSave(%1)").tqarg(syncCache));
+ log(TQString("doSave(%1)").arg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() {
mLoader->setParent(this);
mLoader->setType(0);
- TQDateTime dt(TQDate::tqcurrentDate());
+ TQDateTime dt(TQDate::currentDate());
mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
//mLoader->setGetAll();
@@ -378,7 +378,7 @@ void ResourceCalDav::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() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
@@ -388,12 +388,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful event load");
@@ -426,7 +426,7 @@ void ResourceCalDav::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->tasksErrorString() );
-// loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+// loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
// }
// else {
// // Set new password and try again
@@ -436,12 +436,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->tasksErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
}
}
else {
log("load error: " + loader->tasksErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
}
} else {
log("successful tasks load");
@@ -474,7 +474,7 @@ void ResourceCalDav::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->journalsErrorString() );
-// loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+// loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
// }
// else {
// // Set new password and try again
@@ -484,12 +484,12 @@ void ResourceCalDav::loadFinished() {
}
else {
log("load error: " + loader->journalsErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
}
else {
log("load error: " + loader->journalsErrorString() );
- loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+ loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
}
} else {
log("successful journals load");
@@ -971,7 +971,7 @@ void ResourceCalDav::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());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
@@ -981,12 +981,12 @@ void ResourceCalDav::writingFinished() {
}
else {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");