summaryrefslogtreecommitdiffstats
path: root/kmail/renamejob.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/renamejob.cpp')
-rw-r--r--kmail/renamejob.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 79b0793e1..09966cf9d 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -47,13 +47,13 @@
#include <klocale.h>
#include <config.h>
-#include <qmap.h>
+#include <tqmap.h>
using namespace KMail;
-template <typename T> static QStringList imapPaths( FolderStorage* storage )
+template <typename T> static TQStringList imapPaths( FolderStorage* storage )
{
- QStringList rv;
+ TQStringList rv;
rv.append( static_cast<T>( storage )->imapPath() );
KMFolderDir* dir = storage->folder()->child();
if ( dir ) {
@@ -68,7 +68,7 @@ template <typename T> 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<QString, QString> entries = config->entryMap( oldconfig );
+ TQMap<TQString, TQString> entries = config->entryMap( oldconfig );
KConfigGroupSaver saver(config, "Folder-" + mNewFolder->idString());
- for ( QMap<QString, QString>::Iterator it = entries.begin();
+ for ( TQMap<TQString, TQString>::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<KMFolderCachedImap*>(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() );