| -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 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/addresslist.cpp | 16 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/addresslist.h | 6 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/writemail.cpp | 4 |
6 files changed, 26 insertions, 26 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 @@ -44,5 +44,5 @@ void AddressList::addContact(const QString &email, const QString &name) if ( ! containsEmail(email) ) { - Contact *in = new Contact; + AContact *in = new AContact; in->email = email; in->name = name; @@ -66,9 +66,9 @@ 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; } @@ -77,9 +77,9 @@ 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; } @@ -87,5 +87,5 @@ int AddressList::getEmailRef(const QString &email) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { @@ -100,5 +100,5 @@ int AddressList::getNameRef(const QString &name) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { @@ -110,5 +110,5 @@ int AddressList::getNameRef(const QString &name) } -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 @@ -24,5 +24,5 @@ #include <qlist.h> -struct Contact +struct AContact { QString email; @@ -42,5 +42,5 @@ public: QString getNameByEmail(const QString &email); QString getEmailByName(const QString &name); - QList<Contact>* getContactList(); + QList<AContact>* getContactList(); private: @@ -51,5 +51,5 @@ private: 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 @@ -38,10 +38,10 @@ 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() ) { diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 18d14bc..f2b027c 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp @@ -44,5 +44,5 @@ void AddressList::addContact(const QString &email, const QString &name) if ( ! containsEmail(email) ) { - Contact *in = new Contact; + AContact *in = new AContact; in->email = email; in->name = name; @@ -66,9 +66,9 @@ 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; } @@ -77,9 +77,9 @@ 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; } @@ -87,5 +87,5 @@ int AddressList::getEmailRef(const QString &email) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { @@ -100,5 +100,5 @@ int AddressList::getNameRef(const QString &name) { int pos = 0; - Contact *ptr; + AContact *ptr; for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) { @@ -110,5 +110,5 @@ int AddressList::getNameRef(const QString &name) } -QList<Contact>* AddressList::getContactList() +QList<AContact>* AddressList::getContactList() { return &addresses; diff --git a/noncore/unsupported/mailit/addresslist.h b/noncore/unsupported/mailit/addresslist.h index b46d467..763b6d4 100644 --- a/noncore/unsupported/mailit/addresslist.h +++ b/noncore/unsupported/mailit/addresslist.h @@ -24,5 +24,5 @@ #include <qlist.h> -struct Contact +struct AContact { QString email; @@ -42,5 +42,5 @@ public: QString getNameByEmail(const QString &email); QString getEmailByName(const QString &name); - QList<Contact>* getContactList(); + QList<AContact>* getContactList(); private: @@ -51,5 +51,5 @@ private: private: - QList<Contact> addresses; + QList<AContact> addresses; QString filename; bool dirty; diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp index c75494e..0298cb3 100644 --- a/noncore/unsupported/mailit/writemail.cpp +++ b/noncore/unsupported/mailit/writemail.cpp @@ -38,10 +38,10 @@ 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() ) { |