Remove Swiften/Base/Override.h

Replaced SWIFTEN_OVERRIDE with C++11 standard override keyword. Test-Information: Tested on macOS 10.12.5 with clang trunk. Change-Id: If89c6cc2a648662522a320834c314496c943a55a
author: Tobias Markmann <tm@ayena.de> 2017-07-13 06:07:37 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2017-07-13 06:07:37 (GMT)
commit: 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch)
tree: 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/Parser
parent: 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download: swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip
swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2
58 files changed, 242 insertions, 275 deletions
diff --git a/Swiften/Parser/EnumParser.h b/Swiften/Parser/EnumParser.h
index cf17ead..0da765e 100644
--- a/Swiften/Parser/EnumParser.h
+++ b/Swiften/Parser/EnumParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -13,7 +13,6 @@
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 
 namespace Swift {
     template<typename T>
diff --git a/Swiften/Parser/PayloadParsers/ForwardedParser.h b/Swiften/Parser/PayloadParsers/ForwardedParser.h
index f91fda5..c9f13df 100644
--- a/Swiften/Parser/PayloadParsers/ForwardedParser.h
+++ b/Swiften/Parser/PayloadParsers/ForwardedParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Forwarded.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -22,9 +21,9 @@ namespace Swift {
         public:
             ForwardedParser(PayloadParserFactoryCollection* factories);
 
-            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
             enum Level {
                 TopLevel = 0,
diff --git a/Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h b/Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h
index 1e8806c..af2f061 100644
--- a/Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h
+++ b/Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IsodeIQDelegation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API IsodeIQDelegationParser : public GenericPayloadParser<IsodeIQDelegation> {
         public:
             IsodeIQDelegationParser(PayloadParserFactoryCollection* parsers);
-            virtual ~IsodeIQDelegationParser() SWIFTEN_OVERRIDE;
+            virtual ~IsodeIQDelegationParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/MAMFinParser.h b/Swiften/Parser/PayloadParsers/MAMFinParser.h
index f08231e..419d542 100644
--- a/Swiften/Parser/PayloadParsers/MAMFinParser.h
+++ b/Swiften/Parser/PayloadParsers/MAMFinParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMFin.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,9 +19,9 @@ namespace Swift {
         public:
             MAMFinParser();
 
-            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
             enum Level {
                 TopLevel = 0,
diff --git a/Swiften/Parser/PayloadParsers/MAMQueryParser.h b/Swiften/Parser/PayloadParsers/MAMQueryParser.h
index 7e4b58a..ab062c5 100644
--- a/Swiften/Parser/PayloadParsers/MAMQueryParser.h
+++ b/Swiften/Parser/PayloadParsers/MAMQueryParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,7 +10,6 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMQuery.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -22,9 +21,9 @@ namespace Swift {
         public:
             MAMQueryParser();
 
-            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
             enum Level {
                 TopLevel = 0,
diff --git a/Swiften/Parser/PayloadParsers/MAMResultParser.h b/Swiften/Parser/PayloadParsers/MAMResultParser.h
index e68e365..f058e15 100644
--- a/Swiften/Parser/PayloadParsers/MAMResultParser.h
+++ b/Swiften/Parser/PayloadParsers/MAMResultParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,7 +10,6 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMResult.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -22,9 +21,9 @@ namespace Swift {
         public:
             MAMResultParser(PayloadParserFactoryCollection* factories);
 
-            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
             enum Level {
                 TopLevel = 0,
diff --git a/Swiften/Parser/PayloadParsers/MIXCreateParser.h b/Swiften/Parser/PayloadParsers/MIXCreateParser.h
index b65624e..ef123e1 100644
--- a/Swiften/Parser/PayloadParsers/MIXCreateParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXCreateParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXCreate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -25,11 +24,11 @@ namespace Swift {
     class SWIFTEN_API MIXCreateParser : public GenericPayloadParser<MIXCreate> {
         public:
             MIXCreateParser();
-            virtual ~MIXCreateParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXCreateParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/MIXDestroyParser.h b/Swiften/Parser/PayloadParsers/MIXDestroyParser.h
index 1aef72d..8cfd91e 100644
--- a/Swiften/Parser/PayloadParsers/MIXDestroyParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXDestroyParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXDestroy.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -25,11 +24,11 @@ namespace Swift {
     class SWIFTEN_API MIXDestroyParser : public GenericPayloadParser<MIXDestroy> {
         public:
             MIXDestroyParser();
-            virtual ~MIXDestroyParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXDestroyParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/MIXJoinParser.h b/Swiften/Parser/PayloadParsers/MIXJoinParser.h
index 5472e9d..f371d6f 100644
--- a/Swiften/Parser/PayloadParsers/MIXJoinParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXJoinParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXJoin.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -25,11 +24,11 @@ namespace Swift {
     class SWIFTEN_API MIXJoinParser : public GenericPayloadParser<MIXJoin> {
         public:
             MIXJoinParser();
-            virtual ~MIXJoinParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXJoinParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/MIXLeaveParser.h b/Swiften/Parser/PayloadParsers/MIXLeaveParser.h
index 565d19f..b0798b4 100644
--- a/Swiften/Parser/PayloadParsers/MIXLeaveParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXLeaveParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXLeave.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -24,11 +23,11 @@ namespace Swift {
     class SWIFTEN_API MIXLeaveParser : public GenericPayloadParser<MIXLeave> {
         public:
             MIXLeaveParser();
-            virtual ~MIXLeaveParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXLeaveParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/MIXPayloadParser.h b/Swiften/Parser/PayloadParsers/MIXPayloadParser.h
index 0225b3b..9133e8b 100644
--- a/Swiften/Parser/PayloadParsers/MIXPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXPayloadParser.h
@@ -4,10 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXPayload.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 
@@ -15,6 +20,6 @@ namespace Swift {
     class SWIFTEN_API MIXPayloadParser : public GenericPayloadTreeParser<MIXPayload> {
         public:
             MIXPayloadParser() {}
-            virtual void handleTree(ParserElement::ref root) SWIFTEN_OVERRIDE;
+            virtual void handleTree(ParserElement::ref root) override;
     };
 }
diff --git a/Swiften/Parser/PayloadParsers/MIXPayloadParserFactory.h b/Swiften/Parser/PayloadParsers/MIXPayloadParserFactory.h
index 066d2f0..8397b78 100644
--- a/Swiften/Parser/PayloadParsers/MIXPayloadParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/MIXPayloadParserFactory.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Base/API.h>
@@ -16,11 +22,11 @@ namespace Swift {
             MIXPayloadParserFactory() {
             }
 
-            virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const SWIFTEN_OVERRIDE {
+            virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const override {
                 return element == "mix" && ns == "urn:xmpp:mix:0";
             }
 
-            virtual PayloadParser* createPayloadParser() SWIFTEN_OVERRIDE {
+            virtual PayloadParser* createPayloadParser() override {
                 return new MIXPayloadParser();
             }
     };
diff --git a/Swiften/Parser/PayloadParsers/MIXSetNickParser.h b/Swiften/Parser/PayloadParsers/MIXSetNickParser.h
index 85a5ba9..6d552c8 100644
--- a/Swiften/Parser/PayloadParsers/MIXSetNickParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXSetNickParser.h
@@ -4,10 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXSetNick.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 
@@ -15,6 +20,6 @@ namespace Swift {
     class SWIFTEN_API MIXSetNickParser : public GenericPayloadTreeParser<MIXSetNick> {
         public:
             MIXSetNickParser() {}
-            virtual void handleTree(ParserElement::ref root) SWIFTEN_OVERRIDE;
+            virtual void handleTree(ParserElement::ref root) override;
     };
 }
diff --git a/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h b/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h
index 4b11bb5..e028873 100644
--- a/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h
@@ -4,10 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/MIXSetNickParser.h>
 
@@ -17,11 +22,11 @@ namespace Swift {
             MIXSetNickParserFactory() {
             }
 
-            virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const SWIFTEN_OVERRIDE {
+            virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const override {
                 return element == "setnick" && ns == "urn:xmpp:mix:0";
             }
 
-            virtual PayloadParser* createPayloadParser() SWIFTEN_OVERRIDE {
+            virtual PayloadParser* createPayloadParser() override {
                 return new MIXSetNickParser();
             }
     };
diff --git a/Swiften/Parser/PayloadParsers/MIXSubscribeParser.h b/Swiften/Parser/PayloadParsers/MIXSubscribeParser.h
index 87890c4..95d6d74 100644
--- a/Swiften/Parser/PayloadParsers/MIXSubscribeParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXSubscribeParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXSubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -26,11 +25,11 @@ namespace Swift {
     class SWIFTEN_API MIXSubscribeParser : public GenericPayloadParser<MIXSubscribe> {
         public:
             MIXSubscribeParser();
-            virtual ~MIXSubscribeParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXSubscribeParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/MIXUserPreferenceParser.h b/Swiften/Parser/PayloadParsers/MIXUserPreferenceParser.h
index df34265..b2a2c10 100644
--- a/Swiften/Parser/PayloadParsers/MIXUserPreferenceParser.h
+++ b/Swiften/Parser/PayloadParsers/MIXUserPreferenceParser.h
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXUserPreference.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -25,11 +24,11 @@ namespace Swift {
     class SWIFTEN_API MIXUserPreferenceParser : public GenericPayloadParser<MIXUserPreference> {
         public:
             MIXUserPreferenceParser();
-            virtual ~MIXUserPreferenceParser() SWIFTEN_OVERRIDE;
+            virtual ~MIXUserPreferenceParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level_;
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h
index e1c85fe..383ceae 100644
--- a/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubAffiliationParser : public GenericPayloadParser<PubSubAffiliation> {
         public:
             PubSubAffiliationParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubAffiliationParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h
index ab8119f..48e3825 100644
--- a/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubAffiliationsParser : public GenericPayloadParser<PubSubAffiliations> {
         public:
             PubSubAffiliationsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubAffiliationsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h
index 9986ae6..e53d477 100644
--- a/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubConfigureParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubConfigure.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubConfigureParser : public GenericPayloadParser<PubSubConfigure> {
         public:
             PubSubConfigureParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubConfigureParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubConfigureParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubCreateParser.h b/Swiften/Parser/PayloadParsers/PubSubCreateParser.h
index cd87284..626419c 100644
--- a/Swiften/Parser/PayloadParsers/PubSubCreateParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubCreateParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubCreate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubCreateParser : public GenericPayloadParser<PubSubCreate> {
         public:
             PubSubCreateParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubCreateParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubCreateParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h
index 59c4a93..08f6b43 100644
--- a/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubDefaultParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubDefault.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubDefaultParser : public GenericPayloadParser<PubSubDefault> {
         public:
             PubSubDefaultParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubDefaultParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubDefaultParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
index 8f1645f..273da82 100644
--- a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubError.h>
 #include <Swiften/Parser/EnumParser.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
@@ -18,11 +17,11 @@ namespace Swift {
     class SWIFTEN_API PubSubErrorParser : public GenericPayloadParser<PubSubError> {
         public:
             PubSubErrorParser();
-            virtual ~PubSubErrorParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubErrorParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h
index 3169c81..f4d6327 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventAssociateParser : public GenericPayloadParser<PubSubEventAssociate> {
         public:
             PubSubEventAssociateParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventAssociateParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventAssociateParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h
index c66f792..ffa1deb 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventCollection.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventCollectionParser : public GenericPayloadParser<PubSubEventCollection> {
         public:
             PubSubEventCollectionParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventCollectionParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventCollectionParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h
index 7a7ca1f..6b68d86 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventConfiguration.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventConfigurationParser : public GenericPayloadParser<PubSubEventConfiguration> {
         public:
             PubSubEventConfigurationParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventConfigurationParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventConfigurationParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h
index 3f086ce..54a1913 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDelete.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventDeleteParser : public GenericPayloadParser<PubSubEventDelete> {
         public:
             PubSubEventDeleteParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventDeleteParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDeleteParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h
index 74aa3e1..6a0a7ce 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventDisassociateParser : public GenericPayloadParser<PubSubEventDisassociate> {
         public:
             PubSubEventDisassociateParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventDisassociateParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDisassociateParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h
index 1cd5b47..e9a986d 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItem.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventItemParser : public GenericPayloadParser<PubSubEventItem> {
         public:
             PubSubEventItemParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventItemParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h
index c0a0abf..067a9f7 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItems.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventItemsParser : public GenericPayloadParser<PubSubEventItems> {
         public:
             PubSubEventItemsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventItemsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventParser.h b/Swiften/Parser/PayloadParsers/PubSubEventParser.h
index 7c4df49..02cf01f 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEvent.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventParser : public GenericPayloadParser<PubSubEvent> {
         public:
             PubSubEventParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h
index 84efa6c..1c9e623 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventPurge.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventPurgeParser : public GenericPayloadParser<PubSubEventPurge> {
         public:
             PubSubEventPurgeParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventPurgeParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventPurgeParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h
index 776fc7b..be7593e 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRedirect.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventRedirectParser : public GenericPayloadParser<PubSubEventRedirect> {
         public:
             PubSubEventRedirectParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventRedirectParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRedirectParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h
index 4ddefc0..83a8e66 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRetract.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventRetractParser : public GenericPayloadParser<PubSubEventRetract> {
         public:
             PubSubEventRetractParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventRetractParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRetractParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h
index 5bb349a..6f2eeeb 100644
--- a/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubEventSubscriptionParser : public GenericPayloadParser<PubSubEventSubscription> {
         public:
             PubSubEventSubscriptionParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubEventSubscriptionParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventSubscriptionParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemParser.h b/Swiften/Parser/PayloadParsers/PubSubItemParser.h
index ee9a506..cbbd3a5 100644
--- a/Swiften/Parser/PayloadParsers/PubSubItemParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubItemParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubItemParser : public GenericPayloadParser<PubSubItem> {
         public:
             PubSubItemParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubItemParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubItemsParser.h b/Swiften/Parser/PayloadParsers/PubSubItemsParser.h
index ea7ec52..d792e1b 100644
--- a/Swiften/Parser/PayloadParsers/PubSubItemsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubItemsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItems.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubItemsParser : public GenericPayloadParser<PubSubItems> {
         public:
             PubSubItemsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubItemsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h
index ed8648e..ee11f70 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOptionsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOptionsParser : public GenericPayloadParser<PubSubOptions> {
         public:
             PubSubOptionsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOptionsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOptionsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h
index 37d85f9..7bb93f1 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerAffiliationParser : public GenericPayloadParser<PubSubOwnerAffiliation> {
         public:
             PubSubOwnerAffiliationParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerAffiliationParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h
index f09a9cd..20df72f 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliations.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerAffiliationsParser : public GenericPayloadParser<PubSubOwnerAffiliations> {
         public:
             PubSubOwnerAffiliationsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerAffiliationsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h
index 3eec048..f11f357 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerConfigure.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerConfigureParser : public GenericPayloadParser<PubSubOwnerConfigure> {
         public:
             PubSubOwnerConfigureParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerConfigureParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerConfigureParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h
index 4897788..2f80b85 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDefault.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerDefaultParser : public GenericPayloadParser<PubSubOwnerDefault> {
         public:
             PubSubOwnerDefaultParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerDefaultParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDefaultParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h
index 10c3578..4484329 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDelete.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerDeleteParser : public GenericPayloadParser<PubSubOwnerDelete> {
         public:
             PubSubOwnerDeleteParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerDeleteParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDeleteParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h
index 6a5b6b9..cfacc97 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPubSub.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerPubSubParser : public GenericPayloadParser<PubSubOwnerPubSub> {
         public:
             PubSubOwnerPubSubParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerPubSubParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerPubSubParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h
index 35c6d96..8d233b6 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPurge.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerPurgeParser : public GenericPayloadParser<PubSubOwnerPurge> {
         public:
             PubSubOwnerPurgeParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerPurgeParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerPurgeParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h
index bc564f8..ebb6436 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerRedirect.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerRedirectParser : public GenericPayloadParser<PubSubOwnerRedirect> {
         public:
             PubSubOwnerRedirectParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerRedirectParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerRedirectParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h
index 5f93634..d68d910 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerSubscriptionParser : public GenericPayloadParser<PubSubOwnerSubscription> {
         public:
             PubSubOwnerSubscriptionParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerSubscriptionParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h
index 023d55c..ca868e6 100644
--- a/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscriptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubOwnerSubscriptionsParser : public GenericPayloadParser<PubSubOwnerSubscriptions> {
         public:
             PubSubOwnerSubscriptionsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubOwnerSubscriptionsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubParser.h b/Swiften/Parser/PayloadParsers/PubSubParser.h
index 8177a55..5cc50e1 100644
--- a/Swiften/Parser/PayloadParsers/PubSubParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSub.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -22,11 +21,11 @@ namespace Swift {
     class SWIFTEN_API PubSubParser : public GenericPayloadParser<PubSub> {
         public:
             PubSubParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubPublishParser.h b/Swiften/Parser/PayloadParsers/PubSubPublishParser.h
index cf4444b..e3b05ff 100644
--- a/Swiften/Parser/PayloadParsers/PubSubPublishParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubPublishParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubPublish.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubPublishParser : public GenericPayloadParser<PubSubPublish> {
         public:
             PubSubPublishParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubPublishParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubPublishParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubRetractParser.h b/Swiften/Parser/PayloadParsers/PubSubRetractParser.h
index 741e48a..aa9bbcc 100644
--- a/Swiften/Parser/PayloadParsers/PubSubRetractParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubRetractParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubRetract.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubRetractParser : public GenericPayloadParser<PubSubRetract> {
         public:
             PubSubRetractParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubRetractParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubRetractParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h
index 9f4caa7..9deae2d 100644
--- a/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubSubscribeOptionsParser : public GenericPayloadParser<PubSubSubscribeOptions> {
         public:
             PubSubSubscribeOptionsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubSubscribeOptionsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeOptionsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h
index 7f5f91c..ccd8ac8 100644
--- a/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubSubscribeParser : public GenericPayloadParser<PubSubSubscribe> {
         public:
             PubSubSubscribeParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubSubscribeParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h
index 33e6f87..3d9be23 100644
--- a/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubSubscriptionParser : public GenericPayloadParser<PubSubSubscription> {
         public:
             PubSubSubscriptionParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubSubscriptionParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h
index a2b36de..c7169ae 100644
--- a/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscriptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubSubscriptionsParser : public GenericPayloadParser<PubSubSubscriptions> {
         public:
             PubSubSubscriptionsParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubSubscriptionsParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionsParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             PayloadParserFactoryCollection* parsers;
diff --git a/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h
index 099d0dd..21d5599 100644
--- a/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubUnsubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -20,11 +19,11 @@ namespace Swift {
     class SWIFTEN_API PubSubUnsubscribeParser : public GenericPayloadParser<PubSubUnsubscribe> {
         public:
             PubSubUnsubscribeParser(PayloadParserFactoryCollection* parsers);
-            virtual ~PubSubUnsubscribeParser() SWIFTEN_OVERRIDE;
+            virtual ~PubSubUnsubscribeParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.h b/Swiften/Parser/PayloadParsers/ResultSetParser.h
index 819c0a5..edf6f2f 100644
--- a/Swiften/Parser/PayloadParsers/ResultSetParser.h
+++ b/Swiften/Parser/PayloadParsers/ResultSetParser.h
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ResultSet.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -18,9 +17,9 @@ namespace Swift {
         public:
             ResultSetParser();
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
             enum Level {
                 TopLevel = 0,
diff --git a/Swiften/Parser/PayloadParsers/UserLocationParser.h b/Swiften/Parser/PayloadParsers/UserLocationParser.h
index 881becd..39df9de 100644
--- a/Swiften/Parser/PayloadParsers/UserLocationParser.h
+++ b/Swiften/Parser/PayloadParsers/UserLocationParser.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserLocation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -18,11 +17,11 @@ namespace Swift {
     class SWIFTEN_API UserLocationParser : public GenericPayloadParser<UserLocation> {
         public:
             UserLocationParser();
-            virtual ~UserLocationParser() SWIFTEN_OVERRIDE;
+            virtual ~UserLocationParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
diff --git a/Swiften/Parser/PayloadParsers/UserTuneParser.h b/Swiften/Parser/PayloadParsers/UserTuneParser.h
index ca7a10d..8c7e8c5 100644
--- a/Swiften/Parser/PayloadParsers/UserTuneParser.h
+++ b/Swiften/Parser/PayloadParsers/UserTuneParser.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserTune.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -18,11 +17,11 @@ namespace Swift {
     class SWIFTEN_API UserTuneParser : public GenericPayloadParser<UserTune> {
         public:
             UserTuneParser();
-            virtual ~UserTuneParser() SWIFTEN_OVERRIDE;
+            virtual ~UserTuneParser() override;
 
-            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE;
-            virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE;
+            virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) override;
+            virtual void handleEndElement(const std::string& element, const std::string&) override;
+            virtual void handleCharacterData(const std::string& data) override;
 
         private:
             int level;
author	Tobias Markmann <tm@ayena.de>	2017-07-13 06:07:37 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2017-07-13 06:07:37 (GMT)
commit	497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch)
tree	4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/Parser
parent	8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download	swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2