author | alwin <alwin> | 2004-02-20 03:06:34 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-20 03:06:34 (UTC) |
commit | 132f53a7c9cdc3e14a040558f80bb45ceb3ca9b5 (patch) (side-by-side diff) | |
tree | 959a36e8388e78085562d96b988c1137fa0d4548 | |
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 @@ -5,8 +5,8 @@ #include <qfile.h> #include <qpe/resource.h> -#include <opie/ocontactaccess.h> -#include <opie/ocontact.h> +#include <opie2/ocontactaccess.h> +#include <opie2/ocontact.h> #include <stdlib.h> @@ -21,14 +21,15 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl connect(okButton, SIGNAL(clicked()), SLOT(accept())); connect(cancelButton, SIGNAL(clicked()), SLOT(close())); - OContactAccess::List::Iterator it; + Opie::OContactAccess::List::Iterator it; QString lineEmail, lineName, contactLine; /* what name has to set here???? */ - OContactAccess m_contactdb("opiemail"); + Opie::OContactAccess m_contactdb("opiemail"); + QStringList mails; QString pre,suf; - OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); + Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); for ( it = m_list.begin(); it != m_list.end(); ++it ) { if ((*it).defaultEmail().length()!=0) { mails = (*it).emailList(); 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 @@ -51,9 +51,9 @@ INCLUDEPATH += $(OPIEDIR)/include CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) contains( CONFTEST, y ){ - LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper -liconv + LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper -liconv }else{ - LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper + LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper } TARGET = opiemail |