1 files changed, 19 insertions, 20 deletions

diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index abe4bb6..9ff3de2 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -16,3 +16,3 @@ MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name)
 }
-    
+
 MBOXwrapper::~MBOXwrapper()
@@ -26,6 +26,6 @@ void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
     p+=mailbox;
-    
+
     int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
     mailfolder*folder;
-    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
     r = mailfolder_connect(folder);
@@ -37,5 +37,5 @@ void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
     }
-    
+
     parseList(target,folder->fld_session,mailbox);
-    
+
     mailfolder_disconnect(folder);
@@ -46,6 +46,5 @@ void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
 
-QList<Folder>* MBOXwrapper::listFolders()
+QValueList<Opie::osmart_pointer<Folder> >* MBOXwrapper::listFolders()
 {
-    QList<Folder> * folders = new QList<Folder>();
-    folders->setAutoDelete( false );
+    QValueList<Opie::osmart_pointer<Folder> >* folders = new QValueList<Opie::osmart_pointer<Folder> >();
     QDir dir(MBOXPath);
@@ -56,3 +55,3 @@ QList<Folder>* MBOXwrapper::listFolders()
     for (;it!=entries.end();++it) {
-        Folder*inb=new Folder(*it,"/");
+        FolderP inb=new Folder(*it,"/");
         folders->append(inb);
@@ -69,3 +68,3 @@ void MBOXwrapper::deleteMail(const RecMail&mail)
     mailfolder*folder;
-    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
     r = mailfolder_connect(folder);
@@ -101,3 +100,3 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
     mailfolder*folder;
-    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
     r = mailfolder_connect(folder);
@@ -124,3 +123,3 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
     }
-    body = parseMail(msg);    
+    body = parseMail(msg);
     mailmessage_fetch_result_free(msg,data);
@@ -128,3 +127,3 @@ RecBody MBOXwrapper::fetchBody( const RecMail &mail )
     mailstorage_free(storage);
-    
+
     return body;
@@ -137,3 +136,3 @@ void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
 
-int MBOXwrapper::createMbox(const QString&folder,const Folder*,const QString&,bool )
+int MBOXwrapper::createMbox(const QString&folder,const FolderP&,const QString&,bool )
 {
@@ -184,3 +183,3 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMail&mail)
     mailfolder*folder;
-    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
     r = mailfolder_connect(folder);
@@ -245,3 +244,3 @@ void MBOXwrapper::deleteMails(mailmbox_folder*f,QList<RecMail> &target)
 
-int MBOXwrapper::deleteAllMail(const Folder*tfolder)
+int MBOXwrapper::deleteAllMail(const FolderP&tfolder)
 {
@@ -250,3 +249,3 @@ int MBOXwrapper::deleteAllMail(const Folder*tfolder)
     int res = 1;
-    
+
     mailfolder*folder = 0;
@@ -260,3 +259,3 @@ int MBOXwrapper::deleteAllMail(const Folder*tfolder)
     if (res) {
-        folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+        folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
         r = mailfolder_connect(folder);
@@ -288,3 +287,3 @@ int MBOXwrapper::deleteAllMail(const Folder*tfolder)
 
-int MBOXwrapper::deleteMbox(const Folder*tfolder)
+int MBOXwrapper::deleteMbox(const FolderP&tfolder)
 {
@@ -318,3 +317,3 @@ void MBOXwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
     int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
-    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
+    folder = mailfolder_new( storage,(char*)p.latin1(),NULL);
     r = mailfolder_connect(folder);