Diffstat (limited to 'noncore/net/mail/accountview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/accountview.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
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,35 +1,33 @@ | |||
1 | #include "accountview.h" | 1 | #include "accountview.h" |
2 | #include "imapwrapper.h" | ||
3 | #include "pop3wrapper.h" | ||
4 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
5 | #include "defines.h" | 3 | #include "defines.h" |
6 | 4 | ||
7 | 5 | ||
8 | /** | 6 | /** |
9 | * POP3 Account stuff | 7 | * POP3 Account stuff |
10 | */ | 8 | */ |
11 | 9 | ||
12 | POP3viewItem::POP3viewItem( POP3account *a, QListView *parent ) | 10 | POP3viewItem::POP3viewItem( POP3account *a, QListView *parent ) |
13 | : AccountViewItem( parent ) | 11 | : AccountViewItem( parent ) |
14 | { | 12 | { |
15 | account = a; | 13 | account = a; |
16 | wrapper = new POP3wrapper( account ); | 14 | wrapper = AbstractMail::getWrapper( account ); |
17 | setPixmap( 0, PIXMAP_POP3FOLDER ); | 15 | setPixmap( 0, PIXMAP_POP3FOLDER ); |
18 | setText( 0, account->getAccountName() ); | 16 | setText( 0, account->getAccountName() ); |
19 | } | 17 | } |
20 | 18 | ||
21 | POP3viewItem::~POP3viewItem() | 19 | POP3viewItem::~POP3viewItem() |
22 | { | 20 | { |
23 | delete wrapper; | 21 | delete wrapper; |
24 | } | 22 | } |
25 | 23 | ||
26 | void POP3viewItem::refresh( QList<RecMail> &target ) | 24 | void POP3viewItem::refresh( QList<RecMail> &target ) |
27 | { | 25 | { |
28 | qDebug( "POP3: refresh" ); | 26 | qDebug( "POP3: refresh" ); |
29 | wrapper->listMessages( target ); | 27 | wrapper->listMessages("INBOX", target ); |
30 | } | 28 | } |
31 | 29 | ||
32 | 30 | ||
33 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) | 31 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) |
34 | { | 32 | { |
35 | qDebug( "POP3 fetchBody" ); | 33 | qDebug( "POP3 fetchBody" ); |
@@ -41,40 +39,40 @@ RecBody POP3viewItem::fetchBody( const RecMail &mail ) | |||
41 | */ | 39 | */ |
42 | 40 | ||
43 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent ) | 41 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent ) |
44 | : AccountViewItem( parent ) | 42 | : AccountViewItem( parent ) |
45 | { | 43 | { |
46 | account = a; | 44 | account = a; |
47 | wrapper = new IMAPwrapper( account ); | 45 | wrapper = AbstractMail::getWrapper( account ); |
48 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 46 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
49 | setText( 0, account->getAccountName() ); | 47 | setText( 0, account->getAccountName() ); |
50 | setOpen( true ); | 48 | setOpen( true ); |
51 | } | 49 | } |
52 | 50 | ||
53 | IMAPviewItem::~IMAPviewItem() | 51 | IMAPviewItem::~IMAPviewItem() |
54 | { | 52 | { |
55 | delete wrapper; | 53 | delete wrapper; |
56 | } | 54 | } |
57 | 55 | ||
58 | IMAPwrapper *IMAPviewItem::getWrapper() | 56 | AbstractMail *IMAPviewItem::getWrapper() |
59 | { | 57 | { |
60 | return wrapper; | 58 | return wrapper; |
61 | } | 59 | } |
62 | 60 | ||
63 | void IMAPviewItem::refresh(QList<RecMail>&) | 61 | void IMAPviewItem::refresh(QList<RecMail>&) |
64 | { | 62 | { |
65 | QList<IMAPFolder> *folders = wrapper->listFolders(); | 63 | QList<Folder> *folders = wrapper->listFolders(); |
66 | 64 | ||
67 | QListViewItem *child = firstChild(); | 65 | QListViewItem *child = firstChild(); |
68 | while ( child ) { | 66 | while ( child ) { |
69 | QListViewItem *tmp = child; | 67 | QListViewItem *tmp = child; |
70 | child = child->nextSibling(); | 68 | child = child->nextSibling(); |
71 | delete tmp; | 69 | delete tmp; |
72 | } | 70 | } |
73 | 71 | ||
74 | IMAPFolder *it; | 72 | Folder *it; |
75 | for ( it = folders->first(); it; it = folders->next() ) { | 73 | for ( it = folders->first(); it; it = folders->next() ) { |
76 | (void) new IMAPfolderItem( it, this ); | 74 | (void) new IMAPfolderItem( it, this ); |
77 | } | 75 | } |
78 | } | 76 | } |
79 | 77 | ||
80 | RecBody IMAPviewItem::fetchBody(const RecMail&) | 78 | RecBody IMAPviewItem::fetchBody(const RecMail&) |
@@ -84,13 +82,13 @@ RecBody IMAPviewItem::fetchBody(const RecMail&) | |||
84 | 82 | ||
85 | IMAPfolderItem::~IMAPfolderItem() | 83 | IMAPfolderItem::~IMAPfolderItem() |
86 | { | 84 | { |
87 | delete folder; | 85 | delete folder; |
88 | } | 86 | } |
89 | 87 | ||
90 | IMAPfolderItem::IMAPfolderItem( IMAPFolder *folderInit, IMAPviewItem *parent ) | 88 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent ) |
91 | : AccountViewItem( parent ) | 89 | : AccountViewItem( parent ) |
92 | { | 90 | { |
93 | folder = folderInit; | 91 | folder = folderInit; |
94 | imap = parent; | 92 | imap = parent; |
95 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 93 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
96 | setText( 0, folder->getDisplayName() ); | 94 | setText( 0, folder->getDisplayName() ); |