From c71234bda29bd83de34ce04c766f2be641ed86be Mon Sep 17 00:00:00 2001
From: alwin <alwin>
Date: Fri, 12 Mar 2004 11:21:19 +0000
Subject: fixed a variable name conflict

---
(limited to 'noncore/net/mail')

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
         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;
--
cgit v0.9.0.2