Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2012-03-20 17:51:37 (GMT)
committerTobias Markmann <tm@ayena.de>2012-11-11 16:38:00 (GMT)
commit6af3eb5576ae8475bcb1d545a563dcf059f9366f (patch)
treec3a9fad97f496fbdefef41d850609fe9cbf877ec
parent684559ff499077e33d3d5e4b9ecb39afa240d067 (diff)
downloadswift-contrib-6af3eb5576ae8475bcb1d545a563dcf059f9366f.zip
swift-contrib-6af3eb5576ae8475bcb1d545a563dcf059f9366f.tar.bz2
Serializer cleanup. More make_shared usage.
Diffstat
-rw-r--r--Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp120
1 files changed, 44 insertions, 76 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
index 2676a02..6c6201b 100644
--- a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
@@ -18,61 +18,39 @@
namespace Swift {
-boost::shared_ptr<XMLElement> createTextElement(const std::string& elementName, const std::string& text) {
- boost::shared_ptr<XMLElement> element = boost::make_shared<XMLElement>(elementName);
- element->addNode(boost::make_shared<XMLTextNode>(text));
- return element;
-}
-
VCardSerializer::VCardSerializer() : GenericPayloadSerializer<VCard>() {
}
std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard) const {
XMLElement queryElement("vCard", "vcard-temp");
if (!vcard->getVersion().empty()) {
- boost::shared_ptr<XMLElement> versionElement(new XMLElement("VERSION"));
- versionElement->addNode(boost::make_shared<XMLTextNode>(vcard->getVersion()));
- queryElement.addNode(versionElement);
+ queryElement.addNode(boost::make_shared<XMLElement>("VERSION", "", vcard->getVersion()));
}
if (!vcard->getFullName().empty()) {
- boost::shared_ptr<XMLElement> fullNameElement(new XMLElement("FN"));
- fullNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getFullName()));
- queryElement.addNode(fullNameElement);
+ queryElement.addNode(boost::make_shared<XMLElement>("FN", "", vcard->getFullName()));
}
if (!vcard->getGivenName().empty() || !vcard->getFamilyName().empty() || !vcard->getMiddleName().empty() || !vcard->getPrefix().empty() || !vcard->getSuffix().empty()) {
boost::shared_ptr<XMLElement> nameElement(new XMLElement("N"));
if (!vcard->getFamilyName().empty()) {
- boost::shared_ptr<XMLElement> familyNameElement(new XMLElement("FAMILY"));
- familyNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getFamilyName()));
- nameElement->addNode(familyNameElement);
+ nameElement->addNode(boost::make_shared<XMLElement>("FAMILY", "", vcard->getFamilyName()));
}
if (!vcard->getGivenName().empty()) {
- boost::shared_ptr<XMLElement> givenNameElement(new XMLElement("GIVEN"));
- givenNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getGivenName()));
- nameElement->addNode(givenNameElement);
+ nameElement->addNode(boost::make_shared<XMLElement>("GIVEN", "", vcard->getGivenName()));
}
if (!vcard->getMiddleName().empty()) {
- boost::shared_ptr<XMLElement> middleNameElement(new XMLElement("MIDDLE"));
- middleNameElement->addNode(boost::make_shared<XMLTextNode>(vcard->getMiddleName()));
- nameElement->addNode(middleNameElement);
+ nameElement->addNode(boost::make_shared<XMLElement>("MIDDLE", "", vcard->getMiddleName()));
}
if (!vcard->getPrefix().empty()) {
- boost::shared_ptr<XMLElement> prefixElement(new XMLElement("PREFIX"));
- prefixElement->addNode(boost::make_shared<XMLTextNode>(vcard->getPrefix()));
- nameElement->addNode(prefixElement);
+ nameElement->addNode(boost::make_shared<XMLElement>("PREFIX", "", vcard->getPrefix()));
}
if (!vcard->getSuffix().empty()) {
- boost::shared_ptr<XMLElement> suffixElement(new XMLElement("SUFFIX"));
- suffixElement->addNode(boost::make_shared<XMLTextNode>(vcard->getSuffix()));
- nameElement->addNode(suffixElement);
+ nameElement->addNode(boost::make_shared<XMLElement>("SUFFIX", "", vcard->getSuffix()));
}
queryElement.addNode(nameElement);
}
foreach(const VCard::EMailAddress& emailAddress, vcard->getEMailAddresses()) {
boost::shared_ptr<XMLElement> emailElement(new XMLElement("EMAIL"));
- boost::shared_ptr<XMLElement> userIDElement(new XMLElement("USERID"));
- userIDElement->addNode(boost::make_shared<XMLTextNode>(emailAddress.address));
- emailElement->addNode(userIDElement);
+ emailElement->addNode(boost::make_shared<XMLElement>("USERID", "", emailAddress.address));
if (emailAddress.isHome) {
emailElement->addNode(boost::make_shared<XMLElement>("HOME"));
}
@@ -91,99 +69,89 @@ std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard) c
queryElement.addNode(emailElement);
}
if (!vcard->getNickname().empty()) {
- boost::shared_ptr<XMLElement> nickElement(new XMLElement("NICKNAME"));
- nickElement->addNode(boost::make_shared<XMLTextNode>(vcard->getNickname()));
- queryElement.addNode(nickElement);
+ queryElement.addNode(boost::make_shared<XMLElement>("NICKNAME", "", vcard->getNickname()));
}
if (!vcard->getPhoto().empty() || !vcard->getPhotoType().empty()) {
XMLElement::ref photoElement(new XMLElement("PHOTO"));
if (!vcard->getPhotoType().empty()) {
- XMLElement::ref typeElement(new XMLElement("TYPE"));
- typeElement->addNode(XMLTextNode::ref(new XMLTextNode(vcard->getPhotoType())));
- photoElement->addNode(typeElement);
+ photoElement->addNode(boost::make_shared<XMLElement>("TYPE", "", vcard->getPhotoType()));
}
if (!vcard->getPhoto().empty()) {
- XMLElement::ref binvalElement(new XMLElement("BINVAL"));
- binvalElement->addNode(XMLTextNode::ref(new XMLTextNode(Base64::encode(vcard->getPhoto()))));
- photoElement->addNode(binvalElement);
+ photoElement->addNode(boost::make_shared<XMLElement>("BINVAL", "", Base64::encode(vcard->getPhoto())));
}
queryElement.addNode(photoElement);
}
if (!vcard->getBirthday().is_not_a_date_time()) {
- XMLElement::ref bdayElement(new XMLElement("BDAY"));
- bdayElement->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(dateTimeToString(vcard->getBirthday()))));
- queryElement.addNode(bdayElement);
+ queryElement.addNode(boost::make_shared<XMLElement>("BDAY", "", dateTimeToString(vcard->getBirthday())));
}
foreach(const VCard::Telephone& telephone, vcard->getTelephones()) {
boost::shared_ptr<XMLElement> telElement(new XMLElement("TEL"));
- boost::shared_ptr<XMLElement> numberElement(new XMLElement("NUMBER"));
- numberElement->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(telephone.number)));
- telElement->addNode(numberElement);
+ telElement->addNode(boost::make_shared<XMLElement>("NUMBER", "", telephone.number));
if (telephone.isHome) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("HOME")));
+ telElement->addNode(boost::make_shared<XMLElement>("HOME"));
}
if (telephone.isWork) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("WORK")));
+ telElement->addNode(boost::make_shared<XMLElement>("WORK"));
}
if (telephone.isVoice) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("VOICE")));
+ telElement->addNode(boost::make_shared<XMLElement>("VOICE"));
}
if (telephone.isFax) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("FAX")));
+ telElement->addNode(boost::make_shared<XMLElement>("FAX"));
}
if (telephone.isPager) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("PAGER")));
+ telElement->addNode(boost::make_shared<XMLElement>("PAGER"));
}
if (telephone.isMSG) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("MSG")));
+ telElement->addNode(boost::make_shared<XMLElement>("MSG"));
}
if (telephone.isCell) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("CELL")));
+ telElement->addNode(boost::make_shared<XMLElement>("CELL"));
}
if (telephone.isVideo) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("VIDEO")));
+ telElement->addNode(boost::make_shared<XMLElement>("VIDEO"));
}
if (telephone.isBBS) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("BBS")));
+ telElement->addNode(boost::make_shared<XMLElement>("BBS"));
}
if (telephone.isModem) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("MODEM")));
+ telElement->addNode(boost::make_shared<XMLElement>("MODEM"));
}
if (telephone.isISDN) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("ISDN")));
+ telElement->addNode(boost::make_shared<XMLElement>("ISDN"));
}
if (telephone.isPCS) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("PCS")));
+ telElement->addNode(boost::make_shared<XMLElement>("PCS"));
}
if (telephone.isPreferred) {
- telElement->addNode(boost::shared_ptr<XMLElement>(new XMLElement("PREF")));
+ telElement->addNode(boost::make_shared<XMLElement>("PREF"));
}
queryElement.addNode(telElement);
}
foreach(const VCard::Address& address, vcard->getAddresses()) {
- boost::shared_ptr<XMLElement> adrElement(new XMLElement("ADR"));
+ boost::shared_ptr<XMLElement> adrElement = boost::make_shared<XMLElement>("ADR");
if (!address.POBox.empty()) {
- adrElement->addNode(createTextElement("POBOX", address.POBox));
+ adrElement->addNode(boost::make_shared<XMLElement>("POBOX", "", address.POBox));
}
if (!address.addressExtension.empty()) {
- adrElement->addNode(createTextElement("EXTADD", address.addressExtension));
+ adrElement->addNode(boost::make_shared<XMLElement>("EXTADD", "", address.addressExtension));
}
if (!address.street.empty()) {
- adrElement->addNode(createTextElement("STREET", address.street));
+ adrElement->addNode(boost::make_shared<XMLElement>("STREET", "", address.street));
}
if (!address.locality.empty()) {
- adrElement->addNode(createTextElement("LOCALITY", address.locality));
+ adrElement->addNode(boost::make_shared<XMLElement>("LOCALITY", "", address.locality));
}
if (!address.region.empty()) {
- adrElement->addNode(createTextElement("REGION", address.region));
+ adrElement->addNode(boost::make_shared<XMLElement>("REGION", "", address.region));
}
if (!address.postalCode.empty()) {
- adrElement->addNode(createTextElement("PCODE", address.postalCode));
+ adrElement->addNode(boost::make_shared<XMLElement>("PCODE", "", address.postalCode));
}
if (!address.country.empty()) {
- adrElement->addNode(createTextElement("CTRY", address.country));
+ adrElement->addNode(boost::make_shared<XMLElement>("CTRY", "", address.country));
}
if (address.isHome) {
@@ -211,10 +179,10 @@ std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard) c
}
foreach(const VCard::AddressLabel& addressLabel, vcard->getAddressLabels()) {
- boost::shared_ptr<XMLElement> labelElement(new XMLElement("LABEL"));
+ boost::shared_ptr<XMLElement> labelElement = boost::make_shared<XMLElement>("LABEL");
foreach(const std::string& line, addressLabel.lines) {
- labelElement->addNode(createTextElement("LINE", line));
+ labelElement->addNode(boost::make_shared<XMLElement>("LINE", "", line));
}
if (addressLabel.isHome) {
@@ -242,36 +210,36 @@ std::string VCardSerializer::serializePayload(boost::shared_ptr<VCard> vcard) c
}
foreach(const JID& jid, vcard->getJIDs()) {
- queryElement.addNode(createTextElement("JID", jid.toString()));
+ queryElement.addNode(boost::make_shared<XMLElement>("JID", "", jid.toString()));
}
if (!vcard->getDescription().empty()) {
- queryElement.addNode(createTextElement("DESC", vcard->getDescription()));
+ queryElement.addNode(boost::make_shared<XMLElement>("DESC", "", vcard->getDescription()));
}
foreach(const VCard::Organization& org, vcard->getOrganizations()) {
- boost::shared_ptr<XMLElement> orgElement(new XMLElement("ORG"));
+ boost::shared_ptr<XMLElement> orgElement = boost::make_shared<XMLElement>("ORG");
if (!org.name.empty()) {
- orgElement->addNode(createTextElement("ORGNAME", org.name));
+ orgElement->addNode(boost::make_shared<XMLElement>("ORGNAME", "", org.name));
}
if (!org.units.empty()) {
foreach(const std::string& unit, org.units) {
- orgElement->addNode(createTextElement("ORGUNIT", unit));
+ orgElement->addNode(boost::make_shared<XMLElement>("ORGUNIT", "", unit));
}
}
queryElement.addNode(orgElement);
}
foreach(const std::string& title, vcard->getTitles()) {
- queryElement.addNode(createTextElement("TITLE", title));
+ queryElement.addNode(boost::make_shared<XMLElement>("TITLE", "", title));
}
foreach(const std::string& role, vcard->getRoles()) {
- queryElement.addNode(createTextElement("ROLE", role));
+ queryElement.addNode(boost::make_shared<XMLElement>("ROLE", "", role));
}
foreach(const std::string& url, vcard->getURLs()) {
- queryElement.addNode(createTextElement("URL", url));
+ queryElement.addNode(boost::make_shared<XMLElement>("URL", "", url));
}
if (!vcard->getUnknownContent().empty()) {