-rw-r--r-- | noncore/net/mail/accountitem.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/addresspicker.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/sendmailprogress.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/statusmail.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/newmaildir.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/selectsmtp.cpp | 7 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 1 |
12 files changed, 0 insertions, 28 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index 32a96ff..e925d8d 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -1,16 +1,15 @@ | |||
1 | 1 | ||
2 | #include "accountitem.h" | 2 | #include "accountitem.h" |
3 | #include "accountview.h" | 3 | #include "accountview.h" |
4 | #include "selectstore.h" | ||
5 | #include "newmaildir.h" | 4 | #include "newmaildir.h" |
6 | #include "defines.h" | 5 | #include "defines.h" |
7 | 6 | ||
8 | /* OPIE */ | 7 | /* OPIE */ |
9 | #include <libmailwrapper/mailtypes.h> | 8 | #include <libmailwrapper/mailtypes.h> |
10 | #include <libmailwrapper/abstractmail.h> | 9 | #include <libmailwrapper/abstractmail.h> |
11 | #include <libmailwrapper/mailwrapper.h> | 10 | #include <libmailwrapper/mailwrapper.h> |
12 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
13 | 12 | ||
14 | /* QT */ | 13 | /* QT */ |
15 | #include <qpopupmenu.h> | 14 | #include <qpopupmenu.h> |
16 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp index 35f9cd4..50c82e5 100644 --- a/noncore/net/mail/addresspicker.cpp +++ b/noncore/net/mail/addresspicker.cpp | |||
@@ -1,27 +1,25 @@ | |||
1 | 1 | ||
2 | #include "composemail.h" | 2 | #include "composemail.h" |
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <opie2/ocontactaccess.h> | 5 | #include <opie2/ocontactaccess.h> |
6 | #include <opie2/opimcontact.h> | 6 | #include <opie2/opimcontact.h> |
7 | #include <qpe/resource.h> | 7 | #include <qpe/resource.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | 9 | ||
10 | /* QT */ | 10 | /* QT */ |
11 | #include <qpushbutton.h> | 11 | #include <qpushbutton.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
13 | #include <qtextstream.h> | ||
14 | #include <qlistbox.h> | 13 | #include <qlistbox.h> |
15 | #include <qfile.h> | ||
16 | 14 | ||
17 | /* STD */ | 15 | /* STD */ |
18 | #include <stdlib.h> | 16 | #include <stdlib.h> |
19 | 17 | ||
20 | AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) | 18 | AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) |
21 | : AddressPickerUI( parent, name, modal, flags ) | 19 | : AddressPickerUI( parent, name, modal, flags ) |
22 | { | 20 | { |
23 | okButton->setIconSet( Resource::loadPixmap( "enter" ) ); | 21 | okButton->setIconSet( Resource::loadPixmap( "enter" ) ); |
24 | cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) ); | 22 | cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) ); |
25 | 23 | ||
26 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); | 24 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); |
27 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); | 25 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 741a8e1..9960f88 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -1,21 +1,19 @@ | |||
1 | #include "abstractmail.h" | 1 | #include "abstractmail.h" |
2 | #include "imapwrapper.h" | 2 | #include "imapwrapper.h" |
3 | #include "pop3wrapper.h" | 3 | #include "pop3wrapper.h" |
4 | #include "nntpwrapper.h" | 4 | #include "nntpwrapper.h" |
5 | #include "mhwrapper.h" | 5 | #include "mhwrapper.h" |
6 | #include "mboxwrapper.h" | ||
7 | #include "mailtypes.h" | 6 | #include "mailtypes.h" |
8 | 7 | ||
9 | #include <qstring.h> | ||
10 | #include <qfile.h> | 8 | #include <qfile.h> |
11 | #include <qtextstream.h> | 9 | #include <qtextstream.h> |
12 | #include <stdlib.h> | 10 | #include <stdlib.h> |
13 | #include <libetpan/mailmime_content.h> | 11 | #include <libetpan/mailmime_content.h> |
14 | #include <libetpan/mailmime.h> | 12 | #include <libetpan/mailmime.h> |
15 | 13 | ||
16 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) | 14 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) |
17 | { | 15 | { |
18 | return new IMAPwrapper(a); | 16 | return new IMAPwrapper(a); |
19 | } | 17 | } |
20 | 18 | ||
21 | AbstractMail* AbstractMail::getWrapper(POP3account *a) | 19 | AbstractMail* AbstractMail::getWrapper(POP3account *a) |
diff --git a/noncore/net/mail/libmailwrapper/sendmailprogress.cpp b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp index ef22750..dc0c75a 100644 --- a/noncore/net/mail/libmailwrapper/sendmailprogress.cpp +++ b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp | |||
@@ -1,16 +1,15 @@ | |||
1 | #include "sendmailprogress.h" | 1 | #include "sendmailprogress.h" |
2 | #include <qprogressbar.h> | 2 | #include <qprogressbar.h> |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qstring.h> | ||
5 | 4 | ||
6 | progressMailSend::progressMailSend(QWidget*parent, const char * name) | 5 | progressMailSend::progressMailSend(QWidget*parent, const char * name) |
7 | :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) | 6 | :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) |
8 | { | 7 | { |
9 | } | 8 | } |
10 | 9 | ||
11 | progressMailSend::~progressMailSend() | 10 | progressMailSend::~progressMailSend() |
12 | { | 11 | { |
13 | } | 12 | } |
14 | 13 | ||
15 | void progressMailSend::setMaxMails(unsigned int aMaxMails) | 14 | void progressMailSend::setMaxMails(unsigned int aMaxMails) |
16 | { | 15 | { |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index d75d52a..d7a005e 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -1,21 +1,19 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <sys/stat.h> | 2 | #include <sys/stat.h> |
3 | #include <sys/types.h> | 3 | #include <sys/types.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <fcntl.h> | 5 | #include <fcntl.h> |
6 | #include <string.h> | 6 | #include <string.h> |
7 | #include <qdir.h> | ||
8 | #include <qt.h> | 7 | #include <qt.h> |
9 | #include <qmessagebox.h> | ||
10 | 8 | ||
11 | #include <qpe/config.h> | 9 | #include <qpe/config.h> |
12 | #include <qpe/qcopenvelope_qws.h> | 10 | #include <qpe/qcopenvelope_qws.h> |
13 | 11 | ||
14 | #include <libetpan/libetpan.h> | 12 | #include <libetpan/libetpan.h> |
15 | 13 | ||
16 | #include "smtpwrapper.h" | 14 | #include "smtpwrapper.h" |
17 | #include "mailwrapper.h" | 15 | #include "mailwrapper.h" |
18 | #include "abstractmail.h" | 16 | #include "abstractmail.h" |
19 | #include "logindialog.h" | 17 | #include "logindialog.h" |
20 | #include "mailtypes.h" | 18 | #include "mailtypes.h" |
21 | #include "sendmailprogress.h" | 19 | #include "sendmailprogress.h" |
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp index 172c58f..4134e79 100644 --- a/noncore/net/mail/libmailwrapper/statusmail.cpp +++ b/noncore/net/mail/libmailwrapper/statusmail.cpp | |||
@@ -1,14 +1,13 @@ | |||
1 | #include "statusmail.h" | 1 | #include "statusmail.h" |
2 | #include <qlist.h> | ||
3 | 2 | ||
4 | StatusMail::StatusMail(QList<Account>&list) | 3 | StatusMail::StatusMail(QList<Account>&list) |
5 | { | 4 | { |
6 | currentImapStat.message_count=0; | 5 | currentImapStat.message_count=0; |
7 | currentImapStat.message_unseen=0; | 6 | currentImapStat.message_unseen=0; |
8 | currentImapStat.message_recent=0; | 7 | currentImapStat.message_recent=0; |
9 | lastPop3Stat = currentImapStat; | 8 | lastPop3Stat = currentImapStat; |
10 | currentPop3Stat = currentImapStat; | 9 | currentPop3Stat = currentImapStat; |
11 | connectionList.setAutoDelete(true); | 10 | connectionList.setAutoDelete(true); |
12 | connectionList.clear(); | 11 | connectionList.clear(); |
13 | initAccounts(list); | 12 | initAccounts(list); |
14 | } | 13 | } |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 3f34fe7..bcf0866 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -1,21 +1,19 @@ | |||
1 | #include <qlabel.h> | 1 | #include <qlabel.h> |
2 | #include <qvbox.h> | 2 | #include <qvbox.h> |
3 | #include <qheader.h> | 3 | #include <qheader.h> |
4 | #include <qtimer.h> | 4 | #include <qtimer.h> |
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | #include <qmessagebox.h> | ||
7 | 6 | ||
8 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
9 | #include <qpe/resource.h> | ||
10 | 8 | ||
11 | #include "defines.h" | 9 | #include "defines.h" |
12 | #include "mainwindow.h" | 10 | #include "mainwindow.h" |
13 | 11 | ||
14 | 12 | ||
15 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 13 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
16 | : QMainWindow( parent, name, flags ) | 14 | : QMainWindow( parent, name, flags ) |
17 | { | 15 | { |
18 | 16 | ||
19 | setCaption( tr( "Mail" ) ); | 17 | setCaption( tr( "Mail" ) ); |
20 | setToolBarsMovable( false ); | 18 | setToolBarsMovable( false ); |
21 | 19 | ||
diff --git a/noncore/net/mail/newmaildir.cpp b/noncore/net/mail/newmaildir.cpp index ab0d4e3..e6e9dc7 100644 --- a/noncore/net/mail/newmaildir.cpp +++ b/noncore/net/mail/newmaildir.cpp | |||
@@ -1,15 +1,13 @@ | |||
1 | #include "newmaildir.h" | 1 | #include "newmaildir.h" |
2 | #include <qdialog.h> | ||
3 | #include <qvariant.h> | ||
4 | #include <qlineedit.h> | 2 | #include <qlineedit.h> |
5 | #include <qcheckbox.h> | 3 | #include <qcheckbox.h> |
6 | 4 | ||
7 | Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub) | 5 | Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub) |
8 | : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false) | 6 | : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false) |
9 | { | 7 | { |
10 | if (no_sub) { | 8 | if (no_sub) { |
11 | subdirsPossibleBox->setChecked(false); | 9 | subdirsPossibleBox->setChecked(false); |
12 | subdirsPossibleBox->hide(); | 10 | subdirsPossibleBox->hide(); |
13 | } | 11 | } |
14 | } | 12 | } |
15 | 13 | ||
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index abf93dc..6bfc824 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -3,32 +3,28 @@ | |||
3 | #include "opiemail.h" | 3 | #include "opiemail.h" |
4 | #include "editaccounts.h" | 4 | #include "editaccounts.h" |
5 | #include "composemail.h" | 5 | #include "composemail.h" |
6 | #include "mailistviewitem.h" | 6 | #include "mailistviewitem.h" |
7 | #include "viewmail.h" | 7 | #include "viewmail.h" |
8 | #include "selectstore.h" | 8 | #include "selectstore.h" |
9 | #include "selectsmtp.h" | 9 | #include "selectsmtp.h" |
10 | 10 | ||
11 | /* OPIE */ | 11 | /* OPIE */ |
12 | #include <libmailwrapper/smtpwrapper.h> | 12 | #include <libmailwrapper/smtpwrapper.h> |
13 | #include <libmailwrapper/mailtypes.h> | 13 | #include <libmailwrapper/mailtypes.h> |
14 | #include <libmailwrapper/abstractmail.h> | 14 | #include <libmailwrapper/abstractmail.h> |
15 | #include <qpe/qcopenvelope_qws.h> | ||
16 | #include <qpe/resource.h> | 15 | #include <qpe/resource.h> |
17 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
18 | 17 | ||
19 | /* QT */ | 18 | /* QT */ |
20 | #include <qmessagebox.h> | ||
21 | #include <qaction.h> | ||
22 | #include <qapplication.h> | ||
23 | 19 | ||
24 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 20 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
25 | : MainWindow( parent, name, WStyle_ContextHelp ) | 21 | : MainWindow( parent, name, WStyle_ContextHelp ) |
26 | { | 22 | { |
27 | settings = new Settings(); | 23 | settings = new Settings(); |
28 | 24 | ||
29 | folderView->populate( settings->getAccounts() ); | 25 | folderView->populate( settings->getAccounts() ); |
30 | } | 26 | } |
31 | 27 | ||
32 | OpieMail::~OpieMail() | 28 | OpieMail::~OpieMail() |
33 | { | 29 | { |
34 | if (settings) delete settings; | 30 | if (settings) delete settings; |
diff --git a/noncore/net/mail/selectsmtp.cpp b/noncore/net/mail/selectsmtp.cpp index 79b10ef..82e8a0b 100644 --- a/noncore/net/mail/selectsmtp.cpp +++ b/noncore/net/mail/selectsmtp.cpp | |||
@@ -1,21 +1,14 @@ | |||
1 | #include "selectsmtp.h" | 1 | #include "selectsmtp.h" |
2 | #include <libmailwrapper/mailwrapper.h> | 2 | #include <libmailwrapper/mailwrapper.h> |
3 | #include <qlist.h> | ||
4 | #include <qlabel.h> | ||
5 | #include <qlayout.h> | ||
6 | #include <qcheckbox.h> | ||
7 | #include <qframe.h> | ||
8 | #include <qlineedit.h> | ||
9 | #include <qcombobox.h> | ||
10 | 3 | ||
11 | selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl) | 4 | selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl) |
12 | : selectstoreui(parent,name,modal,fl) | 5 | : selectstoreui(parent,name,modal,fl) |
13 | { | 6 | { |
14 | //m_smtpList.setAutoDelete(false); | 7 | //m_smtpList.setAutoDelete(false); |
15 | m_smtpList = 0; | 8 | m_smtpList = 0; |
16 | //headlabel->setText(tr("<center>Select SMTP account to use</center>")); | 9 | //headlabel->setText(tr("<center>Select SMTP account to use</center>")); |
17 | headlabel->hide(); | 10 | headlabel->hide(); |
18 | folderSelection->hide(); | 11 | folderSelection->hide(); |
19 | folderLabel->hide(); | 12 | folderLabel->hide(); |
20 | accountlabel->setText("<center>SMTP Accounts</center>"); | 13 | accountlabel->setText("<center>SMTP Accounts</center>"); |
21 | Line1->hide(); | 14 | Line1->hide(); |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 8636957..ec93f8d 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -1,34 +1,31 @@ | |||
1 | #include "composemail.h" | 1 | #include "composemail.h" |
2 | #include "viewmail.h" | 2 | #include "viewmail.h" |
3 | #include "accountview.h" | ||
4 | 3 | ||
5 | /* OPIE */ | 4 | /* OPIE */ |
6 | #include <libmailwrapper/settings.h> | 5 | #include <libmailwrapper/settings.h> |
7 | #include <libmailwrapper/abstractmail.h> | 6 | #include <libmailwrapper/abstractmail.h> |
8 | #include <libmailwrapper/mailtypes.h> | 7 | #include <libmailwrapper/mailtypes.h> |
9 | 8 | ||
10 | #include <opie2/ofiledialog.h> | 9 | #include <opie2/ofiledialog.h> |
11 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
12 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
13 | 12 | ||
14 | /* QT */ | 13 | /* QT */ |
15 | #include <qtextbrowser.h> | 14 | #include <qtextbrowser.h> |
16 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
17 | #include <qtextstream.h> | 16 | #include <qtextstream.h> |
18 | #include <qaction.h> | 17 | #include <qaction.h> |
19 | #include <qpopupmenu.h> | 18 | #include <qpopupmenu.h> |
20 | #include <qfile.h> | 19 | #include <qfile.h> |
21 | #include <qapplication.h> | ||
22 | #include <qvaluelist.h> | ||
23 | 20 | ||
24 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 21 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
25 | const QString&fsize,int num,const QValueList<int>&path) | 22 | const QString&fsize,int num,const QValueList<int>&path) |
26 | : QListViewItem(parent,after),_partNum(num) | 23 | : QListViewItem(parent,after),_partNum(num) |
27 | { | 24 | { |
28 | _path=path; | 25 | _path=path; |
29 | setText(0, mime); | 26 | setText(0, mime); |
30 | setText(1, desc); | 27 | setText(1, desc); |
31 | setText(2, file); | 28 | setText(2, file); |
32 | setText(3, fsize); | 29 | setText(3, fsize); |
33 | } | 30 | } |
34 | 31 | ||
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index 7f1d8a0..c2bf08c 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp | |||
@@ -1,18 +1,17 @@ | |||
1 | #include <qtextbrowser.h> | 1 | #include <qtextbrowser.h> |
2 | #include <qlistview.h> | 2 | #include <qlistview.h> |
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qvbox.h> | 5 | #include <qvbox.h> |
6 | #include <qpopupmenu.h> | ||
7 | 6 | ||
8 | #include <qpe/qpetoolbar.h> | 7 | #include <qpe/qpetoolbar.h> |
9 | #include <qmenubar.h> | 8 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
11 | 10 | ||
12 | #include "viewmailbase.h" | 11 | #include "viewmailbase.h" |
13 | //#include "opendiag.h" | 12 | //#include "opendiag.h" |
14 | 13 | ||
15 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 14 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) |
16 | : QMainWindow(parent, name, fl) | 15 | : QMainWindow(parent, name, fl) |
17 | { | 16 | { |
18 | setCaption(tr("E-Mail by %1")); | 17 | setCaption(tr("E-Mail by %1")); |