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/bodyvisitor.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kmail/bodyvisitor.cpp') diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp index 5c920584..337c843c 100644 --- a/kmail/bodyvisitor.cpp +++ b/kmail/bodyvisitor.cpp @@ -76,9 +76,9 @@ namespace KMail { while ( (part = it.current()) != 0 ) { ++it; - // skip this part if the parent part is already loading - if ( part->parent() && - selected.tqcontains( part->parent() ) && + // skip this part if the tqparent part is already loading + if ( part->tqparent() && + selected.tqcontains( part->tqparent() ) && part->loadPart() ) continue; @@ -114,9 +114,9 @@ namespace KMail { headerCheck = false; // check whether to load this part or not: - // look at the basic list, ask the subclass and check the parent + // look at the basic list, ask the subclass and check the tqparent if ( mBasicList.tqcontains( part->originalContentTypeStr() ) || - parentNeedsLoading( part ) || + tqparentNeedsLoading( part ) || addPartToList( part ) ) { if ( part->typeStr() != "MULTIPART" || @@ -137,18 +137,18 @@ namespace KMail { } //----------------------------------------------------------------------------- - bool BodyVisitor::parentNeedsLoading( KMMessagePart *msgPart ) + bool BodyVisitor::tqparentNeedsLoading( KMMessagePart *msgPart ) { KMMessagePart *part = msgPart; while ( part ) { - if ( part->parent() && - ( part->parent()->originalContentTypeStr() == "MULTIPART/SIGNED" || + if ( part->tqparent() && + ( part->tqparent()->originalContentTypeStr() == "MULTIPART/SIGNED" || ( msgPart->originalContentTypeStr() == "APPLICATION/OCTET-STREAM" && - part->parent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) + part->tqparent()->originalContentTypeStr() == "MULTIPART/ENCRYPTED" ) ) ) return true; - part = part->parent(); + part = part->tqparent(); } return false; } -- cgit v1.2.3