-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 16 | ||||
-rw-r--r-- | noncore/net/mailit/addresslist.h | 6 | ||||
-rw-r--r-- | noncore/net/mailit/writemail.cpp | 4 |
3 files changed, 13 insertions, 13 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 @@ -43,7 +43,7 @@ void AddressList::addContact(const QString &email, const QString &name) return; if ( ! containsEmail(email) ) { - Contact *in = new Contact; + AContact *in = new AContact; in->email = email; in->name = name; addresses.append(in); @@ -65,28 +65,28 @@ 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) @@ -99,7 +99,7 @@ int AddressList::getEmailRef(const QString &email) 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) @@ -109,7 +109,7 @@ int AddressList::getNameRef(const QString &name) return -1; } -QList<Contact>* AddressList::getContactList() +QList<AContact>* AddressList::getContactList() { return &addresses; } diff --git a/noncore/net/mailit/addresslist.h b/noncore/net/mailit/addresslist.h index b46d467..763b6d4 100644 --- a/noncore/net/mailit/addresslist.h +++ b/noncore/net/mailit/addresslist.h @@ -23,7 +23,7 @@ #include <qobject.h> #include <qlist.h> -struct Contact +struct AContact { QString email; QString name; @@ -41,7 +41,7 @@ public: bool containsName(const QString &name); QString getNameByEmail(const QString &email); QString getEmailByName(const QString &name); - QList<Contact>* getContactList(); + QList<AContact>* getContactList(); private: int getEmailRef(const QString &email); @@ -50,7 +50,7 @@ private: void read(); private: - QList<Contact> addresses; + QList<AContact> addresses; QString filename; bool dirty; }; diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp index c75494e..0298cb3 100644 --- a/noncore/net/mailit/writemail.cpp +++ b/noncore/net/mailit/writemail.cpp @@ -37,12 +37,12 @@ WriteMail::~WriteMail() void WriteMail::setAddressList(AddressList *list) { - Contact *cPtr; + AContact *cPtr; addressList = list; addressView->clear(); - QList<Contact> *cListPtr = addressList->getContactList(); + QList<AContact> *cListPtr = addressList->getContactList(); QListViewItem *item; for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { item = new QListViewItem(addressView, cPtr->name, cPtr->email); |