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 --- kmail/renamejob.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kmail/renamejob.cpp') diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 79b0793e..09966cf9 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -47,13 +47,13 @@ #include #include -#include +#include using namespace KMail; -template static QStringList imapPaths( FolderStorage* storage ) +template static TQStringList imapPaths( FolderStorage* storage ) { - QStringList rv; + TQStringList rv; rv.append( static_cast( storage )->imapPath() ); KMFolderDir* dir = storage->folder()->child(); if ( dir ) { @@ -68,7 +68,7 @@ template static QStringList imapPaths( FolderStorage* storage ) return rv; } -RenameJob::RenameJob( FolderStorage* storage, const QString& newName, +RenameJob::RenameJob( FolderStorage* storage, const TQString& newName, KMFolderDir* newParent ) : FolderJob( 0, tOther, (storage ? storage->folder() : 0) ), mStorage( storage ), mNewParent( newParent ), @@ -110,7 +110,7 @@ void RenameJob::execute() } // copy to the new folder mCopyFolderJob = new CopyFolderJob( mStorage, mNewParent ); - connect( mCopyFolderJob, SIGNAL(folderCopyComplete(bool)), SLOT(folderCopyComplete(bool)) ); + connect( mCopyFolderJob, TQT_SIGNAL(folderCopyComplete(bool)), TQT_SLOT(folderCopyComplete(bool)) ); mCopyFolderJob->execute(); } else @@ -149,8 +149,8 @@ void RenameJob::execute() ImapAccountBase::jobData jd( src.url() ); account->insertJob( job, jd ); KIO::Scheduler::assignJobToSlave( account->slave(), job ); - connect( job, SIGNAL(result(KIO::Job*)), - SLOT(slotRenameResult(KIO::Job*)) ); + connect( job, TQT_SIGNAL(result(KIO::Job*)), + TQT_SLOT(slotRenameResult(KIO::Job*)) ); } } @@ -207,11 +207,11 @@ void RenameJob::folderCopyComplete(bool success) kdDebug(5006) << "deleting old folder" << endl; // move complete or not necessary // save our settings - QString oldconfig = "Folder-" + mStorage->folder()->idString(); + TQString oldconfig = "Folder-" + mStorage->folder()->idString(); KConfig* config = KMKernel::config(); - QMap entries = config->entryMap( oldconfig ); + TQMap entries = config->entryMap( oldconfig ); KConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString()); - for ( QMap::Iterator it = entries.begin(); + for ( TQMap::Iterator it = entries.begin(); it != entries.end(); ++it ) { if ( it.key() == "Id" || it.key() == "ImapPath" || @@ -235,7 +235,7 @@ void RenameJob::folderCopyComplete(bool success) // tell the account (see KMFolderCachedImap::listDirectory2) KMAcctCachedImap* acct = static_cast(mStorage)->account(); if ( acct ) { - for ( QStringList::ConstIterator it = mOldImapPaths.constBegin(); it != mOldImapPaths.constEnd(); ++it ) + for ( TQStringList::ConstIterator it = mOldImapPaths.constBegin(); it != mOldImapPaths.constEnd(); ++it ) acct->addDeletedFolder( *it ); } kmkernel->dimapFolderMgr()->remove( mStorage->folder() ); -- cgit v1.2.3