17 files changed, 179 insertions, 55 deletions

diff --git a/noncore/net/mail/abstractmail.cpp b/noncore/net/mail/abstractmail.cpp
new file mode 100644
index 0000000..7380c31
--- a/dev/null
+++ b/noncore/net/mail/abstractmail.cpp
@@ -0,0 +1,13 @@
+#include "abstractmail.h"
+#include "imapwrapper.h"
+#include "pop3wrapper.h"
+
+AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
+{
+    return new IMAPwrapper(a);
+}
+
+AbstractMail* AbstractMail::getWrapper(POP3account *a)
+{
+    return new POP3wrapper(a);
+}
diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h
new file mode 100644
index 0000000..bc8938f
--- a/dev/null
+++ b/noncore/net/mail/abstractmail.h
@@ -0,0 +1,30 @@
+#ifndef __abstract_mail_
+#define __abstract_mail_
+
+#include <qobject.h>
+#include "settings.h"
+
+class RecMail;
+class RecBody;
+class RecPart;
+class IMAPwrapper;
+class POP3wrapper;
+class Folder;
+
+class AbstractMail:public QObject
+{
+    Q_OBJECT
+public:
+    AbstractMail(){};
+    virtual ~AbstractMail(){}
+    virtual QList<Folder>* listFolders()=0;
+    virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0;
+    virtual RecBody fetchBody(const RecMail&mail)=0;
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false)=0;
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0;
+    
+    static AbstractMail* getWrapper(IMAPaccount *a);
+    static AbstractMail* getWrapper(POP3account *a);
+};
+
+#endif
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index c7b1eeb..1069b9f 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,6 +1,4 @@
 #include "accountview.h"
-#include "imapwrapper.h"
-#include "pop3wrapper.h"
 #include "mailtypes.h"
 #include "defines.h"
 
@@ -13,7 +11,7 @@ POP3viewItem::POP3viewItem( POP3account *a, QListView *parent )
     : AccountViewItem( parent )
 {
     account = a;
-    wrapper = new POP3wrapper( account );
+    wrapper = AbstractMail::getWrapper( account );
     setPixmap( 0, PIXMAP_POP3FOLDER );
     setText( 0, account->getAccountName() );
 }
@@ -26,7 +24,7 @@ POP3viewItem::~POP3viewItem()
 void POP3viewItem::refresh( QList<RecMail> &target )
 {
     qDebug( "POP3: refresh" );
-    wrapper->listMessages( target );
+    wrapper->listMessages("INBOX", target );
 }
 
 
@@ -44,7 +42,7 @@ IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
     : AccountViewItem( parent )
 {
     account = a;
-    wrapper = new IMAPwrapper( account );
+    wrapper = AbstractMail::getWrapper( account );
     setPixmap( 0, PIXMAP_IMAPFOLDER );
     setText( 0, account->getAccountName() );
     setOpen( true );
@@ -55,14 +53,14 @@ IMAPviewItem::~IMAPviewItem()
     delete wrapper;
 }
 
-IMAPwrapper *IMAPviewItem::getWrapper()
+AbstractMail *IMAPviewItem::getWrapper()
 {
     return wrapper;
 }
 
 void IMAPviewItem::refresh(QList<RecMail>&)
 {
-    QList<IMAPFolder> *folders = wrapper->listFolders();
+    QList<Folder> *folders = wrapper->listFolders();
     
     QListViewItem *child = firstChild();
     while ( child ) {
@@ -71,7 +69,7 @@ void IMAPviewItem::refresh(QList<RecMail>&)
         delete tmp;
     }
     
-    IMAPFolder *it;
+    Folder *it;
     for ( it = folders->first(); it; it = folders->next() ) {
         (void) new IMAPfolderItem( it, this );
     }
@@ -87,7 +85,7 @@ IMAPfolderItem::~IMAPfolderItem()
     delete folder;
 }
 
-IMAPfolderItem::IMAPfolderItem( IMAPFolder *folderInit, IMAPviewItem *parent )
+IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent )
     : AccountViewItem( parent )
 {
     folder = folderInit;
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 4cac673..83d49af 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -6,8 +6,8 @@
 
 #include "settings.h"
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
-class IMAPwrapper;
 class POP3wrapper;
 class RecMail;
 class RecBody;
@@ -33,7 +33,7 @@ public:
 
 private:
     POP3account *account;
-    POP3wrapper *wrapper;
+    AbstractMail *wrapper;
 
 };
 
@@ -45,25 +45,22 @@ public:
     ~IMAPviewItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
-    IMAPwrapper *getWrapper();
-
+    AbstractMail *getWrapper();
 private:
     IMAPaccount *account;
-    IMAPwrapper *wrapper;
-    
+    AbstractMail *wrapper;
 };
 
 class IMAPfolderItem : public AccountViewItem
 {
 
 public:
-    IMAPfolderItem( IMAPFolder *folder, IMAPviewItem *parent );
+    IMAPfolderItem( Folder *folder, IMAPviewItem *parent );
     ~IMAPfolderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
-
 private:
-    IMAPFolder *folder;
+    Folder *folder;
     IMAPviewItem *imap;
     
 };
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 48e476b..e5eb335 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -6,6 +6,7 @@
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
+    : AbstractMail()
 {
     account = a;
     m_imap = 0;
@@ -139,14 +140,14 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
     mailimap_fetch_list_free(result);
 }
 
-QList<IMAPFolder>* IMAPwrapper::listFolders()
+QList<Folder>* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 
-    QList<IMAPFolder> * folders = new QList<IMAPFolder>();
+    QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( true );
     login();
     if (!m_imap) {
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
index 95de215..f88457a 100644
--- a/noncore/net/mail/imapwrapper.h
+++ b/noncore/net/mail/imapwrapper.h
@@ -3,6 +3,7 @@
 
 #include <qlist.h>
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
@@ -12,22 +13,18 @@ struct mailimap_body_type_msg;
 struct mailimap_body_type_mpart;
 struct mailimap_body_fields;
 struct mailimap_msg_att;
-class RecMail;
-class RecBody;
-class RecPart;
 
-class IMAPwrapper : public QObject
+class IMAPwrapper : public AbstractMail
 {
     Q_OBJECT
-
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
-    QList<IMAPFolder>* listFolders();
-    void listMessages(const QString & mailbox,QList<RecMail>&target );
-    RecBody fetchBody(const RecMail&mail);
-    QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
-    QString fetchPart(const RecMail&mail,const RecPart&part);
+    virtual QList<Folder>* listFolders();
+    virtual void listMessages(const QString & mailbox,QList<RecMail>&target );
+    virtual RecBody fetchBody(const RecMail&mail);
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
new file mode 100644
index 0000000..7380c31
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -0,0 +1,13 @@
+#include "abstractmail.h"
+#include "imapwrapper.h"
+#include "pop3wrapper.h"
+
+AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
+{
+    return new IMAPwrapper(a);
+}
+
+AbstractMail* AbstractMail::getWrapper(POP3account *a)
+{
+    return new POP3wrapper(a);
+}
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
new file mode 100644
index 0000000..bc8938f
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -0,0 +1,30 @@
+#ifndef __abstract_mail_
+#define __abstract_mail_
+
+#include <qobject.h>
+#include "settings.h"
+
+class RecMail;
+class RecBody;
+class RecPart;
+class IMAPwrapper;
+class POP3wrapper;
+class Folder;
+
+class AbstractMail:public QObject
+{
+    Q_OBJECT
+public:
+    AbstractMail(){};
+    virtual ~AbstractMail(){}
+    virtual QList<Folder>* listFolders()=0;
+    virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0;
+    virtual RecBody fetchBody(const RecMail&mail)=0;
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false)=0;
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0;
+    
+    static AbstractMail* getWrapper(IMAPaccount *a);
+    static AbstractMail* getWrapper(POP3account *a);
+};
+
+#endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 48e476b..e5eb335 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -6,6 +6,7 @@
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
+    : AbstractMail()
 {
     account = a;
     m_imap = 0;
@@ -139,14 +140,14 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
     mailimap_fetch_list_free(result);
 }
 
-QList<IMAPFolder>* IMAPwrapper::listFolders()
+QList<Folder>* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 
-    QList<IMAPFolder> * folders = new QList<IMAPFolder>();
+    QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( true );
     login();
     if (!m_imap) {
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 95de215..f88457a 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -3,6 +3,7 @@
 
 #include <qlist.h>
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
 struct mailimap;
 struct mailimap_body_type_1part;
@@ -12,22 +13,18 @@ struct mailimap_body_type_msg;
 struct mailimap_body_type_mpart;
 struct mailimap_body_fields;
 struct mailimap_msg_att;
-class RecMail;
-class RecBody;
-class RecPart;
 
-class IMAPwrapper : public QObject
+class IMAPwrapper : public AbstractMail
 {
     Q_OBJECT
-
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
-    QList<IMAPFolder>* listFolders();
-    void listMessages(const QString & mailbox,QList<RecMail>&target );
-    RecBody fetchBody(const RecMail&mail);
-    QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
-    QString fetchPart(const RecMail&mail,const RecPart&part);
+    virtual QList<Folder>* listFolders();
+    virtual void listMessages(const QString & mailbox,QList<RecMail>&target );
+    virtual RecBody fetchBody(const RecMail&mail);
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part);
     static void imap_progress( size_t current, size_t maximum );
 
 protected:
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index abb5a42..49c3b7a 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -59,7 +59,7 @@ RecBody POP3wrapper::parseBody( const char *message )
     return body;
 }
 
-void POP3wrapper::listMessages( QList<RecMail> &target )
+void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
 {
     int err = MAILPOP3_NO_ERROR;
     char *header;
@@ -268,3 +268,22 @@ void POP3wrapper::logout()
     m_pop3 = NULL;
 }
 
+
+QList<Folder>* POP3wrapper::listFolders()
+{
+    QList<Folder> * folders = new QList<Folder>();
+    folders->setAutoDelete( true );
+    Folder*inb=new Folder("INBOX");
+    folders->append(inb);
+    return folders;
+}
+
+QString POP3wrapper::fetchPart(const RecMail&,const QValueList<int>&,bool)
+{
+    return "";
+}
+
+QString POP3wrapper::fetchPart(const RecMail&,const RecPart&)
+{
+    return "";
+}
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index 995bed0..3b24564 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -2,19 +2,25 @@
 #define __POP3WRAPPER
 
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
 class RecMail;
 class RecBody;
 struct mailpop3;
 
-class POP3wrapper : public QObject
+class POP3wrapper : public AbstractMail
 {
     Q_OBJECT
 
 public:
     POP3wrapper( POP3account *a );
     virtual ~POP3wrapper();
-    void listMessages( QList<RecMail> &target );
+    /* mailbox will be ignored */
+    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
+    virtual QList<Folder>* listFolders();
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part);
+
     RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
@@ -32,7 +38,6 @@ private:
     QString parseDateTime( mailimf_date_time *date );
     POP3account *account;
     mailpop3 *m_pop3;
-
 };
 
 #endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 0e7cff6..e7519c6 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -14,7 +14,8 @@ HEADERS	     = defines.h \
                imapwrapper.h \
                mailtypes.h \
                mailistviewitem.h \
-               pop3wrapper.h
+               pop3wrapper.h \
+               abstractmail.h
                
         SOURCES     = main.cpp \
                    opiemail.cpp \
@@ -30,7 +31,8 @@ SOURCES	     = main.cpp \
                viewmailbase.cpp \
                settings.cpp \
                mailtypes.cpp \
-               pop3wrapper.cpp
+               pop3wrapper.cpp \
+               abstractmail.cpp
                
         INTERFACES = editaccountsui.ui \
                selectmailtypeui.ui \
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 74bce5a..6c1cda0 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -18,7 +18,6 @@ class MainWindow : public QMainWindow
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
-    static QString appName() { return QString::fromLatin1("opiemail"); }
 
 public slots:
     void slotAdjustColumns();
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index dcab47c..7bcd818 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -10,9 +10,7 @@ class OpieMail : public MainWindow
 
 public:
     OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
-
  static QString appName() { return QString::fromLatin1("opiemail"); }
-
 protected slots:
     void slotComposeMail();
     void slotSendQueued();
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index abb5a42..49c3b7a 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -59,7 +59,7 @@ RecBody POP3wrapper::parseBody( const char *message )
     return body;
 }
 
-void POP3wrapper::listMessages( QList<RecMail> &target )
+void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
 {
     int err = MAILPOP3_NO_ERROR;
     char *header;
@@ -268,3 +268,22 @@ void POP3wrapper::logout()
     m_pop3 = NULL;
 }
 
+
+QList<Folder>* POP3wrapper::listFolders()
+{
+    QList<Folder> * folders = new QList<Folder>();
+    folders->setAutoDelete( true );
+    Folder*inb=new Folder("INBOX");
+    folders->append(inb);
+    return folders;
+}
+
+QString POP3wrapper::fetchPart(const RecMail&,const QValueList<int>&,bool)
+{
+    return "";
+}
+
+QString POP3wrapper::fetchPart(const RecMail&,const RecPart&)
+{
+    return "";
+}
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index 995bed0..3b24564 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -2,19 +2,25 @@
 #define __POP3WRAPPER
 
 #include "mailwrapper.h"
+#include "abstractmail.h"
 
 class RecMail;
 class RecBody;
 struct mailpop3;
 
-class POP3wrapper : public QObject
+class POP3wrapper : public AbstractMail
 {
     Q_OBJECT
 
 public:
     POP3wrapper( POP3account *a );
     virtual ~POP3wrapper();
-    void listMessages( QList<RecMail> &target );
+    /* mailbox will be ignored */
+    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
+    virtual QList<Folder>* listFolders();
+    virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false);
+    virtual QString fetchPart(const RecMail&mail,const RecPart&part);
+
     RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
@@ -32,7 +38,6 @@ private:
     QString parseDateTime( mailimf_date_time *date );
     POP3account *account;
     mailpop3 *m_pop3;
-
 };
 
 #endif