summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountview.cpp1
-rw-r--r--noncore/net/mail/accountview.h2
-rw-r--r--noncore/net/mail/imapwrapper.cpp2
-rw-r--r--noncore/net/mail/imapwrapper.h25
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.h25
-rw-r--r--noncore/net/mail/libmailwrapper/mailwrapper.h19
-rw-r--r--noncore/net/mail/mail.pro3
-rw-r--r--noncore/net/mail/mailwrapper.h19
9 files changed, 57 insertions, 41 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index c6a44ab..a531976 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,5 +1,6 @@
1#include "accountview.h" 1#include "accountview.h"
2#include "imapwrapper.h"
2#include "defines.h" 3#include "defines.h"
3 4
4IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent ) 5IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
5 : AccountViewItem( parent ) 6 : AccountViewItem( parent )
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 14d8efa..2bc8023 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -5,8 +5,10 @@
5 5
6#include "settings.h" 6#include "settings.h"
7#include "mailwrapper.h" 7#include "mailwrapper.h"
8 8
9class IMAPwrapper;
10
9class AccountViewItem : public QListViewItem 11class AccountViewItem : public QListViewItem
10{ 12{
11 13
12public: 14public:
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,8 +1,8 @@
1 1
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4#include "mailwrapper.h" 4#include "imapwrapper.h"
5 5
6 6
7IMAPwrapper::IMAPwrapper( IMAPaccount *a ) 7IMAPwrapper::IMAPwrapper( IMAPaccount *a )
8{ 8{
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/imapwrapper.h
@@ -0,0 +1,25 @@
1#ifndef __IMAPWRAPPER
2#define __IMAPWRAPPER
3
4#include "mailwrapper.h"
5#include <libetpan/mailimap.h>
6
7class IMAPwrapper : public QObject
8{
9 Q_OBJECT
10
11public:
12 IMAPwrapper( IMAPaccount *a );
13 QList<IMAPFolder>* listFolders();
14 void listMessages(const QString & mailbox,Maillist&target );
15 QString fetchBody(const QString & mailbox,const RecMail&mail);
16
17protected:
18 RecMail*parse_list_result(mailimap_msg_att*);
19
20private:
21 IMAPaccount *account;
22
23};
24
25#endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,8 +1,8 @@
1 1
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4#include "mailwrapper.h" 4#include "imapwrapper.h"
5 5
6 6
7IMAPwrapper::IMAPwrapper( IMAPaccount *a ) 7IMAPwrapper::IMAPwrapper( IMAPaccount *a )
8{ 8{
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -0,0 +1,25 @@
1#ifndef __IMAPWRAPPER
2#define __IMAPWRAPPER
3
4#include "mailwrapper.h"
5#include <libetpan/mailimap.h>
6
7class IMAPwrapper : public QObject
8{
9 Q_OBJECT
10
11public:
12 IMAPwrapper( IMAPaccount *a );
13 QList<IMAPFolder>* listFolders();
14 void listMessages(const QString & mailbox,Maillist&target );
15 QString fetchBody(const QString & mailbox,const RecMail&mail);
16
17protected:
18 RecMail*parse_list_result(mailimap_msg_att*);
19
20private:
21 IMAPaccount *account;
22
23};
24
25#endif
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -5,9 +5,8 @@
5 5
6#include <libetpan/mailmime.h> 6#include <libetpan/mailmime.h>
7#include <libetpan/mailimf.h> 7#include <libetpan/mailimf.h>
8#include <libetpan/mailsmtp.h> 8#include <libetpan/mailsmtp.h>
9#include <libetpan/mailimap.h>
10#include <libetpan/mailstorage.h> 9#include <libetpan/mailstorage.h>
11#include <libetpan/maildriver.h> 10#include <libetpan/maildriver.h>
12#include <qbitarray.h> 11#include <qbitarray.h>
13#include <qdatetime.h> 12#include <qdatetime.h>
@@ -161,23 +160,5 @@ private:
161 Settings *settings; 160 Settings *settings;
162 161
163}; 162};
164 163
165class IMAPwrapper : public QObject
166{
167 Q_OBJECT
168
169public:
170 IMAPwrapper( IMAPaccount *a );
171 QList<IMAPFolder>* listFolders();
172 void listMessages(const QString & mailbox,Maillist&target );
173 QString fetchBody(const QString & mailbox,const RecMail&mail);
174
175protected:
176 RecMail*parse_list_result(mailimap_msg_att*);
177
178private:
179 IMAPaccount *account;
180
181};
182
183#endif 164#endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 46a476d..2142cdc 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -7,9 +7,10 @@ HEADERS = defines.h \
7 mailwrapper.h \ 7 mailwrapper.h \
8 composemail.h \ 8 composemail.h \
9 accountview.h \ 9 accountview.h \
10 mainwindow.h \ 10 mainwindow.h \
11 opiemail.h 11 opiemail.h \
12 imapwrapper.h
12 13
13 SOURCES = main.cpp \ 14 SOURCES = main.cpp \
14 opiemail.cpp \ 15 opiemail.cpp \
15 mainwindow.cpp \ 16 mainwindow.cpp \
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -5,9 +5,8 @@
5 5
6#include <libetpan/mailmime.h> 6#include <libetpan/mailmime.h>
7#include <libetpan/mailimf.h> 7#include <libetpan/mailimf.h>
8#include <libetpan/mailsmtp.h> 8#include <libetpan/mailsmtp.h>
9#include <libetpan/mailimap.h>
10#include <libetpan/mailstorage.h> 9#include <libetpan/mailstorage.h>
11#include <libetpan/maildriver.h> 10#include <libetpan/maildriver.h>
12#include <qbitarray.h> 11#include <qbitarray.h>
13#include <qdatetime.h> 12#include <qdatetime.h>
@@ -161,23 +160,5 @@ private:
161 Settings *settings; 160 Settings *settings;
162 161
163}; 162};
164 163
165class IMAPwrapper : public QObject
166{
167 Q_OBJECT
168
169public:
170 IMAPwrapper( IMAPaccount *a );
171 QList<IMAPFolder>* listFolders();
172 void listMessages(const QString & mailbox,Maillist&target );
173 QString fetchBody(const QString & mailbox,const RecMail&mail);
174
175protected:
176 RecMail*parse_list_result(mailimap_msg_att*);
177
178private:
179 IMAPaccount *account;
180
181};
182
183#endif 164#endif