11 files changed, 17 insertions, 54 deletions
diff --git a/Swiften/Elements/CompressFailure.h b/Swiften/Elements/CompressFailure.h
index ab102ad..7dd8867 100644
--- a/Swiften/Elements/CompressFailure.h
+++ b/Swiften/Elements/CompressFailure.h
@@ -4,8 +4,8 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_CompressFailure_H
-#define SWIFTEN_CompressFailure_H
+#pragma once
+
 
 #include <Swiften/Elements/Element.h>
 
@@ -15,5 +15,3 @@ namespace Swift {
 			CompressFailure() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/CompressRequest.h b/Swiften/Elements/CompressRequest.h
index cb2f8d2..b6fcc64 100644
--- a/Swiften/Elements/CompressRequest.h
+++ b/Swiften/Elements/CompressRequest.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_CompressRequest_H
-#define SWIFTEN_CompressRequest_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
@@ -27,5 +26,3 @@ namespace Swift {
 			std::string method_;
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/Compressed.h b/Swiften/Elements/Compressed.h
index 7154ac4..2affec5 100644
--- a/Swiften/Elements/Compressed.h
+++ b/Swiften/Elements/Compressed.h
@@ -4,17 +4,13 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_COMPRESSED_H
-#define SWIFTEN_COMPRESSED_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
 namespace Swift {
-	class Compressed : public Element
-	{
+	class Compressed : public Element {
 		public:
 			Compressed() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/ResourceBind.h b/Swiften/Elements/ResourceBind.h
index 36d07f6..f67a995 100644
--- a/Swiften/Elements/ResourceBind.h
+++ b/Swiften/Elements/ResourceBind.h
@@ -4,16 +4,14 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_ResourceBind_H
-#define SWIFTEN_ResourceBind_H
+#pragma once
 
 #include <string>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
-	class ResourceBind : public Payload
-	{
+	class ResourceBind : public Payload {
 		public:
 			ResourceBind() {}
 
@@ -38,5 +36,3 @@ namespace Swift {
 			std::string resource_;
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/SecurityLabel.h b/Swiften/Elements/SecurityLabel.h
index 11952c3..0487977 100644
--- a/Swiften/Elements/SecurityLabel.h
+++ b/Swiften/Elements/SecurityLabel.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_SecurityLabel_H
-#define SWIFTEN_SecurityLabel_H
+#pragma once
 
 #include <vector>
 
@@ -59,5 +58,3 @@ namespace Swift {
 			std::vector<std::string> equivalentLabels_;
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/StartSession.h b/Swiften/Elements/StartSession.h
index d7a18c1..7aeb611 100644
--- a/Swiften/Elements/StartSession.h
+++ b/Swiften/Elements/StartSession.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_StartSession_H
-#define SWIFTEN_StartSession_H
+#pragma once
 
 #include <string>
 #include <Swiften/Elements/Payload.h>
@@ -16,5 +15,3 @@ namespace Swift {
 			StartSession() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/StartTLSFailure.h b/Swiften/Elements/StartTLSFailure.h
index 38aace4..5e233fb 100644
--- a/Swiften/Elements/StartTLSFailure.h
+++ b/Swiften/Elements/StartTLSFailure.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_StartTLSFailure_H
-#define SWIFTEN_StartTLSFailure_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
@@ -15,5 +14,3 @@ namespace Swift {
 			StartTLSFailure() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/StartTLSRequest.h b/Swiften/Elements/StartTLSRequest.h
index f4144a7..e284f75 100644
--- a/Swiften/Elements/StartTLSRequest.h
+++ b/Swiften/Elements/StartTLSRequest.h
@@ -4,17 +4,13 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_StartTLSRequest_H
-#define SWIFTEN_StartTLSRequest_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
 namespace Swift {
-	class StartTLSRequest : public Element
-	{
+	class StartTLSRequest : public Element {
 		public:
 			StartTLSRequest() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/TLSProceed.h b/Swiften/Elements/TLSProceed.h
index 91f2844..4bd790a 100644
--- a/Swiften/Elements/TLSProceed.h
+++ b/Swiften/Elements/TLSProceed.h
@@ -4,17 +4,13 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_TLSProceed_H
-#define SWIFTEN_TLSProceed_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
 namespace Swift {
-	class TLSProceed : public Element
-	{
+	class TLSProceed : public Element {
 		public:
 			TLSProceed() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/UnknownElement.h b/Swiften/Elements/UnknownElement.h
index 1b27b88..100ba92 100644
--- a/Swiften/Elements/UnknownElement.h
+++ b/Swiften/Elements/UnknownElement.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_UnknownElement_H
-#define SWIFTEN_UnknownElement_H
+#pragma once
 
 #include <Swiften/Elements/Element.h>
 
@@ -15,5 +14,3 @@ namespace Swift {
 			UnknownElement() {}
 	};
 }
-
-#endif
diff --git a/Swiften/Elements/Version.h b/Swiften/Elements/Version.h
index a7be325..350fd91 100644
--- a/Swiften/Elements/Version.h
+++ b/Swiften/Elements/Version.h
@@ -4,15 +4,13 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_STANZAS_VERSION_H
-#define SWIFTEN_STANZAS_VERSION_H
+#pragma once
 
 #include <string>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
-	class Version : public Payload
-	{
+	class Version : public Payload {
 		public:
 			Version(const std::string& name = "", const std::string& version = "", const std::string& os = "") : name_(name), version_(version), os_(os) { }
 
@@ -26,5 +24,3 @@ namespace Swift {
 			std::string os_;
 	};
 }
-
-#endif