1 files changed, 24 insertions, 26 deletions

diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index aaaa20a..0b00a2e 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -62,3 +62,3 @@ MHwrapper::~MHwrapper()
 
-void MHwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
+void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target )
 {
@@ -78,5 +78,5 @@ void MHwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
 
-QValueList<Opie::osmart_pointer<Folder> >* MHwrapper::listFolders()
+QValueList<Opie::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
-    QValueList<Opie::osmart_pointer<Folder> >* folders = new QValueList<Opie::osmart_pointer<Folder> >();
+    QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >();
     /* this is needed! */
@@ -103,3 +103,3 @@ QValueList<Opie::osmart_pointer<Folder> >* MHwrapper::listFolders()
 
-void MHwrapper::deleteMail(const RecMail&mail)
+void MHwrapper::deleteMail(const RecMailP&mail)
 {
@@ -109,3 +109,3 @@ void MHwrapper::deleteMail(const RecMail&mail)
     }
-    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r!=MAIL_NO_ERROR) {
@@ -114,3 +114,3 @@ void MHwrapper::deleteMail(const RecMail&mail)
     }
-    r = mailsession_remove_message(m_storage->sto_session,mail.getNumber());
+    r = mailsession_remove_message(m_storage->sto_session,mail->getNumber());
     if (r != MAIL_NO_ERROR) {
@@ -120,3 +120,3 @@ void MHwrapper::deleteMail(const RecMail&mail)
 
-void MHwrapper::answeredMail(const RecMail&)
+void MHwrapper::answeredMail(const RecMailP&)
 {
@@ -124,3 +124,3 @@ void MHwrapper::answeredMail(const RecMail&)
 
-RecBody MHwrapper::fetchBody( const RecMail &mail )
+RecBody MHwrapper::fetchBody( const RecMailP &mail )
 {
@@ -133,6 +133,5 @@ RecBody MHwrapper::fetchBody( const RecMail &mail )
     char*data=0;
-    size_t size;
 
     /* mail should hold the complete path! */
-    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r != MAIL_NO_ERROR) {
@@ -140,5 +139,5 @@ RecBody MHwrapper::fetchBody( const RecMail &mail )
     }
-    r = mailsession_get_message(m_storage->sto_session, mail.getNumber(), &msg);
+    r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
-        qDebug("Error fetching mail %i",mail.getNumber());
+        qDebug("Error fetching mail %i",mail->getNumber());
         return body;
@@ -214,3 +213,3 @@ void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder)
 
-encodedString* MHwrapper::fetchRawBody(const RecMail&mail)
+encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
 {
@@ -224,3 +223,3 @@ encodedString* MHwrapper::fetchRawBody(const RecMail&mail)
     size_t size;
-    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r!=MAIL_NO_ERROR) {
@@ -229,5 +228,5 @@ encodedString* MHwrapper::fetchRawBody(const RecMail&mail)
     }
-    r = mailsession_get_message(m_storage->sto_session, mail.getNumber(), &msg);
+    r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber()));
         return 0;
@@ -236,3 +235,3 @@ encodedString* MHwrapper::fetchRawBody(const RecMail&mail)
     if (r != MAIL_NO_ERROR) {
-        Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
+        Global::statusMessage(tr("Error fetching mail %i").arg(mail->getNumber()));
         if (msg) mailmessage_free(msg);
@@ -245,3 +244,3 @@ encodedString* MHwrapper::fetchRawBody(const RecMail&mail)
 
-void MHwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
+void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
 {
@@ -253,6 +252,5 @@ void MHwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
     }
-    RecMail*c = 0;
-    for (unsigned int i=0; i < target.count();++i) {
-        c = target.at(i);
-        r = mailsession_remove_message(m_storage->sto_session,c->getNumber());
+    QValueList<RecMailP>::ConstIterator it;
+    for (it=target.begin(); it!=target.end();++it) {
+        r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber());
         if (r != MAIL_NO_ERROR) {
@@ -374,3 +372,3 @@ const QString&MHwrapper::getName()const
 }
-void MHwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+void MHwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
@@ -387,3 +385,3 @@ void MHwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractM
     QString tf = buildPath(targetFolder);
-    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
     if (r != MAIL_NO_ERROR) {
@@ -393,5 +391,5 @@ void MHwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractM
     if (moveit) {
-        r = mailsession_move_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+        r = mailsession_move_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1());
     } else {
-        r = mailsession_copy_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+        r = mailsession_copy_message(m_storage->sto_session,mail->getNumber(),(char*)tf.latin1());
     }