Swiftdiff options
Diffstat (limited to 'Swiften')
7 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp index cd9b4d7..b5269d1 100644 --- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp +++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp @@ -60,2 +60,7 @@ #include <Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h> +#include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h> +#include <Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h> +#include <Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h> +#include <Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h> +#include <Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h> @@ -139,2 +144,8 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() { serializers_.push_back(new PubSubErrorSerializer()); + + serializers_.push_back(new ResultSetSerializer()); + serializers_.push_back(new ForwardedSerializer(this)); + serializers_.push_back(new MAMResultSerializer(this)); + serializers_.push_back(new MAMQuerySerializer()); + serializers_.push_back(new MAMArchivedSerializer()); diff --git a/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.cpp b/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.cpp index 04a6584..0a49a4b 100644 --- a/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.cpp @@ -15,3 +15,3 @@ using namespace Swift; -MAMArchivedSerializer::MAMArchivedSerializer(PayloadSerializerCollection* serializers) : serializers_(serializers) { +MAMArchivedSerializer::MAMArchivedSerializer() { } diff --git a/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h b/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h index 7c60798..67fffcb 100644 --- a/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h @@ -19,3 +19,3 @@ namespace Swift { public: - MAMArchivedSerializer(PayloadSerializerCollection* serializers); + MAMArchivedSerializer(); virtual ~MAMArchivedSerializer(); @@ -23,5 +23,2 @@ namespace Swift { virtual std::string serializePayload(boost::shared_ptr<MAMArchived>) const SWIFTEN_OVERRIDE; - - private: - PayloadSerializerCollection* serializers_; }; diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp index 1151fba..6a12f8e 100644 --- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp @@ -18,3 +18,3 @@ using namespace Swift; -MAMQuerySerializer::MAMQuerySerializer(PayloadSerializerCollection* serializers) : serializers_(serializers) { +MAMQuerySerializer::MAMQuerySerializer() { } diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h index a6d1339..11526a8 100644 --- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h +++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h @@ -19,3 +19,3 @@ namespace Swift { public: - MAMQuerySerializer(PayloadSerializerCollection* serializers); + MAMQuerySerializer(); virtual ~MAMQuerySerializer(); @@ -23,5 +23,2 @@ namespace Swift { virtual std::string serializePayload(boost::shared_ptr<MAMQuery>) const SWIFTEN_OVERRIDE; - - private: - PayloadSerializerCollection* serializers_; }; diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp index b174d32..2bd5c6a 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp @@ -24,3 +24,3 @@ class MAMArchivedSerializerTest : public CppUnit::TestFixture { void testSerialize() { - MAMArchivedSerializer serializer(&serializers); + MAMArchivedSerializer serializer; diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp index cc49be1..7f6cbd9 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp @@ -27,3 +27,3 @@ class MAMQuerySerializerTest : public CppUnit::TestFixture { void testSerialize() { - MAMQuerySerializer serializer(&serializers); + MAMQuerySerializer serializer; |