diff options
author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp | |
parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp')
-rw-r--r-- | Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp index 8bdefc1..8750c2e 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/MAMQueryParserTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -41,22 +41,22 @@ class MAMQueryParserTest : public CppUnit::TestFixture "</query>")); - boost::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); + std::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getQueryID()); CPPUNIT_ASSERT_EQUAL(std::string("id0"), *payload->getQueryID()); CPPUNIT_ASSERT_EQUAL(std::string("node1"), *payload->getNode()); CPPUNIT_ASSERT(payload->getForm()); - boost::shared_ptr<FormField> fieldType = payload->getForm()->getField("FORM_TYPE"); + std::shared_ptr<FormField> fieldType = payload->getForm()->getField("FORM_TYPE"); CPPUNIT_ASSERT(fieldType); CPPUNIT_ASSERT_EQUAL(std::string("urn:xmpp:mam:0"), fieldType->getTextSingleValue()); - boost::shared_ptr<FormField> fieldStart = payload->getForm()->getField("start"); + std::shared_ptr<FormField> fieldStart = payload->getForm()->getField("start"); CPPUNIT_ASSERT(fieldStart); CPPUNIT_ASSERT_EQUAL(std::string("2010-08-07T00:00:00Z"), fieldStart->getTextSingleValue()); CPPUNIT_ASSERT(payload->getResultSet()); - boost::shared_ptr<ResultSet> resultSet = payload->getResultSet(); + std::shared_ptr<ResultSet> resultSet = payload->getResultSet(); CPPUNIT_ASSERT(resultSet->getMaxItems()); CPPUNIT_ASSERT_EQUAL(*resultSet->getMaxItems(), 10); } @@ -75,7 +75,7 @@ class MAMQueryParserTest : public CppUnit::TestFixture "</x>" "</query>")); - boost::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); + std::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); CPPUNIT_ASSERT(!!payload && !!payload->getForm() && !!payload->getForm()->getField("FORM_TYPE") && !!payload->getForm()->getField("with")); CPPUNIT_ASSERT_EQUAL(std::string("urn:xmpp:mam:0"), payload->getForm()->getField("FORM_TYPE")->getTextSingleValue()); CPPUNIT_ASSERT_EQUAL(std::string("juliet@capulet.lit"), payload->getForm()->getField("with")->getTextSingleValue()); @@ -97,7 +97,7 @@ class MAMQueryParserTest : public CppUnit::TestFixture "</field>" "</x>" "</query>")); - boost::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); + std::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); CPPUNIT_ASSERT(!!payload && !!payload->getForm() && !!payload->getForm()->getField("FORM_TYPE") && !!payload->getForm()->getField("start") && !!payload->getForm()->getField("start")); CPPUNIT_ASSERT_EQUAL(std::string("urn:xmpp:mam:0"), payload->getForm()->getField("FORM_TYPE")->getTextSingleValue()); CPPUNIT_ASSERT_EQUAL(std::string("2010-06-07T00:00:00Z"), payload->getForm()->getField("start")->getTextSingleValue()); @@ -110,7 +110,7 @@ class MAMQueryParserTest : public CppUnit::TestFixture "<query queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">" "</query>")); - boost::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); + std::shared_ptr<MAMQuery> payload = parser.getPayload<MAMQuery>(); CPPUNIT_ASSERT(!!payload); CPPUNIT_ASSERT(payload->getQueryID()); CPPUNIT_ASSERT_EQUAL(std::string("id0"), *payload->getQueryID()); |