Mercurial > bellaciao

comparison dbus_types.cpp @ 6:48045176d1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ContactT and Ji improvments
author Goffi <goffi@goffi.org>
date Fri, 12 Aug 2011 22:08:37 +0200
parents 220e5619bf87
children 017925589d4c
comparison
equal deleted inserted replaced
5:0412dc960e3a 6:48045176d1c6
33 } 33 }
34 34
35 QDBusArgument &operator<<(QDBusArgument &argument, const ContactT &contact) 35 QDBusArgument &operator<<(QDBusArgument &argument, const ContactT &contact)
36 { 36 {
37 argument.beginStructure(); 37 argument.beginStructure();
38 argument << contact.jid << contact.attributes << contact.groups; 38 StringDict attr = contact.getAttributes();
39 argument << contact.jid << attr << contact.groups;
39 argument.endStructure(); 40 argument.endStructure();
40 return argument; 41 return argument;
41 } 42 }
42 const QDBusArgument &operator>>(const QDBusArgument &argument, ContactT &contact) 43 const QDBusArgument &operator>>(const QDBusArgument &argument, ContactT &contact)
43 { 44 {
44 argument.beginStructure(); 45 argument.beginStructure();
45 argument >> contact.jid >> contact.attributes >> contact.groups; 46 argument >> contact.jid;
47 StringDict attr;
48 argument >> attr;
49 contact.setAttributes(attr);
50 argument >> contact.groups;
46 argument.endStructure(); 51 argument.endStructure();
47 return argument; 52 return argument;
48 } 53 }
49 54
50 QDBusArgument &operator<<(QDBusArgument &argument, const MessageT &message) 55 QDBusArgument &operator<<(QDBusArgument &argument, const MessageT &message)