1 files changed, 20 insertions, 20 deletions

diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index aa83f4674..033ea81de 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -37,7 +37,7 @@ KURL GroupwareUploadItem::adaptNewItemUrl( GroupwareDataAdaptor *adaptor,
 {
 kdDebug()<<"GroupwareUploadItem::adaptNewItemUrl, baseurl=" << baseurl.url() << endl;
   if ( adaptor ) {
-    QString path( adaptor->defaultNewItemName( this ) );
+    TQString path( adaptor->defaultNewItemName( this ) );
 kdDebug() << "path=" << path << endl;
     KURL u( baseurl );
     if ( path.isEmpty() ) return u;
@@ -54,7 +54,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
 {
   Q_ASSERT( adaptor );
   if ( !adaptor ) return 0;
-  const QString dta = data();
+  const TQString dta = data();
   //kdDebug(7000) << "Uploading: " << data << endl;
   KURL upUrl( url() );
   if ( adaptor )
@@ -77,7 +77,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
-    QString header;
+    TQString header;
     if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
@@ -95,7 +95,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
   KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
-    QString header;
+    TQString header;
     if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
@@ -110,7 +110,7 @@ kdDebug()<<"new HEADER: " << header << endl;
 
 
 GroupwareDataAdaptor::GroupwareDataAdaptor()
-  : QObject(), mFolderLister( 0 ), mIdMapper( 0 )
+  : TQObject(), mFolderLister( 0 ), mIdMapper( 0 )
 {
 }
 
@@ -153,14 +153,14 @@ kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl
 }
 
 void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
-        const QString &newFingerprint, KPIM::FolderLister::ContentType type )
+        const TQString &newFingerprint, KPIM::FolderLister::ContentType type )
 {
   bool download = false;
-  const QString &location = entry.path();
+  const TQString &location = entry.path();
 
   emit itemOnServer( entry );
   // if not locally present, download
-  const QString &localId = idMapper()->localId( location );
+  const TQString &localId = idMapper()->localId( location );
   kdDebug(5800) << "Looking up remote: " << location
                 << " found: " << localId << endl;
   if ( localId.isEmpty() || !localItemExists( localId ) ) {
@@ -169,7 +169,7 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
   } else {
     kdDebug(5800) << "Locally present " << endl;
     // locally present, let's check if it's newer than what we have
-    const QString &oldFingerprint = idMapper()->fingerprint( localId );
+    const TQString &oldFingerprint = idMapper()->fingerprint( localId );
       if ( oldFingerprint != newFingerprint ) {
       kdDebug(5800) << "Fingerprint changed old: " << oldFingerprint <<
         " new: " << newFingerprint << endl;
@@ -190,12 +190,12 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
   }
 }
 
-bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ )
 {
   if ( !job ) return false;
   KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job);
   bool error = job->error();
-  const QString err = job->errorString();
+  const TQString err = job->errorString();
 
   if ( deljob ) {
     KURL::List urls( deljob->urls() );
@@ -203,8 +203,8 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j
       if ( error ) {
         emit itemDeletionError( *it, err );
       } else {
-        // FIXME: Don't use QString::null here
-        emit itemDeleted( QString::null, *it );
+        // FIXME: Don't use TQString::null here
+        emit itemDeleted( TQString::null, *it );
       }
     }
     return true;
@@ -214,12 +214,12 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j
 }
 
 
-bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
 {
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl;
   KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
   bool error = job->error();
-  const QString err = job->errorString();
+  const TQString err = job->errorString();
 
   if ( trfjob ) {
     KURL url( trfjob->url() );
@@ -236,13 +236,13 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*j
   }
 }
 
-bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
 {
 // TODO: How does the incidence mapper know the old/new ids???
   kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl;
   KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
   bool error = job->error();
-  const QString err = job->errorString();
+  const TQString err = job->errorString();
 
   if ( trfjob ) {
     KURL url( trfjob->url() );
@@ -259,18 +259,18 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &
   }
 }
 
-QString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
+TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
   if ( mJobUIDMap.contains( job ) ) {
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
-    return QString::null;
+    return TQString::null;
   }
 }
 
-void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const QString &uid )
+void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid )
 {
   if ( uid.isEmpty() ) {
     mJobUIDMap.remove( job );