@@ -80,11 +80,29 @@ class Address {
80
80
public:
81
81
Address () = default ;
82
82
Address (const QDomElement &element);
83
- Address (const XMPP::VCard::Address &legacyAddress) :
84
- pobox ({ legacyAddress.pobox }), extaddr({ legacyAddress.extaddr }), street({ legacyAddress.street }),
85
- locality ({ legacyAddress.locality }), region({ legacyAddress.region }), code({ legacyAddress.pcode }),
86
- country ({ legacyAddress.country })
83
+ Address (const XMPP::VCard::Address &legacyAddress)
87
84
{
85
+ if (!legacyAddress.pobox .isEmpty ()) {
86
+ pobox.append (legacyAddress.pobox );
87
+ }
88
+ if (!legacyAddress.extaddr .isEmpty ()) {
89
+ extaddr.append (legacyAddress.extaddr );
90
+ }
91
+ if (!legacyAddress.street .isEmpty ()) {
92
+ street.append (legacyAddress.street );
93
+ }
94
+ if (!legacyAddress.locality .isEmpty ()) {
95
+ locality.append (legacyAddress.locality );
96
+ }
97
+ if (!legacyAddress.region .isEmpty ()) {
98
+ region.append (legacyAddress.region );
99
+ }
100
+ if (!legacyAddress.pcode .isEmpty ()) {
101
+ code.append (legacyAddress.pcode );
102
+ }
103
+ if (!legacyAddress.country .isEmpty ()) {
104
+ country.append (legacyAddress.country );
105
+ }
88
106
}
89
107
QDomElement toXmlElement (QDomDocument &document) const ;
90
108
bool isEmpty () const noexcept ;
0 commit comments