From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- kresources/caldav/config.cpp | 2 +- kresources/caldav/configwidgets.cpp | 6 +++--- kresources/caldav/job.cpp | 6 +++--- kresources/caldav/resource.cpp | 32 ++++++++++++++++---------------- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'kresources/caldav') diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index 9f2190520..f3cf57fdc 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include /*========================================================================= diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index 34fb5fe6c..4a7072b5f 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include @@ -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/job.cpp b/kresources/caldav/job.cpp index 8e49041f6..c79ef06ac 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.").arg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-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.").arg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-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.").arg(-code); + error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code); } else { error_string = err->str; } diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index daf7ebdeb..db4546d82 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->processEvents(TQEventLoop::ExcludeUserInput); + tqApp->tqprocessEvents(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)").arg(syncCache)); + log(TQString("doLoad(%1)").tqarg(syncCache)); clearCache(); @@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() { bool ResourceCalDav::doSave() { bool syncCache = true; - log(TQString("doSave(%1)").arg(syncCache)); + log(TQString("doSave(%1)").tqarg(syncCache)); if (!hasChanges()) { log("no changes"); @@ -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(); @@ -378,7 +378,7 @@ void ResourceCalDav::loadFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful event load"); @@ -426,7 +426,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->tasksErrorString() ); -// loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); +// loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("load error: " + loader->tasksErrorString() ); - loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString()); } } else { log("successful tasks load"); @@ -474,7 +474,7 @@ void ResourceCalDav::loadFinished() { // TQCString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->journalsErrorString() ); -// loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); +// loadError(TQString("[%1] ").tqarg(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] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("load error: " + loader->journalsErrorString() ); - loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); + loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString()); } } else { log("successful journals load"); @@ -971,7 +971,7 @@ void ResourceCalDav::writingFinished() { TQCString newpass; if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").tqarg(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] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); -- cgit v1.2.1