Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 93 insertions, 93 deletions

diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp
index bbae13469..facdf13be 100644
--- a/tderesources/lib/folderconfig.cpp
+++ b/tderesources/lib/folderconfig.cpp
@@ -52,7 +52,7 @@ FolderConfig::FolderConfig( TQWidget *parent )
   topLayout->addWidget( topBox );
   
   TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) );
+  connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) );
   
   mFolderList = new FolderListView( topBox );
 
@@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f )
   if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
 
   mFolderList->setEnabledTypes( types );
-  connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
+  connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) );
 }
 
 void FolderConfig::retrieveFolderList( const KURL &url )
diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp
index c12d3ae69..ec40e8cc4 100644
--- a/tderesources/lib/folderlister.cpp
+++ b/tderesources/lib/folderlister.cpp
@@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor )
     disconnect( mAdaptor, 0, this, 0 );
   }
   mAdaptor = adaptor;
-  connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &,
+  connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &,
                             const TQString &, KPIM::FolderLister::ContentType ) ),
-           this, TQT_SLOT( processFolderResult( const KURL &, const TQString &,
+           this, TQ_SLOT( processFolderResult( const KURL &, const TQString &,
                                            KPIM::FolderLister::ContentType ) ) );
-  connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
-           this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
+  connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
+           this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
 }
 
 void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
@@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u )
 
       kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" 
                     << url.prettyURL() << endl;
-      connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) );
+      connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) );
     } else {
       // TODO: Indicate a problem to the user!
       kdWarning() << "Unable to create the folder list job for the url " 
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index d43d77ce6..f2427c48d 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t
 {
   setEnabledTypes( types );
 
-  connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-           this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
-  connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)),
-           this, TQT_SLOT(showPopupMenu(TQListViewItem*)) );
+  connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+           this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
+  connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)),
+           this, TQ_SLOT(showPopupMenu(TQListViewItem*)) );
 }
 
 void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
@@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
   int id;
 
   m.insertTitle( folder.name, 9999 );
-  id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName );
+  id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName );
   m.setItemChecked( id, i->isOn() );
   m.insertSeparator();
 
   if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
-    id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
+    id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event );
     m.setItemChecked( id, i->isDefault( Event ) );
   }
   if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
-    id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
+    id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo );
     m.setItemChecked( id, i->isDefault( Todo ) );
   }
   if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
-    id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
+    id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal );
     m.setItemChecked( id, i->isDefault( Journal ) );
   }
   if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
-    id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
+    id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact );
     m.setItemChecked( id, i->isDefault( Contact ) );
   }
   if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
-    id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
+    id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All );
     m.setItemChecked( id, i->isDefault( All ) );
   }
   if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
-    id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
+    id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown );
     m.setItemChecked( id, i->isDefault( Unknown ) );
   }
 
diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp
index ab5991531..7ffd3e38e 100644
--- a/tderesources/lib/folderselectdialog.cpp
+++ b/tderesources/lib/folderselectdialog.cpp
@@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
   mListBox->ensureCurrentVisible();
   layout->addWidget( mListBox, 10 );
 
-  connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
-           TQT_SLOT( slotOk() ) );
-  connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
-           TQT_SLOT( slotOk() ) );
+  connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+           TQ_SLOT( slotOk() ) );
+  connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+           TQ_SLOT( slotOk() ) );
 
   mListBox->setFocus();
 
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 52a01fd47..1381b9293 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -59,21 +59,21 @@ void GroupwareDownloadJob::run()
 
   mItemsForDownload.clear();
   mCurrentlyOnServer.clear();
-  connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
-           TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ),
-           TQT_SLOT( slotItemOnServer( const KURL & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
-           TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
-           TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
+           TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ),
+           TQ_SLOT( slotItemOnServer( const KURL & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
+           TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
+           TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(),
     adaptor()->downloadProgressMessage() );
   connect( mProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelLoad() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelLoad() ) );
 
   listItems();
 }
@@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems()
     mListItemsData = TQString();
     mListEventsJob = adaptor()->createListItemsJob( url );
 
-    connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
-    connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
+    connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
@@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem()
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
-    connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-        TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
-    connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-        TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+        TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
+    connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+        TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
   }
 }
 
diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp
index b7e4b57b0..09972b851 100644
--- a/tderesources/lib/groupwareresourcejob.cpp
+++ b/tderesources/lib/groupwareresourcejob.cpp
@@ -30,7 +30,7 @@ using namespace KPIM;
 GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor )
   : mAdaptor( adaptor )
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT( run() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( run() ) );
 }
 
 bool GroupwareJob::error() const
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index 51307d836..4c0f1ba2b 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -52,22 +52,22 @@ void GroupwareUploadJob::run()
     KPIM::ProgressManager::getUniqueID(),
     adaptor()->uploadProgressMessage() );
   connect( mUploadProgress,
-    TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-    TQT_SLOT( cancelSave() ) );
+    TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+    TQ_SLOT( cancelSave() ) );
 
-  connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
-           TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
-           TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
-           TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
+           TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
+           TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
+           TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
 
-  connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
-           TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
-           TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
-  connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
-           TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
+           TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
+           TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
+  connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
+           TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
 
 
   mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() +
@@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem()
 {
   kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl;
   if ( mDeletedItems.isEmpty() ) {
-    TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
   } else {
     kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl;
 
@@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl;
 
     if ( mDeletionJob ) {
       mDeletionJobData = TQString();
-      connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-               TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
-//       connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-//                TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
+      connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+               TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
+//       connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+//                TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       deleteItem();
     }
@@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job )
     adaptor()->interpretRemoveJob( job, mDeletionJobData );
   }
   mDeletionJob = 0;
-  TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) );
 }
 
 
@@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem()
 {
   kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl;
   if ( mChangedItems.isEmpty() ) {
-    TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
   } else {
     kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl;
 
@@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl;
 
     if ( mUploadJob ) {
       mUploadJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-               TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+               TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadItem();
     }
@@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job )
     adaptor()->interpretUploadJob( job, mUploadJobData );
   }
   mUploadJob = 0;
-  TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
 }
 
 
@@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
 
     if ( mUploadJob ) {
       mUploadNewJobData = TQString();
-      connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-               TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
-      connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-               TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
+      connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+               TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
+      connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+               TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
     } else {
       uploadNewItem();
     }
@@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job )
     adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
   }
   mUploadJob = 0;
-  TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
 }
 
 
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 11eedfe52..1710a11ed 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen()
       return false;
     } else {
       mLoginFinished = false;
-      connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
+      connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
       enter_loop();
       return mLoginFinished;
     }
@@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose()
   if ( adaptor() &&
        adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
     TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
-    connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
+    connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
     // TODO: Do we really need to block while waiting for the job to return?
     enter_loop();
   }
@@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad()
   emit resourceChanged( this );
 
   mDownloadJob = createDownloadJob( adaptor() );
-  connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
-    TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+    TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
 
   return true;
 }
@@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave()
   if ( !confirmSave() ) return false;
 
   mUploadJob = createUploadJob( adaptor() );
-  connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
-    TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+  connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+    TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
 
   Incidence::List inc;
   Incidence::List::Iterator it;
@@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job )
 
     if ( !mDownloadJob ) {
       mDownloadJob = createDownloadJob( adaptor() );
-      connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
-          TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+      connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+          TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
     } else {
       kdWarning() << k_funcinfo << "Download still in progress. "
                                    "Can't happen. (TM)" << endl;
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 1ca2570af..4f576ed76 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
   mPasswordEdit->setEchoMode( KLineEdit::Password );
 
   mFolderConfig = new KPIM::FolderConfig( this );
-  connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
-    TQT_SLOT( updateFolders() ) );
+  connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+    TQ_SLOT( updateFolders() ) );
   mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
 
   TQHBox *hBox = new TQHBox( this );
   mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox );
   mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 );
-  connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ),
-           TQT_SLOT( showCacheSettings() ) );
+  connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ),
+           TQ_SLOT( showCacheSettings() ) );
 
   mCacheDialog = new CacheSettingsDialog( this );
 }
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
index f4a469905..cf73e03ac 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
@@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad()
   loadCache();
 
   mDownloadJob = createDownloadJob( mAdaptor );
-  connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
-    TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+    TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
 
   return true;
 }
@@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* )
   }
 
   mUploadJob = createUploadJob( mAdaptor );
-  connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
-    TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+  connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+    TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
 
   TDEABC::Addressee::List addr;
   TDEABC::Addressee::List::Iterator it;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
index 69dfb3d83..a80ce9e02 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
@@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,  con
   mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
 
   mFolderConfig = new KPIM::FolderConfig( this );
-  connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
-    TQT_SLOT( updateFolders() ) );
+  connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+    TQ_SLOT( updateFolders() ) );
   mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
 }