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/kmmsgdict.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kmail/kmmsgdict.cpp') diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp index 07f5797d..223a8adf 100644 --- a/kmail/kmmsgdict.cpp +++ b/kmail/kmmsgdict.cpp @@ -92,7 +92,7 @@ public: if (index >= 0) { int size = array.size(); if (index >= size) { - int newsize = QMAX(size + 25, index + 1); + int newsize = TQMAX(size + 25, index + 1); array.resize(newsize); for (int j = size; j < newsize; j++) array.at(j) = 0; @@ -215,10 +215,10 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum, } if (index == -1) - index = folder->find(msg); + index = folder->tqfind(msg); // Should not happen, indicates id file corruption - while (dict->find((long)msn)) { + while (dict->tqfind((long)msn)) { msn = getNextMsgSerNum(); folder->setDirty( true ); // rewrite id file } @@ -251,7 +251,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, { KMFolderIndex* folder = static_cast( msg->storage() ); if ( !folder ) { - kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial " + kdDebug(5006) << "KMMsgDict::tqreplace: Cannot replace the message serial " << "number, null pointer to storage. Requested serial: " << msgSerNum << endl; kdDebug(5006) << " Message info: Subject: " << msg->subject() << ", To: " @@ -260,7 +260,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, } if ( index == -1 ) - index = folder->find( msg ); + index = folder->tqfind( msg ); remove( msgSerNum ); KMMsgDictEntry *entry = new KMMsgDictEntry( folder->folder(), index ); @@ -279,7 +279,7 @@ void KMMsgDict::tqreplace(unsigned long msgSerNum, void KMMsgDict::remove(unsigned long msgSerNum) { long key = (long)msgSerNum; - KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find(key); + KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind(key); if (!entry) return; @@ -303,7 +303,7 @@ unsigned long KMMsgDict::remove(const KMMsgBase *msg) void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex) { - KMMsgDictREntry *rentry = msg->parent()->storage()->rDict(); + KMMsgDictREntry *rentry = msg->tqparent()->storage()->rDict(); if (rentry) { KMMsgDictEntry *entry = rentry->get(index); if (entry) { @@ -319,7 +319,7 @@ void KMMsgDict::update(const KMMsgBase *msg, int index, int newIndex) void KMMsgDict::getLocation(unsigned long key, KMFolder **retFolder, int *retIndex) const { - KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->find((long)key); + KMMsgDictEntry *entry = (KMMsgDictEntry *)dict->tqfind((long)key); if (entry) { *retFolder = (KMFolder *)entry->folder; *retIndex = entry->index; @@ -448,7 +448,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage ) if (swapByteOrder) msn = kmail_swap_32(msn); - if (!readOk || dict->find(msn)) { + if (!readOk || dict->tqfind(msn)) { for (unsigned int i = 0; i < index; i++) { msn = rentry->getMsn(i); dict->remove((long)msn); -- cgit v1.2.3