← Back to branch summary

~ubuntu-branches/ubuntu/quantal/psi/quantal

« back to all changes in this revision

Viewing changes to iris/xmpp-im/xmpp_vcard.h

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-04-14 18:57:30 UTC
  • mfrom: (2.1.9 hardy)
  • Revision ID: james.westby@ubuntu.com-20080414185730-528re3zp0m2hdlhi
Tags: 0.11-8
http://bugs.debian.org/476122
* added CONFIG -= link_prl to .pro files and removed dependencies
  which are made unnecessary by this change
* Fix segfault when closing last chat tab with qt4.4
  (This is from upstream svn, rev. 1101) (Closes: Bug#476122)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iris/xmpp-im/xmpp_vcard.h
23
23
 
24
24
#include <qstring.h>
25
25
#include <qstringlist.h>
26
 
#include <qcstring.h>
 
26
#include <q3cstring.h>
27
27
 
28
 
#include <qvaluelist.h>
 
28
#include <QList>
29
29
#include <qdom.h>
30
30
 
31
31
class QDate;
107
107
                        QString pcode;
108
108
                        QString country;
109
109
                };
110
 
                typedef QValueList<Address> AddressList;
 
110
                typedef QList<Address> AddressList;
111
111
                const AddressList &addressList() const;
112
112
                void setAddressList(const AddressList &);
113
113
 
127
127
 
128
128
                        QStringList lines;
129
129
                };
130
 
                typedef QValueList<Label> LabelList;
 
130
                typedef QList<Label> LabelList;
131
131
                const LabelList &labelList() const;
132
132
                void setLabelList(const LabelList &);
133
133
 
152
152
 
153
153
                        QString number;
154
154
                };
155
 
                typedef QValueList<Phone> PhoneList;
 
155
                typedef QList<Phone> PhoneList;
156
156
                const PhoneList &phoneList() const;
157
157
                void setPhoneList(const PhoneList &);
158
158
 
168
168
 
169
169
                        QString userid;
170
170
                };
171
 
                typedef QValueList<Email> EmailList;
 
171
                typedef QList<Email> EmailList;
172
172
                const EmailList &emailList() const;
173
173
                void setEmailList(const EmailList &);
174
174
 
281
281
        };
282
282
}
283
283
 
 
284
QString image2type(const QByteArray &ba);
 
285
 
284
286
#endif