| author | alwin <alwin> | 2003-12-23 20:31:24 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2003-12-23 20:31:24 (UTC) |
| commit | 7c720aabcad9b325dbf9910493e3c9fa1d63805e (patch) (side-by-side diff) | |
| tree | a6a7cbc34070c14f2b8b202c1850b57564e836b2 /noncore | |
| parent | 0a613593f2e57c2805d1eef47c16b9fcb8c94a08 (diff) | |
| download | opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.zip opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.gz opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.bz2 | |
resolved a name conflict
| -rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 23 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 23 |
2 files changed, 22 insertions, 24 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 30eb678..853e4a2 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp @@ -3,3 +3,3 @@ -#include <libetpan/mailimap.h> +#include <libetpan/libetpan.h> @@ -324,4 +324,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { -#if 0 - +#if 0 mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; @@ -556,5 +555,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai if (current_body->bd_type==MAILIMAP_BODY_MPART) { - QValueList<int>clist = recList; - clist.append(count); - searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist); + QValueList<int>countlist = recList; + countlist.append(count); + searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist); } else if (current_body->bd_type==MAILIMAP_BODY_1PART){ @@ -562,7 +561,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai fillSinglePart(currentPart,current_body->bd_data.bd_body_1part); - QValueList<int>clist = recList; - clist.append(count); + QValueList<int>countlist = recList; + countlist.append(count); /* important: Check for is NULL 'cause a body can be empty! */ if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { - QString body_text = fetchTextPart(mail,clist,true,currentPart.Encoding()); + QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); target_body.setDescription(currentPart); @@ -571,5 +570,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai QString id(""); - for (unsigned int j = 0; j < clist.count();++j) { + for (unsigned int j = 0; j < countlist.count();++j) { id+=(j>0?" ":""); - id+=QString("%1").arg(clist[j]); + id+=QString("%1").arg(countlist[j]); } @@ -577,3 +576,3 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai currentPart.setIdentifier(id); - currentPart.setPositionlist(clist); + currentPart.setPositionlist(countlist); target_body.addPart(currentPart); diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 30eb678..853e4a2 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -3,3 +3,3 @@ -#include <libetpan/mailimap.h> +#include <libetpan/libetpan.h> @@ -324,4 +324,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { -#if 0 - +#if 0 mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; @@ -556,5 +555,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai if (current_body->bd_type==MAILIMAP_BODY_MPART) { - QValueList<int>clist = recList; - clist.append(count); - searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist); + QValueList<int>countlist = recList; + countlist.append(count); + searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist); } else if (current_body->bd_type==MAILIMAP_BODY_1PART){ @@ -562,7 +561,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai fillSinglePart(currentPart,current_body->bd_data.bd_body_1part); - QValueList<int>clist = recList; - clist.append(count); + QValueList<int>countlist = recList; + countlist.append(count); /* important: Check for is NULL 'cause a body can be empty! */ if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { - QString body_text = fetchTextPart(mail,clist,true,currentPart.Encoding()); + QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); target_body.setDescription(currentPart); @@ -571,5 +570,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai QString id(""); - for (unsigned int j = 0; j < clist.count();++j) { + for (unsigned int j = 0; j < countlist.count();++j) { id+=(j>0?" ":""); - id+=QString("%1").arg(clist[j]); + id+=QString("%1").arg(countlist[j]); } @@ -577,3 +576,3 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai currentPart.setIdentifier(id); - currentPart.setPositionlist(clist); + currentPart.setPositionlist(countlist); target_body.addPart(currentPart); |