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/renamejob.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kmail/renamejob.cpp') diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 7715c5871..5e2a43d3f 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -143,18 +143,18 @@ void RenameJob::execute() src.setPath( mOldImapPath ); KURL dst( account->getUrl() ); dst.setPath( mNewImapPath ); - KIO::SimpleJob *job = KIO::rename( src, dst, true ); + TDEIO::SimpleJob *job = TDEIO::rename( src, dst, true ); kdDebug(5006)<< "RenameJob::rename - " << src.prettyURL() << " |=> " << dst.prettyURL() << endl; ImapAccountBase::jobData jd( src.url() ); account->insertJob( job, jd ); - KIO::Scheduler::assignJobToSlave( account->slave(), job ); - connect( job, TQT_SIGNAL(result(KIO::Job*)), - TQT_SLOT(slotRenameResult(KIO::Job*)) ); + TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); + connect( job, TQT_SIGNAL(result(TDEIO::Job*)), + TQT_SLOT(slotRenameResult(TDEIO::Job*)) ); } } -void RenameJob::slotRenameResult( KIO::Job *job ) +void RenameJob::slotRenameResult( TDEIO::Job *job ) { ImapAccountBase* account = static_cast(mStorage)->account(); ImapAccountBase::JobIterator it = account->findJob(job); @@ -208,9 +208,9 @@ void RenameJob::folderCopyComplete(bool success) // move complete or not necessary // save our settings TQString oldconfig = "Folder-" + mStorage->folder()->idString(); - KConfig* config = KMKernel::config(); + TDEConfig* config = KMKernel::config(); TQMap entries = config->entryMap( oldconfig ); - KConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString()); + TDEConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString()); for ( TQMap::Iterator it = entries.begin(); it != entries.end(); ++it ) { -- cgit v1.2.1