author | alwin <alwin> | 2004-04-04 23:47:04 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-04 23:47:04 (UTC) |
commit | 7485cd42befd86ad035ef4fa29d6e8f728b1e211 (patch) (unidiff) | |
tree | fffb498e97013a953f47652e9aa17c3def4c8a9b /noncore/net/mail | |
parent | fb8ce053c0f08769d359fe4153785e3de72f83ea (diff) | |
download | opie-7485cd42befd86ad035ef4fa29d6e8f728b1e211.zip opie-7485cd42befd86ad035ef4fa29d6e8f728b1e211.tar.gz opie-7485cd42befd86ad035ef4fa29d6e8f728b1e211.tar.bz2 |
someone forget to include opie2/odebug while switching from qDebug
to odebug ;)
23 files changed, 49 insertions, 7 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index ae28313..c1574fd 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -1,35 +1,36 @@ | |||
1 | 1 | ||
2 | #include "accountitem.h" | 2 | #include "accountitem.h" |
3 | #include "accountview.h" | 3 | #include "accountview.h" |
4 | #include "newmaildir.h" | 4 | #include "newmaildir.h" |
5 | #include "nntpgroupsdlg.h" | 5 | #include "nntpgroupsdlg.h" |
6 | #include "defines.h" | 6 | #include "defines.h" |
7 | 7 | ||
8 | /* 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> |
11 | /* OPIE */ | ||
12 | #include <opie2/odebug.h> | ||
12 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
13 | 14 | ||
14 | /* QT */ | 15 | /* QT */ |
15 | #include <qpopupmenu.h> | 16 | #include <qpopupmenu.h> |
16 | #include <qmessagebox.h> | 17 | #include <qmessagebox.h> |
17 | 18 | ||
18 | using namespace Opie::Core; | 19 | using namespace Opie::Core; |
19 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} | 20 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} |
20 | /** | 21 | /** |
21 | * POP3 Account stuff | 22 | * POP3 Account stuff |
22 | */ | 23 | */ |
23 | POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent ) | 24 | POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent ) |
24 | : AccountViewItem( parent ) | 25 | : AccountViewItem( parent ) |
25 | { | 26 | { |
26 | account = a; | 27 | account = a; |
27 | wrapper = AbstractMail::getWrapper( account ); | 28 | wrapper = AbstractMail::getWrapper( account ); |
28 | SETPIX(PIXMAP_POP3FOLDER); | 29 | SETPIX(PIXMAP_POP3FOLDER); |
29 | #if 0 | 30 | #if 0 |
30 | if (!account->getOffline()) | 31 | if (!account->getOffline()) |
31 | { | 32 | { |
32 | setPixmap( 0, ); | 33 | setPixmap( 0, ); |
33 | } | 34 | } |
34 | else | 35 | else |
35 | { | 36 | { |
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 0052061..662e555 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -1,34 +1,36 @@ | |||
1 | 1 | ||
2 | #include "accountview.h" | 2 | #include "accountview.h" |
3 | #include "accountitem.h" | 3 | #include "accountitem.h" |
4 | #include "selectstore.h" | 4 | #include "selectstore.h" |
5 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <libmailwrapper/settings.h> | 6 | #include <libmailwrapper/settings.h> |
8 | #include <libmailwrapper/mailwrapper.h> | 7 | #include <libmailwrapper/mailwrapper.h> |
9 | #include <libmailwrapper/mailtypes.h> | 8 | #include <libmailwrapper/mailtypes.h> |
10 | #include <libmailwrapper/abstractmail.h> | 9 | #include <libmailwrapper/abstractmail.h> |
10 | |||
11 | /* OPIE */ | ||
12 | #include <opie2/odebug.h> | ||
11 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
12 | 14 | ||
13 | /* QT */ | 15 | /* QT */ |
14 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
15 | #include <qpopupmenu.h> | 17 | #include <qpopupmenu.h> |
16 | 18 | ||
17 | using namespace Opie::Core; | 19 | using namespace Opie::Core; |
18 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 20 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
19 | : QListView( parent, name, flags ) | 21 | : QListView( parent, name, flags ) |
20 | { | 22 | { |
21 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), | 23 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), |
22 | SLOT( refresh(QListViewItem*) ) ); | 24 | SLOT( refresh(QListViewItem*) ) ); |
23 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 25 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
24 | SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); | 26 | SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); |
25 | setSorting(0); | 27 | setSorting(0); |
26 | } | 28 | } |
27 | 29 | ||
28 | AccountView::~AccountView() | 30 | AccountView::~AccountView() |
29 | { | 31 | { |
30 | imapAccounts.clear(); | 32 | imapAccounts.clear(); |
31 | mhAccounts.clear(); | 33 | mhAccounts.clear(); |
32 | } | 34 | } |
33 | 35 | ||
34 | void AccountView::slotContextMenu(int id) | 36 | void AccountView::slotContextMenu(int id) |
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index fa703c4..b15e692 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -1,27 +1,28 @@ | |||
1 | #include <qt.h> | 1 | #include <qt.h> |
2 | 2 | ||
3 | #include <opie2/ofiledialog.h> | 3 | #include <opie2/ofiledialog.h> |
4 | #include <opie2/odebug.h> | ||
4 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
5 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
6 | #include <qpe/global.h> | 7 | #include <qpe/global.h> |
7 | #include <qpe/contact.h> | 8 | #include <qpe/contact.h> |
8 | 9 | ||
9 | #include "composemail.h" | 10 | #include "composemail.h" |
10 | 11 | ||
11 | #include <libmailwrapper/smtpwrapper.h> | 12 | #include <libmailwrapper/smtpwrapper.h> |
12 | #include <libmailwrapper/storemail.h> | 13 | #include <libmailwrapper/storemail.h> |
13 | #include <libmailwrapper/abstractmail.h> | 14 | #include <libmailwrapper/abstractmail.h> |
14 | #include <libmailwrapper/mailtypes.h> | 15 | #include <libmailwrapper/mailtypes.h> |
15 | 16 | ||
16 | using namespace Opie::Core; | 17 | using namespace Opie::Core; |
17 | using namespace Opie::Ui; | 18 | using namespace Opie::Ui; |
18 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 19 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
19 | : ComposeMailUI( parent, name, modal, flags ) | 20 | : ComposeMailUI( parent, name, modal, flags ) |
20 | { | 21 | { |
21 | settings = s; | 22 | settings = s; |
22 | m_replyid = ""; | 23 | m_replyid = ""; |
23 | 24 | ||
24 | QString vfilename = Global::applicationFileName("addressbook", | 25 | QString vfilename = Global::applicationFileName("addressbook", |
25 | "businesscard.vcf"); | 26 | "businesscard.vcf"); |
26 | Contact c; | 27 | Contact c; |
27 | if (QFile::exists(vfilename)) { | 28 | if (QFile::exists(vfilename)) { |
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp index de064ca..b0ce57d 100644 --- a/noncore/net/mail/editaccounts.cpp +++ b/noncore/net/mail/editaccounts.cpp | |||
@@ -1,37 +1,40 @@ | |||
1 | 1 | ||
2 | #include "defines.h" | 2 | #include "defines.h" |
3 | #include "editaccounts.h" | 3 | #include "editaccounts.h" |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <opie2/odebug.h> | ||
6 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
7 | 8 | ||
8 | /* QT */ | 9 | /* QT */ |
9 | #include <qt.h> | 10 | #include <qt.h> |
10 | #include <qstringlist.h> | 11 | #include <qstringlist.h> |
11 | 12 | ||
12 | #include <libmailwrapper/nntpwrapper.h> | 13 | #include <libmailwrapper/nntpwrapper.h> |
13 | 14 | ||
15 | using namespace Opie::Core; | ||
16 | |||
14 | AccountListItem::AccountListItem( QListView *parent, Account *a) | 17 | AccountListItem::AccountListItem( QListView *parent, Account *a) |
15 | : QListViewItem( parent ) | 18 | : QListViewItem( parent ) |
16 | { | 19 | { |
17 | account = a; | 20 | account = a; |
18 | setText( 0, account->getAccountName() ); | 21 | setText( 0, account->getAccountName() ); |
19 | QString ttext = ""; | 22 | QString ttext = ""; |
20 | switch (account->getType()) { | 23 | switch (account->getType()) { |
21 | case MAILLIB::A_NNTP: | 24 | case MAILLIB::A_NNTP: |
22 | ttext="NNTP"; | 25 | ttext="NNTP"; |
23 | break; | 26 | break; |
24 | case MAILLIB::A_POP3: | 27 | case MAILLIB::A_POP3: |
25 | ttext = "POP3"; | 28 | ttext = "POP3"; |
26 | break; | 29 | break; |
27 | case MAILLIB::A_IMAP: | 30 | case MAILLIB::A_IMAP: |
28 | ttext = "IMAP"; | 31 | ttext = "IMAP"; |
29 | break; | 32 | break; |
30 | case MAILLIB::A_SMTP: | 33 | case MAILLIB::A_SMTP: |
31 | ttext = "SMTP"; | 34 | ttext = "SMTP"; |
32 | break; | 35 | break; |
33 | default: | 36 | default: |
34 | ttext = "UNKNOWN"; | 37 | ttext = "UNKNOWN"; |
35 | break; | 38 | break; |
36 | } | 39 | } |
37 | setText( 1, ttext); | 40 | setText( 1, ttext); |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 1a26351..7c1c0e4 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -1,31 +1,33 @@ | |||
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 "mailtypes.h" | 6 | #include "mailtypes.h" |
7 | 7 | ||
8 | #include <opie2/odebug.h> | ||
9 | |||
8 | #include <qfile.h> | 10 | #include <qfile.h> |
9 | #include <qtextstream.h> | 11 | #include <qtextstream.h> |
10 | #include <stdlib.h> | 12 | #include <stdlib.h> |
11 | #include <libetpan/mailmime_content.h> | 13 | #include <libetpan/mailmime_content.h> |
12 | #include <libetpan/mailmime.h> | 14 | #include <libetpan/mailmime.h> |
13 | 15 | ||
14 | using namespace Opie::Core; | 16 | using namespace Opie::Core; |
15 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) | 17 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) |
16 | { | 18 | { |
17 | return new IMAPwrapper(a); | 19 | return new IMAPwrapper(a); |
18 | } | 20 | } |
19 | 21 | ||
20 | AbstractMail* AbstractMail::getWrapper(POP3account *a) | 22 | AbstractMail* AbstractMail::getWrapper(POP3account *a) |
21 | { | 23 | { |
22 | return new POP3wrapper(a); | 24 | return new POP3wrapper(a); |
23 | } | 25 | } |
24 | 26 | ||
25 | AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) | 27 | AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) |
26 | { | 28 | { |
27 | return new NNTPwrapper(a); | 29 | return new NNTPwrapper(a); |
28 | } | 30 | } |
29 | 31 | ||
30 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) | 32 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) |
31 | { | 33 | { |
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp index 36ec232..eb322a7 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.cpp +++ b/noncore/net/mail/libmailwrapper/generatemail.cpp | |||
@@ -1,29 +1,31 @@ | |||
1 | #include "generatemail.h" | 1 | #include "generatemail.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | 3 | ||
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | 5 | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
6 | #include <qt.h> | 8 | #include <qt.h> |
7 | 9 | ||
8 | using namespace Opie::Core; | 10 | using namespace Opie::Core; |
9 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; | 11 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; |
10 | 12 | ||
11 | Generatemail::Generatemail() | 13 | Generatemail::Generatemail() |
12 | { | 14 | { |
13 | } | 15 | } |
14 | 16 | ||
15 | Generatemail::~Generatemail() | 17 | Generatemail::~Generatemail() |
16 | { | 18 | { |
17 | } | 19 | } |
18 | 20 | ||
19 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { | 21 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { |
20 | clistiter *it, *it2; | 22 | clistiter *it, *it2; |
21 | 23 | ||
22 | for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) { | 24 | for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) { |
23 | mailimf_address *addr; | 25 | mailimf_address *addr; |
24 | addr = (mailimf_address *) it->data; | 26 | addr = (mailimf_address *) it->data; |
25 | 27 | ||
26 | if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) { | 28 | if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) { |
27 | esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL ); | 29 | esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL ); |
28 | } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) { | 30 | } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) { |
29 | clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list; | 31 | clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list; |
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index fae4c99..3e4293b 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -1,28 +1,30 @@ | |||
1 | #include "genericwrapper.h" | 1 | #include "genericwrapper.h" |
2 | #include <libetpan/libetpan.h> | 2 | #include <libetpan/libetpan.h> |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | 4 | ||
5 | #include <opie2/odebug.h> | ||
6 | |||
5 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
6 | Genericwrapper::Genericwrapper() | 8 | Genericwrapper::Genericwrapper() |
7 | : AbstractMail() | 9 | : AbstractMail() |
8 | { | 10 | { |
9 | bodyCache.clear(); | 11 | bodyCache.clear(); |
10 | m_storage = 0; | 12 | m_storage = 0; |
11 | m_folder = 0; | 13 | m_folder = 0; |
12 | } | 14 | } |
13 | 15 | ||
14 | Genericwrapper::~Genericwrapper() | 16 | Genericwrapper::~Genericwrapper() |
15 | { | 17 | { |
16 | if (m_folder) { | 18 | if (m_folder) { |
17 | mailfolder_free(m_folder); | 19 | mailfolder_free(m_folder); |
18 | } | 20 | } |
19 | if (m_storage) { | 21 | if (m_storage) { |
20 | mailstorage_free(m_storage); | 22 | mailstorage_free(m_storage); |
21 | } | 23 | } |
22 | cleanMimeCache(); | 24 | cleanMimeCache(); |
23 | } | 25 | } |
24 | 26 | ||
25 | void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime) | 27 | void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime) |
26 | { | 28 | { |
27 | if (!mime) { | 29 | if (!mime) { |
28 | return; | 30 | return; |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 35468fe..9b7c0e0 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -1,28 +1,29 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <libetpan/libetpan.h> | 2 | #include <libetpan/libetpan.h> |
3 | #include <qpe/global.h> | 3 | #include <qpe/global.h> |
4 | #include <opie2/oapplication.h> | 4 | #include <opie2/oapplication.h> |
5 | #include <opie2/odebug.h> | ||
5 | 6 | ||
6 | #include "imapwrapper.h" | 7 | #include "imapwrapper.h" |
7 | #include "mailtypes.h" | 8 | #include "mailtypes.h" |
8 | #include "logindialog.h" | 9 | #include "logindialog.h" |
9 | 10 | ||
10 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
11 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) | 12 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) |
12 | : AbstractMail() | 13 | : AbstractMail() |
13 | { | 14 | { |
14 | account = a; | 15 | account = a; |
15 | m_imap = 0; | 16 | m_imap = 0; |
16 | m_Lastmbox = ""; | 17 | m_Lastmbox = ""; |
17 | } | 18 | } |
18 | 19 | ||
19 | IMAPwrapper::~IMAPwrapper() | 20 | IMAPwrapper::~IMAPwrapper() |
20 | { | 21 | { |
21 | logout(); | 22 | logout(); |
22 | } | 23 | } |
23 | 24 | ||
24 | /* to avoid to often select statements in loops etc. | 25 | /* to avoid to often select statements in loops etc. |
25 | we trust that we are logged in and connection is established!*/ | 26 | we trust that we are logged in and connection is established!*/ |
26 | int IMAPwrapper::selectMbox(const QString&mbox) | 27 | int IMAPwrapper::selectMbox(const QString&mbox) |
27 | { | 28 | { |
28 | if (mbox == m_Lastmbox) { | 29 | if (mbox == m_Lastmbox) { |
diff --git a/noncore/net/mail/libmailwrapper/logindialog.cpp b/noncore/net/mail/libmailwrapper/logindialog.cpp index c9ae190..ce705b2 100644 --- a/noncore/net/mail/libmailwrapper/logindialog.cpp +++ b/noncore/net/mail/libmailwrapper/logindialog.cpp | |||
@@ -1,28 +1,32 @@ | |||
1 | #include <qlineedit.h> | 1 | #include <qlineedit.h> |
2 | 2 | ||
3 | #include "logindialog.h" | 3 | #include "logindialog.h" |
4 | 4 | ||
5 | #include <opie2/odebug.h> | ||
6 | |||
7 | using namespace Opie::Core; | ||
8 | |||
5 | LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, WFlags flags ) | 9 | LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, WFlags flags ) |
6 | : LoginDialogUI( parent, name, modal, flags ) | 10 | : LoginDialogUI( parent, name, modal, flags ) |
7 | { | 11 | { |
8 | userLine->setText( (user.isEmpty()?QString(""):user) ); | 12 | userLine->setText( (user.isEmpty()?QString(""):user) ); |
9 | passLine->setText( (pass.isEmpty()?QString(""):pass) ); | 13 | passLine->setText( (pass.isEmpty()?QString(""):pass) ); |
10 | _user = user; | 14 | _user = user; |
11 | _pass = pass; | 15 | _pass = pass; |
12 | 16 | ||
13 | if ( user.isEmpty() ) { | 17 | if ( user.isEmpty() ) { |
14 | userLine->setFocus(); | 18 | userLine->setFocus(); |
15 | } else { | 19 | } else { |
16 | passLine->setFocus(); | 20 | passLine->setFocus(); |
17 | } | 21 | } |
18 | } | 22 | } |
19 | 23 | ||
20 | void LoginDialog::accept() | 24 | void LoginDialog::accept() |
21 | { | 25 | { |
22 | //_user.replace( 0, _user.length(), userLine->text() ); | 26 | //_user.replace( 0, _user.length(), userLine->text() ); |
23 | //_pass.replace( 0, _pass.length(), passLine->text() ); | 27 | //_pass.replace( 0, _pass.length(), passLine->text() ); |
24 | _user = userLine->text(); | 28 | _user = userLine->text(); |
25 | _pass = passLine->text(); | 29 | _pass = passLine->text(); |
26 | 30 | ||
27 | odebug << "User im accept: |" << _user.latin1() << "|" << oendl; | 31 | odebug << "User im accept: |" << _user.latin1() << "|" << oendl; |
28 | QDialog::accept(); | 32 | QDialog::accept(); |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 6d44db4..d4395a2 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp | |||
@@ -1,25 +1,28 @@ | |||
1 | #include "mailtypes.h" | 1 | #include "mailtypes.h" |
2 | |||
3 | #include <opie2/odebug.h> | ||
4 | |||
2 | #include <stdlib.h> | 5 | #include <stdlib.h> |
3 | 6 | ||
4 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
5 | RecMail::RecMail() | 8 | RecMail::RecMail() |
6 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) | 9 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) |
7 | { | 10 | { |
8 | init(); | 11 | init(); |
9 | } | 12 | } |
10 | 13 | ||
11 | RecMail::RecMail(const RecMail&old) | 14 | RecMail::RecMail(const RecMail&old) |
12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) | 15 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) |
13 | { | 16 | { |
14 | init(); | 17 | init(); |
15 | copy_old(old); | 18 | copy_old(old); |
16 | odebug << "Copy constructor RecMail" << oendl; | 19 | odebug << "Copy constructor RecMail" << oendl; |
17 | } | 20 | } |
18 | 21 | ||
19 | RecMail::~RecMail() | 22 | RecMail::~RecMail() |
20 | { | 23 | { |
21 | wrapper = 0; | 24 | wrapper = 0; |
22 | } | 25 | } |
23 | 26 | ||
24 | void RecMail::copy_old(const RecMail&old) | 27 | void RecMail::copy_old(const RecMail&old) |
25 | { | 28 | { |
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp index df2112f..a030cca 100644 --- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp | |||
@@ -1,30 +1,32 @@ | |||
1 | #include "mboxwrapper.h" | 1 | #include "mboxwrapper.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "mailwrapper.h" | 3 | #include "mailwrapper.h" |
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | |||
8 | #include <opie2/odebug.h> | ||
7 | #include <qpe/global.h> | 9 | #include <qpe/global.h> |
8 | 10 | ||
9 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
10 | MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name) | 12 | MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name) |
11 | : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name) | 13 | : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name) |
12 | { | 14 | { |
13 | QDir dir(MBOXPath); | 15 | QDir dir(MBOXPath); |
14 | if (!dir.exists()) { | 16 | if (!dir.exists()) { |
15 | dir.mkdir(MBOXPath); | 17 | dir.mkdir(MBOXPath); |
16 | } | 18 | } |
17 | } | 19 | } |
18 | 20 | ||
19 | MBOXwrapper::~MBOXwrapper() | 21 | MBOXwrapper::~MBOXwrapper() |
20 | { | 22 | { |
21 | } | 23 | } |
22 | 24 | ||
23 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) | 25 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) |
24 | { | 26 | { |
25 | mailstorage*storage = mailstorage_new(NULL); | 27 | mailstorage*storage = mailstorage_new(NULL); |
26 | QString p = MBOXPath+"/"; | 28 | QString p = MBOXPath+"/"; |
27 | p+=mailbox; | 29 | p+=mailbox; |
28 | 30 | ||
29 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 31 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
30 | mailfolder*folder; | 32 | mailfolder*folder; |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index cd7cecb..403afcf 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -1,33 +1,34 @@ | |||
1 | #include "mhwrapper.h" | 1 | #include "mhwrapper.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "mailwrapper.h" | 3 | #include "mailwrapper.h" |
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qmessagebox.h> | 6 | #include <qmessagebox.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
9 | #include <opie2/oprocess.h> | 9 | #include <opie2/oprocess.h> |
10 | #include <opie2/odebug.h> | ||
10 | 11 | ||
11 | using namespace Opie::Core; | 12 | using namespace Opie::Core; |
12 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 13 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
13 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) | 14 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) |
14 | { | 15 | { |
15 | if (MHPath.length()>0) { | 16 | if (MHPath.length()>0) { |
16 | if (MHPath[MHPath.length()-1]=='/') { | 17 | if (MHPath[MHPath.length()-1]=='/') { |
17 | MHPath=MHPath.left(MHPath.length()-1); | 18 | MHPath=MHPath.left(MHPath.length()-1); |
18 | } | 19 | } |
19 | odebug << MHPath << oendl; | 20 | odebug << MHPath << oendl; |
20 | QDir dir(MHPath); | 21 | QDir dir(MHPath); |
21 | if (!dir.exists()) { | 22 | if (!dir.exists()) { |
22 | dir.mkdir(MHPath); | 23 | dir.mkdir(MHPath); |
23 | } | 24 | } |
24 | init_storage(); | 25 | init_storage(); |
25 | } | 26 | } |
26 | } | 27 | } |
27 | 28 | ||
28 | void MHwrapper::init_storage() | 29 | void MHwrapper::init_storage() |
29 | { | 30 | { |
30 | int r; | 31 | int r; |
31 | QString pre = MHPath; | 32 | QString pre = MHPath; |
32 | if (!m_storage) { | 33 | if (!m_storage) { |
33 | m_storage = mailstorage_new(NULL); | 34 | m_storage = mailstorage_new(NULL); |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp index 5d5011a..c99b97c 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp | |||
@@ -1,34 +1,35 @@ | |||
1 | #include "nntpwrapper.h" | 1 | #include "nntpwrapper.h" |
2 | #include "logindialog.h" | 2 | #include "logindialog.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | 4 | ||
5 | #include <qfile.h> | 5 | #include <qfile.h> |
6 | 6 | ||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | 8 | ||
9 | #include <libetpan/libetpan.h> | 9 | #include <libetpan/libetpan.h> |
10 | 10 | ||
11 | #include <opie2/odebug.h> | ||
11 | 12 | ||
12 | #define HARD_MSG_SIZE_LIMIT 5242880 | 13 | #define HARD_MSG_SIZE_LIMIT 5242880 |
13 | 14 | ||
14 | using namespace Opie::Core; | 15 | using namespace Opie::Core; |
15 | NNTPwrapper::NNTPwrapper( NNTPaccount *a ) | 16 | NNTPwrapper::NNTPwrapper( NNTPaccount *a ) |
16 | : Genericwrapper() { | 17 | : Genericwrapper() { |
17 | account = a; | 18 | account = a; |
18 | m_nntp = NULL; | 19 | m_nntp = NULL; |
19 | msgTempName = a->getFileName()+"_msg_cache"; | 20 | msgTempName = a->getFileName()+"_msg_cache"; |
20 | last_msg_id = 0; | 21 | last_msg_id = 0; |
21 | } | 22 | } |
22 | 23 | ||
23 | NNTPwrapper::~NNTPwrapper() { | 24 | NNTPwrapper::~NNTPwrapper() { |
24 | logout(); | 25 | logout(); |
25 | QFile msg_cache(msgTempName); | 26 | QFile msg_cache(msgTempName); |
26 | if (msg_cache.exists()) { | 27 | if (msg_cache.exists()) { |
27 | msg_cache.remove(); | 28 | msg_cache.remove(); |
28 | } | 29 | } |
29 | } | 30 | } |
30 | 31 | ||
31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { | 32 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { |
32 | odebug << "NNTP: " << current << " of " << maximum << "" << oendl; | 33 | odebug << "NNTP: " << current << " of " << maximum << "" << oendl; |
33 | } | 34 | } |
34 | 35 | ||
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index c586c29..3cfd1ee 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -1,32 +1,33 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include <libetpan/libetpan.h> | 5 | #include <libetpan/libetpan.h> |
6 | |||
7 | #include <opie2/odebug.h> | ||
6 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
7 | #include <qfile.h> | 9 | #include <qfile.h> |
8 | //#include <qstring.h> | ||
9 | 10 | ||
10 | /* we don't fetch messages larger than 5 MB */ | 11 | /* we don't fetch messages larger than 5 MB */ |
11 | #define HARD_MSG_SIZE_LIMIT 5242880 | 12 | #define HARD_MSG_SIZE_LIMIT 5242880 |
12 | 13 | ||
13 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
14 | POP3wrapper::POP3wrapper( POP3account *a ) | 15 | POP3wrapper::POP3wrapper( POP3account *a ) |
15 | : Genericwrapper() { | 16 | : Genericwrapper() { |
16 | account = a; | 17 | account = a; |
17 | m_pop3 = NULL; | 18 | m_pop3 = NULL; |
18 | msgTempName = a->getFileName()+"_msg_cache"; | 19 | msgTempName = a->getFileName()+"_msg_cache"; |
19 | last_msg_id = 0; | 20 | last_msg_id = 0; |
20 | } | 21 | } |
21 | 22 | ||
22 | POP3wrapper::~POP3wrapper() { | 23 | POP3wrapper::~POP3wrapper() { |
23 | logout(); | 24 | logout(); |
24 | QFile msg_cache(msgTempName); | 25 | QFile msg_cache(msgTempName); |
25 | if (msg_cache.exists()) { | 26 | if (msg_cache.exists()) { |
26 | msg_cache.remove(); | 27 | msg_cache.remove(); |
27 | } | 28 | } |
28 | } | 29 | } |
29 | 30 | ||
30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { | 31 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { |
31 | odebug << "POP3: " << current << " of " << maximum << "" << oendl; | 32 | odebug << "POP3: " << current << " of " << maximum << "" << oendl; |
32 | } | 33 | } |
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp index de36eeb..3c9b25c 100644 --- a/noncore/net/mail/libmailwrapper/settings.cpp +++ b/noncore/net/mail/libmailwrapper/settings.cpp | |||
@@ -1,27 +1,28 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <qdir.h> | 2 | #include <qdir.h> |
3 | 3 | ||
4 | #include <opie2/odebug.h> | ||
4 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
5 | 6 | ||
6 | #include "settings.h" | 7 | #include "settings.h" |
7 | //#include "defines.h" | 8 | //#include "defines.h" |
8 | 9 | ||
9 | #define IMAP_PORT "143" | 10 | #define IMAP_PORT "143" |
10 | #define IMAP_SSL_PORT "993" | 11 | #define IMAP_SSL_PORT "993" |
11 | #define SMTP_PORT "25" | 12 | #define SMTP_PORT "25" |
12 | #define SMTP_SSL_PORT "465" | 13 | #define SMTP_SSL_PORT "465" |
13 | #define POP3_PORT "110" | 14 | #define POP3_PORT "110" |
14 | #define POP3_SSL_PORT "995" | 15 | #define POP3_SSL_PORT "995" |
15 | #define NNTP_PORT "119" | 16 | #define NNTP_PORT "119" |
16 | #define NNTP_SSL_PORT "563" | 17 | #define NNTP_SSL_PORT "563" |
17 | 18 | ||
18 | 19 | ||
19 | Settings::Settings() | 20 | Settings::Settings() |
20 | : QObject() | 21 | : QObject() |
21 | { | 22 | { |
22 | updateAccounts(); | 23 | updateAccounts(); |
23 | } | 24 | } |
24 | 25 | ||
25 | void Settings::checkDirectory() | 26 | void Settings::checkDirectory() |
26 | { | 27 | { |
27 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 28 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index ba78c3b..db7a8ee 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -1,31 +1,32 @@ | |||
1 | #include "smtpwrapper.h" | 1 | #include "smtpwrapper.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | #include "abstractmail.h" | 3 | #include "abstractmail.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include "mailtypes.h" | 5 | #include "mailtypes.h" |
6 | #include "sendmailprogress.h" | 6 | #include "sendmailprogress.h" |
7 | 7 | ||
8 | #include <opie2/odebug.h> | ||
8 | #include <qt.h> | 9 | #include <qt.h> |
9 | 10 | ||
10 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
11 | #include <qpe/qcopenvelope_qws.h> | 12 | #include <qpe/qcopenvelope_qws.h> |
12 | 13 | ||
13 | #include <libetpan/libetpan.h> | 14 | #include <libetpan/libetpan.h> |
14 | 15 | ||
15 | 16 | ||
16 | using namespace Opie::Core; | 17 | using namespace Opie::Core; |
17 | progressMailSend*SMTPwrapper::sendProgress = 0; | 18 | progressMailSend*SMTPwrapper::sendProgress = 0; |
18 | 19 | ||
19 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | 20 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) |
20 | : Generatemail() | 21 | : Generatemail() |
21 | { | 22 | { |
22 | m_SmtpAccount = aSmtp; | 23 | m_SmtpAccount = aSmtp; |
23 | Config cfg( "mail" ); | 24 | Config cfg( "mail" ); |
24 | cfg.setGroup( "Status" ); | 25 | cfg.setGroup( "Status" ); |
25 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); | 26 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); |
26 | emit queuedMails( m_queuedMail ); | 27 | emit queuedMails( m_queuedMail ); |
27 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); | 28 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); |
28 | m_smtp = 0; | 29 | m_smtp = 0; |
29 | } | 30 | } |
30 | 31 | ||
31 | SMTPwrapper::~SMTPwrapper() | 32 | SMTPwrapper::~SMTPwrapper() |
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp index 51383f6..7e14df3 100644 --- a/noncore/net/mail/libmailwrapper/statusmail.cpp +++ b/noncore/net/mail/libmailwrapper/statusmail.cpp | |||
@@ -1,26 +1,30 @@ | |||
1 | #include "statusmail.h" | 1 | #include "statusmail.h" |
2 | 2 | ||
3 | #include <opie2/odebug.h> | ||
4 | |||
5 | using namespace Opie::Core; | ||
6 | |||
3 | StatusMail::StatusMail(QList<Account>&list) | 7 | StatusMail::StatusMail(QList<Account>&list) |
4 | { | 8 | { |
5 | currentImapStat.message_count=0; | 9 | currentImapStat.message_count=0; |
6 | currentImapStat.message_unseen=0; | 10 | currentImapStat.message_unseen=0; |
7 | currentImapStat.message_recent=0; | 11 | currentImapStat.message_recent=0; |
8 | lastPop3Stat = currentImapStat; | 12 | lastPop3Stat = currentImapStat; |
9 | currentPop3Stat = currentImapStat; | 13 | currentPop3Stat = currentImapStat; |
10 | connectionList.setAutoDelete(true); | 14 | connectionList.setAutoDelete(true); |
11 | connectionList.clear(); | 15 | connectionList.clear(); |
12 | initAccounts(list); | 16 | initAccounts(list); |
13 | } | 17 | } |
14 | 18 | ||
15 | StatusMail::~StatusMail() | 19 | StatusMail::~StatusMail() |
16 | { | 20 | { |
17 | } | 21 | } |
18 | 22 | ||
19 | void StatusMail::initAccounts(QList<Account>&accounts) | 23 | void StatusMail::initAccounts(QList<Account>&accounts) |
20 | { | 24 | { |
21 | 25 | ||
22 | Account *it; | 26 | Account *it; |
23 | folderStat currentStat; | 27 | folderStat currentStat; |
24 | AbstractMail * current = 0; | 28 | AbstractMail * current = 0; |
25 | currentPop3Stat.message_count=0; | 29 | currentPop3Stat.message_count=0; |
26 | currentPop3Stat.message_recent=0; | 30 | currentPop3Stat.message_recent=0; |
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp index 546d756..4add8a1 100644 --- a/noncore/net/mail/libmailwrapper/storemail.cpp +++ b/noncore/net/mail/libmailwrapper/storemail.cpp | |||
@@ -1,31 +1,31 @@ | |||
1 | #include "storemail.h" | 1 | #include "storemail.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | #include "settings.h" | 3 | #include "settings.h" |
4 | #include "abstractmail.h" | 4 | #include "abstractmail.h" |
5 | 5 | ||
6 | #include <libetpan/libetpan.h> | 6 | #include <libetpan/libetpan.h> |
7 | 7 | #include <opie2/odebug.h> | |
8 | #include <qstring.h> | 8 | #include <qstring.h> |
9 | 9 | ||
10 | #include <stdlib.h> | 10 | #include <stdlib.h> |
11 | 11 | ||
12 | using namespace Opie::Core; | 12 | using namespace Opie::Core; |
13 | Storemail::Storemail(Account*aAccount,const QString&aFolder) | 13 | Storemail::Storemail(Account*aAccount,const QString&aFolder) |
14 | : Generatemail() | 14 | : Generatemail() |
15 | { | 15 | { |
16 | wrapper = 0; | 16 | wrapper = 0; |
17 | m_Account = aAccount; | 17 | m_Account = aAccount; |
18 | m_tfolder = aFolder; | 18 | m_tfolder = aFolder; |
19 | wrapper = AbstractMail::getWrapper(m_Account); | 19 | wrapper = AbstractMail::getWrapper(m_Account); |
20 | if (wrapper) { | 20 | if (wrapper) { |
21 | wrapper->createMbox(m_tfolder); | 21 | wrapper->createMbox(m_tfolder); |
22 | } | 22 | } |
23 | } | 23 | } |
24 | 24 | ||
25 | Storemail::Storemail(const QString&dir,const QString&aFolder) | 25 | Storemail::Storemail(const QString&dir,const QString&aFolder) |
26 | : Generatemail() | 26 | : Generatemail() |
27 | { | 27 | { |
28 | wrapper = 0; | 28 | wrapper = 0; |
29 | m_Account = 0; | 29 | m_Account = 0; |
30 | m_tfolder = aFolder; | 30 | m_tfolder = aFolder; |
31 | wrapper = AbstractMail::getWrapper(dir); | 31 | wrapper = AbstractMail::getWrapper(dir); |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 4c87d64..979b73a 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -1,35 +1,37 @@ | |||
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 | 6 | ||
7 | #include <opie2/odebug.h> | ||
7 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
8 | 9 | ||
9 | #include "defines.h" | 10 | #include "defines.h" |
10 | #include "mainwindow.h" | 11 | #include "mainwindow.h" |
11 | 12 | ||
13 | using namespace Opie::Core; | ||
12 | 14 | ||
13 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 15 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
14 | : QMainWindow( parent, name, flags ) | 16 | : QMainWindow( parent, name, flags ) |
15 | { | 17 | { |
16 | 18 | ||
17 | setCaption( tr( "Mail" ) ); | 19 | setCaption( tr( "Mail" ) ); |
18 | setToolBarsMovable( false ); | 20 | setToolBarsMovable( false ); |
19 | 21 | ||
20 | toolBar = new QToolBar( this ); | 22 | toolBar = new QToolBar( this ); |
21 | menuBar = new QMenuBar( toolBar ); | 23 | menuBar = new QMenuBar( toolBar ); |
22 | mailMenu = new QPopupMenu( menuBar ); | 24 | mailMenu = new QPopupMenu( menuBar ); |
23 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 25 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
24 | settingsMenu = new QPopupMenu( menuBar ); | 26 | settingsMenu = new QPopupMenu( menuBar ); |
25 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); | 27 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); |
26 | 28 | ||
27 | addToolBar( toolBar ); | 29 | addToolBar( toolBar ); |
28 | toolBar->setHorizontalStretchable( true ); | 30 | toolBar->setHorizontalStretchable( true ); |
29 | 31 | ||
30 | QLabel *spacer = new QLabel( toolBar ); | 32 | QLabel *spacer = new QLabel( toolBar ); |
31 | spacer->setBackgroundMode( QWidget::PaletteButton ); | 33 | spacer->setBackgroundMode( QWidget::PaletteButton ); |
32 | toolBar->setStretchableWidget( spacer ); | 34 | toolBar->setStretchableWidget( spacer ); |
33 | 35 | ||
34 | composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL, | 36 | composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL, |
35 | 0, 0, this ); | 37 | 0, 0, this ); |
diff --git a/noncore/net/mail/nntpgroups.cpp b/noncore/net/mail/nntpgroups.cpp index 3243ee3..d81d8b1 100644 --- a/noncore/net/mail/nntpgroups.cpp +++ b/noncore/net/mail/nntpgroups.cpp | |||
@@ -1,31 +1,33 @@ | |||
1 | #include "nntpgroups.h" | 1 | #include "nntpgroups.h" |
2 | 2 | ||
3 | #include <libmailwrapper/settings.h> | 3 | #include <libmailwrapper/settings.h> |
4 | 4 | #include <opie2/odebug.h> | |
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | #include <qlineedit.h> | 6 | #include <qlineedit.h> |
7 | 7 | ||
8 | using namespace Opie::Core; | ||
9 | |||
8 | NNTPGroups::NNTPGroups(NNTPaccount *account, QWidget* parent, const char* name, WFlags fl) | 10 | NNTPGroups::NNTPGroups(NNTPaccount *account, QWidget* parent, const char* name, WFlags fl) |
9 | : NNTPGroupsUI(parent,name,fl),subscribedGroups() | 11 | : NNTPGroupsUI(parent,name,fl),subscribedGroups() |
10 | { | 12 | { |
11 | m_Account = account; | 13 | m_Account = account; |
12 | fillGroups(); | 14 | fillGroups(); |
13 | } | 15 | } |
14 | 16 | ||
15 | NNTPGroups::~NNTPGroups() | 17 | NNTPGroups::~NNTPGroups() |
16 | { | 18 | { |
17 | 19 | ||
18 | } | 20 | } |
19 | 21 | ||
20 | void NNTPGroups::slotGetNG() | 22 | void NNTPGroups::slotGetNG() |
21 | { | 23 | { |
22 | if (!m_Account) return; | 24 | if (!m_Account) return; |
23 | GroupListView->clear(); | 25 | GroupListView->clear(); |
24 | NNTPwrapper tmp( m_Account ); | 26 | NNTPwrapper tmp( m_Account ); |
25 | QString filter = Groupfilteredit->text(); | 27 | QString filter = Groupfilteredit->text(); |
26 | QStringList list = tmp.listAllNewsgroups(filter); | 28 | QStringList list = tmp.listAllNewsgroups(filter); |
27 | subscribedGroupsNotListed = subscribedGroups; | 29 | subscribedGroupsNotListed = subscribedGroups; |
28 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 30 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
29 | QCheckListItem *item; | 31 | QCheckListItem *item; |
30 | item = new QCheckListItem( GroupListView, (*it), QCheckListItem::CheckBox ); | 32 | item = new QCheckListItem( GroupListView, (*it), QCheckListItem::CheckBox ); |
31 | if ( subscribedGroups.contains( (*it) ) >= 1 ) { | 33 | if ( subscribedGroups.contains( (*it) ) >= 1 ) { |
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 0669b5a..5399c3c 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -1,43 +1,46 @@ | |||
1 | 1 | ||
2 | #include "settingsdialog.h" | 2 | #include "settingsdialog.h" |
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 */ | ||
12 | #include <libmailwrapper/smtpwrapper.h> | 11 | #include <libmailwrapper/smtpwrapper.h> |
13 | #include <libmailwrapper/mailtypes.h> | 12 | #include <libmailwrapper/mailtypes.h> |
14 | #include <libmailwrapper/abstractmail.h> | 13 | #include <libmailwrapper/abstractmail.h> |
14 | /* OPIE */ | ||
15 | #include <opie2/odebug.h> | ||
15 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
16 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
17 | 18 | ||
18 | /* QT */ | 19 | /* QT */ |
19 | 20 | ||
21 | using namespace Opie::Core; | ||
22 | |||
20 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 23 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
21 | : MainWindow( parent, name, WStyle_ContextHelp ) | 24 | : MainWindow( parent, name, WStyle_ContextHelp ) |
22 | { | 25 | { |
23 | settings = new Settings(); | 26 | settings = new Settings(); |
24 | 27 | ||
25 | folderView->populate( settings->getAccounts() ); | 28 | folderView->populate( settings->getAccounts() ); |
26 | } | 29 | } |
27 | 30 | ||
28 | OpieMail::~OpieMail() | 31 | OpieMail::~OpieMail() |
29 | { | 32 | { |
30 | if (settings) delete settings; | 33 | if (settings) delete settings; |
31 | } | 34 | } |
32 | 35 | ||
33 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 36 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
34 | { | 37 | { |
35 | // copied from old mail2 | 38 | // copied from old mail2 |
36 | if (msg == "writeMail(QString,QString)") | 39 | if (msg == "writeMail(QString,QString)") |
37 | { | 40 | { |
38 | QDataStream stream(data,IO_ReadOnly); | 41 | QDataStream stream(data,IO_ReadOnly); |
39 | QString name, email; | 42 | QString name, email; |
40 | stream >> name >> email; | 43 | stream >> name >> email; |
41 | // removing the whitespaces at beginning and end is needed! | 44 | // removing the whitespaces at beginning and end is needed! |
42 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 45 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); |
43 | } | 46 | } |
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index cac9048..2fc1d01 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -1,32 +1,32 @@ | |||
1 | #include <qpainter.h> | 1 | #include <qpainter.h> |
2 | #include <qtimer.h> | 2 | #include <qtimer.h> |
3 | 3 | ||
4 | #include <qpe/qcopenvelope_qws.h> | 4 | #include <qpe/qcopenvelope_qws.h> |
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
8 | 8 | #include <opie2/odebug.h> | |
9 | #include <opie2/odevice.h> | 9 | #include <opie2/odevice.h> |
10 | 10 | ||
11 | #include <libmailwrapper/settings.h> | 11 | #include <libmailwrapper/settings.h> |
12 | 12 | ||
13 | #include "mailapplet.h" | 13 | #include "mailapplet.h" |
14 | 14 | ||
15 | using namespace Opie::Core; | 15 | using namespace Opie::Core; |
16 | 16 | ||
17 | MailApplet::MailApplet( QWidget *parent ) | 17 | MailApplet::MailApplet( QWidget *parent ) |
18 | : QWidget( parent ) { | 18 | : QWidget( parent ) { |
19 | 19 | ||
20 | m_config = new Config( "mail" ); | 20 | m_config = new Config( "mail" ); |
21 | m_config->setGroup( "Applet" ); | 21 | m_config->setGroup( "Applet" ); |
22 | 22 | ||
23 | setFixedWidth( AppLnk::smallIconSize() ); | 23 | setFixedWidth( AppLnk::smallIconSize() ); |
24 | setFixedHeight( AppLnk::smallIconSize() ); | 24 | setFixedHeight( AppLnk::smallIconSize() ); |
25 | 25 | ||
26 | hide(); | 26 | hide(); |
27 | 27 | ||
28 | m_newMails = 0; | 28 | m_newMails = 0; |
29 | m_statusMail = 0l; | 29 | m_statusMail = 0l; |
30 | 30 | ||
31 | if ( !m_config->readBoolEntry( "Disabled", false ) ) { | 31 | if ( !m_config->readBoolEntry( "Disabled", false ) ) { |
32 | // delay 5 sec until the whole mail backend gets started .-) | 32 | // delay 5 sec until the whole mail backend gets started .-) |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index a574ea1..7267bcb 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -1,45 +1,48 @@ | |||
1 | #include "composemail.h" | 1 | #include "composemail.h" |
2 | #include "viewmail.h" | 2 | #include "viewmail.h" |
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <libmailwrapper/settings.h> | 5 | #include <libmailwrapper/settings.h> |
6 | #include <libmailwrapper/abstractmail.h> | 6 | #include <libmailwrapper/abstractmail.h> |
7 | #include <libmailwrapper/mailtypes.h> | 7 | #include <libmailwrapper/mailtypes.h> |
8 | 8 | ||
9 | #include <opie2/odebug.h> | ||
9 | #include <opie2/ofiledialog.h> | 10 | #include <opie2/ofiledialog.h> |
10 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
11 | #include <qpe/qpeapplication.h> | 12 | #include <qpe/qpeapplication.h> |
12 | 13 | ||
13 | /* QT */ | 14 | /* QT */ |
14 | #include <qtextbrowser.h> | 15 | #include <qtextbrowser.h> |
15 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
16 | #include <qtextstream.h> | 17 | #include <qtextstream.h> |
17 | #include <qaction.h> | 18 | #include <qaction.h> |
18 | #include <qpopupmenu.h> | 19 | #include <qpopupmenu.h> |
19 | #include <qfile.h> | 20 | #include <qfile.h> |
20 | 21 | ||
21 | using namespace Opie::Ui; | 22 | using namespace Opie::Ui; |
23 | using namespace Opie::Core; | ||
24 | |||
22 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 25 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
23 | const QString&fsize,int num,const QValueList<int>&path) | 26 | const QString&fsize,int num,const QValueList<int>&path) |
24 | : QListViewItem(parent,after),_partNum(num) | 27 | : QListViewItem(parent,after),_partNum(num) |
25 | { | 28 | { |
26 | _path=path; | 29 | _path=path; |
27 | setText(0, mime); | 30 | setText(0, mime); |
28 | setText(1, desc); | 31 | setText(1, desc); |
29 | setText(2, file); | 32 | setText(2, file); |
30 | setText(3, fsize); | 33 | setText(3, fsize); |
31 | } | 34 | } |
32 | 35 | ||
33 | AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 36 | AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
34 | const QString&fsize,int num,const QValueList<int>&path) | 37 | const QString&fsize,int num,const QValueList<int>&path) |
35 | : QListViewItem(parent,after),_partNum(num) | 38 | : QListViewItem(parent,after),_partNum(num) |
36 | { | 39 | { |
37 | _path=path; | 40 | _path=path; |
38 | setText(0, mime); | 41 | setText(0, mime); |
39 | setText(1, desc); | 42 | setText(1, desc); |
40 | setText(2, file); | 43 | setText(2, file); |
41 | setText(3, fsize); | 44 | setText(3, fsize); |
42 | } | 45 | } |
43 | 46 | ||
44 | bool AttachItem::isParentof(const QValueList<int>&path) | 47 | bool AttachItem::isParentof(const QValueList<int>&path) |
45 | { | 48 | { |