diff options
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp index 07dd8de..befd76d 100644 --- a/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp @@ -1,63 +1,61 @@ /* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. + * Copyright (c) 2010-2016 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. */ #include <Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h> -#include <boost/shared_ptr.hpp> -#include <boost/smart_ptr/make_shared.hpp> +#include <memory> -#include <Swiften/Base/foreach.h> +#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h> #include <Swiften/Serializer/XML/XMLElement.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> -#include <Swiften/Serializer/PayloadSerializers/FormSerializer.h> namespace Swift { SearchPayloadSerializer::SearchPayloadSerializer() { } -std::string SearchPayloadSerializer::serializePayload(boost::shared_ptr<SearchPayload> searchPayload) const { - XMLElement searchElement("query", "jabber:iq:search"); +std::string SearchPayloadSerializer::serializePayload(std::shared_ptr<SearchPayload> searchPayload) const { + XMLElement searchElement("query", "jabber:iq:search"); - if (searchPayload->getInstructions()) { - searchElement.addNode(XMLElement::ref(new XMLElement("instructions", "", *searchPayload->getInstructions()))); - } + if (searchPayload->getInstructions()) { + searchElement.addNode(XMLElement::ref(new XMLElement("instructions", "", *searchPayload->getInstructions()))); + } - if (searchPayload->getNick()) { - searchElement.addNode(XMLElement::ref(new XMLElement("nick", "", *searchPayload->getNick()))); - } + if (searchPayload->getNick()) { + searchElement.addNode(XMLElement::ref(new XMLElement("nick", "", *searchPayload->getNick()))); + } - if (searchPayload->getFirst()) { - searchElement.addNode(XMLElement::ref(new XMLElement("first", "", *searchPayload->getFirst()))); - } + if (searchPayload->getFirst()) { + searchElement.addNode(XMLElement::ref(new XMLElement("first", "", *searchPayload->getFirst()))); + } - if (searchPayload->getLast()) { - searchElement.addNode(XMLElement::ref(new XMLElement("last", "", *searchPayload->getLast()))); - } + if (searchPayload->getLast()) { + searchElement.addNode(XMLElement::ref(new XMLElement("last", "", *searchPayload->getLast()))); + } - if (searchPayload->getEMail()) { - searchElement.addNode(XMLElement::ref(new XMLElement("email", "", *searchPayload->getEMail()))); - } + if (searchPayload->getEMail()) { + searchElement.addNode(XMLElement::ref(new XMLElement("email", "", *searchPayload->getEMail()))); + } - foreach(const SearchPayload::Item& item, searchPayload->getItems()) { - XMLElement::ref itemElement(new XMLElement("item")); - itemElement->setAttribute("jid", item.jid); - itemElement->addNode(XMLElement::ref(new XMLElement("first", "", item.first))); - itemElement->addNode(XMLElement::ref(new XMLElement("last", "", item.last))); - itemElement->addNode(XMLElement::ref(new XMLElement("nick", "", item.nick))); - itemElement->addNode(XMLElement::ref(new XMLElement("email", "", item.email))); + for (const auto& item : searchPayload->getItems()) { + XMLElement::ref itemElement(new XMLElement("item")); + itemElement->setAttribute("jid", item.jid); + itemElement->addNode(XMLElement::ref(new XMLElement("first", "", item.first))); + itemElement->addNode(XMLElement::ref(new XMLElement("last", "", item.last))); + itemElement->addNode(XMLElement::ref(new XMLElement("nick", "", item.nick))); + itemElement->addNode(XMLElement::ref(new XMLElement("email", "", item.email))); - searchElement.addNode(itemElement); - } + searchElement.addNode(itemElement); + } - if (Form::ref form = searchPayload->getForm()) { - searchElement.addNode(boost::make_shared<XMLRawTextNode>(FormSerializer().serialize(form))); - } + if (Form::ref form = searchPayload->getForm()) { + searchElement.addNode(std::make_shared<XMLRawTextNode>(FormSerializer().serialize(form))); + } - return searchElement.serialize(); + return searchElement.serialize(); } } |