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
@@ -45,3 +45,3 @@ void AddressList::addContact(const QString &email, const QString &name)
   if ( ! containsEmail(email) ) {
-    Contact *in = new Contact;
+    AContact *in = new AContact;
     in->email = email;
@@ -67,3 +67,3 @@ QString AddressList::getNameByEmail(const QString &email)
   if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
     return ptr->name;
@@ -71,3 +71,3 @@ QString AddressList::getNameByEmail(const QString &email)
   
-  return NULL;
+  return QString::null;
 }
@@ -78,3 +78,3 @@ QString AddressList::getEmailByName(const QString &name)
   if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
     return ptr->email;
@@ -82,3 +82,3 @@ QString AddressList::getEmailByName(const QString &name)
   
-  return NULL;
+  return QString::null;
 }
@@ -88,3 +88,3 @@ int AddressList::getEmailRef(const QString &email)
   int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
   
@@ -101,3 +101,3 @@ int AddressList::getNameRef(const QString &name)
   int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
   
@@ -111,3 +111,3 @@ int AddressList::getNameRef(const QString &name)
 
-QList<Contact>* AddressList::getContactList()
+QList<AContact>* AddressList::getContactList()
 {
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
@@ -25,3 +25,3 @@
 
-struct Contact
+struct AContact
 {
@@ -43,3 +43,3 @@ public:
   QString getEmailByName(const QString &name);
-  QList<Contact>* getContactList();
+  QList<AContact>* getContactList();
 
@@ -52,3 +52,3 @@ private:
 private:
-  QList<Contact> addresses;
+  QList<AContact> addresses;
   QString filename;
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
@@ -39,3 +39,3 @@ void WriteMail::setAddressList(AddressList *list)
 {
-        Contact *cPtr;
+        AContact *cPtr;
         
@@ -44,3 +44,3 @@ void WriteMail::setAddressList(AddressList *list)
         addressView->clear();
-        QList<Contact> *cListPtr = addressList->getContactList();
+        QList<AContact> *cListPtr = addressList->getContactList();
         QListViewItem *item;
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
@@ -45,3 +45,3 @@ void AddressList::addContact(const QString &email, const QString &name)
   if ( ! containsEmail(email) ) {
-    Contact *in = new Contact;
+    AContact *in = new AContact;
     in->email = email;
@@ -67,3 +67,3 @@ QString AddressList::getNameByEmail(const QString &email)
   if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
     return ptr->name;
@@ -71,3 +71,3 @@ QString AddressList::getNameByEmail(const QString &email)
   
-  return NULL;
+  return QString::null;
 }
@@ -78,3 +78,3 @@ QString AddressList::getEmailByName(const QString &name)
   if (pos != -1) {
-    Contact *ptr = addresses.at(pos);
+    AContact *ptr = addresses.at(pos);
     return ptr->email;
@@ -82,3 +82,3 @@ QString AddressList::getEmailByName(const QString &name)
   
-  return NULL;
+  return QString::null;
 }
@@ -88,3 +88,3 @@ int AddressList::getEmailRef(const QString &email)
   int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
   
@@ -101,3 +101,3 @@ int AddressList::getNameRef(const QString &name)
   int pos = 0;
-  Contact *ptr;
+  AContact *ptr;
   
@@ -111,3 +111,3 @@ int AddressList::getNameRef(const QString &name)
 
-QList<Contact>* AddressList::getContactList()
+QList<AContact>* AddressList::getContactList()
 {
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
@@ -25,3 +25,3 @@
 
-struct Contact
+struct AContact
 {
@@ -43,3 +43,3 @@ public:
   QString getEmailByName(const QString &name);
-  QList<Contact>* getContactList();
+  QList<AContact>* getContactList();
 
@@ -52,3 +52,3 @@ private:
 private:
-  QList<Contact> addresses;
+  QList<AContact> addresses;
   QString filename;
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
@@ -39,3 +39,3 @@ void WriteMail::setAddressList(AddressList *list)
 {
-        Contact *cPtr;
+        AContact *cPtr;
         
@@ -44,3 +44,3 @@ void WriteMail::setAddressList(AddressList *list)
         addressView->clear();
-        QList<Contact> *cListPtr = addressList->getContactList();
+        QList<AContact> *cListPtr = addressList->getContactList();
         QListViewItem *item;