Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2012-03-20 18:14:23 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2012-11-11 16:38:01 (GMT) |
| commit | 40150b034eca3a5b73cb9530366840cc4386a72c (patch) | |
| tree | 6b4820681e2b7a650783f5fba9764a1fe541e0e4 | |
| parent | 6af3eb5576ae8475bcb1d545a563dcf059f9366f (diff) | |
| download | swift-contrib-40150b034eca3a5b73cb9530366840cc4386a72c.zip swift-contrib-40150b034eca3a5b73cb9530366840cc4386a72c.tar.bz2 | |
POBox -> poBox
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp | 4 | ||||
| -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 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp index ac4fca5..54080f1 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp @@ -188,7 +188,7 @@ void QtVCardWidget::setVCard(VCard::ref vcard) { addressField->setDeliveryType(address.deliveryType == VCard::InternationalDelivery ? QtVCardAddressField::InternationalDelivery : QtVCardAddressField::DomesticDelivery); addressField->setPreferred(address.isPreferred); - addressField->setPOBox(P2QSTRING(address.POBox)); + addressField->setPOBox(P2QSTRING(address.poBox)); addressField->setAddressExtension(P2QSTRING(address.addressExtension)); addressField->setStreet(P2QSTRING(address.street)); addressField->setLocality(P2QSTRING(address.locality)); @@ -337,7 +337,7 @@ VCard::ref QtVCardWidget::getVCard() { address.deliveryType = addressField->getDeliveryType() == QtVCardAddressField::InternationalDelivery ? VCard::InternationalDelivery : VCard::DomesticDelivery; address.isPreferred = addressField->getPreferred(); - address.POBox = Q2PSTRING(addressField->getPOBox()); + address.poBox = Q2PSTRING(addressField->getPOBox()); address.addressExtension = Q2PSTRING(addressField->getAddressExtension()); address.street = Q2PSTRING(addressField->getStreet()); address.locality = Q2PSTRING(addressField->getLocality()); 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)); |