author | zecke <zecke> | 2003-05-24 08:45:50 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-24 08:45:50 (UTC) |
commit | 3fb06f85a52b6fcbece50ed30c196efc2a91e8ce (patch) (side-by-side diff) | |
tree | 618d3b21756a07fad10e1e1359bd12a0e7e15089 /noncore/net/mailit/addresslist.cpp | |
parent | 694ff39fe4f0f4164edd7a2a80abe6be3a4fa2f9 (diff) | |
download | opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.zip opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.gz opie-3fb06f85a52b6fcbece50ed30c196efc2a91e8ce.tar.bz2 |
don't crash when compiled with gcc3
one Contact in libqpe
one Contact in addresslist.h
a nice game of russian roulette gcc3 lost...
Diffstat (limited to 'noncore/net/mailit/addresslist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 18d14bc..f2b027c 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp @@ -34,91 +34,91 @@ AddressList::AddressList() AddressList::~AddressList() { addresses.clear(); } void AddressList::addContact(const QString &email, const QString &name) { //skip if not a valid email address, if (email.find( '@') == -1) return; if ( ! containsEmail(email) ) { - Contact *in = new Contact; + AContact *in = new AContact; in->email = email; in->name = name; addresses.append(in); dirty = TRUE; } } bool AddressList::containsEmail(const QString &email) { return ( getEmailRef(email) != -1 ); } bool AddressList::containsName(const QString &name) { return ( getNameRef(name) != -1 ); } QString AddressList::getNameByEmail(const QString &email) { int pos = getEmailRef(email); if (pos != -1) { - Contact *ptr = addresses.at(pos); + AContact *ptr = addresses.at(pos); return ptr->name; } - return NULL; + return QString::null; } QString AddressList::getEmailByName(const QString &name) { int pos = getNameRef(name); if (pos != -1) { - Contact *ptr = addresses.at(pos); + AContact *ptr = addresses.at(pos); return ptr->email; } - return NULL; + return QString::null; } int AddressList::getEmailRef(const QString &email) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { if (ptr->email == email) return pos; pos++; } return -1; } int AddressList::getNameRef(const QString &name) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { if (ptr->name == name) return pos; pos++; } return -1; } -QList<Contact>* AddressList::getContactList() +QList<AContact>* AddressList::getContactList() { return &addresses; } void AddressList::read() { OContactAccess::List::Iterator it; QString lineEmail, lineName, email, name; OContactAccess m_contactdb("mailit"); OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); //OContact* oc;(*it).defaultEmail() |