author | alwin <alwin> | 2004-02-20 03:06:34 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-20 03:06:34 (UTC) |
commit | 132f53a7c9cdc3e14a040558f80bb45ceb3ca9b5 (patch) (unidiff) | |
tree | 959a36e8388e78085562d96b988c1137fa0d4548 /noncore/net/mail | |
parent | cb6a133e6c640e5a26de329bfb907c551a6158e4 (diff) | |
download | opie-132f53a7c9cdc3e14a040558f80bb45ceb3ca9b5.zip opie-132f53a7c9cdc3e14a040558f80bb45ceb3ca9b5.tar.gz opie-132f53a7c9cdc3e14a040558f80bb45ceb3ca9b5.tar.bz2 |
removed usage of libopie - only the stuff from opie2
-rw-r--r-- | noncore/net/mail/addresspicker.cpp | 11 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp index c6dec35..f4f4cea 100644 --- a/noncore/net/mail/addresspicker.cpp +++ b/noncore/net/mail/addresspicker.cpp | |||
@@ -6,6 +6,6 @@ | |||
6 | 6 | ||
7 | #include <qpe/resource.h> | 7 | #include <qpe/resource.h> |
8 | #include <opie/ocontactaccess.h> | 8 | #include <opie2/ocontactaccess.h> |
9 | #include <opie/ocontact.h> | 9 | #include <opie2/ocontact.h> |
10 | 10 | ||
11 | 11 | ||
@@ -22,12 +22,13 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl | |||
22 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); | 22 | connect(okButton, SIGNAL(clicked()), SLOT(accept())); |
23 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); | 23 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); |
24 | OContactAccess::List::Iterator it; | 24 | Opie::OContactAccess::List::Iterator it; |
25 | 25 | ||
26 | QString lineEmail, lineName, contactLine; | 26 | QString lineEmail, lineName, contactLine; |
27 | /* what name has to set here???? */ | 27 | /* what name has to set here???? */ |
28 | OContactAccess m_contactdb("opiemail"); | 28 | Opie::OContactAccess m_contactdb("opiemail"); |
29 | |||
29 | QStringList mails; | 30 | QStringList mails; |
30 | QString pre,suf; | 31 | QString pre,suf; |
31 | OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); | 32 | Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); |
32 | for ( it = m_list.begin(); it != m_list.end(); ++it ) { | 33 | for ( it = m_list.begin(); it != m_list.end(); ++it ) { |
33 | if ((*it).defaultEmail().length()!=0) { | 34 | if ((*it).defaultEmail().length()!=0) { |
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index d3d2ab1..7e0de2b 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro | |||
@@ -52,7 +52,7 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
52 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 52 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
53 | contains( CONFTEST, y ){ | 53 | contains( CONFTEST, y ){ |
54 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper -liconv | 54 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper -liconv |
55 | }else{ | 55 | }else{ |
56 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper | 56 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper |
57 | } | 57 | } |
58 | 58 | ||