1 files changed, 12 insertions, 14 deletions

diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h
index c7c8183..208cf2f 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.h
@@ -8,4 +8,2 @@
 
-class RecMail;
-class RecBody;
 class encodedString;
@@ -21,15 +19,15 @@ public:
 
-    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
-    virtual QValueList<Opie::osmart_pointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target );
+    virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
-    virtual void deleteMail(const RecMail&mail);
-    virtual void answeredMail(const RecMail&mail);
-    virtual void mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
-    virtual void mvcpAllMails(const Opie::osmart_pointer<Folder>&fromFolder,
+    virtual void deleteMail(const RecMailP&mail);
+    virtual void answeredMail(const RecMailP&mail);
+    virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
+    virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder,
         const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
 
-    virtual int createMbox(const QString&folder,const Opie::osmart_pointer<Folder>&f=0,
+    virtual int createMbox(const QString&folder,const Opie::OSmartPointer<Folder>&f=0,
         const QString&d="",bool s=false);
-    virtual int deleteMbox(const Opie::osmart_pointer<Folder>&);
+    virtual int deleteMbox(const Opie::OSmartPointer<Folder>&);
 
@@ -37,8 +35,8 @@ public:
 
-    virtual RecBody fetchBody( const RecMail &mail );
+    virtual RecBody fetchBody( const RecMailP &mail );
     static void mbox_progress( size_t current, size_t maximum );
 
-    virtual encodedString* fetchRawBody(const RecMail&mail);
-    virtual void deleteMails(const QString & FolderName,QList<RecMail> &target);
-    virtual int deleteAllMail(const Opie::osmart_pointer<Folder>&);
+    virtual encodedString* fetchRawBody(const RecMailP&mail);
+    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::OSmartPointer<RecMail> > &target);
+    virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;