From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/kmfoldersearch.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kmail/kmfoldersearch.cpp') diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index 471d2f3e..5ebc8b2c 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -69,8 +69,8 @@ #define IDS_SEARCH_HEADER_LEN 30 -KMSearch::KMSearch(TQObject * parent, const char * name) - :TQObject(parent, name) +KMSearch::KMSearch(TQObject * tqparent, const char * name) + :TQObject(tqparent, name) { mRemainingFolders = -1; mRecursive = true; @@ -135,11 +135,11 @@ bool KMSearch::inScope(KMFolder* folder) const return false; KMFolderDir *rootDir = mRoot->child(); - KMFolderDir *ancestorDir = folder->parent(); + KMFolderDir *ancestorDir = folder->tqparent(); while ( ancestorDir ) { if ( ancestorDir == rootDir ) return true; - ancestorDir = ancestorDir->parent(); + ancestorDir = ancestorDir->tqparent(); } return false; } @@ -204,7 +204,7 @@ void KMSearch::start() } mRemainingFolders = mFolders.count(); - mLastFolder = TQString::null; + mLastFolder = TQString(); mProcessNextBatchTimer->start( 0, true ); } @@ -237,7 +237,7 @@ void KMSearch::stop() mRemainingFolders = -1; mOpenedFolders.clear(); mFolders.clear(); - mLastFolder = TQString::null; + mLastFolder = TQString(); mRunByIndex = mRunning = false; emit finished(false); } @@ -304,7 +304,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder, { mRemainingFolders = 0; mRunning = false; - mLastFolder = TQString::null; + mLastFolder = TQString(); mRemainingFolders = -1; mFolders.clear(); emit finished( true ); @@ -688,7 +688,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg ) this folder via the inherited method, then clear the imap ones. */ FolderStorage::ignoreJobsForMessage( msg ); - if (msg->parent()->folderType() == KMFolderTypeImap) { + if (msg->tqparent()->folderType() == KMFolderTypeImap) { KMAcctImap *account = static_cast( msg->storage() )->account(); if( !account ) @@ -698,7 +698,7 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg ) } -int KMFolderSearch::find(const KMMsgBase* msg) const +int KMFolderSearch::tqfind(const KMMsgBase* msg) const { int pos = 0; TQ_UINT32 serNum = msg->getMsgSerNum(); @@ -787,7 +787,7 @@ int KMFolderSearch::writeIndex( bool ) DwString KMFolderSearch::getDwString(int idx) { - return getMsgBase(idx)->parent()->getDwString( idx ); + return getMsgBase(idx)->tqparent()->getDwString( idx ); } KMMessage* KMFolderSearch::readMsg(int idx) @@ -910,7 +910,7 @@ KMMsgInfo* KMFolderSearch::setIndexEntry(int idx, KMMessage *msg) { assert(idx >= 0 && idx < (int)mSerNums.count()); Q_UNUSED( idx ); - return msg->storage()->setIndexEntry(msg->parent()->find(msg), msg); + return msg->storage()->setIndexEntry(msg->tqparent()->tqfind(msg), msg); } void KMFolderSearch::clearIndex(bool, bool) -- cgit v1.2.3