2 files changed, 32 insertions, 19 deletions
diff --git a/Swiften/Entity/Entity.cpp b/Swiften/Entity/Entity.cpp
index da2ecaf..dea47b0 100644
--- a/Swiften/Entity/Entity.cpp
+++ b/Swiften/Entity/Entity.cpp
@@ -6,26 +6,45 @@
 
 #include "Swiften/Entity/Entity.h"
 
+#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
+#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
+
+
 namespace Swift {
 
+Entity::Entity() {
+	payloadParserFactories = new FullPayloadParserFactoryCollection();
+	payloadSerializers = new FullPayloadSerializerCollection();
+}
+
 Entity::~Entity() {
+	delete payloadSerializers;
+	delete payloadParserFactories;
 }
 
 
 void Entity::addPayloadParserFactory(PayloadParserFactory* payloadParserFactory) {
-	payloadParserFactories.addFactory(payloadParserFactory);
+	payloadParserFactories->addFactory(payloadParserFactory);
 }
 
 void Entity::removePayloadParserFactory(PayloadParserFactory* payloadParserFactory) {
-	payloadParserFactories.removeFactory(payloadParserFactory);
+	payloadParserFactories->removeFactory(payloadParserFactory);
 }
 
 void Entity::addPayloadSerializer(PayloadSerializer* payloadSerializer) {
-	payloadSerializers.addSerializer(payloadSerializer);
+	payloadSerializers->addSerializer(payloadSerializer);
 }
 
 void Entity::removePayloadSerializer(PayloadSerializer* payloadSerializer) {
-	payloadSerializers.removeSerializer(payloadSerializer);
+	payloadSerializers->removeSerializer(payloadSerializer);
+}
+
+PayloadParserFactoryCollection* Entity::getPayloadParserFactories() {
+	return payloadParserFactories;
+}
+
+PayloadSerializerCollection* Entity::getPayloadSerializers() {
+	return payloadSerializers;
 }
 
 }
diff --git a/Swiften/Entity/Entity.h b/Swiften/Entity/Entity.h
index 20d02ba..65480d0 100644
--- a/Swiften/Entity/Entity.h
+++ b/Swiften/Entity/Entity.h
@@ -6,21 +6,20 @@
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <boost/shared_ptr.hpp>
-
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
-#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
-
 namespace Swift {
 	class PayloadParserFactory;
 	class PayloadSerializer;
+	class FullPayloadParserFactoryCollection;
+	class FullPayloadSerializerCollection;
+	class PayloadParserFactoryCollection;
+	class PayloadSerializerCollection;
 
 	/** 
 	 * The base class for XMPP entities (Clients, Components).
 	 */
 	class Entity  {
 		public: 
+			Entity();
 			virtual ~Entity();
 
 			void addPayloadParserFactory(PayloadParserFactory* payloadParserFactory);
@@ -30,16 +29,11 @@ namespace Swift {
 			void removePayloadSerializer(PayloadSerializer* payloadSerializer);
 
 		protected:
-			PayloadParserFactoryCollection* getPayloadParserFactories() {
-				return &payloadParserFactories;
-			}
-
-			PayloadSerializerCollection* getPayloadSerializers() {
-				return &payloadSerializers;
-			}
+			PayloadParserFactoryCollection* getPayloadParserFactories();
+			PayloadSerializerCollection* getPayloadSerializers();
 
 		private:
-			FullPayloadParserFactoryCollection payloadParserFactories;
-			FullPayloadSerializerCollection payloadSerializers;
+			FullPayloadParserFactoryCollection* payloadParserFactories;
+			FullPayloadSerializerCollection* payloadSerializers;
 	};
 }