From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmail/imapjob.cpp | 68 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'kmail/imapjob.cpp') diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index ab57da23..2fee6acf 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -157,17 +157,17 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, jd.progressItem->setTotalItems( jd.total ); connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); - KIO::SimpleJob *job = KIO::put( url, 0, false, false, false ); - KIO::Scheduler::assignJobToSlave( account->slave(), job ); + TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false ); + TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); account->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(KIO::Job *)), - TQT_SLOT(slotPutMessageResult(KIO::Job *)) ); - connect( job, TQT_SIGNAL(dataReq(KIO::Job *, TQByteArray &)), - TQT_SLOT(slotPutMessageDataReq(KIO::Job *, TQByteArray &)) ); - connect( job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(KIO::Job *, const TQString &)) ); - connect( job, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)), - TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t))); + connect( job, TQT_SIGNAL(result(TDEIO::Job *)), + TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) ); + connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); + connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } else if ( jt == tCopyMessage || jt == tMoveMessage ) @@ -198,16 +198,16 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, jd.progressItem->setTotalItems( jd.total ); connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); - KIO::SimpleJob *simpleJob = KIO::special( url, packedArgs, false ); - KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); + TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false ); + TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); - connect( mJob, TQT_SIGNAL(result(KIO::Job *)), - TQT_SLOT(slotCopyMessageResult(KIO::Job *)) ); + connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), + TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); if ( jt == tMoveMessage ) { - connect( mJob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)), - TQT_SLOT(slotCopyMessageInfoData(KIO::Job *, const TQString &)) ); + connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); } } else { @@ -321,30 +321,30 @@ void ImapJob::slotGetNextMessage() account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); jd.progressItem->setTotalItems( jd.total ); - KIO::SimpleJob *simpleJob = KIO::get( url, false, false ); - KIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); + TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false ); + TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 ) { - connect( mJob, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotGetBodyStructureResult(KIO::Job *)) ); + connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); } else { - connect( mJob, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotGetMessageResult(KIO::Job *)) ); + connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) ); } - connect( mJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - msgParent, TQT_SLOT(slotSimpleData(KIO::Job *, const TQByteArray &)) ); + connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); if ( jd.total > 1 ) { - connect(mJob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t))); + connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } //----------------------------------------------------------------------------- -void ImapJob::slotGetMessageResult( KIO::Job * job ) +void ImapJob::slotGetMessageResult( TDEIO::Job * job ) { KMMessage *msg = mMsgList.first(); if (!msg || !msg->parent() || !job) { @@ -461,7 +461,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) } //----------------------------------------------------------------------------- -void ImapJob::slotGetBodyStructureResult( KIO::Job * job ) +void ImapJob::slotGetBodyStructureResult( TDEIO::Job * job ) { KMMessage *msg = mMsgList.first(); if (!msg || !msg->parent() || !job) { @@ -499,7 +499,7 @@ void ImapJob::slotGetBodyStructureResult( KIO::Job * job ) } //----------------------------------------------------------------------------- -void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data ) +void ImapJob::slotPutMessageDataReq( TDEIO::Job *job, TQByteArray &data ) { KMAcctImap *account = static_cast(mDestFolder->storage())->account(); if ( !account ) @@ -525,7 +525,7 @@ void ImapJob::slotPutMessageDataReq( KIO::Job *job, TQByteArray &data ) //----------------------------------------------------------------------------- -void ImapJob::slotPutMessageResult( KIO::Job *job ) +void ImapJob::slotPutMessageResult( TDEIO::Job *job ) { KMAcctImap *account = static_cast(mDestFolder->storage())->account(); if ( !account ) @@ -570,7 +570,7 @@ void ImapJob::slotPutMessageResult( KIO::Job *job ) } //----------------------------------------------------------------------------- -void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data) +void ImapJob::slotCopyMessageInfoData(TDEIO::Job * job, const TQString & data) { KMFolderImap * imapFolder = static_cast(mDestFolder->storage()); KMAcctImap *account = imapFolder->account(); @@ -609,7 +609,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data) } //---------------------------------------------------------------------------- -void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data) +void ImapJob::slotPutMessageInfoData(TDEIO::Job *job, const TQString &data) { KMFolderImap * imapFolder = static_cast(mDestFolder->storage()); KMAcctImap *account = imapFolder->account(); @@ -634,7 +634,7 @@ void ImapJob::slotPutMessageInfoData(KIO::Job *job, const TQString &data) //----------------------------------------------------------------------------- -void ImapJob::slotCopyMessageResult( KIO::Job *job ) +void ImapJob::slotCopyMessageResult( TDEIO::Job *job ) { KMAcctImap *account = static_cast(mDestFolder->storage())->account(); if ( !account ) @@ -684,7 +684,7 @@ void ImapJob::setParentFolder( const KMFolderImap* parent ) } //----------------------------------------------------------------------------- -void ImapJob::slotProcessedSize(KIO::Job * job, KIO::filesize_t processed) +void ImapJob::slotProcessedSize(TDEIO::Job * job, TDEIO::filesize_t processed) { KMMessage *msg = mMsgList.first(); if (!msg || !job) { -- cgit v1.2.3