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/Serializer/PayloadSerializers/WhiteboardSerializer.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/Serializer/PayloadSerializers/WhiteboardSerializer.cpp')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp index 27d3f57..5aebca3 100644 --- a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp @@ -13,9 +13,9 @@ #include <Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h> #include <iostream> +#include <memory> #include <boost/lexical_cast.hpp> -#include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h> #include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h> @@ -24,7 +24,7 @@ namespace Swift { void WhiteboardElementSerializingVisitor::visit(WhiteboardLineElement& line) { - element = boost::make_shared<XMLElement>("line"); + element = std::make_shared<XMLElement>("line"); try { element->setAttribute("x1", boost::lexical_cast<std::string>(line.x1())); element->setAttribute("y1", boost::lexical_cast<std::string>(line.y1())); @@ -39,7 +39,7 @@ namespace Swift { } void WhiteboardElementSerializingVisitor::visit(WhiteboardFreehandPathElement& path) { - element = boost::make_shared<XMLElement>("path"); + element = std::make_shared<XMLElement>("path"); element->setAttribute("id", path.getID()); element->setAttribute("stroke", path.getColor().toHex()); try { @@ -59,7 +59,7 @@ namespace Swift { } void WhiteboardElementSerializingVisitor::visit(WhiteboardRectElement& rect) { - element = boost::make_shared<XMLElement>("rect"); + element = std::make_shared<XMLElement>("rect"); try { element->setAttribute("x", boost::lexical_cast<std::string>(rect.getX())); element->setAttribute("y", boost::lexical_cast<std::string>(rect.getY())); @@ -76,7 +76,7 @@ namespace Swift { } void WhiteboardElementSerializingVisitor::visit(WhiteboardPolygonElement& polygon) { - element = boost::make_shared<XMLElement>("polygon"); + element = std::make_shared<XMLElement>("polygon"); try { element->setAttribute("id", polygon.getID()); element->setAttribute("stroke", polygon.getPenColor().toHex()); @@ -95,7 +95,7 @@ namespace Swift { } void WhiteboardElementSerializingVisitor::visit(WhiteboardTextElement& text) { - element = boost::make_shared<XMLElement>("text"); + element = std::make_shared<XMLElement>("text"); try { element->setAttribute("x", boost::lexical_cast<std::string>(text.getX())); element->setAttribute("y", boost::lexical_cast<std::string>(text.getY())); @@ -103,13 +103,13 @@ namespace Swift { element->setAttribute("id", text.getID()); element->setAttribute("fill", text.getColor().toHex()); element->setAttribute("opacity", alphaToOpacity(text.getColor().getAlpha())); - element->addNode(boost::make_shared<XMLTextNode>(text.getText())); + element->addNode(std::make_shared<XMLTextNode>(text.getText())); } catch (boost::bad_lexical_cast&) { } } void WhiteboardElementSerializingVisitor::visit(WhiteboardEllipseElement& ellipse) { - element = boost::make_shared<XMLElement>("ellipse"); + element = std::make_shared<XMLElement>("ellipse"); try { element->setAttribute("cx", boost::lexical_cast<std::string>(ellipse.getCX())); element->setAttribute("cy", boost::lexical_cast<std::string>(ellipse.getCY())); @@ -138,13 +138,13 @@ namespace Swift { } } - std::string WhiteboardSerializer::serializePayload(boost::shared_ptr<WhiteboardPayload> payload) const { + std::string WhiteboardSerializer::serializePayload(std::shared_ptr<WhiteboardPayload> payload) const { XMLElement element("wb", "http://swift.im/whiteboard"); if (payload->getType() == WhiteboardPayload::Data) { - XMLElement::ref operationNode = boost::make_shared<XMLElement>("operation"); + XMLElement::ref operationNode = std::make_shared<XMLElement>("operation"); WhiteboardElementSerializingVisitor visitor; // payload->getElement()->accept(visitor); - WhiteboardInsertOperation::ref insertOp = boost::dynamic_pointer_cast<WhiteboardInsertOperation>(payload->getOperation()); + WhiteboardInsertOperation::ref insertOp = std::dynamic_pointer_cast<WhiteboardInsertOperation>(payload->getOperation()); if (insertOp) { try { operationNode->setAttribute("type", "insert"); @@ -156,7 +156,7 @@ namespace Swift { insertOp->getElement()->accept(visitor); operationNode->addNode(visitor.getResult()); } - WhiteboardUpdateOperation::ref updateOp = boost::dynamic_pointer_cast<WhiteboardUpdateOperation>(payload->getOperation()); + WhiteboardUpdateOperation::ref updateOp = std::dynamic_pointer_cast<WhiteboardUpdateOperation>(payload->getOperation()); if (updateOp) { try { operationNode->setAttribute("type", "update"); @@ -171,7 +171,7 @@ namespace Swift { } - WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(payload->getOperation()); + WhiteboardDeleteOperation::ref deleteOp = std::dynamic_pointer_cast<WhiteboardDeleteOperation>(payload->getOperation()); if (deleteOp) { try { operationNode->setAttribute("type", "delete"); |