author | alwin <alwin> | 2004-03-12 11:21:19 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-12 11:21:19 (UTC) |
commit | c71234bda29bd83de34ce04c766f2be641ed86be (patch) (side-by-side diff) | |
tree | 85abe5962891fabe7a743b6f518469b6d6f8c40a | |
parent | eb734381bc4414ef5584c51e49582c3fa8930440 (diff) | |
download | opie-c71234bda29bd83de34ce04c766f2be641ed86be.zip opie-c71234bda29bd83de34ce04c766f2be641ed86be.tar.gz opie-c71234bda29bd83de34ce04c766f2be641ed86be.tar.bz2 |
fixed a variable name conflict
-rw-r--r-- | noncore/net/mail/libmailwrapper/genericwrapper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index ffa049f..6c8a5a1 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp @@ -145,40 +145,40 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi clistiter * cur = 0; QString b; RecPart part; switch (mime->mm_type) { case MAILMIME_SINGLE: { QValueList<int>countlist = recList; countlist.append(current_count); r = mailmessage_fetch_section(message,mime,&data,&len); part.setSize(len); part.setPositionlist(countlist); b = gen_attachment_id(); part.setIdentifier(b); fillSingleBody(part,message,mime); if (part.Type()=="text" && target.Bodytext().isNull()) { - encodedString*r = new encodedString(); - r->setContent(data,len); - encodedString*res = decode_String(r,part.Encoding()); + encodedString*rs = new encodedString(); + rs->setContent(data,len); + encodedString*res = decode_String(rs,part.Encoding()); if (countlist.count()>2) { - bodyCache[b]=r; + bodyCache[b]=rs; target.addPart(part); } else { - delete r; + delete rs; } b = QString(res->Content()); delete res; target.setBodytext(b); target.setDescription(part); } else { bodyCache[b]=new encodedString(data,len); target.addPart(part); } } break; case MAILMIME_MULTIPLE: { unsigned int ccount = 1; mailmime*cbody=0; QValueList<int>countlist = recList; |