From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kopete/libkopete/kopetetransfermanager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kopete/libkopete/kopetetransfermanager.cpp') diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 3f7a9358..27952b9a 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -51,14 +51,14 @@ Kopete::FileTransferInfo::FileTransferInfo( Kopete::Contact *contact, const TQS Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const TQString &localFile, bool showProgressInfo) - : KIO::Job(showProgressInfo), mInfo(kfti) + : TDEIO::Job(showProgressInfo), mInfo(kfti) { KURL targ; targ.setPath( localFile ); init( targ, showProgressInfo ); } Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const Kopete::Contact *contact, bool showProgressInfo) - : KIO::Job(showProgressInfo), mInfo(kfti) + : TDEIO::Job(showProgressInfo), mInfo(kfti) { // TODO: use mInfo.url().fileName() after move to protocol-aware filetransfers KURL targ; targ.setPath( mInfo.file() ); @@ -72,7 +72,7 @@ void Kopete::Transfer::init( const KURL &target, bool showProgressInfo ) if( showProgressInfo ) Observer::self()->slotCopying( this, sourceURL(), destinationURL() ); - connect( this, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) ); + connect( this, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) ); setAutoErrorHandlingEnabled( true, 0 ); } @@ -139,7 +139,7 @@ void Kopete::Transfer::slotError( int error, const TQString &errorText ) void Kopete::Transfer::slotResultEmitted() { - if( error() == KIO::ERR_USER_CANCELED ) + if( error() == TDEIO::ERR_USER_CANCELED ) emit transferCanceled(); } @@ -169,7 +169,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac nextID++; Kopete::FileTransferInfo info(contact, file, size, recipient,di, nextID); Kopete::Transfer *trans = new Kopete::Transfer(info, contact); - connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *))); + connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(nextID, trans); return trans; } @@ -177,7 +177,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac void Kopete::TransferManager::slotAccepted(const Kopete::FileTransferInfo& info, const TQString& filename) { Kopete::Transfer *trans = new Kopete::Transfer(info, filename); - connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *))); + connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(info.transferId(), trans); emit accepted(trans,filename); } @@ -206,7 +206,7 @@ void Kopete::TransferManager::removeTransfer( unsigned int id ) //we don't need to delete the job, the job get deleted itself } -void Kopete::TransferManager::slotComplete(KIO::Job *job) +void Kopete::TransferManager::slotComplete(TDEIO::Job *job) { Kopete::Transfer *transfer=dynamic_cast(job); if(!transfer) -- cgit v1.2.1