9 files changed, 17 insertions, 14 deletions
diff --git a/Swiften/Elements/Element.h b/Swiften/Elements/Element.h
index 638418d..14539c1 100644
--- a/Swiften/Elements/Element.h
+++ b/Swiften/Elements/Element.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -12,4 +12,6 @@ namespace Swift {
 	class SWIFTEN_API Element {
 		public:
+			Element() {}
+			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Element)
 			virtual ~Element();
 	};
diff --git a/Swiften/Elements/JinglePayload.h b/Swiften/Elements/JinglePayload.h
index 5f12e90..7d7160b 100644
--- a/Swiften/Elements/JinglePayload.h
+++ b/Swiften/Elements/JinglePayload.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2011 Remko Tronçon
+ * Copyright (c) 2011-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -12,4 +12,5 @@
 
 #include <string>
+#include <Swiften/Base/API.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/Payload.h>
@@ -43,5 +44,4 @@ namespace Swift {
 					Reason() : type(UnknownType), text("") {}
 					Reason(Type type, const std::string& text = "") : type(type), text(text) {}
-					~Reason() {}
 					Type type;
 					std::string text;
diff --git a/Swiften/Elements/Payload.h b/Swiften/Elements/Payload.h
index 15a72d5..1459837 100644
--- a/Swiften/Elements/Payload.h
+++ b/Swiften/Elements/Payload.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -16,5 +16,9 @@ namespace Swift {
 			typedef boost::shared_ptr<Payload> ref;
 		public:
+			Payload() {}
+			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Payload)
 			virtual ~Payload();
+
+			SWIFTEN_DEFAULT_COPY_ASSIGMNENT_OPERATOR(Payload)
 	};
 }
diff --git a/Swiften/Elements/Presence.h b/Swiften/Elements/Presence.h
index 2e9e224..d16be2a 100644
--- a/Swiften/Elements/Presence.h
+++ b/Swiften/Elements/Presence.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -13,4 +13,5 @@
 #include <Swiften/Elements/StatusShow.h>
 
+
 namespace Swift {
 	class SWIFTEN_API Presence : public Stanza {
@@ -22,4 +23,5 @@ namespace Swift {
 			Presence();
 			Presence(const std::string& status);
+			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Presence)
 			virtual ~Presence();
 
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h
index bd0d7e9..f1c9e00 100644
--- a/Swiften/Elements/Stanza.h
+++ b/Swiften/Elements/Stanza.h
@@ -26,4 +26,5 @@ namespace Swift {
 			Stanza();
 			virtual ~Stanza();
+			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Stanza)
 
 			template<typename T> 
diff --git a/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
index 091ee30..95015c9 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h
@@ -16,7 +16,4 @@ namespace Swift {
 		typedef boost::shared_ptr<WhiteboardDeleteOperation> ref;
 	public:
-		~WhiteboardDeleteOperation() {
-		}
-
 		std::string getElementID() const {
 			return elementID_;
diff --git a/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
index 8c20044..fd52405 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h
@@ -16,7 +16,4 @@ namespace Swift {
 		typedef boost::shared_ptr<WhiteboardInsertOperation> ref;
 	public:
-		~WhiteboardInsertOperation() {
-		}
-
 		WhiteboardElement::ref getElement() const {
 			return element_;
diff --git a/Swiften/Elements/Whiteboard/WhiteboardOperation.h b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
index 75f6e6a..497d551 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardOperation.h
@@ -7,4 +7,5 @@
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <string>
@@ -15,4 +16,6 @@ namespace Swift {
 		typedef boost::shared_ptr<WhiteboardOperation> ref;
 	public:
+		WhiteboardOperation() {}
+		SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(WhiteboardOperation)
 		virtual ~WhiteboardOperation(){}
 
diff --git a/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
index a52a341..a68cc7d 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h
@@ -16,7 +16,4 @@ namespace Swift {
 		typedef boost::shared_ptr<WhiteboardUpdateOperation> ref;
 	public:
-		~WhiteboardUpdateOperation() {
-		}
-
 		WhiteboardElement::ref getElement() const {
 			return element_;