From 9d9b6c625cd872bc907f0d1f6a516ff7c4e1b61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 30 Jan 2014 13:48:57 +0100
Subject: Change include order of some files

Change-Id: I3c6343b4e9de998af1e00533ef4741f33b896c20

diff --git a/Swiften/Elements/PubSubAffiliations.h b/Swiften/Elements/PubSubAffiliations.h
index 0c3efa6..4a6d0f7 100644
--- a/Swiften/Elements/PubSubAffiliations.h
+++ b/Swiften/Elements/PubSubAffiliations.h
@@ -11,8 +11,8 @@
 #include <Swiften/Elements/Payload.h>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubAffiliation.h>
 #include <Swiften/Elements/PubSubPayload.h>
diff --git a/Swiften/Elements/PubSubEventCollection.h b/Swiften/Elements/PubSubEventCollection.h
index 7789139..9c1d7cc 100644
--- a/Swiften/Elements/PubSubEventCollection.h
+++ b/Swiften/Elements/PubSubEventCollection.h
@@ -13,8 +13,8 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
-#include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
+#include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 
 namespace Swift {
diff --git a/Swiften/Elements/PubSubEventDelete.h b/Swiften/Elements/PubSubEventDelete.h
index 3641af5..3c27c82 100644
--- a/Swiften/Elements/PubSubEventDelete.h
+++ b/Swiften/Elements/PubSubEventDelete.h
@@ -12,8 +12,8 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
-#include <Swiften/Elements/PubSubEventRedirect.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
+#include <Swiften/Elements/PubSubEventRedirect.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubEventDelete : public PubSubEventPayload {
diff --git a/Swiften/Elements/PubSubEventItem.h b/Swiften/Elements/PubSubEventItem.h
index c22c431..b25a79f 100644
--- a/Swiften/Elements/PubSubEventItem.h
+++ b/Swiften/Elements/PubSubEventItem.h
@@ -11,8 +11,8 @@
 #include <Swiften/Elements/Payload.h>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/Payload.h>
 
diff --git a/Swiften/Elements/PubSubEventItems.h b/Swiften/Elements/PubSubEventItems.h
index 2b0a2d9..78b2ef0 100644
--- a/Swiften/Elements/PubSubEventItems.h
+++ b/Swiften/Elements/PubSubEventItems.h
@@ -10,12 +10,12 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubEventItem.h>
-#include <Swiften/Elements/PubSubEventRetract.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
+#include <Swiften/Elements/PubSubEventRetract.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubEventItems : public PubSubEventPayload {
diff --git a/Swiften/Elements/PubSubEventSubscription.h b/Swiften/Elements/PubSubEventSubscription.h
index d5df5d8..8d681b7 100644
--- a/Swiften/Elements/PubSubEventSubscription.h
+++ b/Swiften/Elements/PubSubEventSubscription.h
@@ -9,12 +9,12 @@
 #include <Swiften/Base/Override.h>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/optional.hpp>
 #include <string>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
 
-#include <Swiften/JID/JID.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
+#include <Swiften/JID/JID.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubEventSubscription : public PubSubEventPayload {
diff --git a/Swiften/Elements/PubSubItem.h b/Swiften/Elements/PubSubItem.h
index 1bd8fa8..7d65904 100644
--- a/Swiften/Elements/PubSubItem.h
+++ b/Swiften/Elements/PubSubItem.h
@@ -10,8 +10,8 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/Payload.h>
 
diff --git a/Swiften/Elements/PubSubItems.h b/Swiften/Elements/PubSubItems.h
index 79864c5..f2147ef 100644
--- a/Swiften/Elements/PubSubItems.h
+++ b/Swiften/Elements/PubSubItems.h
@@ -11,8 +11,8 @@
 #include <Swiften/Elements/Payload.h>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Elements/PubSubPayload.h>
diff --git a/Swiften/Elements/PubSubOwnerAffiliations.h b/Swiften/Elements/PubSubOwnerAffiliations.h
index 93eabd1..4aeb278 100644
--- a/Swiften/Elements/PubSubOwnerAffiliations.h
+++ b/Swiften/Elements/PubSubOwnerAffiliations.h
@@ -10,11 +10,11 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
+#include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubOwnerAffiliations : public PubSubOwnerPayload {
diff --git a/Swiften/Elements/PubSubOwnerConfigure.h b/Swiften/Elements/PubSubOwnerConfigure.h
index ebe72de..5dae983 100644
--- a/Swiften/Elements/PubSubOwnerConfigure.h
+++ b/Swiften/Elements/PubSubOwnerConfigure.h
@@ -13,8 +13,8 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
-#include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/Form.h>
+#include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubOwnerConfigure : public PubSubOwnerPayload {
diff --git a/Swiften/Elements/PubSubOwnerDefault.h b/Swiften/Elements/PubSubOwnerDefault.h
index 6593f00..2133dff 100644
--- a/Swiften/Elements/PubSubOwnerDefault.h
+++ b/Swiften/Elements/PubSubOwnerDefault.h
@@ -11,8 +11,8 @@
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
 
-#include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/Form.h>
+#include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubOwnerDefault : public PubSubOwnerPayload {
diff --git a/Swiften/Elements/PubSubOwnerSubscriptions.h b/Swiften/Elements/PubSubOwnerSubscriptions.h
index c7dcfc1..ea64517 100644
--- a/Swiften/Elements/PubSubOwnerSubscriptions.h
+++ b/Swiften/Elements/PubSubOwnerSubscriptions.h
@@ -10,8 +10,8 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
diff --git a/Swiften/Elements/PubSubPublish.h b/Swiften/Elements/PubSubPublish.h
index 26d1bc4..916ed05 100644
--- a/Swiften/Elements/PubSubPublish.h
+++ b/Swiften/Elements/PubSubPublish.h
@@ -10,8 +10,8 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Elements/PubSubPayload.h>
diff --git a/Swiften/Elements/PubSubRetract.h b/Swiften/Elements/PubSubRetract.h
index 773bd8a..13fa594 100644
--- a/Swiften/Elements/PubSubRetract.h
+++ b/Swiften/Elements/PubSubRetract.h
@@ -10,8 +10,8 @@
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Elements/PubSubPayload.h>
diff --git a/Swiften/Elements/PubSubSubscription.h b/Swiften/Elements/PubSubSubscription.h
index a91b95e..07a85ec 100644
--- a/Swiften/Elements/PubSubSubscription.h
+++ b/Swiften/Elements/PubSubSubscription.h
@@ -13,8 +13,8 @@
 #include <boost/shared_ptr.hpp>
 #include <string>
 
-#include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/Elements/PubSubPayload.h>
+#include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
diff --git a/Swiften/Elements/PubSubSubscriptions.h b/Swiften/Elements/PubSubSubscriptions.h
index f18355c..a5e8b14 100644
--- a/Swiften/Elements/PubSubSubscriptions.h
+++ b/Swiften/Elements/PubSubSubscriptions.h
@@ -11,11 +11,11 @@
 #include <Swiften/Elements/Payload.h>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include <Swiften/Elements/PubSubSubscription.h>
 #include <Swiften/Elements/PubSubPayload.h>
+#include <Swiften/Elements/PubSubSubscription.h>
 
 namespace Swift {
 	class SWIFTEN_API PubSubSubscriptions : public PubSubPayload {
diff --git a/Swiften/Elements/SecurityLabel.h b/Swiften/Elements/SecurityLabel.h
index d9e18ab..9a61123 100644
--- a/Swiften/Elements/SecurityLabel.h
+++ b/Swiften/Elements/SecurityLabel.h
@@ -9,8 +9,8 @@
 #include <Swiften/Base/Override.h>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 
 
diff --git a/Swiften/Elements/UserLocation.h b/Swiften/Elements/UserLocation.h
index 0de29f6..817b259 100644
--- a/Swiften/Elements/UserLocation.h
+++ b/Swiften/Elements/UserLocation.h
@@ -9,9 +9,9 @@
 #include <Swiften/Base/Override.h>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/optional.hpp>
 #include <string>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
 
 
 
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp
index 15aaf7f..aa1da86 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.cpp
@@ -13,8 +13,8 @@
 
 #include <Swiften/Parser/PayloadParserFactoryCollection.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
-#include <Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h>
 #include <Swiften/Parser/PayloadParsers/PubSubEventItemParser.h>
+#include <Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h>
 
 using namespace Swift;
 
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.cpp
index cd8f45f..8399243 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.cpp
@@ -12,8 +12,8 @@
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
 #include <Swiften/Base/foreach.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp
index 4130a71..9f72298 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp
@@ -11,8 +11,8 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h>
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
index b75d544..7898ba4 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.cpp
@@ -11,7 +11,7 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
 
 using namespace Swift;
 
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.cpp
index 4cbb0ab..44a96cf 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.cpp
@@ -11,8 +11,8 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
-#include <Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h>
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
-- 
cgit v0.10.2-6-g49f6