Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Elements/VCard.h | 2 | ||||
| -rw-r--r-- | Swiften/Parser/PayloadParsers/VCardParser.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Elements/VCard.h b/Swiften/Elements/VCard.h index 41f2623..84b6cfe 100644 --- a/Swiften/Elements/VCard.h +++ b/Swiften/Elements/VCard.h @@ -69,7 +69,7 @@ namespace Swift { DeliveryType deliveryType; bool isPreferred; - std::string POBox; + std::string poBox; std::string addressExtension; std::string street; std::string locality; diff --git a/Swiften/Parser/PayloadParsers/VCardParser.cpp b/Swiften/Parser/PayloadParsers/VCardParser.cpp index 9640787..620a307 100644 --- a/Swiften/Parser/PayloadParsers/VCardParser.cpp +++ b/Swiften/Parser/PayloadParsers/VCardParser.cpp @@ -176,7 +176,7 @@ void VCardParser::handleEndElement(const std::string& element, const std::string currentAddress_.isPreferred = true; } else if (elementHierarchy == "/vCard/ADR/POBOX") { - currentAddress_.POBox = currentText_; + currentAddress_.poBox = currentText_; } else if (elementHierarchy == "/vCard/ADR/EXTADD") { currentAddress_.addressExtension = currentText_; @@ -197,7 +197,7 @@ void VCardParser::handleEndElement(const std::string& element, const std::string currentAddress_.country = currentText_; } else if (elementHierarchy == "/vCard/ADR") { - if (!currentAddress_.POBox.empty() || !currentAddress_.addressExtension.empty() || + if (!currentAddress_.poBox.empty() || !currentAddress_.addressExtension.empty() || !currentAddress_.street.empty() || !currentAddress_.locality.empty() || !currentAddress_.region.empty() || !currentAddress_.region.empty() || !currentAddress_.postalCode.empty() || !currentAddress_.country.empty()) { diff --git a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp index 6c6201b..22d59b4 100644 --- a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp @@ -132,8 +132,8 @@ std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard) c foreach(const VCard::Address& address, vcard->getAddresses()) { boost::shared_ptr<XMLElement> adrElement = boost::make_shared<XMLElement>("ADR"); - if (!address.POBox.empty()) { - adrElement->addNode(boost::make_shared<XMLElement>("POBOX", "", address.POBox)); + if (!address.poBox.empty()) { + adrElement->addNode(boost::make_shared<XMLElement>("POBOX", "", address.poBox)); } if (!address.addressExtension.empty()) { adrElement->addNode(boost::make_shared<XMLElement>("EXTADD", "", address.addressExtension)); |