diff options
Diffstat (limited to 'kmail/kmcommands.cpp')
-rw-r--r-- | kmail/kmcommands.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 7108fff65..9c1d25f96 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -636,7 +636,7 @@ KMCommand::Result KMUrlSaveCommand::execute() parentWidget() ); if ( saveUrl.isEmpty() ) return Canceled; - if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) ) + if ( TDEIO::NetAccess::exists( saveUrl, false, parentWidget() ) ) { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") @@ -644,13 +644,13 @@ KMCommand::Result KMUrlSaveCommand::execute() != KMessageBox::Continue) return Canceled; } - KIO::Job *job = KIO::file_copy(mUrl, saveUrl, -1, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotUrlSaveResult(KIO::Job*))); + TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } -void KMUrlSaveCommand::slotUrlSaveResult( KIO::Job *job ) +void KMUrlSaveCommand::slotUrlSaveResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog(); @@ -841,14 +841,14 @@ KURL KMSaveMsgCommand::url() KMCommand::Result KMSaveMsgCommand::execute() { - mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, false, false ); + mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, false, false ); mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)), + connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotSaveResult(KIO::Job*))); + connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -904,7 +904,7 @@ void KMSaveMsgCommand::slotSaveDataReq() } } } else { - mJob->slotError( KIO::ERR_ABORTED, + mJob->slotError( TDEIO::ERR_ABORTED, i18n("The message was removed while saving it. " "It has not been saved.") ); } @@ -955,11 +955,11 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg) } } -void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) +void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job) { if (job->error()) { - if (job->error() == KIO::ERR_FILE_ALREADY_EXIST) + if (job->error() == TDEIO::ERR_FILE_ALREADY_EXIST) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") @@ -967,14 +967,14 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) == KMessageBox::Continue) { mOffset = 0; - mJob = KIO::put( mUrl, S_IRUSR|S_IWUSR, true, false ); + mJob = TDEIO::put( mUrl, S_IRUSR|S_IWUSR, true, false ); mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray &)), + connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotSaveResult(KIO::Job*))); + connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotSaveResult(TDEIO::Job*))); } } else @@ -1012,17 +1012,17 @@ KMCommand::Result KMOpenMsgCommand::execute() setDeletesItself( false ); return Canceled; } - mJob = KIO::get( mUrl, false, false ); + mJob = TDEIO::get( mUrl, false, false ); mJob->setReportDataSent( true ); - connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotDataArrived( KIO::Job*, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); + connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); setEmitsCompletedItself( true ); return OK; } -void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data ) +void KMOpenMsgCommand::slotDataArrived( TDEIO::Job *, const TQByteArray & data ) { if ( data.isEmpty() ) return; @@ -1030,7 +1030,7 @@ void KMOpenMsgCommand::slotDataArrived( KIO::Job *, const TQByteArray & data ) mMsgString.append( data.data(), data.size() ); } -void KMOpenMsgCommand::slotResult( KIO::Job *job ) +void KMOpenMsgCommand::slotResult( TDEIO::Job *job ) { if ( job->error() ) { // handle errors @@ -1607,7 +1607,7 @@ KMPrintCommand::KMPrintCommand( TQWidget *parent, KMMessage *msg, if ( GlobalSettings::useDefaultFonts() ) mOverrideFont = TDEGlobalSettings::generalFont(); else { - KConfigGroup fonts( KMKernel::config(), "Fonts" ); + TDEConfigGroup fonts( KMKernel::config(), "Fonts" ); TQString tmp = fonts.readEntry( "print-font", TDEGlobalSettings::generalFont().toString() ); mOverrideFont.fromString( tmp ); } @@ -2641,7 +2641,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() } - if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { + if ( TDEIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) .arg( curUrl.fileName() ), @@ -2773,7 +2773,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, if ( !url.isLocalFile() ) { tf.close(); - if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) ) + if ( !TDEIO::NetAccess::upload( tf.name(), url, parentWidget() ) ) { KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) @@ -3334,13 +3334,13 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E return; d.setDisabled( true ); // we got this far, don't delete yet - KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); + TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( parentWidget() ); - connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) ); + connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); } -void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( KIO::Job * job ) +void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job ) { if ( job->error() ) job->showErrorDialog(); |