some more smart-pointers

some bugfixes
some renaming of internals

1 files changed, 24 insertions, 25 deletions

diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 3b3be0f..071e734 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -207,3 +207,3 @@ void IMAPwrapper::logout()
 
-void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
+void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::OSmartPointer<RecMail> > &target )
 {
@@ -268,3 +268,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
 
-QValueList<Opie::osmart_pointer<Folder> >* IMAPwrapper::listFolders()
+QValueList<Opie::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
@@ -484,3 +484,3 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 
-RecBody IMAPwrapper::fetchBody(const RecMail&mail)
+RecBody IMAPwrapper::fetchBody(const RecMailP&mail)
 {
@@ -496,3 +496,3 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 
-    mb = mail.getMbox().latin1();
+    mb = mail->getMbox().latin1();
 
@@ -502,3 +502,3 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail)
     }
-    err = selectMbox(mail.getMbox());
+    err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
@@ -508,3 +508,3 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail)
     /* the range has to start at 1!!! not with 0!!!! */
-    set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
+    set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() );
     fetchAtt = mailimap_fetch_att_new_bodystructure();
@@ -570,3 +570,3 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 
-encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>&path,bool internal_call)
+encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call)
 {
@@ -587,3 +587,3 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
     if (!internal_call) {
-        err = selectMbox(mail.getMbox());
+        err = selectMbox(mail->getMbox());
         if ( err != MAILIMAP_NO_ERROR ) {
@@ -592,3 +592,3 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
     }
-    set = mailimap_set_new_single(mail.getNumber());
+    set = mailimap_set_new_single(mail->getNumber());
 
@@ -643,3 +643,3 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
    current_count means the position inside the internal loop! */
-void IMAPwrapper::traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body,
+void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&target_body,
     int current_recursion,QValueList<int>recList,int current_count)
@@ -871,3 +871,3 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
 
-void IMAPwrapper::deleteMail(const RecMail&mail)
+void IMAPwrapper::deleteMail(const RecMailP&mail)
 {
@@ -881,3 +881,3 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
     }
-    err = selectMbox(mail.getMbox());
+    err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
@@ -888,3 +888,3 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
     store_flags = mailimap_store_att_flags_new_set_flags(flist);
-    set = mailimap_set_new_single(mail.getNumber());
+    set = mailimap_set_new_single(mail->getNumber());
     err = mailimap_store(m_imap,set,store_flags);
@@ -906,3 +906,3 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
 
-void IMAPwrapper::answeredMail(const RecMail&mail)
+void IMAPwrapper::answeredMail(const RecMailP&mail)
 {
@@ -916,3 +916,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
     }
-    err = selectMbox(mail.getMbox());
+    err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
@@ -923,3 +923,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
     store_flags = mailimap_store_att_flags_new_add_flags(flist);
-    set = mailimap_set_new_single(mail.getNumber());
+    set = mailimap_set_new_single(mail->getNumber());
     err = mailimap_store(m_imap,set,store_flags);
@@ -934,3 +934,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
 
-QString IMAPwrapper::fetchTextPart(const RecMail&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
+QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
 {
@@ -949,3 +949,3 @@ QString IMAPwrapper::fetchTextPart(const RecMail&mail,const QValueList<int>&path
 
-QString IMAPwrapper::fetchTextPart(const RecMail&mail,const RecPart&part)
+QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const RecPart&part)
 {
@@ -954,3 +954,3 @@ QString IMAPwrapper::fetchTextPart(const RecMail&mail,const RecPart&part)
 
-encodedString* IMAPwrapper::fetchDecodedPart(const RecMail&mail,const RecPart&part)
+encodedString* IMAPwrapper::fetchDecodedPart(const RecMailP&mail,const RecPart&part)
 {
@@ -962,3 +962,3 @@ encodedString* IMAPwrapper::fetchDecodedPart(const RecMail&mail,const RecPart&pa
 
-encodedString* IMAPwrapper::fetchRawPart(const RecMail&mail,const RecPart&part)
+encodedString* IMAPwrapper::fetchRawPart(const RecMailP&mail,const RecPart&part)
 {
@@ -1057,3 +1057,2 @@ void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     int r = 0;
-    int res = 0;
     target_stat.message_count = 0;
@@ -1117,3 +1116,3 @@ const QString&IMAPwrapper::getName()const
 
-encodedString* IMAPwrapper::fetchRawBody(const RecMail&mail)
+encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
 {
@@ -1156,3 +1155,3 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
 
-void IMAPwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
@@ -1168,3 +1167,3 @@ void IMAPwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,Abstrac
     }
-    int err = selectMbox(mail.getMbox());
+    int err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
@@ -1172,3 +1171,3 @@ void IMAPwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,Abstrac
     }
-    set = mailimap_set_new_single(mail.getNumber());
+    set = mailimap_set_new_single(mail->getNumber());
     err = mailimap_copy(m_imap,set,targetFolder.latin1());