resolved a name conflict

author: alwin <alwin> 2003-12-23 20:31:24 (UTC)
committer: alwin <alwin> 2003-12-23 20:31:24 (UTC)
commit: 7c720aabcad9b325dbf9910493e3c9fa1d63805e (patch) (unidiff)
tree: a6a7cbc34070c14f2b8b202c1850b57564e836b2
parent: 0a613593f2e57c2805d1eef47c16b9fcb8c94a08 (diff)
download: opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.zip
opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.gz
opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.bz2
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;
+            QValueList<int>countlist = recList;
-            clist.append(count);
+            countlist.append(count);
-            searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);
+            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;    
+            QValueList<int>countlist = recList;    
-            clist.append(count);
+            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;
+            QValueList<int>countlist = recList;
-            clist.append(count);
+            countlist.append(count);
-            searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);
+            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;    
+            QValueList<int>countlist = recList;    
-            clist.append(count);
+            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);
author	alwin <alwin>	2003-12-23 20:31:24 (UTC)
committer	alwin <alwin>	2003-12-23 20:31:24 (UTC)
commit	7c720aabcad9b325dbf9910493e3c9fa1d63805e (patch) (unidiff)
tree	a6a7cbc34070c14f2b8b202c1850b57564e836b2
parent	0a613593f2e57c2805d1eef47c16b9fcb8c94a08 (diff)
download	opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.zip opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.gz opie-7c720aabcad9b325dbf9910493e3c9fa1d63805e.tar.bz2

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 @@
3		3
4	#include <libetpan/mailimap.h>	4	#include <libetpan/libetpan.h>
5		5
@@ -324,4 +324,3 @@ RecMailIMAPwrapper::parse_list_result(mailimap_msg_att m_att)
324	} else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {	324	} else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
325	#if 0	325	#if 0
326
327	mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;	326	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
556	if (current_body->bd_type==MAILIMAP_BODY_MPART) {	555	if (current_body->bd_type==MAILIMAP_BODY_MPART) {
557	QValueList<int>clist = recList;	556	QValueList<int>countlist = recList;
558	clist.append(count);	557	countlist.append(count);
559	searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);	558	searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist);
560	} else if (current_body->bd_type==MAILIMAP_BODY_1PART){	559	} else if (current_body->bd_type==MAILIMAP_BODY_1PART){
@@ -562,7 +561,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
562	fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);	561	fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);
563	QValueList<int>clist = recList;	562	QValueList<int>countlist = recList;
564	clist.append(count);	563	countlist.append(count);
565	/* important: Check for is NULL 'cause a body can be empty! */	564	/* important: Check for is NULL 'cause a body can be empty! */
566	if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {	565	if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {
567	QString body_text = fetchTextPart(mail,clist,true,currentPart.Encoding());	566	QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding());
568	target_body.setDescription(currentPart);	567	target_body.setDescription(currentPart);
@@ -571,5 +570,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
571	QString id("");	570	QString id("");
572	for (unsigned int j = 0; j < clist.count();++j) {	571	for (unsigned int j = 0; j < countlist.count();++j) {
573	id+=(j>0?" ":"");	572	id+=(j>0?" ":"");
574	id+=QString("%1").arg(clist[j]);	573	id+=QString("%1").arg(countlist[j]);
575	}	574	}
@@ -577,3 +576,3 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
577	currentPart.setIdentifier(id);	576	currentPart.setIdentifier(id);
578	currentPart.setPositionlist(clist);	577	currentPart.setPositionlist(countlist);
579	target_body.addPart(currentPart);	578	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 @@
3		3
4	#include <libetpan/mailimap.h>	4	#include <libetpan/libetpan.h>
5		5
@@ -324,4 +324,3 @@ RecMailIMAPwrapper::parse_list_result(mailimap_msg_att m_att)
324	} else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {	324	} else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
325	#if 0	325	#if 0
326
327	mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;	326	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
556	if (current_body->bd_type==MAILIMAP_BODY_MPART) {	555	if (current_body->bd_type==MAILIMAP_BODY_MPART) {
557	QValueList<int>clist = recList;	556	QValueList<int>countlist = recList;
558	clist.append(count);	557	countlist.append(count);
559	searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);	558	searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist);
560	} else if (current_body->bd_type==MAILIMAP_BODY_1PART){	559	} else if (current_body->bd_type==MAILIMAP_BODY_1PART){
@@ -562,7 +561,7 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
562	fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);	561	fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);
563	QValueList<int>clist = recList;	562	QValueList<int>countlist = recList;
564	clist.append(count);	563	countlist.append(count);
565	/* important: Check for is NULL 'cause a body can be empty! */	564	/* important: Check for is NULL 'cause a body can be empty! */
566	if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {	565	if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {
567	QString body_text = fetchTextPart(mail,clist,true,currentPart.Encoding());	566	QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding());
568	target_body.setDescription(currentPart);	567	target_body.setDescription(currentPart);
@@ -571,5 +570,5 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
571	QString id("");	570	QString id("");
572	for (unsigned int j = 0; j < clist.count();++j) {	571	for (unsigned int j = 0; j < countlist.count();++j) {
573	id+=(j>0?" ":"");	572	id+=(j>0?" ":"");
574	id+=QString("%1").arg(clist[j]);	573	id+=QString("%1").arg(countlist[j]);
575	}	574	}
@@ -577,3 +576,3 @@ void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mai
577	currentPart.setIdentifier(id);	576	currentPart.setIdentifier(id);
578	currentPart.setPositionlist(clist);	577	currentPart.setPositionlist(countlist);
579	target_body.addPart(currentPart);	578	target_body.addPart(currentPart);