1 files changed, 32 insertions, 32 deletions

diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 7acc1cd03..7bfa804a7 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -59,21 +59,21 @@ void GroupwareDownloadJob::run()
 
   mItemsForDownload.clear();
   mCurrentlyOnServer.clear();
-  connect( adaptor(), SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
-           SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
-  connect( adaptor(), SIGNAL( itemOnServer( const KURL & ) ),
-           SLOT( slotItemOnServer( const KURL & ) ) );
-  connect( adaptor(), SIGNAL( itemDownloaded( const QString &, const KURL &, const QString & ) ),
-           SLOT( slotItemDownloaded( const QString &, const KURL &, const QString & ) ) );
-  connect( adaptor(), SIGNAL( itemDownloadError( const KURL &, const QString & ) ),
-           SLOT( slotItemDownloadError( const KURL &, const QString & ) ) );
+  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 & ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(),
     adaptor()->downloadProgressMessage() );
   connect( mProgress,
-           SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           SLOT( cancelLoad() ) );
+           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQT_SLOT( cancelLoad() ) );
 
   listItems();
 }
@@ -102,18 +102,18 @@ void GroupwareDownloadJob::listItems()
 
     kdDebug(5800) << "OpenGroupware::listIncidences(): " << url << endl;
 
-    mListItemsData = QString::null;
+    mListItemsData = TQString::null;
     mListEventsJob = adaptor()->createListItemsJob( url );
 
-    connect( mListEventsJob, SIGNAL( result( KIO::Job * ) ),
-             SLOT( slotListItemsResult( KIO::Job * ) ) );
-    connect( mListEventsJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
-        SLOT( slotListItemsData( KIO::Job *, const QByteArray & ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
+             TQT_SLOT( slotListItemsResult( KIO::Job * ) ) );
+    connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) );
   }
 }
 
 
-void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const QByteArray &data )
+void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl;
 
@@ -135,7 +135,7 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
     adaptor()->interpretListItemsJob( job, mListItemsData );
   }
 
-  mListItemsData = QString::null;
+  mListItemsData = TQString::null;
   mListEventsJob = 0;
 
   listItems();
@@ -143,13 +143,13 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
 
 void GroupwareDownloadJob::deleteIncidencesGoneFromServer()
 {
-  QMap<QString, QString> remoteIds( adaptor()->idMapper()->remoteIdMap() );
+  TQMap<TQString, TQString> remoteIds( adaptor()->idMapper()->remoteIdMap() );
   KURL::List::ConstIterator it = mCurrentlyOnServer.begin();
   while ( it != mCurrentlyOnServer.end() ) {
     remoteIds.remove( (*it).path() );
     ++it;
   }
-  QMap<QString, QString>::ConstIterator it2;
+  TQMap<TQString, TQString>::ConstIterator it2;
   for (it2 = remoteIds.begin(); it2 != remoteIds.end(); ++it2) {
     adaptor()->deleteItem( remoteIds[ it2.key() ] );
   }
@@ -170,27 +170,27 @@ void GroupwareDownloadJob::downloadItem()
     success();
   } else {
     if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) {
-      mDownloadItemsData = QString::null;
+      mDownloadItemsData = TQString::null;
       mDownloadJob = adaptor()->createDownloadJob( mItemsForDownload );
       mItemsDownloading = mItemsForDownload;
       mItemsForDownload.clear();
     } else {
       // Download the first item of the list
-      QMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin();
+      TQMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin();
       KURL href( it.key() );
       KPIM::FolderLister::ContentType ctype = it.data();
       mItemsDownloading.insert( it.key(), it.data() );
       mItemsForDownload.remove( it.key() );
  
       adaptor()->adaptDownloadUrl( href );
-      mDownloadItemsData = QString::null;
+      mDownloadItemsData = TQString::null;
 
       mDownloadJob = adaptor()->createDownloadJob( href, ctype );
     }
-    connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
-        SLOT( slotDownloadItemResult( KIO::Job * ) ) );
-    connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
-        SLOT( slotDownloadItemData( KIO::Job *, const QByteArray & ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+        TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) );
+    connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+        TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) );
   }
 }
 
@@ -211,17 +211,17 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
     mProgress->incCompletedItems();
     mProgress->updateProgress();
   }
-  mDownloadItemsData = QString::null;
+  mDownloadItemsData = TQString::null;
   mDownloadJob = 0;
 
   downloadItem();
 }
 
-void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const QByteArray &data )
+void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data )
 {
   kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl;
 
-  mDownloadItemsData.append( QString::fromUtf8( data.data(), data.size() ) );
+  mDownloadItemsData.append( TQString::fromUtf8( data.data(), data.size() ) );
 }
 
 void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
@@ -246,7 +246,7 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")"
 }
 
 
-void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const QString &/*error*/ )
+void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ )
 {
   // TODO: Error handling!
   if ( mItemsDownloading.contains( remoteURL ) ) {
@@ -257,8 +257,8 @@ void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const Q
 }
 
 
-void GroupwareDownloadJob::slotItemDownloaded( const QString &localID,
-         const KURL &remoteURL, const QString &fingerprint )
+void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID,
+         const KURL &remoteURL, const TQString &fingerprint )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl;
   if ( mItemsForDownload.contains( remoteURL ) ) {