1 files changed, 12 insertions, 12 deletions

diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp
index 3da63e4b..4bc11df0 100644
--- a/tderesources/carddav/resource.cpp
+++ b/tderesources/carddav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() {
         clearChanges();
         if (mWriteRetryTimer != NULL) {
             if (mWriteRetryTimer->isActive() == false) {
-                disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+                disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
                 delete mWriteRetryTimer;
                 mWriteRetryTimer = NULL;
             }
@@ -256,8 +256,8 @@ void ResourceCardDav::init() {
     // creating jobs
     // TQt4 handles this quite differently, as shown below,
     // whereas TQt3 needs events (see ::event())
-//     connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-//     connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+//     connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+//     connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
 
     setType("ResourceCardDav");
 }
@@ -372,14 +372,14 @@ void ResourceCardDav::loadFinished() {
     if (loader->error()) {
         if (loader->errorNumber() == -401) {
             if (NULL != mPrefs) {
-                TQCString newpass;
+                TQString 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() );
                     if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
                 }
                 else {
                     // Set new password and try again
-                    mPrefs->setPassword(TQString(newpass));
+                    mPrefs->setPassword(newpass);
                     startLoading(mPrefs->getFullUrl());
                 }
             }
@@ -587,14 +587,14 @@ bool ResourceCardDav::event ( TQEvent * e ) {
     if (e->type() == 1000) {
         // Read done
         loadFinished();
-        return TRUE;
+        return true;
     }
     else if (e->type() == 1001) {
         // Write done
         writingFinished();
-        return TRUE;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
 
 bool ResourceCardDav::startWriting(const TQString& url) {
@@ -609,9 +609,9 @@ bool ResourceCardDav::startWriting(const TQString& url) {
     if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
         if (mWriteRetryTimer == NULL) {
             mWriteRetryTimer = new TQTimer(this);
-            connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+            connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
         }
-        mWriteRetryTimer->start(1000, TRUE);
+        mWriteRetryTimer->start(1000, true);
         return false;
     }
 
@@ -641,14 +641,14 @@ void ResourceCardDav::writingFinished() {
     if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) {
         if (mWriter->errorNumber() == -401) {
             if (NULL != mPrefs) {
-                TQCString newpass;
+                TQString 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());
                     if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
                 }
                 else {
                     // Set new password and try again
-                    mPrefs->setPassword(TQString(newpass));
+                    mPrefs->setPassword(newpass);
                     startWriting(mPrefs->getFullUrl());
                 }
             }