Work around a gcc4 warning bug. This wouldn't be worth it if it didn't also make the code nicer - esp. in partNode

svn path=/trunk/KDE/kdepim/; revision=428501

kmmessage.cpp

@@ -245,7 +245,7 @@ void KMMessage::setUnencryptedMsg( KMMessage* unencrypted )
 //-----------------------------------------------------------------------------
 //FIXME: move to libemailfunctions
 KPIM::EmailParseResult KMMessage::isValidEmailAddressList( const QString& aStr,
-                                                           QString& brokenAddress ) 
+                                                           QString& brokenAddress )
 {
   if ( aStr.isEmpty() ) {
      return KPIM::AddressEmpty;
@@ -814,8 +814,7 @@ QString KMMessage::asQuotedString( const QString& aHeaderStr,
   const QString headerStr = formatString( aHeaderStr );
   if ( sSmartQuote && sWordWrap )
     return headerStr + smartQuote( content, sWrapCol );
-  else
-    return headerStr + content;
+  return headerStr + content;
 }
 
 //-----------------------------------------------------------------------------
@@ -1157,12 +1156,12 @@ KMMessage* KMMessage::createForward()
   QString id;
 
   // If this is a multipart mail or if the main part is only the text part,
-  // Make an identical copy of the mail, minus headers, so attachments are 
+  // Make an identical copy of the mail, minus headers, so attachments are
   // preserved
   if ( type() == DwMime::kTypeMultipart ||
      ( type() == DwMime::kTypeText && subtype() == DwMime::kSubtypePlain ) ) {
     msg->fromDwString( this->asDwString() );
-    // remember the type and subtype, initFromMessage sets the contents type to 
+    // remember the type and subtype, initFromMessage sets the contents type to
     // text/plain, via initHeader, for unclear reasons
     const int type = msg->type();
     const int subtype = msg->subtype();
@@ -1175,7 +1174,7 @@ KMMessage* KMMessage::createForward()
     while (field)
     {
       nextField = field->Next();
-      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos ) 
+      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos )
         header.RemoveField(field);
       field = nextField;
     }

partNode.cpp

@@ -403,12 +403,11 @@ partNode* partNode::findType( int type, int subType, bool deep, bool wide )
            && (    (subType == DwMime::kSubtypeUnknown)
                    || (subType == mSubType) ) )
         return this;
-    else if( mChild && deep )
+    if ( mChild && deep )
         return mChild->findType( type, subType, deep, wide );
-    else if( mNext && wide )
+    if ( mNext && wide )
         return mNext->findType(  type, subType, deep, wide );
-    else
-        return 0;
+    return 0;
 }
 
 partNode* partNode::findNodeForDwPart( DwBodyPart* part )
@@ -431,12 +430,11 @@ partNode* partNode::findTypeNot( int type, int subType, bool deep, bool wide )
            && (    (subType == DwMime::kSubtypeUnknown)
                    || (subType != mSubType) ) )
         return this;
-    else if( mChild && deep )
+    if ( mChild && deep )
         return mChild->findTypeNot( type, subType, deep, wide );
-    else if( mNext && wide )
+    if ( mNext && wide )
         return mNext->findTypeNot(  type, subType, deep, wide );
-    else
-        return 0;
+    return 0;
 }
 
 void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,