From 40150b034eca3a5b73cb9530366840cc4386a72c Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 20 Mar 2012 19:14:23 +0100
Subject: POBox -> poBox


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));
-- 
cgit v0.10.2-6-g49f6