1 files changed, 31 insertions, 31 deletions

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() ) );
 }