Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-25 18:44:36 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-25 18:45:36 (GMT) |
| commit | f77eeb87104a4ea0fd8e43399da14dc5f1cd97c3 (patch) | |
| tree | 484a1755ccb69421de3ed9b7b9c731870f2de56a /Swiften/Serializer | |
| parent | bd80c3b9054d91b3cbc309400f4db195c708115d (diff) | |
| download | swift-contrib-f77eeb87104a4ea0fd8e43399da14dc5f1cd97c3.zip swift-contrib-f77eeb87104a4ea0fd8e43399da14dc5f1cd97c3.tar.bz2 | |
Remove the use of Shared<>.
Diffstat (limited to 'Swiften/Serializer')
| -rw-r--r-- | Swiften/Serializer/StanzaAckSerializer.h | 2 | ||||
| -rw-r--r-- | Swiften/Serializer/XML/XMLElement.h | 6 | ||||
| -rw-r--r-- | Swiften/Serializer/XML/XMLTextNode.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Swiften/Serializer/StanzaAckSerializer.h b/Swiften/Serializer/StanzaAckSerializer.h index eb957b9..d29fbde 100644 --- a/Swiften/Serializer/StanzaAckSerializer.h +++ b/Swiften/Serializer/StanzaAckSerializer.h @@ -20,7 +20,7 @@ namespace Swift { } virtual String serialize(boost::shared_ptr<Element> element) const { - StanzaAck::ref stanzaAck = StanzaAck::cast(element); + StanzaAck::ref stanzaAck(boost::dynamic_pointer_cast<StanzaAck>(element)); assert(stanzaAck->isValid()); XMLElement result("a", "urn:xmpp:sm:2"); result.setAttribute("h", String(boost::lexical_cast<std::string>(stanzaAck->getHandledStanzasCount()))); diff --git a/Swiften/Serializer/XML/XMLElement.h b/Swiften/Serializer/XML/XMLElement.h index 8447ab1..cac29f1 100644 --- a/Swiften/Serializer/XML/XMLElement.h +++ b/Swiften/Serializer/XML/XMLElement.h @@ -11,12 +11,14 @@ #include <map> #include "Swiften/Base/String.h" -#include "Swiften/Base/Shared.h" + #include "Swiften/Serializer/XML/XMLNode.h" namespace Swift { - class XMLElement : public XMLNode, public Shared<XMLElement> { + class XMLElement : public XMLNode { public: + typedef boost::shared_ptr<XMLElement> ref; + XMLElement(const String& tag, const String& xmlns = ""); void setAttribute(const String& attribute, const String& value); diff --git a/Swiften/Serializer/XML/XMLTextNode.h b/Swiften/Serializer/XML/XMLTextNode.h index e158916..dae4d58 100644 --- a/Swiften/Serializer/XML/XMLTextNode.h +++ b/Swiften/Serializer/XML/XMLTextNode.h @@ -7,10 +7,10 @@ #pragma once #include "Swiften/Serializer/XML/XMLNode.h" -#include "Swiften/Base/Shared.h" + namespace Swift { - class XMLTextNode : public XMLNode, public Shared<XMLTextNode> { + class XMLTextNode : public XMLNode { public: typedef boost::shared_ptr<XMLTextNode> ref; |