1 files changed, 8 insertions, 8 deletions

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
@@ -40,13 +40,13 @@ 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;
   }
 }
@@ -62,57 +62,57 @@ bool AddressList::containsName(const QString &name)
 }
 
 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()
 {