| author | alwin <alwin> | 2004-03-12 11:21:19 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2004-03-12 11:21:19 (UTC) |
| commit | c71234bda29bd83de34ce04c766f2be641ed86be (patch) (unidiff) | |
| 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 | |||
| @@ -158,14 +158,14 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi | |||
| 158 | part.setIdentifier(b); | 158 | part.setIdentifier(b); |
| 159 | fillSingleBody(part,message,mime); | 159 | fillSingleBody(part,message,mime); |
| 160 | if (part.Type()=="text" && target.Bodytext().isNull()) { | 160 | if (part.Type()=="text" && target.Bodytext().isNull()) { |
| 161 | encodedString*r = new encodedString(); | 161 | encodedString*rs = new encodedString(); |
| 162 | r->setContent(data,len); | 162 | rs->setContent(data,len); |
| 163 | encodedString*res = decode_String(r,part.Encoding()); | 163 | encodedString*res = decode_String(rs,part.Encoding()); |
| 164 | if (countlist.count()>2) { | 164 | if (countlist.count()>2) { |
| 165 | bodyCache[b]=r; | 165 | bodyCache[b]=rs; |
| 166 | target.addPart(part); | 166 | target.addPart(part); |
| 167 | } else { | 167 | } else { |
| 168 | delete r; | 168 | delete rs; |
| 169 | } | 169 | } |
| 170 | b = QString(res->Content()); | 170 | b = QString(res->Content()); |
| 171 | delete res; | 171 | delete res; |