Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587)

3 files changed, 13 insertions, 13 deletions

diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp
index b83660f8b..4a9888ea1 100644
--- a/tderesources/caldav/config.cpp
+++ b/tderesources/caldav/config.cpp
@@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() {
     mainLayout->addWidget(mRememberPassword, 8, 1);
 
     mTasksUrl->setEnabled(mUseSTasks->isChecked());
-    connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotSTasksToggled( bool ) ) );
+    connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotSTasksToggled( bool ) ) );
 
     mJournalsUrl->setEnabled(mUseSJournals->isChecked());
-    connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotSJournalsToggled( bool ) ) );
+    connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotSJournalsToggled( bool ) ) );
 
     // configs
     TQHBoxLayout* horizontal = new TQHBoxLayout(this);
diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp
index 7e003dcde..9f4f1e110 100644
--- a/tderesources/caldav/configwidgets.cpp
+++ b/tderesources/caldav/configwidgets.cpp
@@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
   d->mGroup->insert( automaticReloadOnStartup, 1 );
   d->mGroup->insert( noAutomaticReload, 0 );
 
-  connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotIntervalToggled( bool ) ) );
+  connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotIntervalToggled( bool ) ) );
 
   TQHBox *intervalBox = new TQHBox( groupBox );
   //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
   d->mGroup->insert( onExit, 1 );
   d->mGroup->insert( intervalRadio, 2 );
 
-  connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotIntervalToggled( bool ) ) );
+  connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotIntervalToggled( bool ) ) );
 
   TQHBox *intervalBox = new TQHBox( groupBox );
   //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index 8fae5c984..2c63da224 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCalDav::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;
             }
@@ -249,8 +249,8 @@ void ResourceCalDav::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("ResourceCalDav");
 }
@@ -850,7 +850,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
     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);
         return false;
@@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() {
     }
 
     // Give the remote system a few seconds to process the data before we allow any read operations
-    TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) );
+    TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) );
 
     // Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them.
     // That's why no mutexes are required.