From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/lib/groupwareuploadjob.cpp | 102 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'kresources/lib/groupwareuploadjob.cpp') diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp index bb3098fc2..e4d6cb131 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/kresources/lib/groupwareuploadjob.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include using namespace KPIM; @@ -52,22 +52,22 @@ void GroupwareUploadJob::run() KPIM::ProgressManager::getUniqueID(), adaptor()->uploadProgressMessage() ); connect( mUploadProgress, - SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - SLOT( cancelSave() ) ); + TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQT_SLOT( cancelSave() ) ); - connect( adaptor(), SIGNAL( itemDeletionError( const KURL &, const QString & ) ), - SLOT( slotItemDeleteError( const KURL &, const QString & ) ) ); - connect( adaptor(), SIGNAL( itemUploadError( const KURL &, const QString & ) ), - SLOT( slotItemUploadError( const KURL &, const QString & ) ) ); - connect( adaptor(), SIGNAL( itemUploadNewError( const QString &, const QString & ) ), - SLOT( slotItemUploadNewError( const QString &, const QString & ) ) ); + 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(), SIGNAL( itemDeleted( const QString &, const KURL & ) ), - SLOT( slotItemDeleted( const QString &, const KURL & ) ) ); - connect( adaptor(), SIGNAL( itemUploaded( const QString &, const KURL & ) ), - SLOT( slotItemUploaded( const QString &, const KURL & ) ) ); - connect( adaptor(), SIGNAL( itemUploadedNew( const QString &, const KURL& ) ), - SLOT( slotItemUploadedNew( const QString &, const KURL & ) ) ); + 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 & ) ) ); mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() + @@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem() { kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<interpretRemoveJob( job, mDeletionJobData ); } mDeletionJob = 0; - QTimer::singleShot( 0, this, SLOT( deleteItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) ); } @@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem() { kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<interpretUploadJob( job, mUploadJobData ); } mUploadJob = 0; - QTimer::singleShot( 0, this, SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); } @@ -216,11 +216,11 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < } if ( mUploadJob ) { - mUploadNewJobData = QString::null; - connect( mUploadJob, SIGNAL( result( KIO::Job* ) ), - SLOT( slotUploadNewJobResult( KIO::Job* ) ) ); - connect( mUploadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ), - SLOT( slotUploadNewJobData( KIO::Job *, const QByteArray & ) ) ); + mUploadNewJobData = TQString::null; + connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ), + TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) ); + connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < } } -void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const QByteArray &data ) +void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data ) { kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl; @@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job ) adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } mUploadJob = 0; - QTimer::singleShot( 0, this, SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); } @@ -255,12 +255,12 @@ void GroupwareUploadJob::kill() cancelSave(); } -void GroupwareUploadJob::slotItemDeleted( const QString &/*localId*/, const KURL &remoteURL ) +void GroupwareUploadJob::slotItemDeleted( const TQString &/*localId*/, const KURL &remoteURL ) { kdDebug() << "GroupwareUploadJob::slotItemDeleted, removal successful: "<< remoteURL.url() << endl; - const QString &remote = remoteURL.path(); - const QString &local = adaptor()->idMapper()->localId( remote ); + const TQString &remote = remoteURL.path(); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !local.isEmpty() ) { // TODO: Is the deleted status reset in the resource? adaptor()->deleteItem( local ); @@ -290,12 +290,12 @@ kdDebug()<<"Found it in the list!"<idMapper()->localId( remote ); + const TQString &remote = remoteURL.path(); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !local.isEmpty() ) { // TODO: Is the deleted status reset in the resource? // adaptor()->itemUploaded( local, remoteURL ); @@ -327,14 +327,14 @@ kdDebug()<<"Found it in the list!"<remote id map when creating the upload job... And maybe - const QString &local = adaptor()->idMapper()->localId( remote ); + const TQString &local = adaptor()->idMapper()->localId( remote ); if ( !localId.isEmpty() ) { adaptor()->deleteItem( localId ); } @@ -367,7 +367,7 @@ kdDebug()<<"Found it in the list!"<