--- a/dbus_types.cpp	Fri Aug 12 22:08:37 2011 +0200
+++ b/dbus_types.cpp	Sun Aug 14 18:03:54 2011 +0200
@@ -32,22 +32,22 @@
     return argument;
 }
 
-QDBusArgument &operator<<(QDBusArgument &argument, const ContactT &contact)
+QDBusArgument &operator<<(QDBusArgument &argument, const Contact &contact)
 {
     argument.beginStructure();
     StringDict attr = contact.getAttributes();
-    argument << contact.jid << attr << contact.groups;
+    argument << contact.getJid() << attr << contact.getGroups();
     argument.endStructure();
     return argument;
 }
-const QDBusArgument &operator>>(const QDBusArgument &argument, ContactT &contact)
+const QDBusArgument &operator>>(const QDBusArgument &argument, Contact &contact)
 {
     argument.beginStructure();
-    argument >> contact.jid;
+    argument >> contact.getJid();
     StringDict attr;
     argument >> attr;
     contact.setAttributes(attr);
-    argument >> contact.groups;
+    argument >> contact.getGroups();
     argument.endStructure();
     return argument;
 }