Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 39 insertions, 39 deletions

diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 4c2ab12c8..e93b89444 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents()
   kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl;
 
   mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false );
-  connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
-  connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
+  connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
+  connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
 
   mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") );
   connect( mLoadEventsProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelLoadEvents() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelLoadEvents() ) );
 
   mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
 }
@@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos()
   kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl;
 
   mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false );
-  connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
-  connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
+  connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
+  connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
 
   mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") );
   connect( mLoadTodosProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelLoadTodos() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelLoadTodos() ) );
 
   mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
 }
@@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences()
   kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl;
 
   mUploadJob = TDEIO::davPropPatch( url, doc, false );
-  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
-  connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
+  connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+  connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
 
   mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") );
   connect( mUploadProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelUpload() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelUpload() ) );
 }
 
 void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp
index 83246a033..8652263f5 100644
--- a/tderesources/slox/kcalresourcesloxconfig.cpp
+++ b/tderesources/slox/kcalresourcesloxconfig.cpp
@@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent,  const char* n
 
   mCalButton = new KPushButton( i18n("Calendar Folder..."), this );
   mainLayout->addWidget( mCalButton, 5, 0 );
-  connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) );
+  connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) );
 
   mTaskButton = new KPushButton( i18n("Task Folder..."), this );
   mainLayout->addWidget( mTaskButton, 5, 1 );
-  connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) );
+  connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) );
 
   mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
   mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 );
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index 3afa7019d..e5ba26512 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts()
     mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
   }
 
-  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void SloxAccounts::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp
index 716c2d40e..c1f1086ef 100644
--- a/tderesources/slox/sloxfolderdialog.cpp
+++ b/tderesources/slox/sloxfolderdialog.cpp
@@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type,
   mListView->addColumn( i18n("Folder ID"), 0 );
   setMainWidget( mListView );
   updateFolderView();
-  connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) );
+  connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) );
 }
 
 SloxFolderDialog::~SloxFolderDialog()
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index d7284d3a0..b862a388d 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders()
 
   mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
 
-  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void SloxFolderManager::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 5b0b65157..d77347d3d 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -208,16 +208,16 @@ bool ResourceSlox::asyncLoad()
   kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl;
 
   mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
-  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
-  connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
 
   mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") );
   connect( mDownloadProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelDownload() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelDownload() ) );
 
   mPrefs->setLastSync( TQDateTime::currentDateTime() );
 
@@ -521,16 +521,16 @@ void ResourceSlox::uploadContacts()
   url.setPass( mPrefs->password() );
 
   mUploadJob = TDEIO::davPropPatch( url, doc, false );
-  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
-  connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-           TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+  connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+  connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+           TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
 
   mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
       KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") );
   connect( mUploadProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelUpload() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelUpload() ) );
 }
 
 void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop,
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp
index 8ad6701c0..36f762387 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.cpp
+++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp
@@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent,  const char* name )
 
   mFolderButton = new KPushButton( i18n("Select Folder..."), this );
   mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 );
-  connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) );
+  connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) );
 
 }
 
diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp
index 22c44e662..ea7b3da11 100644
--- a/tderesources/slox/testsloxaccounts.cpp
+++ b/tderesources/slox/testsloxaccounts.cpp
@@ -55,7 +55,7 @@ int main(int argc,char **argv)
   
   app.setMainWidget( &button );
   button.show();
-  TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) );
   
   app.exec();
 }