author | alwin <alwin> | 2003-12-14 03:41:49 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-14 03:41:49 (UTC) |
commit | 84ac61a9b46d463c9e3112f55cc1e69957d1348a (patch) (unidiff) | |
tree | aa2a03fc364b529a9863d44b9d51f030b22f4820 /noncore | |
parent | 12ba6ab9606538628afc7f7015e115a0251d0389 (diff) | |
download | opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.zip opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.tar.gz opie-84ac61a9b46d463c9e3112f55cc1e69957d1348a.tar.bz2 |
-memleak fixed
-check for non-selectable mailboxes
-potential crasher fixed
-selection handling better (app will not send a net-command on each mouse
click)
-rw-r--r-- | noncore/net/mail/accountview.cpp | 9 | ||||
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/pop3wrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 2 |
7 files changed, 29 insertions, 16 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 847b099..d725b87 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -64,64 +64,69 @@ void IMAPviewItem::refresh(QList<RecMail>&) | |||
64 | 64 | ||
65 | QListViewItem *child = firstChild(); | 65 | QListViewItem *child = firstChild(); |
66 | while ( child ) { | 66 | while ( child ) { |
67 | QListViewItem *tmp = child; | 67 | QListViewItem *tmp = child; |
68 | child = child->nextSibling(); | 68 | child = child->nextSibling(); |
69 | delete tmp; | 69 | delete tmp; |
70 | } | 70 | } |
71 | 71 | ||
72 | Folder *it; | 72 | Folder *it; |
73 | QListViewItem*item = 0; | 73 | QListViewItem*item = 0; |
74 | for ( it = folders->first(); it; it = folders->next() ) { | 74 | for ( it = folders->first(); it; it = folders->next() ) { |
75 | item = new IMAPfolderItem( it, this , item ); | 75 | item = new IMAPfolderItem( it, this , item ); |
76 | item->setSelectable(it->may_select()); | ||
76 | } | 77 | } |
78 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
79 | folders->setAutoDelete(false); | ||
80 | delete folders; | ||
77 | } | 81 | } |
78 | 82 | ||
79 | RecBody IMAPviewItem::fetchBody(const RecMail&) | 83 | RecBody IMAPviewItem::fetchBody(const RecMail&) |
80 | { | 84 | { |
81 | return RecBody(); | 85 | return RecBody(); |
82 | } | 86 | } |
83 | 87 | ||
84 | IMAPfolderItem::~IMAPfolderItem() | 88 | IMAPfolderItem::~IMAPfolderItem() |
85 | { | 89 | { |
86 | delete folder; | 90 | delete folder; |
87 | } | 91 | } |
88 | 92 | ||
89 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) | 93 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) |
90 | : AccountViewItem( parent,after ) | 94 | : AccountViewItem( parent,after ) |
91 | { | 95 | { |
92 | folder = folderInit; | 96 | folder = folderInit; |
93 | imap = parent; | 97 | imap = parent; |
94 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 98 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
95 | setText( 0, folder->getDisplayName() ); | 99 | setText( 0, folder->getDisplayName() ); |
96 | } | 100 | } |
97 | 101 | ||
98 | void IMAPfolderItem::refresh(QList<RecMail>&target) | 102 | void IMAPfolderItem::refresh(QList<RecMail>&target) |
99 | { | 103 | { |
100 | imap->getWrapper()->listMessages( folder->getName(),target ); | 104 | if (folder->may_select()) |
105 | imap->getWrapper()->listMessages( folder->getName(),target ); | ||
101 | } | 106 | } |
102 | 107 | ||
103 | RecBody IMAPfolderItem::fetchBody(const RecMail&aMail) | 108 | RecBody IMAPfolderItem::fetchBody(const RecMail&aMail) |
104 | { | 109 | { |
105 | return imap->getWrapper()->fetchBody(aMail); | 110 | return imap->getWrapper()->fetchBody(aMail); |
106 | } | 111 | } |
107 | 112 | ||
108 | /** | 113 | /** |
109 | * Generic stuff | 114 | * Generic stuff |
110 | */ | 115 | */ |
111 | 116 | ||
112 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 117 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
113 | : QListView( parent, name, flags ) | 118 | : QListView( parent, name, flags ) |
114 | { | 119 | { |
115 | connect( this, SIGNAL( clicked( QListViewItem * ) ), | 120 | connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), |
116 | SLOT( refresh( QListViewItem * ) ) ); | 121 | SLOT( refresh( QListViewItem * ) ) ); |
117 | setSorting(-1); | 122 | setSorting(-1); |
118 | } | 123 | } |
119 | 124 | ||
120 | void AccountView::populate( QList<Account> list ) | 125 | void AccountView::populate( QList<Account> list ) |
121 | { | 126 | { |
122 | clear(); | 127 | clear(); |
123 | 128 | ||
124 | Account *it; | 129 | Account *it; |
125 | for ( it = list.first(); it; it = list.next() ) { | 130 | for ( it = list.first(); it; it = list.next() ) { |
126 | if ( it->getType().compare( "IMAP" ) == 0 ) { | 131 | if ( it->getType().compare( "IMAP" ) == 0 ) { |
127 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); | 132 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); |
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 9ee0dff..912a412 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp | |||
@@ -140,25 +140,25 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) | |||
140 | } | 140 | } |
141 | mailimap_fetch_list_free(result); | 141 | mailimap_fetch_list_free(result); |
142 | } | 142 | } |
143 | 143 | ||
144 | QList<Folder>* IMAPwrapper::listFolders() | 144 | QList<Folder>* IMAPwrapper::listFolders() |
145 | { | 145 | { |
146 | const char *path, *mask; | 146 | const char *path, *mask; |
147 | int err = MAILIMAP_NO_ERROR; | 147 | int err = MAILIMAP_NO_ERROR; |
148 | clist *result; | 148 | clist *result; |
149 | clistcell *current; | 149 | clistcell *current; |
150 | 150 | ||
151 | QList<Folder> * folders = new QList<Folder>(); | 151 | QList<Folder> * folders = new QList<Folder>(); |
152 | folders->setAutoDelete( true ); | 152 | folders->setAutoDelete( false ); |
153 | login(); | 153 | login(); |
154 | if (!m_imap) { | 154 | if (!m_imap) { |
155 | return folders; | 155 | return folders; |
156 | } | 156 | } |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
160 | * We must not forget to filter them out in next loop! | 160 | * We must not forget to filter them out in next loop! |
161 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 161 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
162 | */ | 162 | */ |
163 | QString temp; | 163 | QString temp; |
164 | mask = "INBOX" ; | 164 | mask = "INBOX" ; |
@@ -179,37 +179,41 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
179 | qDebug("error fetching folders: %s",m_imap->imap_response); | 179 | qDebug("error fetching folders: %s",m_imap->imap_response); |
180 | } | 180 | } |
181 | mailimap_list_result_free( result ); | 181 | mailimap_list_result_free( result ); |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * second stage - get the other then inbox folders | 184 | * second stage - get the other then inbox folders |
185 | */ | 185 | */ |
186 | mask = "*" ; | 186 | mask = "*" ; |
187 | path = account->getPrefix().latin1(); | 187 | path = account->getPrefix().latin1(); |
188 | if (!path) path = ""; | 188 | if (!path) path = ""; |
189 | result = clist_new(); | 189 | result = clist_new(); |
190 | qDebug(path); | 190 | qDebug(path); |
191 | bool selectable = true; | ||
192 | mailimap_mbx_list_flags*bflags; | ||
191 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 193 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
192 | if ( err == MAILIMAP_NO_ERROR ) { | 194 | if ( err == MAILIMAP_NO_ERROR ) { |
193 | current = result->first; | 195 | current = result->first; |
194 | for ( int i = result->count; i > 0; i-- ) { | 196 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
195 | list = (mailimap_mailbox_list *) current->data; | 197 | list = (mailimap_mailbox_list *) current->data; |
196 | // it is better use the deep copy mechanism of qt itself | 198 | // it is better use the deep copy mechanism of qt itself |
197 | // instead of using strdup! | 199 | // instead of using strdup! |
198 | temp = list->mb_name; | 200 | temp = list->mb_name; |
199 | current = current->next; | ||
200 | if (temp.lower()=="inbox") | 201 | if (temp.lower()=="inbox") |
201 | continue; | 202 | continue; |
202 | folders->append(new IMAPFolder(temp)); | 203 | if ( (bflags = list->mb_flag) ) { |
203 | 204 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | |
205 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | ||
206 | } | ||
207 | folders->append(new IMAPFolder(temp,selectable)); | ||
204 | } | 208 | } |
205 | } else { | 209 | } else { |
206 | qDebug("error fetching folders %s",m_imap->imap_response); | 210 | qDebug("error fetching folders %s",m_imap->imap_response); |
207 | } | 211 | } |
208 | mailimap_list_result_free( result ); | 212 | mailimap_list_result_free( result ); |
209 | return folders; | 213 | return folders; |
210 | } | 214 | } |
211 | 215 | ||
212 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 216 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
213 | { | 217 | { |
214 | RecMail * m = 0; | 218 | RecMail * m = 0; |
215 | mailimap_msg_att_item *item=0; | 219 | mailimap_msg_att_item *item=0; |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 9ee0dff..912a412 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -140,25 +140,25 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) | |||
140 | } | 140 | } |
141 | mailimap_fetch_list_free(result); | 141 | mailimap_fetch_list_free(result); |
142 | } | 142 | } |
143 | 143 | ||
144 | QList<Folder>* IMAPwrapper::listFolders() | 144 | QList<Folder>* IMAPwrapper::listFolders() |
145 | { | 145 | { |
146 | const char *path, *mask; | 146 | const char *path, *mask; |
147 | int err = MAILIMAP_NO_ERROR; | 147 | int err = MAILIMAP_NO_ERROR; |
148 | clist *result; | 148 | clist *result; |
149 | clistcell *current; | 149 | clistcell *current; |
150 | 150 | ||
151 | QList<Folder> * folders = new QList<Folder>(); | 151 | QList<Folder> * folders = new QList<Folder>(); |
152 | folders->setAutoDelete( true ); | 152 | folders->setAutoDelete( false ); |
153 | login(); | 153 | login(); |
154 | if (!m_imap) { | 154 | if (!m_imap) { |
155 | return folders; | 155 | return folders; |
156 | } | 156 | } |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 159 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
160 | * We must not forget to filter them out in next loop! | 160 | * We must not forget to filter them out in next loop! |
161 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 161 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
162 | */ | 162 | */ |
163 | QString temp; | 163 | QString temp; |
164 | mask = "INBOX" ; | 164 | mask = "INBOX" ; |
@@ -179,37 +179,41 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
179 | qDebug("error fetching folders: %s",m_imap->imap_response); | 179 | qDebug("error fetching folders: %s",m_imap->imap_response); |
180 | } | 180 | } |
181 | mailimap_list_result_free( result ); | 181 | mailimap_list_result_free( result ); |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * second stage - get the other then inbox folders | 184 | * second stage - get the other then inbox folders |
185 | */ | 185 | */ |
186 | mask = "*" ; | 186 | mask = "*" ; |
187 | path = account->getPrefix().latin1(); | 187 | path = account->getPrefix().latin1(); |
188 | if (!path) path = ""; | 188 | if (!path) path = ""; |
189 | result = clist_new(); | 189 | result = clist_new(); |
190 | qDebug(path); | 190 | qDebug(path); |
191 | bool selectable = true; | ||
192 | mailimap_mbx_list_flags*bflags; | ||
191 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 193 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
192 | if ( err == MAILIMAP_NO_ERROR ) { | 194 | if ( err == MAILIMAP_NO_ERROR ) { |
193 | current = result->first; | 195 | current = result->first; |
194 | for ( int i = result->count; i > 0; i-- ) { | 196 | for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { |
195 | list = (mailimap_mailbox_list *) current->data; | 197 | list = (mailimap_mailbox_list *) current->data; |
196 | // it is better use the deep copy mechanism of qt itself | 198 | // it is better use the deep copy mechanism of qt itself |
197 | // instead of using strdup! | 199 | // instead of using strdup! |
198 | temp = list->mb_name; | 200 | temp = list->mb_name; |
199 | current = current->next; | ||
200 | if (temp.lower()=="inbox") | 201 | if (temp.lower()=="inbox") |
201 | continue; | 202 | continue; |
202 | folders->append(new IMAPFolder(temp)); | 203 | if ( (bflags = list->mb_flag) ) { |
203 | 204 | selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& | |
205 | bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); | ||
206 | } | ||
207 | folders->append(new IMAPFolder(temp,selectable)); | ||
204 | } | 208 | } |
205 | } else { | 209 | } else { |
206 | qDebug("error fetching folders %s",m_imap->imap_response); | 210 | qDebug("error fetching folders %s",m_imap->imap_response); |
207 | } | 211 | } |
208 | mailimap_list_result_free( result ); | 212 | mailimap_list_result_free( result ); |
209 | return folders; | 213 | return folders; |
210 | } | 214 | } |
211 | 215 | ||
212 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 216 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
213 | { | 217 | { |
214 | RecMail * m = 0; | 218 | RecMail * m = 0; |
215 | mailimap_msg_att_item *item=0; | 219 | mailimap_msg_att_item *item=0; |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 62523bf..5065d29 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -264,25 +264,25 @@ void POP3wrapper::logout() | |||
264 | { | 264 | { |
265 | int err = MAILPOP3_NO_ERROR; | 265 | int err = MAILPOP3_NO_ERROR; |
266 | if ( m_pop3 == NULL ) return; | 266 | if ( m_pop3 == NULL ) return; |
267 | err = mailpop3_quit( m_pop3 ); | 267 | err = mailpop3_quit( m_pop3 ); |
268 | mailpop3_free( m_pop3 ); | 268 | mailpop3_free( m_pop3 ); |
269 | m_pop3 = NULL; | 269 | m_pop3 = NULL; |
270 | } | 270 | } |
271 | 271 | ||
272 | 272 | ||
273 | QList<Folder>* POP3wrapper::listFolders() | 273 | QList<Folder>* POP3wrapper::listFolders() |
274 | { | 274 | { |
275 | QList<Folder> * folders = new QList<Folder>(); | 275 | QList<Folder> * folders = new QList<Folder>(); |
276 | folders->setAutoDelete( true ); | 276 | folders->setAutoDelete( false ); |
277 | Folder*inb=new Folder("INBOX"); | 277 | Folder*inb=new Folder("INBOX"); |
278 | folders->append(inb); | 278 | folders->append(inb); |
279 | return folders; | 279 | return folders; |
280 | } | 280 | } |
281 | 281 | ||
282 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) | 282 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) |
283 | { | 283 | { |
284 | return ""; | 284 | return ""; |
285 | } | 285 | } |
286 | 286 | ||
287 | void POP3wrapper::deleteMail(const RecMail&) | 287 | void POP3wrapper::deleteMail(const RecMail&) |
288 | { | 288 | { |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index cab1a66..fae3e97 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -74,25 +74,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
74 | 74 | ||
75 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, | 75 | editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, |
76 | 0, 0, this ); | 76 | 0, 0, this ); |
77 | editAccounts->addTo( settingsMenu ); | 77 | editAccounts->addTo( settingsMenu ); |
78 | 78 | ||
79 | QWidget *view = new QWidget( this ); | 79 | QWidget *view = new QWidget( this ); |
80 | setCentralWidget( view ); | 80 | setCentralWidget( view ); |
81 | 81 | ||
82 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); | 82 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); |
83 | 83 | ||
84 | folderView = new AccountView( view ); | 84 | folderView = new AccountView( view ); |
85 | folderView->header()->hide(); | 85 | folderView->header()->hide(); |
86 | folderView->setRootIsDecorated( false ); | 86 | folderView->setRootIsDecorated( true ); |
87 | folderView->addColumn( tr( "Mailbox" ) ); | 87 | folderView->addColumn( tr( "Mailbox" ) ); |
88 | //folderView->hide(); | 88 | //folderView->hide(); |
89 | 89 | ||
90 | layout->addWidget( folderView ); | 90 | layout->addWidget( folderView ); |
91 | 91 | ||
92 | mailView = new QListView( view ); | 92 | mailView = new QListView( view ); |
93 | mailView->addColumn( tr( "" ) ); | 93 | mailView->addColumn( tr( "" ) ); |
94 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); | 94 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); |
95 | mailView->addColumn( tr( "Sender" ),QListView::Manual ); | 95 | mailView->addColumn( tr( "Sender" ),QListView::Manual ); |
96 | mailView->addColumn( tr( "Date" )); | 96 | mailView->addColumn( tr( "Date" )); |
97 | mailView->setAllColumnsShowFocus(true); | 97 | mailView->setAllColumnsShowFocus(true); |
98 | mailView->setSorting(-1); | 98 | mailView->setSorting(-1); |
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp index 62523bf..5065d29 100644 --- a/noncore/net/mail/pop3wrapper.cpp +++ b/noncore/net/mail/pop3wrapper.cpp | |||
@@ -264,25 +264,25 @@ void POP3wrapper::logout() | |||
264 | { | 264 | { |
265 | int err = MAILPOP3_NO_ERROR; | 265 | int err = MAILPOP3_NO_ERROR; |
266 | if ( m_pop3 == NULL ) return; | 266 | if ( m_pop3 == NULL ) return; |
267 | err = mailpop3_quit( m_pop3 ); | 267 | err = mailpop3_quit( m_pop3 ); |
268 | mailpop3_free( m_pop3 ); | 268 | mailpop3_free( m_pop3 ); |
269 | m_pop3 = NULL; | 269 | m_pop3 = NULL; |
270 | } | 270 | } |
271 | 271 | ||
272 | 272 | ||
273 | QList<Folder>* POP3wrapper::listFolders() | 273 | QList<Folder>* POP3wrapper::listFolders() |
274 | { | 274 | { |
275 | QList<Folder> * folders = new QList<Folder>(); | 275 | QList<Folder> * folders = new QList<Folder>(); |
276 | folders->setAutoDelete( true ); | 276 | folders->setAutoDelete( false ); |
277 | Folder*inb=new Folder("INBOX"); | 277 | Folder*inb=new Folder("INBOX"); |
278 | folders->append(inb); | 278 | folders->append(inb); |
279 | return folders; | 279 | return folders; |
280 | } | 280 | } |
281 | 281 | ||
282 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) | 282 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) |
283 | { | 283 | { |
284 | return ""; | 284 | return ""; |
285 | } | 285 | } |
286 | 286 | ||
287 | void POP3wrapper::deleteMail(const RecMail&) | 287 | void POP3wrapper::deleteMail(const RecMail&) |
288 | { | 288 | { |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 2415c82..e53f4a3 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -1,14 +1,14 @@ | |||
1 | #include <qtextbrowser.h> | 1 | #include <qtextbrowser.h> |
2 | #include <qmessagebox.h>? | 2 | #include <qmessagebox.h> |
3 | #include <qtextstream.h> | 3 | #include <qtextstream.h> |
4 | #include <qaction.h> | 4 | #include <qaction.h> |
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | 7 | ||
8 | #include <opie/ofiledialog.h> | 8 | #include <opie/ofiledialog.h> |
9 | 9 | ||
10 | #include "settings.h" | 10 | #include "settings.h" |
11 | #include "composemail.h" | 11 | #include "composemail.h" |
12 | #include "viewmail.h" | 12 | #include "viewmail.h" |
13 | #include "abstractmail.h" | 13 | #include "abstractmail.h" |
14 | #include "accountview.h" | 14 | #include "accountview.h" |