Create ToplevelElement to replace Element.

Change-Id: I3460f6f4a2ffa9b795080664f49d9138440de72d
author: Richard Maudsley <richard.maudsley@isode.com> 2014-04-28 08:36:39 (GMT)
committer: Richard Maudsley <richard.maudsley@isode.com> 2014-04-28 15:23:59 (GMT)
commit: be642f17bfa2df7cb88ddb5fb4aa37438d9e2110 (patch)
tree: c11e239dfcfcab2b38b64e6a19ffb48e8c30c44d /Swiften/Elements
parent: 64511948b075e650cacfcc78e40371abee1d2716 (diff)
download: swift-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.zip
swift-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.tar.bz2
26 files changed, 78 insertions, 77 deletions
diff --git a/Swiften/Elements/AuthChallenge.h b/Swiften/Elements/AuthChallenge.h
index f7f2796..6332d69 100644
--- a/Swiften/Elements/AuthChallenge.h
+++ b/Swiften/Elements/AuthChallenge.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,10 +9,10 @@
 #include <boost/optional.hpp>
 #include <vector>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class AuthChallenge : public Element {
+	class AuthChallenge : public ToplevelElement {
 		public:
 			AuthChallenge() {
 			}
diff --git a/Swiften/Elements/AuthFailure.h b/Swiften/Elements/AuthFailure.h
index ac40956..5088dcf 100644
--- a/Swiften/Elements/AuthFailure.h
+++ b/Swiften/Elements/AuthFailure.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -8,10 +8,10 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class AuthFailure : public Element {
+	class AuthFailure : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<AuthFailure> ref;
 
diff --git a/Swiften/Elements/AuthRequest.h b/Swiften/Elements/AuthRequest.h
index bfc86c2..bc88b9b 100644
--- a/Swiften/Elements/AuthRequest.h
+++ b/Swiften/Elements/AuthRequest.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -10,11 +10,11 @@
 #include <string>
 #include <boost/optional.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
-	class AuthRequest : public Element {
+	class AuthRequest : public ToplevelElement {
 		public:
 			AuthRequest(const std::string& mechanism = "") : mechanism_(mechanism) {
 			}
diff --git a/Swiften/Elements/AuthResponse.h b/Swiften/Elements/AuthResponse.h
index db2dcea..f8a075c 100644
--- a/Swiften/Elements/AuthResponse.h
+++ b/Swiften/Elements/AuthResponse.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,11 +9,11 @@
 #include <vector>
 #include <boost/optional.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
-	class AuthResponse : public Element {
+	class AuthResponse : public ToplevelElement {
 		public:
 			AuthResponse() {
 			}
diff --git a/Swiften/Elements/AuthSuccess.h b/Swiften/Elements/AuthSuccess.h
index 3c0f329..8e4591c 100644
--- a/Swiften/Elements/AuthSuccess.h
+++ b/Swiften/Elements/AuthSuccess.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,10 +9,10 @@
 #include <vector>
 #include <boost/optional.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class AuthSuccess : public Element {
+	class AuthSuccess : public ToplevelElement {
 		public:
 			AuthSuccess() {}
 
diff --git a/Swiften/Elements/ComponentHandshake.h b/Swiften/Elements/ComponentHandshake.h
index 5992b8c..b2f9b21 100644
--- a/Swiften/Elements/ComponentHandshake.h
+++ b/Swiften/Elements/ComponentHandshake.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,10 +9,10 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class ComponentHandshake : public Element {
+	class ComponentHandshake : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<ComponentHandshake> ref;
 
diff --git a/Swiften/Elements/CompressFailure.h b/Swiften/Elements/CompressFailure.h
index 7dd8867..75e1d1d 100644
--- a/Swiften/Elements/CompressFailure.h
+++ b/Swiften/Elements/CompressFailure.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -7,10 +7,10 @@
 #pragma once
 
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class CompressFailure : public Element {
+	class CompressFailure : public ToplevelElement {
 		public:
 			CompressFailure() {}
 	};
diff --git a/Swiften/Elements/CompressRequest.h b/Swiften/Elements/CompressRequest.h
index b6fcc64..9e2e267 100644
--- a/Swiften/Elements/CompressRequest.h
+++ b/Swiften/Elements/CompressRequest.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class CompressRequest : public Element
+	class CompressRequest : public ToplevelElement
 	{
 		public:
 			CompressRequest(const std::string& method = "") : method_(method) {}
diff --git a/Swiften/Elements/Compressed.h b/Swiften/Elements/Compressed.h
index 2affec5..f593412 100644
--- a/Swiften/Elements/Compressed.h
+++ b/Swiften/Elements/Compressed.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class Compressed : public Element {
+	class Compressed : public ToplevelElement {
 		public:
 			Compressed() {}
 	};
diff --git a/Swiften/Elements/EnableStreamManagement.h b/Swiften/Elements/EnableStreamManagement.h
index 15a091e..732b225 100644
--- a/Swiften/Elements/EnableStreamManagement.h
+++ b/Swiften/Elements/EnableStreamManagement.h
@@ -1,16 +1,16 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 
 namespace Swift {
-	class EnableStreamManagement : public Element {
+	class EnableStreamManagement : public ToplevelElement {
 		public:
 			EnableStreamManagement() {}
 	};
diff --git a/Swiften/Elements/Payload.h b/Swiften/Elements/Payload.h
index 1459837..7d6789c 100644
--- a/Swiften/Elements/Payload.h
+++ b/Swiften/Elements/Payload.h
@@ -9,9 +9,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class SWIFTEN_API Payload {
+	class SWIFTEN_API Payload : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<Payload> ref;
 		public:
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h
index e83f522..648c4df 100644
--- a/Swiften/Elements/Stanza.h
+++ b/Swiften/Elements/Stanza.h
@@ -1,5 +1,5 @@
 /*
- * 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,13 +13,13 @@
 #include <boost/date_time/posix_time/ptime.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
 	class Payload;
 
-	class SWIFTEN_API Stanza : public Element {
+	class SWIFTEN_API Stanza : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<Stanza> ref;
 
diff --git a/Swiften/Elements/StanzaAck.h b/Swiften/Elements/StanzaAck.h
index 8fe64e0..0d99c5b 100644
--- a/Swiften/Elements/StanzaAck.h
+++ b/Swiften/Elements/StanzaAck.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 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.
  */
@@ -8,10 +8,10 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class StanzaAck : public Element {
+	class StanzaAck : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<StanzaAck> ref;
 
diff --git a/Swiften/Elements/StanzaAckRequest.h b/Swiften/Elements/StanzaAckRequest.h
index 81b3871..0ae11ad 100644
--- a/Swiften/Elements/StanzaAckRequest.h
+++ b/Swiften/Elements/StanzaAckRequest.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 
 namespace Swift {
-	class StanzaAckRequest : public Element {
+	class StanzaAckRequest : public ToplevelElement {
 	};
 }
diff --git a/Swiften/Elements/StartTLSFailure.h b/Swiften/Elements/StartTLSFailure.h
index 5e233fb..ce13fd6 100644
--- a/Swiften/Elements/StartTLSFailure.h
+++ b/Swiften/Elements/StartTLSFailure.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class StartTLSFailure : public Element {
+	class StartTLSFailure : public ToplevelElement {
 		public:
 			StartTLSFailure() {}
 	};
diff --git a/Swiften/Elements/StartTLSRequest.h b/Swiften/Elements/StartTLSRequest.h
index e284f75..4b4f1f1 100644
--- a/Swiften/Elements/StartTLSRequest.h
+++ b/Swiften/Elements/StartTLSRequest.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class StartTLSRequest : public Element {
+	class StartTLSRequest : public ToplevelElement {
 		public:
 			StartTLSRequest() {}
 	};
diff --git a/Swiften/Elements/StreamError.h b/Swiften/Elements/StreamError.h
index a58d3ae..300f1c7 100644
--- a/Swiften/Elements/StreamError.h
+++ b/Swiften/Elements/StreamError.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -8,11 +8,11 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 #include <string>
 
 namespace Swift {
-	class StreamError : public Element {
+	class StreamError : public ToplevelElement {
 		public:
 			typedef boost::shared_ptr<StreamError> ref;
 
diff --git a/Swiften/Elements/StreamFeatures.h b/Swiften/Elements/StreamFeatures.h
index 5e7b6c9..ed40544 100644
--- a/Swiften/Elements/StreamFeatures.h
+++ b/Swiften/Elements/StreamFeatures.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -11,10 +11,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class SWIFTEN_API StreamFeatures : public Element	{
+	class SWIFTEN_API StreamFeatures : public ToplevelElement	{
 		public:
 			typedef boost::shared_ptr<StreamFeatures> ref;
 
diff --git a/Swiften/Elements/StreamManagementEnabled.h b/Swiften/Elements/StreamManagementEnabled.h
index 0985574..bb1f858 100644
--- a/Swiften/Elements/StreamManagementEnabled.h
+++ b/Swiften/Elements/StreamManagementEnabled.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2011 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.
  */
@@ -9,10 +9,10 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class SWIFTEN_API StreamManagementEnabled : public Element {
+	class SWIFTEN_API StreamManagementEnabled : public ToplevelElement {
 		public:
 			StreamManagementEnabled();
 			~StreamManagementEnabled();
diff --git a/Swiften/Elements/StreamManagementFailed.h b/Swiften/Elements/StreamManagementFailed.h
index 7c6d1b7..a90bddd 100644
--- a/Swiften/Elements/StreamManagementFailed.h
+++ b/Swiften/Elements/StreamManagementFailed.h
@@ -1,16 +1,16 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 
 namespace Swift {
-	class StreamManagementFailed : public Element {
+	class StreamManagementFailed : public ToplevelElement {
 		public:
 			StreamManagementFailed() {}
 	};
diff --git a/Swiften/Elements/StreamResume.h b/Swiften/Elements/StreamResume.h
index aec0909..e87dabb 100644
--- a/Swiften/Elements/StreamResume.h
+++ b/Swiften/Elements/StreamResume.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,10 +9,10 @@
 #include <string>
 #include <boost/optional.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class StreamResume : public Element {
+	class StreamResume : public ToplevelElement {
 		public:
 			StreamResume();
 			~StreamResume();
diff --git a/Swiften/Elements/StreamResumed.h b/Swiften/Elements/StreamResumed.h
index cf9a755..7890901 100644
--- a/Swiften/Elements/StreamResumed.h
+++ b/Swiften/Elements/StreamResumed.h
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -9,10 +9,10 @@
 #include <string>
 #include <boost/optional.hpp>
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class StreamResumed : public Element {
+	class StreamResumed : public ToplevelElement {
 		public:
 			StreamResumed();
 			~StreamResumed();
diff --git a/Swiften/Elements/TLSProceed.h b/Swiften/Elements/TLSProceed.h
index 4bd790a..27faf26 100644
--- a/Swiften/Elements/TLSProceed.h
+++ b/Swiften/Elements/TLSProceed.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class TLSProceed : public Element {
+	class TLSProceed : public ToplevelElement {
 		public:
 			TLSProceed() {}
 	};
diff --git a/Swiften/Elements/Element.cpp b/Swiften/Elements/ToplevelElement.cpp
index 94829ba..c58a914 100644
--- a/Swiften/Elements/Element.cpp
+++ b/Swiften/Elements/ToplevelElement.cpp
@@ -1,14 +1,14 @@
 /*
- * 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.
  */
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
 
-Element::~Element() {
+ToplevelElement::~ToplevelElement() {
 }
 
 }
diff --git a/Swiften/Elements/Element.h b/Swiften/Elements/ToplevelElement.h
index 14539c1..b3f60c7 100644
--- a/Swiften/Elements/Element.h
+++ b/Swiften/Elements/ToplevelElement.h
@@ -9,10 +9,10 @@
 #include <Swiften/Base/API.h>
 
 namespace Swift {
-	class SWIFTEN_API Element {
+	class SWIFTEN_API ToplevelElement {
 		public:
-			Element() {}
-			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Element)
-			virtual ~Element();
+			ToplevelElement() {}
+			SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(ToplevelElement)
+			virtual ~ToplevelElement();
 	};
 }
diff --git a/Swiften/Elements/UnknownElement.h b/Swiften/Elements/UnknownElement.h
index 100ba92..48072ef 100644
--- a/Swiften/Elements/UnknownElement.h
+++ b/Swiften/Elements/UnknownElement.h
@@ -1,15 +1,15 @@
 /*
- * 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.
  */
 
 #pragma once
 
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 
 namespace Swift {
-	class UnknownElement : public Element {
+	class UnknownElement : public ToplevelElement {
 		public:
 			UnknownElement() {}
 	};
author	Richard Maudsley <richard.maudsley@isode.com>	2014-04-28 08:36:39 (GMT)
committer	Richard Maudsley <richard.maudsley@isode.com>	2014-04-28 15:23:59 (GMT)
commit	be642f17bfa2df7cb88ddb5fb4aa37438d9e2110 (patch)
tree	c11e239dfcfcab2b38b64e6a19ffb48e8c30c44d /Swiften/Elements
parent	64511948b075e650cacfcc78e40371abee1d2716 (diff)
download	swift-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.zip swift-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.tar.bz2