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
parent: 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download: swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip
swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2
187 files changed, 571 insertions, 747 deletions
diff --git a/Swiften/Base/Override.h b/Swiften/Base/Override.h
deleted file mode 100644
index 2806aae..0000000
--- a/Swiften/Base/Override.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2012 Isode Limited.
- * All rights reserved.
- * See the COPYING file for more information.
- */
-
-#pragma once
-
-#if defined(__clang__)
-# if __has_feature(cxx_override_control) || __has_extension(cxx_override_control)
-#  define SWIFTEN_OVERRIDE override
-# else
-#  define SWIFTEN_OVERRIDE
-# endif
-
-#elif defined(__GNUC__)
-# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#  define SWIFTEN_OVERRIDE override
-# else
-#  define SWIFTEN_OVERRIDE
-# endif
-
-#elif defined(_MSC_VER)
-// Actually, 1700 is the first version that supports the C++11 override, but
-// older versions apparently support a similar keyword.
-# if _MSC_VER >= 1400
-#  define SWIFTEN_OVERRIDE override
-# else
-#  define SWIFTEN_OVERRIDE
-# endif
-
-#else
-# define SWIFTEN_OVERRIDE
-#endif
diff --git a/Swiften/Base/SimpleIDGenerator.h b/Swiften/Base/SimpleIDGenerator.h
index 5baf2f1..09e01de 100644
--- a/Swiften/Base/SimpleIDGenerator.h
+++ b/Swiften/Base/SimpleIDGenerator.h
@@ -1,32 +1,31 @@
 /*
  * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 
 namespace Swift {
 
     /**
      * @brief The SimpleIDGenerator class implements a IDGenerator generating consecutive ID strings from
      * the lower case latin alphabet.
      */
 
     class SWIFTEN_API SimpleIDGenerator : public IDGenerator {
         public:
             SimpleIDGenerator();
-            ~SimpleIDGenerator() SWIFTEN_OVERRIDE;
+            ~SimpleIDGenerator() override;
 
-            std::string generateID() SWIFTEN_OVERRIDE;
+            std::string generateID() override;
 
         private:
             std::string currentID;
     };
 }
diff --git a/Swiften/Base/StdRandomGenerator.h b/Swiften/Base/StdRandomGenerator.h
index 4cc5e95..159d361 100644
--- a/Swiften/Base/StdRandomGenerator.h
+++ b/Swiften/Base/StdRandomGenerator.h
@@ -1,25 +1,24 @@
 /*
  * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <random>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Base/RandomGenerator.h>
 
 namespace Swift {
     class SWIFTEN_API StdRandomGenerator : public RandomGenerator {
         public:
             StdRandomGenerator();
 
-            int generateRandomInteger(int max) SWIFTEN_OVERRIDE;
+            int generateRandomInteger(int max) override;
 
         private:
             std::mt19937 generator;
     };
 }
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
index 63dfc4c..d4257e0 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
@@ -1,112 +1,112 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Crypto/CommonCryptoCryptoProvider.h>
 
 #include <cassert>
 
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <CommonCrypto/CommonDigest.h>
 #include <CommonCrypto/CommonHMAC.h>
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Crypto/Hash.h>
 
 using namespace Swift;
 
 namespace {
     class SHA1Hash : public Hash {
         public:
             SHA1Hash() : finalized(false) {
                 if (!CC_SHA1_Init(&context)) {
                     assert(false);
                 }
             }
 
-            virtual ~SHA1Hash() SWIFTEN_OVERRIDE {
+            virtual ~SHA1Hash() override {
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
+            virtual std::vector<unsigned char> getHash() override {
                 assert(!finalized);
                 std::vector<unsigned char> result(CC_SHA1_DIGEST_LENGTH);
                 CC_SHA1_Final(vecptr(result), &context);
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 assert(!finalized);
                 if (!CC_SHA1_Update(&context, vecptr(data), boost::numeric_cast<CC_LONG>(data.size()))) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             CC_SHA1_CTX context;
             bool finalized;
     };
 
     class MD5Hash : public Hash {
         public:
             MD5Hash() : finalized(false) {
                 if (!CC_MD5_Init(&context)) {
                     assert(false);
                 }
             }
 
-            virtual ~MD5Hash() SWIFTEN_OVERRIDE {
+            virtual ~MD5Hash() override {
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
+            virtual std::vector<unsigned char> getHash() override {
                 assert(!finalized);
                 std::vector<unsigned char> result(CC_MD5_DIGEST_LENGTH);
                 CC_MD5_Final(vecptr(result), &context);
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 assert(!finalized);
                 if (!CC_MD5_Update(&context, vecptr(data), boost::numeric_cast<CC_LONG>(data.size()))) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             CC_MD5_CTX context;
             bool finalized;
     };
 
     template<typename T>
     ByteArray getHMACSHA1Internal(const T& key, const ByteArray& data) {
         std::vector<unsigned char> result(CC_SHA1_DIGEST_LENGTH);
         CCHmac(kCCHmacAlgSHA1, vecptr(key), key.size(), vecptr(data), boost::numeric_cast<CC_LONG>(data.size()), vecptr(result));
         return result;
     }
 }
 
 CommonCryptoCryptoProvider::CommonCryptoCryptoProvider() {
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.h b/Swiften/Crypto/CommonCryptoCryptoProvider.h
index 302410d..7d1675f 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.h
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.h
@@ -1,25 +1,24 @@
 /*
  * Copyright (c) 2013-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/Crypto/CryptoProvider.h>
 
 namespace Swift {
     class SWIFTEN_API CommonCryptoCryptoProvider : public CryptoProvider {
         public:
             CommonCryptoCryptoProvider();
-            virtual ~CommonCryptoCryptoProvider() SWIFTEN_OVERRIDE;
+            virtual ~CommonCryptoCryptoProvider() override;
 
-            virtual Hash* createSHA1() SWIFTEN_OVERRIDE;
-            virtual Hash* createMD5() SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual bool isMD5AllowedForCrypto() const SWIFTEN_OVERRIDE;
+            virtual Hash* createSHA1() override;
+            virtual Hash* createMD5() override;
+            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) override;
+            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) override;
+            virtual bool isMD5AllowedForCrypto() const override;
     };
 }
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
index c785041..b46cb2a 100644
--- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp
+++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
@@ -1,113 +1,113 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Crypto/OpenSSLCryptoProvider.h>
 
 #include <openssl/sha.h>
 #include <openssl/md5.h>
 #include <openssl/hmac.h>
 #include <cassert>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Crypto/Hash.h>
 #include <Swiften/Base/ByteArray.h>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 using namespace Swift;
 
 namespace {
     class SHA1Hash : public Hash {
         public:
             SHA1Hash() : finalized(false) {
                 if (!SHA1_Init(&context)) {
                     assert(false);
                 }
             }
 
             ~SHA1Hash() {
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
+            virtual std::vector<unsigned char> getHash() override {
                 assert(!finalized);
                 std::vector<unsigned char> result(SHA_DIGEST_LENGTH);
                 SHA1_Final(vecptr(result), &context);
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 assert(!finalized);
                 if (!SHA1_Update(&context, vecptr(data), data.size())) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             SHA_CTX context;
             bool finalized;
     };
 
     class MD5Hash : public Hash {
         public:
             MD5Hash() : finalized(false) {
                 if (!MD5_Init(&context)) {
                     assert(false);
                 }
             }
 
             ~MD5Hash() {
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
+            virtual std::vector<unsigned char> getHash() override {
                 assert(!finalized);
                 std::vector<unsigned char> result(MD5_DIGEST_LENGTH);
                 MD5_Final(vecptr(result), &context);
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 assert(!finalized);
                 if (!MD5_Update(&context, vecptr(data), data.size())) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             MD5_CTX context;
             bool finalized;
     };
 
 
     template<typename T>
     ByteArray getHMACSHA1Internal(const T& key, const ByteArray& data) {
         unsigned int len = SHA_DIGEST_LENGTH;
         std::vector<unsigned char> result(len);
         HMAC(EVP_sha1(), vecptr(key), boost::numeric_cast<int>(key.size()), vecptr(data), data.size(), vecptr(result), &len);
         return result;
     }
 }
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.h b/Swiften/Crypto/OpenSSLCryptoProvider.h
index 24d7bd8..e4ee97d 100644
--- a/Swiften/Crypto/OpenSSLCryptoProvider.h
+++ b/Swiften/Crypto/OpenSSLCryptoProvider.h
@@ -1,24 +1,23 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 
 namespace Swift {
     class OpenSSLCryptoProvider : public CryptoProvider {
         public:
             OpenSSLCryptoProvider();
-            virtual ~OpenSSLCryptoProvider() SWIFTEN_OVERRIDE;
+            virtual ~OpenSSLCryptoProvider() override;
 
-            virtual Hash* createSHA1() SWIFTEN_OVERRIDE;
-            virtual Hash* createMD5() SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual bool isMD5AllowedForCrypto() const SWIFTEN_OVERRIDE;
+            virtual Hash* createSHA1() override;
+            virtual Hash* createMD5() override;
+            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) override;
+            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) override;
+            virtual bool isMD5AllowedForCrypto() const override;
     };
 }
diff --git a/Swiften/Crypto/WindowsCryptoProvider.cpp b/Swiften/Crypto/WindowsCryptoProvider.cpp
index 513941f..c784283 100644
--- a/Swiften/Crypto/WindowsCryptoProvider.cpp
+++ b/Swiften/Crypto/WindowsCryptoProvider.cpp
@@ -1,80 +1,80 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 /*
  * Copyright (c) 2013 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Crypto/WindowsCryptoProvider.h>
 
 #include <Windows.h>
 #define SECURITY_WIN32
 #include <security.h>
 #include <Wincrypt.h>
 #include <cassert>
 #include <memory>
 
 #include <Swiften/Crypto/Hash.h>
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Base/WindowsRegistry.h>
 
 using namespace Swift;
 
 struct WindowsCryptoProvider::Private {
     HCRYPTPROV context;
 };
 
 namespace {
     class WindowsHash : public Hash {
         public:
             WindowsHash(HCRYPTPROV context, ALG_ID algorithm) : hash(NULL) {
                 if (!CryptCreateHash(context, algorithm, 0, 0, &hash)) {
                     assert(false);
                 }
             }
 
             virtual ~WindowsHash() {
                 CryptDestroyHash(hash);
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
             virtual std::vector<unsigned char> getHash() {
                 std::vector<unsigned char> result;
                 DWORD hashLength = sizeof(DWORD);
                 DWORD hashSize;
                 CryptGetHashParam(hash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&hashSize), &hashLength, 0);
                 result.resize(static_cast<size_t>(hashSize));
                 if (!CryptGetHashParam(hash, HP_HASHVAL, vecptr(result), &hashSize, 0)) {
                     assert(false);
                 }
                 result.resize(static_cast<size_t>(hashSize));
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 if (!CryptHashData(hash, const_cast<BYTE*>(vecptr(data)), data.size(), 0)) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             HCRYPTHASH hash;
     };
 
 #if 0 // NOT YET DONE
@@ -96,65 +96,65 @@ namespace {
             template<typename T>
             HMACHash(HCRYPTPROV context, const T& rawKey) : hash(NULL) {
                 // Import raw key
                 T blobData(sizeof(PlainTextKeyBlob) + rawKey.size());
                 PlainTextKeyBlob* blob = reinterpret_cast<PlainTextKeyBlob*>(vecptr(blobData));
                 blob->hdr.bType = PLAINTEXTKEYBLOB;
                 blob->hdr.bVersion = CUR_BLOB_VERSION;
                 blob->hdr.reserved = 0;
                 blob->hdr.aiKeyAlg = CALG_RC2;
                 blob->dwKeySize = rawKey.size();
                 std::copy(rawKey.begin(), rawKey.end(), blobData.begin() + sizeof(PlainTextKeyBlob));
                 HCRYPTKEY key;
                 if (!CryptImportKey(context, vecptr(blobData), blobData.size(), 0, CRYPT_IPSEC_HMAC_KEY, &key)) {
                     assert(false);
                     return;
                 }
 
                 // Create hash
                 if (!CryptCreateHash(context, CALG_HMAC, key, 0, &hash)) {
                     assert(false);
                     return;
                 }
                 ZeroMemory(&info, sizeof(info));
                 info.HashAlgid = CALG_SHA1;
             }
 
             ~HMACHash() {
                 CryptDestroyHash(hash);
             }
 
-            virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const ByteArray& data) override {
                 return updateInternal(data);
             }
 
-            virtual Hash& update(const SafeByteArray& data) SWIFTEN_OVERRIDE {
+            virtual Hash& update(const SafeByteArray& data) override {
                 return updateInternal(data);
             }
 
             virtual std::vector<unsigned char> getHash() {
                 std::vector<unsigned char> result;
                 DWORD hashLength = sizeof(DWORD);
                 DWORD hashSize;
                 CryptGetHashParam(hash, HP_HASHSIZE, reinterpret_cast<BYTE*>(&hashSize), &hashLength, 0);
                 result.resize(static_cast<size_t>(hashSize));
                 if (!CryptGetHashParam(hash, HP_HASHVAL, vecptr(result), &hashSize, 0)) {
                     assert(false);
                 }
                 result.resize(static_cast<size_t>(hashSize));
                 return result;
             }
 
         private:
             template<typename ContainerType>
             Hash& updateInternal(const ContainerType& data) {
                 if (!CryptHashData(hash, const_cast<BYTE*>(vecptr(data)), data.size(), 0)) {
                     assert(false);
                 }
                 return *this;
             }
 
         private:
             HCRYPTHASH hash;
             HMAC_INFO info;
     };
 #endif
diff --git a/Swiften/Crypto/WindowsCryptoProvider.h b/Swiften/Crypto/WindowsCryptoProvider.h
index f446027..d0c982e 100644
--- a/Swiften/Crypto/WindowsCryptoProvider.h
+++ b/Swiften/Crypto/WindowsCryptoProvider.h
@@ -1,32 +1,31 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <boost/noncopyable.hpp>
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 
 namespace Swift {
     class WindowsCryptoProvider : public CryptoProvider, public boost::noncopyable {
         public:
             WindowsCryptoProvider();
             virtual ~WindowsCryptoProvider();
 
-            virtual Hash* createSHA1() SWIFTEN_OVERRIDE;
-            virtual Hash* createMD5() SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) SWIFTEN_OVERRIDE;
-            virtual bool isMD5AllowedForCrypto() const SWIFTEN_OVERRIDE;
+            virtual Hash* createSHA1() override;
+            virtual Hash* createMD5() override;
+            virtual ByteArray getHMACSHA1(const SafeByteArray& key, const ByteArray& data) override;
+            virtual ByteArray getHMACSHA1(const ByteArray& key, const ByteArray& data) override;
+            virtual bool isMD5AllowedForCrypto() const override;
 
         private:
             struct Private;
             const std::unique_ptr<Private> p;
     };
 }
diff --git a/Swiften/Elements/ContainerPayload.h b/Swiften/Elements/ContainerPayload.h
index 3da04b7..033575a 100644
--- a/Swiften/Elements/ContainerPayload.h
+++ b/Swiften/Elements/ContainerPayload.h
@@ -1,34 +1,33 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     template<typename T>
     class SWIFTEN_API ContainerPayload : public Payload {
         public:
             ContainerPayload() {}
             ContainerPayload(std::shared_ptr<T> payload) : payload(payload) {}
 
             void setPayload(std::shared_ptr<T> payload) {
                 this->payload = payload;
             }
 
             std::shared_ptr<T> getPayload() const {
                 return payload;
             }
 
         private:
             std::shared_ptr<T> payload;
     };
 }
diff --git a/Swiften/Elements/IsodeIQDelegation.h b/Swiften/Elements/IsodeIQDelegation.h
index 39655ce..074a06d 100644
--- a/Swiften/Elements/IsodeIQDelegation.h
+++ b/Swiften/Elements/IsodeIQDelegation.h
@@ -1,36 +1,35 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Forwarded.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API IsodeIQDelegation : public Payload {
         public:
 
             IsodeIQDelegation();
 
             virtual ~IsodeIQDelegation();
 
             std::shared_ptr<Forwarded> getForward() const {
                 return forward;
             }
 
             void setForward(std::shared_ptr<Forwarded> value) {
                 this->forward = value ;
             }
 
 
         private:
             std::shared_ptr<Forwarded> forward;
     };
 }
diff --git a/Swiften/Elements/PubSub.h b/Swiften/Elements/PubSub.h
index d62c54e..47b8c3f 100644
--- a/Swiften/Elements/PubSub.h
+++ b/Swiften/Elements/PubSub.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/ContainerPayload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSub : public ContainerPayload<PubSubPayload> {
         public:
             PubSub();
             virtual ~PubSub();
     };
 }
diff --git a/Swiften/Elements/PubSubAffiliation.h b/Swiften/Elements/PubSubAffiliation.h
index b19e84b..058ef88 100644
--- a/Swiften/Elements/PubSubAffiliation.h
+++ b/Swiften/Elements/PubSubAffiliation.h
@@ -1,42 +1,41 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubAffiliation : public Payload {
         public:
             enum Type {
                 None,
                 Member,
                 Outcast,
                 Owner,
                 Publisher,
                 PublishOnly
             };
 
             PubSubAffiliation();
             PubSubAffiliation(const std::string& node) : node(node), type(None) {}
             virtual ~PubSubAffiliation();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             Type getType() const {
                 return type;
             }
 
diff --git a/Swiften/Elements/PubSubAffiliations.h b/Swiften/Elements/PubSubAffiliations.h
index c7e22ce..f3a6dda 100644
--- a/Swiften/Elements/PubSubAffiliations.h
+++ b/Swiften/Elements/PubSubAffiliations.h
@@ -1,46 +1,45 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubAffiliation.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubAffiliations : public PubSubPayload {
         public:
 
             PubSubAffiliations();
 
             virtual ~PubSubAffiliations();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubAffiliation> >& getAffiliations() const {
                 return affiliations;
             }
 
             void setAffiliations(const std::vector< std::shared_ptr<PubSubAffiliation> >& value) {
                 this->affiliations = value ;
             }
 
             void addAffiliation(std::shared_ptr<PubSubAffiliation> value) {
                 this->affiliations.push_back(value);
diff --git a/Swiften/Elements/PubSubConfigure.h b/Swiften/Elements/PubSubConfigure.h
index 8442198..88a1ea9 100644
--- a/Swiften/Elements/PubSubConfigure.h
+++ b/Swiften/Elements/PubSubConfigure.h
@@ -1,36 +1,35 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubConfigure : public Payload {
         public:
 
             PubSubConfigure();
 
             virtual ~PubSubConfigure();
 
             std::shared_ptr<Form> getData() const {
                 return data;
             }
 
             void setData(std::shared_ptr<Form> value) {
                 this->data = value ;
             }
 
 
         private:
             std::shared_ptr<Form> data;
     };
 }
diff --git a/Swiften/Elements/PubSubCreate.h b/Swiften/Elements/PubSubCreate.h
index 5ece36e..ac6b987 100644
--- a/Swiften/Elements/PubSubCreate.h
+++ b/Swiften/Elements/PubSubCreate.h
@@ -1,43 +1,42 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubConfigure.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubCreate : public PubSubPayload {
         public:
 
             PubSubCreate();
             PubSubCreate(const std::string& node) : node(node) {}
             virtual ~PubSubCreate();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<PubSubConfigure> getConfigure() const {
                 return configure;
             }
 
             void setConfigure(std::shared_ptr<PubSubConfigure> value) {
                 this->configure = value ;
             }
 
 
         private:
diff --git a/Swiften/Elements/PubSubDefault.h b/Swiften/Elements/PubSubDefault.h
index 08482b4..aa058ac 100644
--- a/Swiften/Elements/PubSubDefault.h
+++ b/Swiften/Elements/PubSubDefault.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubDefault : public PubSubPayload {
         public:
             enum Type {
                 None,
                 Collection,
                 Leaf
             };
 
             PubSubDefault();
 
             virtual ~PubSubDefault();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             Type getType() const {
                 return type;
             }
 
             void setType(Type value) {
                 this->type = value ;
diff --git a/Swiften/Elements/PubSubEvent.h b/Swiften/Elements/PubSubEvent.h
index 8f02258..561f731 100644
--- a/Swiften/Elements/PubSubEvent.h
+++ b/Swiften/Elements/PubSubEvent.h
@@ -1,23 +1,22 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ContainerPayload.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEvent : public ContainerPayload<PubSubEventPayload> {
         public:
             PubSubEvent();
             virtual ~PubSubEvent();
     };
 }
diff --git a/Swiften/Elements/PubSubEventAssociate.h b/Swiften/Elements/PubSubEventAssociate.h
index 5d963a0..b7bb839 100644
--- a/Swiften/Elements/PubSubEventAssociate.h
+++ b/Swiften/Elements/PubSubEventAssociate.h
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventAssociate : public Payload {
         public:
 
             PubSubEventAssociate();
 
             virtual ~PubSubEventAssociate();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
 
         private:
             std::string node;
     };
 }
diff --git a/Swiften/Elements/PubSubEventCollection.h b/Swiften/Elements/PubSubEventCollection.h
index 61056e2..367fe02 100644
--- a/Swiften/Elements/PubSubEventCollection.h
+++ b/Swiften/Elements/PubSubEventCollection.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
 #include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventCollection : public PubSubEventPayload {
         public:
 
             PubSubEventCollection();
 
             virtual ~PubSubEventCollection();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<PubSubEventDisassociate> getDisassociate() const {
                 return disassociate;
             }
 
             void setDisassociate(std::shared_ptr<PubSubEventDisassociate> value) {
                 this->disassociate = value ;
             }
 
             std::shared_ptr<PubSubEventAssociate> getAssociate() const {
diff --git a/Swiften/Elements/PubSubEventConfiguration.h b/Swiften/Elements/PubSubEventConfiguration.h
index 6c5305d..e529014 100644
--- a/Swiften/Elements/PubSubEventConfiguration.h
+++ b/Swiften/Elements/PubSubEventConfiguration.h
@@ -1,43 +1,42 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventConfiguration : public PubSubEventPayload {
         public:
 
             PubSubEventConfiguration();
 
             virtual ~PubSubEventConfiguration();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<Form> getData() const {
                 return data;
             }
 
             void setData(std::shared_ptr<Form> value) {
                 this->data = value ;
             }
 
 
         private:
diff --git a/Swiften/Elements/PubSubEventDelete.h b/Swiften/Elements/PubSubEventDelete.h
index 787dce0..f899d4e 100644
--- a/Swiften/Elements/PubSubEventDelete.h
+++ b/Swiften/Elements/PubSubEventDelete.h
@@ -1,43 +1,42 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 #include <Swiften/Elements/PubSubEventRedirect.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventDelete : public PubSubEventPayload {
         public:
 
             PubSubEventDelete();
 
             virtual ~PubSubEventDelete();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<PubSubEventRedirect> getRedirects() const {
                 return redirects;
             }
 
             void setRedirects(std::shared_ptr<PubSubEventRedirect> value) {
                 this->redirects = value ;
             }
 
 
         private:
diff --git a/Swiften/Elements/PubSubEventDisassociate.h b/Swiften/Elements/PubSubEventDisassociate.h
index 826b1f4..415ac29 100644
--- a/Swiften/Elements/PubSubEventDisassociate.h
+++ b/Swiften/Elements/PubSubEventDisassociate.h
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventDisassociate : public Payload {
         public:
 
             PubSubEventDisassociate();
 
             virtual ~PubSubEventDisassociate();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
 
         private:
             std::string node;
     };
 }
diff --git a/Swiften/Elements/PubSubEventItem.h b/Swiften/Elements/PubSubEventItem.h
index 50e8757..defdbf4 100644
--- a/Swiften/Elements/PubSubEventItem.h
+++ b/Swiften/Elements/PubSubEventItem.h
@@ -1,46 +1,45 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventItem : public Payload {
         public:
 
             PubSubEventItem();
 
             virtual ~PubSubEventItem();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const boost::optional< std::string >& getPublisher() const {
                 return publisher;
             }
 
             void setPublisher(const boost::optional< std::string >& value) {
                 this->publisher = value ;
             }
 
             const std::vector< std::shared_ptr<Payload> >& getData() const {
                 return data;
             }
 
diff --git a/Swiften/Elements/PubSubEventItems.h b/Swiften/Elements/PubSubEventItems.h
index 48fd340..aade826 100644
--- a/Swiften/Elements/PubSubEventItems.h
+++ b/Swiften/Elements/PubSubEventItems.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventItem.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 #include <Swiften/Elements/PubSubEventRetract.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventItems : public PubSubEventPayload {
         public:
 
             PubSubEventItems();
 
             virtual ~PubSubEventItems();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubEventItem> >& getItems() const {
                 return items;
             }
 
             void setItems(const std::vector< std::shared_ptr<PubSubEventItem> >& value) {
                 this->items = value ;
             }
 
             void addItem(std::shared_ptr<PubSubEventItem> value) {
diff --git a/Swiften/Elements/PubSubEventPurge.h b/Swiften/Elements/PubSubEventPurge.h
index 743cc25..647598d 100644
--- a/Swiften/Elements/PubSubEventPurge.h
+++ b/Swiften/Elements/PubSubEventPurge.h
@@ -1,36 +1,35 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventPurge : public PubSubEventPayload {
         public:
 
             PubSubEventPurge();
 
             virtual ~PubSubEventPurge();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
 
         private:
             std::string node;
     };
 }
diff --git a/Swiften/Elements/PubSubEventRedirect.h b/Swiften/Elements/PubSubEventRedirect.h
index e0e351f..063cf8c 100644
--- a/Swiften/Elements/PubSubEventRedirect.h
+++ b/Swiften/Elements/PubSubEventRedirect.h
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventRedirect : public Payload {
         public:
 
             PubSubEventRedirect();
 
             virtual ~PubSubEventRedirect();
 
             const std::string& getURI() const {
                 return uri;
             }
 
             void setURI(const std::string& value) {
                 this->uri = value ;
             }
 
 
         private:
             std::string uri;
     };
 }
diff --git a/Swiften/Elements/PubSubEventRetract.h b/Swiften/Elements/PubSubEventRetract.h
index b0aea96..19e02c9 100644
--- a/Swiften/Elements/PubSubEventRetract.h
+++ b/Swiften/Elements/PubSubEventRetract.h
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventRetract : public Payload {
         public:
 
             PubSubEventRetract();
 
             virtual ~PubSubEventRetract();
 
             const std::string& getID() const {
                 return id;
             }
 
             void setID(const std::string& value) {
                 this->id = value ;
             }
 
 
         private:
             std::string id;
     };
 }
diff --git a/Swiften/Elements/PubSubEventSubscription.h b/Swiften/Elements/PubSubEventSubscription.h
index 0b8297c..37e8b74 100644
--- a/Swiften/Elements/PubSubEventSubscription.h
+++ b/Swiften/Elements/PubSubEventSubscription.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubEventSubscription : public PubSubEventPayload {
         public:
             enum SubscriptionType {
                 None,
                 Pending,
                 Subscribed,
                 Unconfigured
             };
 
             PubSubEventSubscription();
 
             virtual ~PubSubEventSubscription();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const JID& getJID() const {
                 return jid;
             }
 
diff --git a/Swiften/Elements/PubSubItem.h b/Swiften/Elements/PubSubItem.h
index d424ae4..ba13150 100644
--- a/Swiften/Elements/PubSubItem.h
+++ b/Swiften/Elements/PubSubItem.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubItem : public Payload {
         public:
 
             PubSubItem();
 
             virtual ~PubSubItem();
 
             const std::vector< std::shared_ptr<Payload> >& getData() const {
                 return data;
             }
 
             void setData(const std::vector< std::shared_ptr<Payload> >& value) {
                 this->data = value ;
             }
 
             void addData(std::shared_ptr<Payload> value) {
                 this->data.push_back(value);
             }
 
             const std::string& getID() const {
                 return id;
             }
 
             void setID(const std::string& value) {
                 this->id = value ;
             }
 
diff --git a/Swiften/Elements/PubSubItems.h b/Swiften/Elements/PubSubItems.h
index 9903075..c60adca 100644
--- a/Swiften/Elements/PubSubItems.h
+++ b/Swiften/Elements/PubSubItems.h
@@ -1,46 +1,45 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubItems : public PubSubPayload {
         public:
 
             PubSubItems();
             PubSubItems(const std::string& node) : node(node) {}
             virtual ~PubSubItems();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubItem> >& getItems() const {
                 return items;
             }
 
             void setItems(const std::vector< std::shared_ptr<PubSubItem> >& value) {
                 this->items = value ;
             }
 
             void addItem(std::shared_ptr<PubSubItem> value) {
                 this->items.push_back(value);
diff --git a/Swiften/Elements/PubSubOptions.h b/Swiften/Elements/PubSubOptions.h
index 2b312a7..80a3b03 100644
--- a/Swiften/Elements/PubSubOptions.h
+++ b/Swiften/Elements/PubSubOptions.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOptions : public PubSubPayload {
         public:
 
             PubSubOptions();
 
             virtual ~PubSubOptions();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const JID& getJID() const {
                 return jid;
             }
 
             void setJID(const JID& value) {
                 this->jid = value ;
             }
 
             std::shared_ptr<Form> getData() const {
diff --git a/Swiften/Elements/PubSubOwnerAffiliation.h b/Swiften/Elements/PubSubOwnerAffiliation.h
index a8c1d91..77886d1 100644
--- a/Swiften/Elements/PubSubOwnerAffiliation.h
+++ b/Swiften/Elements/PubSubOwnerAffiliation.h
@@ -1,40 +1,39 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/Payload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerAffiliation : public Payload {
         public:
             enum Type {
                 None,
                 Member,
                 Outcast,
                 Owner,
                 Publisher,
                 PublishOnly
             };
 
             PubSubOwnerAffiliation();
 
             virtual ~PubSubOwnerAffiliation();
 
             const JID& getJID() const {
                 return jid;
             }
 
             void setJID(const JID& value) {
                 this->jid = value ;
             }
 
             Type getType() const {
                 return type;
             }
diff --git a/Swiften/Elements/PubSubOwnerAffiliations.h b/Swiften/Elements/PubSubOwnerAffiliations.h
index f1085bb..2434d4e 100644
--- a/Swiften/Elements/PubSubOwnerAffiliations.h
+++ b/Swiften/Elements/PubSubOwnerAffiliations.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerAffiliations : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerAffiliations();
 
             virtual ~PubSubOwnerAffiliations();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubOwnerAffiliation> >& getAffiliations() const {
                 return affiliations;
             }
 
             void setAffiliations(const std::vector< std::shared_ptr<PubSubOwnerAffiliation> >& value) {
                 this->affiliations = value ;
             }
 
             void addAffiliation(std::shared_ptr<PubSubOwnerAffiliation> value) {
                 this->affiliations.push_back(value);
diff --git a/Swiften/Elements/PubSubOwnerConfigure.h b/Swiften/Elements/PubSubOwnerConfigure.h
index 7dcf792..2b84753 100644
--- a/Swiften/Elements/PubSubOwnerConfigure.h
+++ b/Swiften/Elements/PubSubOwnerConfigure.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerConfigure : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerConfigure();
             PubSubOwnerConfigure(const std::string& node) : node(node) {}
             virtual ~PubSubOwnerConfigure();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<Form> getData() const {
                 return data;
             }
 
             void setData(std::shared_ptr<Form> value) {
                 this->data = value ;
             }
 
 
         private:
diff --git a/Swiften/Elements/PubSubOwnerDefault.h b/Swiften/Elements/PubSubOwnerDefault.h
index 322f47a..a17d9f3 100644
--- a/Swiften/Elements/PubSubOwnerDefault.h
+++ b/Swiften/Elements/PubSubOwnerDefault.h
@@ -1,37 +1,36 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerDefault : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerDefault();
 
             virtual ~PubSubOwnerDefault();
 
             std::shared_ptr<Form> getData() const {
                 return data;
             }
 
             void setData(std::shared_ptr<Form> value) {
                 this->data = value ;
             }
 
 
         private:
             std::shared_ptr<Form> data;
     };
 }
diff --git a/Swiften/Elements/PubSubOwnerDelete.h b/Swiften/Elements/PubSubOwnerDelete.h
index 7cc5d79..a222e85 100644
--- a/Swiften/Elements/PubSubOwnerDelete.h
+++ b/Swiften/Elements/PubSubOwnerDelete.h
@@ -1,43 +1,42 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/PubSubOwnerRedirect.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerDelete : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerDelete();
             PubSubOwnerDelete(const std::string& node) : node(node) {}
             virtual ~PubSubOwnerDelete();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             std::shared_ptr<PubSubOwnerRedirect> getRedirect() const {
                 return redirect;
             }
 
             void setRedirect(std::shared_ptr<PubSubOwnerRedirect> value) {
                 this->redirect = value ;
             }
 
 
         private:
diff --git a/Swiften/Elements/PubSubOwnerPubSub.h b/Swiften/Elements/PubSubOwnerPubSub.h
index f3474cf..9989cde 100644
--- a/Swiften/Elements/PubSubOwnerPubSub.h
+++ b/Swiften/Elements/PubSubOwnerPubSub.h
@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/ContainerPayload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerPubSub : public ContainerPayload<PubSubOwnerPayload> {
         public:
             PubSubOwnerPubSub();
             virtual ~PubSubOwnerPubSub();
     };
 }
diff --git a/Swiften/Elements/PubSubOwnerPurge.h b/Swiften/Elements/PubSubOwnerPurge.h
index aca48e1..3631bd9 100644
--- a/Swiften/Elements/PubSubOwnerPurge.h
+++ b/Swiften/Elements/PubSubOwnerPurge.h
@@ -1,36 +1,35 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerPurge : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerPurge();
 
             virtual ~PubSubOwnerPurge();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
 
         private:
             std::string node;
     };
 }
diff --git a/Swiften/Elements/PubSubOwnerRedirect.h b/Swiften/Elements/PubSubOwnerRedirect.h
index c481f98..f7deca8 100644
--- a/Swiften/Elements/PubSubOwnerRedirect.h
+++ b/Swiften/Elements/PubSubOwnerRedirect.h
@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerRedirect : public Payload {
         public:
 
             PubSubOwnerRedirect();
 
             virtual ~PubSubOwnerRedirect();
 
             const std::string& getURI() const {
                 return uri;
             }
 
             void setURI(const std::string& value) {
                 this->uri = value ;
             }
 
 
         private:
             std::string uri;
     };
 }
diff --git a/Swiften/Elements/PubSubOwnerSubscription.h b/Swiften/Elements/PubSubOwnerSubscription.h
index 6a3fcc1..cf2edd9 100644
--- a/Swiften/Elements/PubSubOwnerSubscription.h
+++ b/Swiften/Elements/PubSubOwnerSubscription.h
@@ -1,40 +1,39 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/Payload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerSubscription : public Payload {
         public:
             enum SubscriptionType {
                 None,
                 Pending,
                 Subscribed,
                 Unconfigured
             };
 
             PubSubOwnerSubscription();
 
             virtual ~PubSubOwnerSubscription();
 
             const JID& getJID() const {
                 return jid;
             }
 
             void setJID(const JID& value) {
                 this->jid = value ;
             }
 
             SubscriptionType getSubscription() const {
                 return subscription;
             }
 
             void setSubscription(SubscriptionType value) {
diff --git a/Swiften/Elements/PubSubOwnerSubscriptions.h b/Swiften/Elements/PubSubOwnerSubscriptions.h
index ec5aa17..d7cd8df 100644
--- a/Swiften/Elements/PubSubOwnerSubscriptions.h
+++ b/Swiften/Elements/PubSubOwnerSubscriptions.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOwnerPayload.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubOwnerSubscriptions : public PubSubOwnerPayload {
         public:
 
             PubSubOwnerSubscriptions();
 
             virtual ~PubSubOwnerSubscriptions();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubOwnerSubscription> >& getSubscriptions() const {
                 return subscriptions;
             }
 
             void setSubscriptions(const std::vector< std::shared_ptr<PubSubOwnerSubscription> >& value) {
                 this->subscriptions = value ;
             }
 
             void addSubscription(std::shared_ptr<PubSubOwnerSubscription> value) {
                 this->subscriptions.push_back(value);
diff --git a/Swiften/Elements/PubSubPublish.h b/Swiften/Elements/PubSubPublish.h
index dff099b..2d6d5bb 100644
--- a/Swiften/Elements/PubSubPublish.h
+++ b/Swiften/Elements/PubSubPublish.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Elements/PubSubPayload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubPublish : public PubSubPayload {
         public:
 
             PubSubPublish();
 
             virtual ~PubSubPublish();
 
             const std::string& getNode() const {
                 return node;
             }
 
             void setNode(const std::string& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubItem> >& getItems() const {
                 return items;
             }
 
             void setItems(const std::vector< std::shared_ptr<PubSubItem> >& value) {
                 this->items = value ;
             }
 
             void addItem(std::shared_ptr<PubSubItem> value) {
                 this->items.push_back(value);
diff --git a/Swiften/Elements/PubSubSubscribe.h b/Swiften/Elements/PubSubSubscribe.h
index a4c0b68..aaaca38 100644
--- a/Swiften/Elements/PubSubSubscribe.h
+++ b/Swiften/Elements/PubSubSubscribe.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubOptions.h>
 #include <Swiften/Elements/PubSubPayload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubSubscribe : public PubSubPayload {
         public:
 
             PubSubSubscribe();
 
             virtual ~PubSubSubscribe();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const JID& getJID() const {
                 return jid;
             }
 
             void setJID(const JID& value) {
                 this->jid = value ;
             }
 
             std::shared_ptr<PubSubOptions> getOptions() const {
diff --git a/Swiften/Elements/PubSubSubscribeOptions.h b/Swiften/Elements/PubSubSubscribeOptions.h
index c837787..1521427 100644
--- a/Swiften/Elements/PubSubSubscribeOptions.h
+++ b/Swiften/Elements/PubSubSubscribeOptions.h
@@ -1,33 +1,32 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubSubscribeOptions : public Payload {
         public:
 
             PubSubSubscribeOptions();
 
             virtual ~PubSubSubscribeOptions();
 
             bool isRequired() const {
                 return required;
             }
 
             void setRequired(bool value) {
                 this->required = value ;
             }
 
 
         private:
             bool required;
     };
 }
diff --git a/Swiften/Elements/PubSubSubscription.h b/Swiften/Elements/PubSubSubscription.h
index e2b527f..9645ebb 100644
--- a/Swiften/Elements/PubSubSubscription.h
+++ b/Swiften/Elements/PubSubSubscription.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 #include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubSubscription : public PubSubPayload {
         public:
             enum SubscriptionType {
                 None,
                 Pending,
                 Subscribed,
                 Unconfigured
             };
 
             PubSubSubscription();
 
             virtual ~PubSubSubscription();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const boost::optional< std::string >& getSubscriptionID() const {
                 return subscriptionID;
             }
diff --git a/Swiften/Elements/PubSubSubscriptions.h b/Swiften/Elements/PubSubSubscriptions.h
index 441e6c1..f721bd5 100644
--- a/Swiften/Elements/PubSubSubscriptions.h
+++ b/Swiften/Elements/PubSubSubscriptions.h
@@ -1,46 +1,45 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubSubscriptions : public PubSubPayload {
         public:
 
             PubSubSubscriptions();
             PubSubSubscriptions(const std::string& node) : node(node) {}
             virtual ~PubSubSubscriptions();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const std::vector< std::shared_ptr<PubSubSubscription> >& getSubscriptions() const {
                 return subscriptions;
             }
 
             void setSubscriptions(const std::vector< std::shared_ptr<PubSubSubscription> >& value) {
                 this->subscriptions = value ;
             }
 
             void addSubscription(std::shared_ptr<PubSubSubscription> value) {
                 this->subscriptions.push_back(value);
diff --git a/Swiften/Elements/PubSubUnsubscribe.h b/Swiften/Elements/PubSubUnsubscribe.h
index 305af9a..c0c25bd 100644
--- a/Swiften/Elements/PubSubUnsubscribe.h
+++ b/Swiften/Elements/PubSubUnsubscribe.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/PubSubPayload.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubUnsubscribe : public PubSubPayload {
         public:
 
             PubSubUnsubscribe();
 
             virtual ~PubSubUnsubscribe();
 
             const boost::optional< std::string >& getNode() const {
                 return node;
             }
 
             void setNode(const boost::optional< std::string >& value) {
                 this->node = value ;
             }
 
             const JID& getJID() const {
                 return jid;
             }
 
             void setJID(const JID& value) {
                 this->jid = value ;
             }
 
             const boost::optional< std::string >& getSubscriptionID() const {
                 return subscriptionID;
diff --git a/Swiften/Elements/SecurityLabel.h b/Swiften/Elements/SecurityLabel.h
index 748c65e..0f0311e 100644
--- a/Swiften/Elements/SecurityLabel.h
+++ b/Swiften/Elements/SecurityLabel.h
@@ -1,43 +1,42 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API SecurityLabel : public Payload {
         public:
 
             SecurityLabel();
 
             virtual ~SecurityLabel();
 
             const std::vector< std::string >& getEquivalentLabels() const {
                 return equivalentLabels;
             }
 
             void setEquivalentLabels(const std::vector< std::string >& value) {
                 this->equivalentLabels = value ;
             }
 
             void addEquivalentLabel(const std::string& value) {
                 this->equivalentLabels.push_back(value);
             }
 
             const std::string& getForegroundColor() const {
                 return foregroundColor;
             }
 
             void setForegroundColor(const std::string& value) {
                 this->foregroundColor = value ;
             }
 
diff --git a/Swiften/Elements/UserLocation.h b/Swiften/Elements/UserLocation.h
index 3bdaec6..b59fc5c 100644
--- a/Swiften/Elements/UserLocation.h
+++ b/Swiften/Elements/UserLocation.h
@@ -1,45 +1,44 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API UserLocation : public Payload {
         public:
 
             UserLocation();
 
             virtual ~UserLocation();
 
             const boost::optional< std::string >& getArea() const {
                 return area;
             }
 
             void setArea(const boost::optional< std::string >& value) {
                 this->area = value ;
             }
 
             const boost::optional< double >& getAltitude() const {
                 return altitude;
             }
 
             void setAltitude(const boost::optional< double >& value) {
                 this->altitude = value ;
             }
 
             const boost::optional< std::string >& getLocality() const {
                 return locality;
             }
 
diff --git a/Swiften/Elements/UserTune.h b/Swiften/Elements/UserTune.h
index 7def9b9..5413085 100644
--- a/Swiften/Elements/UserTune.h
+++ b/Swiften/Elements/UserTune.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
     class SWIFTEN_API UserTune : public Payload {
         public:
 
             UserTune();
 
             virtual ~UserTune();
 
             const boost::optional< unsigned int >& getRating() const {
                 return rating;
             }
 
             void setRating(const boost::optional< unsigned int >& value) {
                 this->rating = value ;
             }
 
             const boost::optional< std::string >& getTitle() const {
                 return title;
             }
 
             void setTitle(const boost::optional< std::string >& value) {
                 this->title = value ;
             }
 
             const boost::optional< std::string >& getTrack() const {
                 return track;
             }
 
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.h b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
index 8843de8..1bfe799 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.h
@@ -1,109 +1,108 @@
 /*
  * Copyright (c) 2013-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/ErrorPayload.h>
 #include <Swiften/FileTransfer/FileTransferTransporter.h>
 
 namespace Swift {
     class LocalJingleTransportCandidateGenerator;
     class RemoteJingleTransportCandidateSelector;
     class SOCKS5BytestreamRegistry;
     class SOCKS5BytestreamServerManager;
     class SOCKS5BytestreamProxiesManager;
     class SOCKS5BytestreamClientSession;
     class SOCKS5BytestreamServerSession;
     class IDGenerator;
     class IQRouter;
     class ReadBytestream;
     class WriteBytestream;
     class ConnectionFactory;
     class TimerFactory;
     class CryptoProvider;
     class FileTransferOptions;
 
     class SWIFTEN_API DefaultFileTransferTransporter : public FileTransferTransporter {
         public:
             enum Role {
                 Initiator,
                 Responder
             };
 
             DefaultFileTransferTransporter(
                 const JID& initiator,
                 const JID& responder,
                 Role role,
                 SOCKS5BytestreamRegistry*,
                 SOCKS5BytestreamServerManager* s5bServerManager,
                 SOCKS5BytestreamProxiesManager* s5bProxy,
                 IDGenerator* idGenerator,
                 ConnectionFactory*,
                 TimerFactory*,
                 CryptoProvider*,
                 IQRouter*,
                 const FileTransferOptions&);
-            virtual ~DefaultFileTransferTransporter() SWIFTEN_OVERRIDE;
+            virtual ~DefaultFileTransferTransporter() override;
 
 
             virtual void initialize();
             virtual void initialize(const std::string& s5bSessionID);
 
-            virtual void startGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
-            virtual void stopGeneratingLocalCandidates() SWIFTEN_OVERRIDE;
+            virtual void startGeneratingLocalCandidates() override;
+            virtual void stopGeneratingLocalCandidates() override;
 
             virtual void addRemoteCandidates(
-                    const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) SWIFTEN_OVERRIDE;
-            virtual void startTryingRemoteCandidates() SWIFTEN_OVERRIDE;
-            virtual void stopTryingRemoteCandidates() SWIFTEN_OVERRIDE;
+                    const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) override;
+            virtual void startTryingRemoteCandidates() override;
+            virtual void stopTryingRemoteCandidates() override;
 
-            virtual void startActivatingProxy(const JID& jid) SWIFTEN_OVERRIDE;
-            virtual void stopActivatingProxy() SWIFTEN_OVERRIDE;
+            virtual void startActivatingProxy(const JID& jid) override;
+            virtual void stopActivatingProxy() override;
 
             virtual std::shared_ptr<TransportSession> createIBBSendSession(
-                    const std::string& sessionID, unsigned int blockSize, std::shared_ptr<ReadBytestream>) SWIFTEN_OVERRIDE;
+                    const std::string& sessionID, unsigned int blockSize, std::shared_ptr<ReadBytestream>) override;
             virtual std::shared_ptr<TransportSession> createIBBReceiveSession(
-                    const std::string& sessionID, unsigned long long size, std::shared_ptr<WriteBytestream>) SWIFTEN_OVERRIDE;
+                    const std::string& sessionID, unsigned long long size, std::shared_ptr<WriteBytestream>) override;
             virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
-                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createRemoteCandidateSession(
-                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
-                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
             virtual std::shared_ptr<TransportSession> createLocalCandidateSession(
-                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) SWIFTEN_OVERRIDE;
+                    std::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) override;
 
         private:
             void handleLocalCandidatesGenerated(const std::vector<JingleS5BTransportPayload::Candidate>&);
             void handleRemoteCandidateSelectFinished(
                     const boost::optional<JingleS5BTransportPayload::Candidate>&,
                     std::shared_ptr<SOCKS5BytestreamClientSession>);
             void handleActivateProxySessionResult(const std::string& sessionID, ErrorPayload::ref error);
             void closeLocalSession();
             void closeRemoteSession();
             std::shared_ptr<SOCKS5BytestreamServerSession> getServerSession();
 
             std::string getSOCKS5DstAddr() const;
             std::string getInitiatorCandidateSOCKS5DstAddr() const;
             std::string getResponderCandidateSOCKS5DstAddr() const;
             std::string getRemoteCandidateSOCKS5DstAddr() const;
             std::string getLocalCandidateSOCKS5DstAddr() const;
 
         private:
             JID initiator;
             JID responder;
             Role role;
             SOCKS5BytestreamRegistry* s5bRegistry;
             SOCKS5BytestreamServerManager* s5bServerManager;
             SOCKS5BytestreamProxiesManager* s5bProxy;
             CryptoProvider* crypto;
             IQRouter* router;
             LocalJingleTransportCandidateGenerator* localCandidateGenerator;
             RemoteJingleTransportCandidateSelector* remoteCandidateSelector;
             std::string s5bSessionID;
             std::shared_ptr<SOCKS5BytestreamClientSession> remoteS5BClientSession;
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
index 774747a..fe4f6ea 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h
@@ -1,51 +1,50 @@
 /*
  * Copyright (c) 2013-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/FileTransfer/FileTransferTransporterFactory.h>
 
 namespace Swift {
     class SOCKS5BytestreamRegistry;
     class SOCKS5BytestreamServerManager;
     class SOCKS5BytestreamProxiesManager;
     class IDGenerator;
     class ConnectionFactory;
     class TimerFactory;
     class CryptoProvider;
     class IQRouter;
 
     class SWIFTEN_API DefaultFileTransferTransporterFactory : public FileTransferTransporterFactory {
         public:
             DefaultFileTransferTransporterFactory(
                 SOCKS5BytestreamRegistry*,
                 SOCKS5BytestreamServerManager* s5bServerManager,
                 SOCKS5BytestreamProxiesManager* s5bProxy,
                 IDGenerator* idGenerator,
                 ConnectionFactory*,
                 TimerFactory*,
                 CryptoProvider*,
                 IQRouter*);
-            virtual ~DefaultFileTransferTransporterFactory() SWIFTEN_OVERRIDE;
+            virtual ~DefaultFileTransferTransporterFactory() override;
 
             virtual FileTransferTransporter* createInitiatorTransporter(
-                    const JID& initiator, const JID& responder, const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const JID& initiator, const JID& responder, const FileTransferOptions&) override;
             virtual FileTransferTransporter* createResponderTransporter(
-                    const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions&) override;
 
         private:
             SOCKS5BytestreamRegistry* s5bRegistry;
             SOCKS5BytestreamServerManager* s5bServerManager;
             SOCKS5BytestreamProxiesManager* s5bProxiesManager;
             IDGenerator* idGenerator;
             ConnectionFactory* connectionFactory;
             TimerFactory* timerFactory;
             CryptoProvider* cryptoProvider;
             IQRouter* iqRouter;
     };
 }
diff --git a/Swiften/FileTransfer/FailingTransportSession.h b/Swiften/FileTransfer/FailingTransportSession.h
index 28d9d07..489786b 100644
--- a/Swiften/FileTransfer/FailingTransportSession.h
+++ b/Swiften/FileTransfer/FailingTransportSession.h
@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <Swiften/Base/API.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 
 namespace Swift {
 
 class SWIFTEN_API FailingTransportSession : public TransportSession {
     public:
-        virtual ~FailingTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~FailingTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 };
 
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index e02dfc6..d3d55f0 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -1,103 +1,102 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/S5BProxyRequest.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 
 namespace Swift {
     class ConnectionFactory;
     class ConnectionServerFactory;
     class CryptoProvider;
     class DomainNameResolver;
     class EntityCapsProvider;
     class FileTransferTransporterFactory;
     class IQRouter;
     class IncomingFileTransferManager;
     class JID;
     class JingleSessionManager;
     class NATTraverser;
     class NetworkEnvironment;
     class OutgoingFileTransferManager;
     class PresenceOracle;
     class ReadBytestream;
     class SOCKS5BytestreamProxiesManager;
     class SOCKS5BytestreamRegistry;
     class SOCKS5BytestreamServerManager;
     class TimerFactory;
 
     class SWIFTEN_API FileTransferManagerImpl : public FileTransferManager {
         public:
             FileTransferManagerImpl(
                     const JID& ownFullJID,
                     JingleSessionManager* jingleSessionManager,
                     IQRouter* router,
                     EntityCapsProvider* capsProvider,
                     PresenceOracle* presOracle,
                     ConnectionFactory* connectionFactory,
                     ConnectionServerFactory* connectionServerFactory,
                     TimerFactory* timerFactory,
                     DomainNameResolver* domainNameResolver,
                     NetworkEnvironment* networkEnvironment,
                     NATTraverser* natTraverser,
                     CryptoProvider* crypto);
-            virtual ~FileTransferManagerImpl() SWIFTEN_OVERRIDE;
+            virtual ~FileTransferManagerImpl() override;
 
             OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID& to,
                     const boost::filesystem::path& filepath,
                     const std::string& description,
                     std::shared_ptr<ReadBytestream> bytestream,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const FileTransferOptions&) override;
             OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID& to,
                     const std::string& filename,
                     const std::string& description,
                     const boost::uintmax_t sizeInBytes,
                     const boost::posix_time::ptime& lastModified,
                     std::shared_ptr<ReadBytestream> bytestream,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE;
+                    const FileTransferOptions&) override;
 
             void start();
             void stop();
 
         private:
             boost::optional<JID> highestPriorityJIDSupportingFileTransfer(const JID& bareJID);
 
         private:
             OutgoingFileTransferManager* outgoingFTManager;
             IncomingFileTransferManager* incomingFTManager;
             FileTransferTransporterFactory* transporterFactory;
             IQRouter* iqRouter;
             EntityCapsProvider* capsProvider;
             PresenceOracle* presenceOracle;
             IDGenerator idGenerator;
             SOCKS5BytestreamRegistry* bytestreamRegistry;
             SOCKS5BytestreamProxiesManager* bytestreamProxy;
             SOCKS5BytestreamServerManager* s5bServerManager;
     };
 }
diff --git a/Swiften/FileTransfer/FileTransferOptions.h b/Swiften/FileTransfer/FileTransferOptions.h
index 2bc4ee1..aa9aa97 100644
--- a/Swiften/FileTransfer/FileTransferOptions.h
+++ b/Swiften/FileTransfer/FileTransferOptions.h
@@ -1,40 +1,39 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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>
 
 namespace Swift {
     class SWIFTEN_API FileTransferOptions {
         public:
             FileTransferOptions() : allowInBand_(true), allowAssisted_(true), allowProxied_(true), allowDirect_(true) {
             }
             SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(FileTransferOptions)
             ~FileTransferOptions();
 
             FileTransferOptions& withInBandAllowed(bool b) {
                 allowInBand_ = b;
                 return *this;
             }
 
             bool isInBandAllowed() const {
                 return allowInBand_;
             }
 
             FileTransferOptions& withAssistedAllowed(bool b) {
                 allowAssisted_ = b;
                 return *this;
             }
 
             bool isAssistedAllowed() const {
                 return allowAssisted_;
             }
 
             FileTransferOptions& withProxiedAllowed(bool b) {
                 allowProxied_ = b;
                 return *this;
diff --git a/Swiften/FileTransfer/IBBReceiveTransportSession.h b/Swiften/FileTransfer/IBBReceiveTransportSession.h
index 7529274..5b1fd8d 100644
--- a/Swiften/FileTransfer/IBBReceiveTransportSession.h
+++ b/Swiften/FileTransfer/IBBReceiveTransportSession.h
@@ -1,31 +1,31 @@
 /*
  * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/FileTransfer/IBBReceiveSession.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 
 namespace Swift {
 
 class SWIFTEN_API IBBReceiveTransportSession : public TransportSession {
     public:
         IBBReceiveTransportSession(std::shared_ptr<IBBReceiveSession> session);
-        virtual ~IBBReceiveTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~IBBReceiveTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 
     private:
         std::shared_ptr<IBBReceiveSession> session;
         boost::signals2::scoped_connection finishedConnection;
         boost::signals2::scoped_connection bytesSentConnection;
 };
 
 }
diff --git a/Swiften/FileTransfer/IBBSendTransportSession.h b/Swiften/FileTransfer/IBBSendTransportSession.h
index f9bf8fb..7deaaac 100644
--- a/Swiften/FileTransfer/IBBSendTransportSession.h
+++ b/Swiften/FileTransfer/IBBSendTransportSession.h
@@ -1,31 +1,31 @@
 /*
  * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/FileTransfer/IBBSendSession.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 
 namespace Swift {
 
 class SWIFTEN_API IBBSendTransportSession : public TransportSession {
     public:
         IBBSendTransportSession(std::shared_ptr<IBBSendSession> session);
-        virtual ~IBBSendTransportSession() SWIFTEN_OVERRIDE;
+        virtual ~IBBSendTransportSession() override;
 
-        virtual void start() SWIFTEN_OVERRIDE;
-        virtual void stop() SWIFTEN_OVERRIDE;
+        virtual void start() override;
+        virtual void stop() override;
 
     private:
         std::shared_ptr<IBBSendSession> session;
         boost::signals2::scoped_connection finishedConnection;
         boost::signals2::scoped_connection bytesSentConnection;
 };
 
 }
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index e71126b..f42004d 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -1,127 +1,126 @@
 /*
  * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/cstdint.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/JingleFileTransfer.h>
 #include <Swiften/Jingle/JingleContentID.h>
 
 namespace Swift {
     class CryptoProvider;
     class FileTransferTransporterFactory;
     class IncrementalBytestreamHashCalculator;
     class JID;
     class JingleContentPayload;
     class JingleFileTransferDescription;
     class JingleSession;
     class Timer;
     class TimerFactory;
 
     /**
      * @brief The IncomingJingleFileTransfer class contains the business logic for managing incoming
      *        Jingle file transfers.
      *
      * Calling IncomingJingleFileTransfer::accept will start to negotiate possible transfer
      * methods and after a working method has been decided among peers the trasnfer is started.
      */
     class SWIFTEN_API IncomingJingleFileTransfer : public IncomingFileTransfer, public JingleFileTransfer {
         public:
             typedef std::shared_ptr<IncomingJingleFileTransfer> ref;
 
             IncomingJingleFileTransfer(
                 const JID& recipient,
                 std::shared_ptr<JingleSession>,
                 std::shared_ptr<JingleContentPayload> content,
                 FileTransferTransporterFactory*,
                 TimerFactory*,
                 CryptoProvider*);
-            virtual ~IncomingJingleFileTransfer() SWIFTEN_OVERRIDE;
+            virtual ~IncomingJingleFileTransfer() override;
 
-            virtual void accept(std::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) SWIFTEN_OVERRIDE;
-            virtual void cancel() SWIFTEN_OVERRIDE;
+            virtual void accept(std::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) override;
+            virtual void cancel() override;
 
         private:
             enum State {
                 Initial,
                 GeneratingInitialLocalCandidates,
                 TryingCandidates,
                 WaitingForPeerProxyActivate,
                 WaitingForLocalProxyActivate,
                 WaitingForFallbackOrTerminate,
                 Transferring,
                 WaitingForHash,
                 Finished
             };
 
             virtual void handleSessionTerminateReceived(
-                    boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
-            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
+                    boost::optional<JinglePayload::Reason> reason) override;
+            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) override;
             virtual void handleTransportReplaceReceived(
-                    const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+                    const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
 
             virtual void handleLocalTransportCandidatesGenerated(
                     const std::string& s5bSessionID,
                     const std::vector<JingleS5BTransportPayload::Candidate>&,
-                    const std::string& dstAddr) SWIFTEN_OVERRIDE;
+                    const std::string& dstAddr) override;
 
             void handleWriteStreamDataReceived(const std::vector<unsigned char>& data);
             void stopActiveTransport();
             void checkCandidateSelected();
-            virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE;
+            virtual JingleContentID getContentID() const override;
             void checkIfAllDataReceived();
             bool verifyData();
             void handleWaitOnHashTimerTicked();
             void handleTransferFinished(boost::optional<FileTransferError>);
 
         private:
-            virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
-            virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
+            virtual void startTransferViaRemoteCandidate() override;
+            virtual void startTransferViaLocalCandidate() override;
             void checkHashAndTerminate();
             void stopAll();
             void setState(State state);
             void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error);
-            const JID& getSender() const SWIFTEN_OVERRIDE;
-            const JID& getRecipient() const SWIFTEN_OVERRIDE;
+            const JID& getSender() const override;
+            const JID& getRecipient() const override;
             static FileTransfer::State::Type getExternalState(State state);
-            virtual bool hasPriorityOnCandidateTie() const SWIFTEN_OVERRIDE;
-            virtual void fallback() SWIFTEN_OVERRIDE;
-            virtual void startTransferring(std::shared_ptr<TransportSession>) SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForPeerProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForLocalProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isTryingCandidates() const SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE;
-            virtual void terminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
+            virtual bool hasPriorityOnCandidateTie() const override;
+            virtual void fallback() override;
+            virtual void startTransferring(std::shared_ptr<TransportSession>) override;
+            virtual bool isWaitingForPeerProxyActivate() const override;
+            virtual bool isWaitingForLocalProxyActivate() const override;
+            virtual bool isTryingCandidates() const override;
+            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() override;
+            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() override;
+            virtual void terminate(JinglePayload::Reason::Type reason) override;
 
 
         private:
             std::shared_ptr<JingleContentPayload> initialContent;
             CryptoProvider* crypto;
             State state;
             std::shared_ptr<JingleFileTransferDescription> description;
             std::shared_ptr<WriteBytestream> stream;
             boost::uintmax_t receivedBytes;
             IncrementalBytestreamHashCalculator* hashCalculator;
             std::shared_ptr<Timer> waitOnHashTimer;
             std::map<std::string, ByteArray> hashes;
             FileTransferOptions options;
 
             boost::signals2::scoped_connection writeStreamDataReceivedConnection;
             boost::signals2::scoped_connection waitOnHashTimerTickedConnection;
             boost::signals2::connection transferFinishedConnection;
     };
 }
diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
index 2159063..8c53d16 100644
--- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
+++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h
@@ -1,50 +1,49 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h>
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxyFinder.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
     class SOCKS5BytestreamServerManager;
     class SOCKS5BytestreamProxiesManager;
     class SOCKS5BytestreamServerInitializeRequest;
     class SOCKS5BytestreamServerResourceUser;
     class SOCKS5BytestreamServerPortForwardingUser;
     class JingleS5BTransportPayload;
 
     class LocalJingleTransportCandidateGenerator {
         public:
             LocalJingleTransportCandidateGenerator(
                     SOCKS5BytestreamServerManager* s5bServerManager,
                     SOCKS5BytestreamProxiesManager* s5bProxy,
                     const JID& ownJID,
                     IDGenerator* idGenerator,
                     const FileTransferOptions& options);
             virtual ~LocalJingleTransportCandidateGenerator();
 
             virtual void start();
             virtual void stop();
 
             boost::signals2::signal<void (const std::vector<JingleS5BTransportPayload::Candidate>&)> onLocalTransportCandidatesGenerated;
 
         private:
             void handleS5BServerInitialized(bool success);
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index 0ab4e2b..6db4e40 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -1,122 +1,121 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <boost/optional/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleFileTransferFileInfo.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/JingleFileTransfer.h>
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/Jingle/JingleContentID.h>
 #include <Swiften/Network/Timer.h>
 
 namespace Swift {
     class CryptoProvider;
     class FileTransferTransporterFactory;
     class IDGenerator;
     class IncrementalBytestreamHashCalculator;
     class ReadBytestream;
     class TimerFactory;
     class TransportSession;
 
     class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer, public JingleFileTransfer {
         public:
             OutgoingJingleFileTransfer(
                 const JID& to,
                 std::shared_ptr<JingleSession>,
                 std::shared_ptr<ReadBytestream>,
                 FileTransferTransporterFactory*,
                 TimerFactory*,
                 IDGenerator*,
                 const JingleFileTransferFileInfo&,
                 const FileTransferOptions&,
                 CryptoProvider*);
-            virtual ~OutgoingJingleFileTransfer() SWIFTEN_OVERRIDE;
+            virtual ~OutgoingJingleFileTransfer() override;
 
-            virtual void start() SWIFTEN_OVERRIDE;
-            virtual void cancel() SWIFTEN_OVERRIDE;
+            virtual void start() override;
+            virtual void cancel() override;
 
         private:
             enum State {
                 Initial,
                 GeneratingInitialLocalCandidates,
                 WaitingForAccept,
                 TryingCandidates,
                 WaitingForPeerProxyActivate,
                 WaitingForLocalProxyActivate,
                 WaitingForCandidateAcknowledge,
                 FallbackRequested,
                 Transferring,
                 WaitForTermination,
                 Finished
             };
 
-            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) SWIFTEN_OVERRIDE;
-            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportRejectReceived(const JingleContentID &, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void startTransferViaRemoteCandidate() SWIFTEN_OVERRIDE;
-            virtual void startTransferViaLocalCandidate() SWIFTEN_OVERRIDE;
+            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason> reason) override;
+            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportRejectReceived(const JingleContentID &, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void startTransferViaRemoteCandidate() override;
+            virtual void startTransferViaLocalCandidate() override;
             void startTransferringIfCandidateAcknowledged();
 
-            virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& dstAddr) SWIFTEN_OVERRIDE;
-            virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
+            virtual void handleLocalTransportCandidatesGenerated(const std::string& s5bSessionID, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& dstAddr) override;
+            virtual void handleTransportInfoAcknowledged(const std::string& id) override;
 
-            virtual JingleContentID getContentID() const SWIFTEN_OVERRIDE;
+            virtual JingleContentID getContentID() const override;
 
-            virtual void terminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
+            virtual void terminate(JinglePayload::Reason::Type reason) override;
 
-            virtual void fallback() SWIFTEN_OVERRIDE;
+            virtual void fallback() override;
             void handleTransferFinished(boost::optional<FileTransferError>);
 
             void sendSessionInfoHash();
 
-            virtual void startTransferring(std::shared_ptr<TransportSession>) SWIFTEN_OVERRIDE;
+            virtual void startTransferring(std::shared_ptr<TransportSession>) override;
 
-            virtual bool hasPriorityOnCandidateTie() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForPeerProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isWaitingForLocalProxyActivate() const SWIFTEN_OVERRIDE;
-            virtual bool isTryingCandidates() const SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() SWIFTEN_OVERRIDE;
-            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE;
+            virtual bool hasPriorityOnCandidateTie() const override;
+            virtual bool isWaitingForPeerProxyActivate() const override;
+            virtual bool isWaitingForLocalProxyActivate() const override;
+            virtual bool isTryingCandidates() const override;
+            virtual std::shared_ptr<TransportSession> createLocalCandidateSession() override;
+            virtual std::shared_ptr<TransportSession> createRemoteCandidateSession() override;
 
             void handleWaitForRemoteTerminationTimeout();
 
             void stopAll();
             void setInternalState(State state);
             void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error);
 
             static FileTransfer::State::Type getExternalState(State state);
 
         private:
             IDGenerator* idGenerator;
             std::shared_ptr<ReadBytestream> stream;
             JingleFileTransferFileInfo fileInfo;
             FileTransferOptions options;
             JingleContentID contentID;
             IncrementalBytestreamHashCalculator* hashCalculator;
             State state;
             bool candidateAcknowledged;
 
             Timer::ref waitForRemoteTermination;
 
             boost::signals2::connection processedBytesConnection;
             boost::signals2::connection transferFinishedConnection;
     };
 
 }
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
index c4257f6..c205516 100644
--- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
+++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h
@@ -1,51 +1,50 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h>
 
 #include <memory>
 #include <queue>
 #include <vector>
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Network/Connection.h>
 
 namespace Swift {
     class ConnectionFactory;
     class TimerFactory;
 
     class RemoteJingleTransportCandidateSelector {
         public:
             RemoteJingleTransportCandidateSelector(ConnectionFactory*, TimerFactory*, const FileTransferOptions&);
             virtual ~RemoteJingleTransportCandidateSelector();
 
             virtual void addCandidates(const std::vector<JingleS5BTransportPayload::Candidate>&);
             virtual void setSOCKS5DstAddr(const std::string&);
             virtual void startSelectingCandidate();
             virtual void stopSelectingCandidate();
 
             boost::signals2::signal<void (const boost::optional<JingleS5BTransportPayload::Candidate>&, std::shared_ptr<SOCKS5BytestreamClientSession>)> onCandidateSelectFinished;
 
         private:
             void tryNextCandidate();
             void handleSessionReady(bool error);
 
         private:
             ConnectionFactory* connectionFactory;
             TimerFactory* timerFactory;
 
diff --git a/Swiften/FileTransfer/S5BTransportSession.h b/Swiften/FileTransfer/S5BTransportSession.h
index 87fc5c1..fd92f2e 100644
--- a/Swiften/FileTransfer/S5BTransportSession.h
+++ b/Swiften/FileTransfer/S5BTransportSession.h
@@ -8,62 +8,62 @@
 
 #include <boost/bind.hpp>
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/FileTransfer/ReadBytestream.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 #include <Swiften/FileTransfer/WriteBytestream.h>
 
 namespace Swift {
 
 template <typename T>
 class SWIFTEN_API S5BTransportSession : public TransportSession {
     public:
         S5BTransportSession(
                 std::shared_ptr<T> session,
                 std::shared_ptr<ReadBytestream> readStream) :
                     session(session),
                     readStream(readStream) {
             initialize();
         }
 
         S5BTransportSession(
                 std::shared_ptr<T> session,
                 std::shared_ptr<WriteBytestream> writeStream) :
                     session(session),
                     writeStream(writeStream) {
             initialize();
         }
 
-        virtual ~S5BTransportSession() SWIFTEN_OVERRIDE {
+        virtual ~S5BTransportSession() override {
         }
 
-        virtual void start() SWIFTEN_OVERRIDE {
+        virtual void start() override {
             if (readStream) {
                 session->startSending(readStream);
             }
             else {
                 session->startReceiving(writeStream);
             }
         }
 
-        virtual void stop() SWIFTEN_OVERRIDE {
+        virtual void stop() override {
             session->stop();
         }
 
     private:
         void initialize() {
             finishedConnection = session->onFinished.connect(boost::bind(boost::ref(onFinished), _1));
             bytesSentConnection = session->onBytesSent.connect(boost::bind(boost::ref(onBytesSent), _1));
         }
 
     private:
         std::shared_ptr<T> session;
         std::shared_ptr<ReadBytestream> readStream;
         std::shared_ptr<WriteBytestream> writeStream;
 
         boost::signals2::scoped_connection finishedConnection;
         boost::signals2::scoped_connection bytesSentConnection;
 };
 
 }
diff --git a/Swiften/FileTransfer/TransportSession.h b/Swiften/FileTransfer/TransportSession.h
index dc6e59a..2d56517 100644
--- a/Swiften/FileTransfer/TransportSession.h
+++ b/Swiften/FileTransfer/TransportSession.h
@@ -1,26 +1,25 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/FileTransfer/FileTransferError.h>
 
 namespace Swift {
     class SWIFTEN_API TransportSession {
         public:
             virtual ~TransportSession();
 
             virtual void start() = 0;
             virtual void stop() = 0;
 
             boost::signals2::signal<void (size_t)> onBytesSent;
             boost::signals2::signal<void (boost::optional<FileTransferError>)> onFinished;
     };
 }
diff --git a/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h b/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
index 03e2476..6119658 100644
--- a/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
+++ b/Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h
@@ -1,56 +1,55 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
 namespace Swift {
     class S5BProxyRequest;
     class FileTransferOptions;
 
     class DummyFileTransferManager : public FileTransferManager {
         public:
             DummyFileTransferManager() : FileTransferManager() {
             }
 
             virtual OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID&,
                     const boost::filesystem::path&,
                     const std::string&,
                     std::shared_ptr<ReadBytestream>,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE {
+                    const FileTransferOptions&) override {
                 return OutgoingFileTransfer::ref();
             }
 
             virtual OutgoingFileTransfer::ref createOutgoingFileTransfer(
                     const JID&,
                     const std::string&,
                     const std::string&,
                     const boost::uintmax_t,
                     const boost::posix_time::ptime&,
                     std::shared_ptr<ReadBytestream>,
-                    const FileTransferOptions&) SWIFTEN_OVERRIDE {
+                    const FileTransferOptions&) override {
                 return OutgoingFileTransfer::ref();
             }
 
             virtual void addS5BProxy(std::shared_ptr<S5BProxyRequest>) {
             }
 
     };
 }
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
index 72b933d..9793b87 100644
--- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
@@ -1,51 +1,50 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <iostream>
 #include <memory>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/Elements/IBB.h>
 #include <Swiften/Elements/JingleFileTransferDescription.h>
 #include <Swiften/Elements/JingleIBBTransportPayload.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/FileTransfer/ByteArrayWriteBytestream.h>
 #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>
 #include <Swiften/FileTransfer/IncomingJingleFileTransfer.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #include <Swiften/Jingle/FakeJingleSession.h>
 #include <Swiften/Network/DummyConnectionFactory.h>
 #include <Swiften/Network/DummyConnectionServerFactory.h>
 #include <Swiften/Network/DummyTimerFactory.h>
 #include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/PlatformNATTraversalWorker.h>
 #include <Swiften/Network/PlatformNetworkEnvironment.h>
 #include <Swiften/Network/StaticDomainNameResolver.h>
 #include <Swiften/Queries/IQRouter.h>
 
 using namespace Swift;
 
 class IncomingJingleFileTransferTest : public CppUnit::TestFixture {
         CPPUNIT_TEST_SUITE(IncomingJingleFileTransferTest);
         CPPUNIT_TEST(test_AcceptOnyIBBSendsSessionAccept);
         CPPUNIT_TEST(test_OnlyIBBTransferReceiveWorks);
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
index 3f4d20f..a0fe057 100644
--- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
@@ -1,54 +1,53 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <iostream>
 #include <memory>
 
 #include <boost/bind.hpp>
 #include <boost/optional.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/Elements/IBB.h>
 #include <Swiften/Elements/JingleFileTransferDescription.h>
 #include <Swiften/Elements/JingleIBBTransportPayload.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/FileTransfer/ByteArrayReadBytestream.h>
 #include <Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h>
 #include <Swiften/FileTransfer/OutgoingJingleFileTransfer.h>
 #include <Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #include <Swiften/FileTransfer/UnitTest/DummyFileTransferTransporterFactory.h>
 #include <Swiften/Jingle/FakeJingleSession.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/DummyConnection.h>
 #include <Swiften/Network/DummyConnectionFactory.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include <Swiften/Network/DummyConnectionServerFactory.h>
 #include <Swiften/Network/DummyTimerFactory.h>
 #include <Swiften/Network/PlatformNATTraversalWorker.h>
 #include <Swiften/Network/PlatformNetworkEnvironment.h>
 #include <Swiften/Queries/IQRouter.h>
 
 using namespace Swift;
 
 class OutgoingJingleFileTransferTest : public CppUnit::TestFixture {
diff --git a/Swiften/IDN/ICUConverter.h b/Swiften/IDN/ICUConverter.h
index 0a0b0d3..b0f5d85 100644
--- a/Swiften/IDN/ICUConverter.h
+++ b/Swiften/IDN/ICUConverter.h
@@ -1,23 +1,22 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/IDN/IDNConverter.h>
 
 namespace Swift {
     class SWIFTEN_API ICUConverter : public IDNConverter {
         public:
-            virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
-            virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+            virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) override;
+            virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) override;
 
-            virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) SWIFTEN_OVERRIDE;
+            virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) override;
     };
 }
diff --git a/Swiften/IDN/LibIDNConverter.h b/Swiften/IDN/LibIDNConverter.h
index 3f1d1f7..5553ab3 100644
--- a/Swiften/IDN/LibIDNConverter.h
+++ b/Swiften/IDN/LibIDNConverter.h
@@ -1,24 +1,23 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/IDN/IDNConverter.h>
 
 namespace Swift {
     class SWIFTEN_API LibIDNConverter : public IDNConverter {
         public:
-            virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
-            virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) SWIFTEN_OVERRIDE;
+            virtual std::string getStringPrepared(const std::string& s, StringPrepProfile profile) override;
+            virtual SafeByteArray getStringPrepared(const SafeByteArray& s, StringPrepProfile profile) override;
 
-            virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) SWIFTEN_OVERRIDE;
+            virtual boost::optional<std::string> getIDNAEncoded(const std::string& s) override;
     };
 }
 
diff --git a/Swiften/Jingle/AbstractJingleSessionListener.h b/Swiften/Jingle/AbstractJingleSessionListener.h
index 590cd14..dd8bd1e 100644
--- a/Swiften/Jingle/AbstractJingleSessionListener.h
+++ b/Swiften/Jingle/AbstractJingleSessionListener.h
@@ -1,26 +1,25 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-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/Jingle/JingleSessionListener.h>
 
 namespace Swift {
     class SWIFTEN_API AbstractJingleSessionListener : public JingleSessionListener {
         public:
-            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
-            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportReplaceReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
-            virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
+            virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) override;
+            virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>) override;
+            virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportReplaceReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) override;
+            virtual void handleTransportInfoAcknowledged(const std::string& id) override;
     };
 }
 
diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h
index 8463d8c..0ed97d5 100644
--- a/Swiften/Jingle/FakeJingleSession.h
+++ b/Swiften/Jingle/FakeJingleSession.h
@@ -1,53 +1,52 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/signals2.hpp>
 #include <boost/variant.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Base/SimpleIDGenerator.h>
 #include <Swiften/Elements/JinglePayload.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Jingle/JingleContentID.h>
 #include <Swiften/Jingle/JingleSession.h>
 
 namespace Swift {
     class JingleContentID;
 
     class SWIFTEN_API FakeJingleSession : public JingleSession {
         public:
         struct InitiateCall {
             InitiateCall(JingleContentID contentId, JingleDescription::ref desc, JingleTransportPayload::ref payL) : id(contentId), description(desc), payload(payL) {}
             JingleContentID id;
             JingleDescription::ref description;
             JingleTransportPayload::ref payload;
         };
 
         struct  TerminateCall {
             TerminateCall(JinglePayload::Reason::Type r) : reason(r) {}
             JinglePayload::Reason::Type reason;
         };
 
         struct InfoCall {
             InfoCall(std::shared_ptr<Payload> info) : payload(info) {}
             std::shared_ptr<Payload> payload;
         };
 
         struct AcceptCall {
             AcceptCall(JingleContentID contentId, JingleDescription::ref desc, JingleTransportPayload::ref payL) : id(contentId), description(desc), payload(payL) {}
@@ -59,56 +58,56 @@ namespace Swift {
         struct InfoTransportCall {
             InfoTransportCall(JingleContentID contentId, JingleTransportPayload::ref payL) : id(contentId), payload(payL) {}
             JingleContentID id;
             JingleTransportPayload::ref payload;
         };
 
         struct AcceptTransportCall {
             AcceptTransportCall(JingleContentID contentId, JingleTransportPayload::ref payL) : id(contentId), payload(payL) {}
             JingleContentID id;
             JingleTransportPayload::ref payload;
         };
 
         struct RejectTransportCall {
             RejectTransportCall(JingleContentID contentId, JingleTransportPayload::ref payL) : id(contentId), payload(payL) {}
             JingleContentID id;
             JingleTransportPayload::ref payload;
         };
 
         struct ReplaceTransportCall {
             ReplaceTransportCall(JingleContentID contentId, JingleTransportPayload::ref payL) : id(contentId), payload(payL) {}
             JingleContentID id;
             JingleTransportPayload::ref payload;
         };
 
         typedef boost::variant<InitiateCall, TerminateCall, AcceptCall, InfoCall, InfoTransportCall, AcceptTransportCall, RejectTransportCall, ReplaceTransportCall> Command;
 
         public:
             typedef std::shared_ptr<FakeJingleSession> ref;
 
             FakeJingleSession(const JID& initiator, const std::string& id);
-            virtual ~FakeJingleSession() SWIFTEN_OVERRIDE;
-
-            virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
-            virtual void sendTerminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
-            virtual void sendInfo(std::shared_ptr<Payload>) SWIFTEN_OVERRIDE;
-            virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref = JingleTransportPayload::ref()) SWIFTEN_OVERRIDE;
-            virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
-            virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
-            virtual void sendTransportReject(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
-            virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
+            virtual ~FakeJingleSession() override;
+
+            virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref) override;
+            virtual void sendTerminate(JinglePayload::Reason::Type reason) override;
+            virtual void sendInfo(std::shared_ptr<Payload>) override;
+            virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref = JingleTransportPayload::ref()) override;
+            virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) override;
+            virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref) override;
+            virtual void sendTransportReject(const JingleContentID&, JingleTransportPayload::ref) override;
+            virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref) override;
 
             void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>);
             void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>);
             void handleSessionInfoReceived(std::shared_ptr<JinglePayload>);
 
             void handleTransportReplaceReceived(const JingleContentID&, JingleTransportPayload::ref);
             void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
             void handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
             void handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
             void handleTransportInfoAcknowledged(const std::string& id);
 
         public:
             std::vector<Command> calledCommands;
             SimpleIDGenerator idGenerator;
     };
 }
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h
index 885f824..2bf8d33 100644
--- a/Swiften/Network/BoostNetworkFactories.h
+++ b/Swiften/Network/BoostNetworkFactories.h
@@ -1,94 +1,93 @@
 /*
  * Copyright (c) 2010-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/Network/BoostIOServiceThread.h>
 #include <Swiften/Network/NetworkFactories.h>
 
 namespace Swift {
     class EventLoop;
     class NATTraverser;
     class PlatformTLSFactories;
 
     class SWIFTEN_API BoostNetworkFactories : public NetworkFactories {
         public:
             /**
              * Construct the network factories, using the provided EventLoop.
              * @param ioService If this optional parameter is provided, it will be
              * used for the construction of the BoostIOServiceThread.
              */
             BoostNetworkFactories(EventLoop* eventLoop, std::shared_ptr<boost::asio::io_service> ioService = std::shared_ptr<boost::asio::io_service>());
-            virtual ~BoostNetworkFactories() SWIFTEN_OVERRIDE;
+            virtual ~BoostNetworkFactories() override;
 
-            virtual TimerFactory* getTimerFactory() const SWIFTEN_OVERRIDE {
+            virtual TimerFactory* getTimerFactory() const override {
                 return timerFactory;
             }
 
-            virtual ConnectionFactory* getConnectionFactory() const SWIFTEN_OVERRIDE {
+            virtual ConnectionFactory* getConnectionFactory() const override {
                 return connectionFactory;
             }
 
             BoostIOServiceThread* getIOServiceThread() {
                 return &ioServiceThread;
             }
 
-            DomainNameResolver* getDomainNameResolver() const SWIFTEN_OVERRIDE {
+            DomainNameResolver* getDomainNameResolver() const override {
                 return domainNameResolver;
             }
 
-            ConnectionServerFactory* getConnectionServerFactory() const SWIFTEN_OVERRIDE {
+            ConnectionServerFactory* getConnectionServerFactory() const override {
                 return connectionServerFactory;
             }
 
-            NetworkEnvironment* getNetworkEnvironment() const SWIFTEN_OVERRIDE {
+            NetworkEnvironment* getNetworkEnvironment() const override {
                 return networkEnvironment;
             }
 
-            NATTraverser* getNATTraverser() const SWIFTEN_OVERRIDE {
+            NATTraverser* getNATTraverser() const override {
                 return natTraverser;
             }
 
-            virtual XMLParserFactory* getXMLParserFactory() const SWIFTEN_OVERRIDE {
+            virtual XMLParserFactory* getXMLParserFactory() const override {
                 return xmlParserFactory;
             }
 
-            virtual TLSContextFactory* getTLSContextFactory() const SWIFTEN_OVERRIDE;
+            virtual TLSContextFactory* getTLSContextFactory() const override;
 
-            virtual ProxyProvider* getProxyProvider() const SWIFTEN_OVERRIDE {
+            virtual ProxyProvider* getProxyProvider() const override {
                 return proxyProvider;
             }
 
-            virtual EventLoop* getEventLoop() const SWIFTEN_OVERRIDE {
+            virtual EventLoop* getEventLoop() const override {
                 return eventLoop;
             }
 
-            virtual IDNConverter* getIDNConverter() const SWIFTEN_OVERRIDE {
+            virtual IDNConverter* getIDNConverter() const override {
                 return idnConverter;
             }
 
-            virtual CryptoProvider* getCryptoProvider() const SWIFTEN_OVERRIDE {
+            virtual CryptoProvider* getCryptoProvider() const override {
                 return cryptoProvider;
             }
 
         private:
             BoostIOServiceThread ioServiceThread;
             TimerFactory* timerFactory;
             ConnectionFactory* connectionFactory;
             DomainNameResolver* domainNameResolver;
             ConnectionServerFactory* connectionServerFactory;
             NATTraverser* natTraverser;
             NetworkEnvironment* networkEnvironment;
             XMLParserFactory* xmlParserFactory;
             PlatformTLSFactories* tlsFactories;
             ProxyProvider* proxyProvider;
             EventLoop* eventLoop;
             IDNConverter* idnConverter;
             CryptoProvider* cryptoProvider;
     };
 }
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,38 +1,37 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <cassert>
 #include <map>
 #include <string>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 
 namespace Swift {
     template<typename T>
     class SWIFTEN_API EnumParser {
         public:
             EnumParser() {
             }
 
             EnumParser& operator()(T value, const std::string& text) {
                 values[text] = value;
                 return *this;
             }
 
             boost::optional<T> parse(const std::string& value) {
                 typename std::map<std::string, T>::const_iterator i = values.find(value);
                 return i == values.end() ? boost::optional<T>() : i->second;
             }
 
         private:
             std::map<std::string, T> values;
     };
 }
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,40 +1,39 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Forwarded.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class StanzaParser;
     class DelayParser;
 
     class SWIFTEN_API ForwardedParser : public GenericPayloadParser<Forwarded> {
         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,
                 PayloadLevel = 1
             };
 
         private:
             PayloadParserFactoryCollection* factories_;
             std::shared_ptr<StanzaParser> childParser_;
             std::shared_ptr<DelayParser> delayParser_;
             int level_;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IsodeIQDelegation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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,36 +1,35 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMFin.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class ResultSetParser;
 
     class SWIFTEN_API MAMFinParser : public GenericPayloadParser<MAMFin> {
         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,
                 PayloadLevel = 1
             };
 
         private:
             std::shared_ptr<ResultSetParser> resultSetParser_;
             int level_;
     };
 }
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,39 +1,38 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMQuery.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class ResultSetParser;
     class FormParser;
 
     class SWIFTEN_API MAMQueryParser : public GenericPayloadParser<MAMQuery> {
         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,
                 PayloadLevel = 1
             };
 
         private:
             std::shared_ptr<FormParser> formParser_;
             std::shared_ptr<ResultSetParser> resultSetParser_;
             int level_;
     };
 }
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,39 +1,38 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMResult.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class ForwardedParser;
 
     class SWIFTEN_API MAMResultParser : public GenericPayloadParser<MAMResult> {
         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,
                 PayloadLevel = 1
             };
 
         private:
             std::shared_ptr<ForwardedParser> payloadParser_;
             PayloadParserFactoryCollection* factories_;
             int level_;
     };
 }
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
@@ -1,38 +1,37 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXCreate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParser;
 
     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_;
             std::shared_ptr<PayloadParser> currentPayloadParser_;
     };
 }
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
@@ -1,37 +1,36 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXDestroy.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParser;
 
     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
@@ -1,38 +1,37 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXJoin.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParser;
 
     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_;
             std::shared_ptr<PayloadParser> currentPayloadParser_;
     };
 }
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
@@ -1,36 +1,35 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXLeave.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 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
@@ -1,20 +1,25 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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>
 
 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
@@ -1,27 +1,33 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/MIXPayloadParser.h>
 
 namespace Swift {
     class SWIFTEN_API MIXPayloadParserFactory : public PayloadParserFactory {
         public:
             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
@@ -1,20 +1,25 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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>
 
 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
@@ -1,28 +1,33 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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>
 
 namespace Swift {
     class SWIFTEN_API MIXSetNickParserFactory : public PayloadParserFactory {
         public:
             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
@@ -1,38 +1,37 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXSubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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
@@ -1,38 +1,37 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXUserPreference.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParser;
 
     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_;
             std::shared_ptr<PayloadParser> currentPayloadParser_;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubConfigure.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubCreate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubDefault.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,32 +1,31 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #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>
 
 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;
             EnumParser<PubSubError::Type> typeParser;
             EnumParser<PubSubError::UnsupportedFeatureType> unsupportedTypeParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventCollection.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventConfiguration.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDelete.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItem.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItems.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEvent.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventPurge.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRedirect.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRetract.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItems.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliations.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerConfigure.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDefault.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDelete.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPubSub.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPurge.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerRedirect.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscriptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,38 +1,37 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSub.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
     class PubSubOptions;
     class PubSubConfigure;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
             std::shared_ptr<PubSubConfigure> configurePayload;
             std::shared_ptr<PubSubOptions> optionsPayload;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubPublish.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubRetract.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscriptions.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             int level;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,33 +1,32 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubUnsubscribe.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class PayloadParserFactoryCollection;
     class PayloadParser;
 
     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;
             std::shared_ptr<PayloadParser> currentPayloadParser;
     };
 }
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
@@ -1,34 +1,33 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ResultSet.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
     class SWIFTEN_API ResultSetParser : public GenericPayloadParser<ResultSet> {
         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,
                 PayloadLevel = 1
             };
 
         private:
             std::string currentText_;
             int level_;
     };
 }
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
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserLocation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 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;
             std::string currentText;
     };
 }
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
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserTune.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 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;
             std::string currentText;
     };
 }
diff --git a/Swiften/PubSub/PubSubManager.h b/Swiften/PubSub/PubSubManager.h
index eba5dd9..477b3de 100644
--- a/Swiften/PubSub/PubSubManager.h
+++ b/Swiften/PubSub/PubSubManager.h
@@ -1,44 +1,43 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Elements/PubSub.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
 #include <Swiften/Elements/PubSubCreate.h>
 #include <Swiften/Elements/PubSubDefault.h>
 #include <Swiften/Elements/PubSubEventPayload.h>
 #include <Swiften/Elements/PubSubItems.h>
 #include <Swiften/Elements/PubSubOwnerAffiliations.h>
 #include <Swiften/Elements/PubSubOwnerConfigure.h>
 #include <Swiften/Elements/PubSubOwnerDefault.h>
 #include <Swiften/Elements/PubSubOwnerDelete.h>
 #include <Swiften/Elements/PubSubOwnerPubSub.h>
 #include <Swiften/Elements/PubSubOwnerPurge.h>
 #include <Swiften/Elements/PubSubOwnerSubscriptions.h>
 #include <Swiften/Elements/PubSubPublish.h>
 #include <Swiften/Elements/PubSubRetract.h>
 #include <Swiften/Elements/PubSubSubscribe.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 #include <Swiften/Elements/PubSubSubscriptions.h>
 #include <Swiften/Elements/PubSubUnsubscribe.h>
 #include <Swiften/PubSub/PubSubUtil.h>
 #include <Swiften/Queries/PubSubRequest.h>
 #define SWIFTEN_PUBSUBMANAGER_DECLARE_CREATE_REQUEST(payload, container, response) \
     virtual std::shared_ptr< PubSubRequest<payload> >  \
         createRequest(IQ::Type, const JID&, std::shared_ptr<payload>) = 0;
 
 namespace Swift {
     class JID;
 
     class SWIFTEN_API PubSubManager {
diff --git a/Swiften/PubSub/PubSubManagerImpl.h b/Swiften/PubSub/PubSubManagerImpl.h
index e4f920c..0d0739c 100644
--- a/Swiften/PubSub/PubSubManagerImpl.h
+++ b/Swiften/PubSub/PubSubManagerImpl.h
@@ -1,39 +1,38 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/PubSub/PubSubManager.h>
 #define SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST(payload, container, response) \
     virtual std::shared_ptr< PubSubRequest<payload> >  \
-            createRequest(IQ::Type type, const JID& receiver, std::shared_ptr<payload> p) SWIFTEN_OVERRIDE { \
+            createRequest(IQ::Type type, const JID& receiver, std::shared_ptr<payload> p) override { \
         return std::make_shared< PubSubRequest<payload> >(type, receiver, p, router); \
     }
 
 namespace Swift {
     class StanzaChannel;
     class Message;
 
     class SWIFTEN_API PubSubManagerImpl : public PubSubManager {
         public:
             PubSubManagerImpl(StanzaChannel* stanzaChannel, IQRouter* router);
-            virtual ~PubSubManagerImpl() SWIFTEN_OVERRIDE;
+            virtual ~PubSubManagerImpl() override;
 
             SWIFTEN_PUBSUB_FOREACH_PUBSUB_PAYLOAD_TYPE(
                     SWIFTEN_PUBSUBMANAGERIMPL_DECLARE_CREATE_REQUEST)
 
         private:
             void handleMessageRecevied(std::shared_ptr<Message>);
 
         private:
             StanzaChannel* stanzaChannel;
             IQRouter* router;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h b/Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h
index e86d15f..439e684 100644
--- a/Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Forwarded.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API ForwardedSerializer : public GenericPayloadSerializer<Forwarded> {
         public:
             ForwardedSerializer(PayloadSerializerCollection* serializers);
-            virtual ~ForwardedSerializer() SWIFTEN_OVERRIDE;
+            virtual ~ForwardedSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<Forwarded>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<Forwarded>) const override;
 
         private:
             PayloadSerializerCollection* serializers_;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h b/Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h
index eb1cf94..419e2d5 100644
--- a/Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IsodeIQDelegation.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API IsodeIQDelegationSerializer : public GenericPayloadSerializer<IsodeIQDelegation> {
         public:
             IsodeIQDelegationSerializer(PayloadSerializerCollection* serializers);
-            virtual ~IsodeIQDelegationSerializer() SWIFTEN_OVERRIDE;
+            virtual ~IsodeIQDelegationSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<IsodeIQDelegation>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<IsodeIQDelegation>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h b/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
index 46c007e..d8cff6a 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
@@ -1,24 +1,23 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMFin.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API MAMFinSerializer : public GenericPayloadSerializer<MAMFin> {
         public:
             MAMFinSerializer();
-            virtual ~MAMFinSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MAMFinSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MAMFin>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MAMFin>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
index 5e5a2b0..e2ed063 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
@@ -1,24 +1,23 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMQuery.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API MAMQuerySerializer : public GenericPayloadSerializer<MAMQuery> {
         public:
             MAMQuerySerializer();
-            virtual ~MAMQuerySerializer() SWIFTEN_OVERRIDE;
+            virtual ~MAMQuerySerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MAMQuery>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MAMQuery>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h b/Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h
index 1a68c1e..5cac8c4 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMResult.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API MAMResultSerializer : public GenericPayloadSerializer<MAMResult> {
         public:
             MAMResultSerializer(PayloadSerializerCollection* serializers);
-            virtual ~MAMResultSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MAMResultSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MAMResult>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MAMResult>) const override;
 
         private:
             PayloadSerializerCollection* serializers_;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h
index cb2f060..54f3adc 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXCreateSerializer.h
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXCreate.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
     class SWIFTEN_API MIXCreateSerializer : public GenericPayloadSerializer<MIXCreate> {
         public:
             MIXCreateSerializer();
-            virtual ~MIXCreateSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXCreateSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXCreate>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXCreate>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h b/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h
index 872faa9..a0640a1 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXDestroySerializer.h
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXDestroy.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
     class SWIFTEN_API MIXDestroySerializer : public GenericPayloadSerializer<MIXDestroy> {
         public:
             MIXDestroySerializer();
-            virtual ~MIXDestroySerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXDestroySerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXDestroy>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXDestroy>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h
index acc2b1b..9be6915 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXJoinSerializer.h
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXJoin.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
     class SWIFTEN_API MIXJoinSerializer : public GenericPayloadSerializer<MIXJoin> {
         public:
             MIXJoinSerializer();
-            virtual ~MIXJoinSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXJoinSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXJoin>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXJoin>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h
index 191adeb..dd593b6 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXLeaveSerializer.h
@@ -1,30 +1,29 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXLeave.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API MIXLeaveSerializer : public GenericPayloadSerializer<MIXLeave> {
         public:
             MIXLeaveSerializer();
-            virtual ~MIXLeaveSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXLeaveSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXLeave>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXLeave>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXPayloadSerializer.h
index 3481ca8..bc7ec7f 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXPayloadSerializer.h
@@ -1,21 +1,26 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API MIXPayloadSerializer : public GenericPayloadSerializer<MIXPayload> {
         public:
             MIXPayloadSerializer();
 
-            virtual std::string serializePayload(std::shared_ptr<MIXPayload> payload) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXPayload> payload) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXSetNickSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXSetNickSerializer.h
index a58443b..7c28d8e 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXSetNickSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXSetNickSerializer.h
@@ -1,21 +1,26 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API MIXSetNickSerializer : public GenericPayloadSerializer<MIXSetNick> {
         public:
             MIXSetNickSerializer();
 
-            virtual std::string serializePayload(std::shared_ptr<MIXSetNick> payload) const SWIFTEN_OVERRIDE ;
+            virtual std::string serializePayload(std::shared_ptr<MIXSetNick> payload) const override ;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h
index 94bebe9..a63a2be 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXSubscribeSerializer.h
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXSubscribe.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
     class SWIFTEN_API MIXSubscribeSerializer : public GenericPayloadSerializer<MIXSubscribe> {
         public:
             MIXSubscribeSerializer();
-            virtual ~MIXSubscribeSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXSubscribeSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXSubscribe>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXSubscribe>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h
index 349de08..f262b83 100644
--- a/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MIXUserPreferenceSerializer.h
@@ -1,31 +1,30 @@
 /*
  * Copyright (c) 2017 Tarun Gupta
  * Licensed under the simplified BSD license.
  * 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 <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MIXUserPreference.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
 
     class SWIFTEN_API MIXUserPreferenceSerializer : public GenericPayloadSerializer<MIXUserPreference> {
         public:
             MIXUserPreferenceSerializer();
-            virtual ~MIXUserPreferenceSerializer() SWIFTEN_OVERRIDE;
+            virtual ~MIXUserPreferenceSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<MIXUserPreference>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<MIXUserPreference>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h
index c3aef57..9b6dadb 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliation.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubAffiliationSerializer : public GenericPayloadSerializer<PubSubAffiliation> {
         public:
             PubSubAffiliationSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubAffiliationSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubAffiliation>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubAffiliation>) const override;
 
         private:
             static std::string serializeType(PubSubAffiliation::Type);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationsSerializer.h
index e69459c..b8096d3 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubAffiliationsSerializer : public GenericPayloadSerializer<PubSubAffiliations> {
         public:
             PubSubAffiliationsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubAffiliationsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubAffiliations>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubAffiliations>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubConfigureSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubConfigureSerializer.h
index b9583e1..ead5c4f 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubConfigureSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubConfigureSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubConfigure.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubConfigureSerializer : public GenericPayloadSerializer<PubSubConfigure> {
         public:
             PubSubConfigureSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubConfigureSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubConfigureSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubConfigure>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubConfigure>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubCreateSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubCreateSerializer.h
index feec060..0aa32af 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubCreateSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubCreateSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubCreate.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubCreateSerializer : public GenericPayloadSerializer<PubSubCreate> {
         public:
             PubSubCreateSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubCreateSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubCreateSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubCreate>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubCreate>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h
index 9a83fae..42419e3 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubDefault.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubDefaultSerializer : public GenericPayloadSerializer<PubSubDefault> {
         public:
             PubSubDefaultSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubDefaultSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubDefaultSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubDefault>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubDefault>) const override;
 
         private:
             static std::string serializeType(PubSubDefault::Type);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
index e18131b..0f075fe 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-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/PubSubError.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API PubSubErrorSerializer : public GenericPayloadSerializer<PubSubError> {
         public:
             PubSubErrorSerializer();
-            virtual ~PubSubErrorSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubErrorSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubError>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubError>) const override;
 
         private:
             static std::string serializeType(PubSubError::Type);
             static std::string serializeUnsupportedFeatureType(PubSubError::UnsupportedFeatureType);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventAssociateSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventAssociateSerializer.h
index 80d115d..766ad93 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventAssociateSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventAssociateSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventAssociateSerializer : public GenericPayloadSerializer<PubSubEventAssociate> {
         public:
             PubSubEventAssociateSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventAssociateSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventAssociateSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventAssociate>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventAssociate>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h
index 28fbabd..749abdd 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventCollection.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventCollectionSerializer : public GenericPayloadSerializer<PubSubEventCollection> {
         public:
             PubSubEventCollectionSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventCollectionSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventCollectionSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventCollection>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventCollection>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h
index a6eb7cc..3902840 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventConfiguration.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventConfigurationSerializer : public GenericPayloadSerializer<PubSubEventConfiguration> {
         public:
             PubSubEventConfigurationSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventConfigurationSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventConfigurationSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventConfiguration>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventConfiguration>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h
index 1a17fe1..94f7441 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDelete.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventDeleteSerializer : public GenericPayloadSerializer<PubSubEventDelete> {
         public:
             PubSubEventDeleteSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventDeleteSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDeleteSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventDelete>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventDelete>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventDisassociateSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventDisassociateSerializer.h
index 2d9af03..8f9fd00 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventDisassociateSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventDisassociateSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDisassociate.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventDisassociateSerializer : public GenericPayloadSerializer<PubSubEventDisassociate> {
         public:
             PubSubEventDisassociateSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventDisassociateSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDisassociateSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventDisassociate>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventDisassociate>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h
index 2e62275..5bb2b83 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItem.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventItemSerializer : public GenericPayloadSerializer<PubSubEventItem> {
         public:
             PubSubEventItemSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventItemSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventItem>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventItem>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h
index 1ba8560..83d3d95 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItems.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventItemsSerializer : public GenericPayloadSerializer<PubSubEventItems> {
         public:
             PubSubEventItemsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventItemsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventItems>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventItems>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h
index 9044629..533841f 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventPurge.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventPurgeSerializer : public GenericPayloadSerializer<PubSubEventPurge> {
         public:
             PubSubEventPurgeSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventPurgeSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventPurgeSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventPurge>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventPurge>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventRedirectSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventRedirectSerializer.h
index d4ca3dc..391d93e 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventRedirectSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventRedirectSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRedirect.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventRedirectSerializer : public GenericPayloadSerializer<PubSubEventRedirect> {
         public:
             PubSubEventRedirectSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventRedirectSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRedirectSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventRedirect>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventRedirect>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h
index 4feb43a..5a70fdd 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRetract.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventRetractSerializer : public GenericPayloadSerializer<PubSubEventRetract> {
         public:
             PubSubEventRetractSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventRetractSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRetractSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventRetract>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventRetract>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h
index d118016..f16a749 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h
@@ -1,30 +1,29 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEvent.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventSerializer : public GenericPayloadSerializer<PubSubEvent> {
         public:
             PubSubEventSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEvent>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEvent>) const override;
 
         private:
             std::vector< std::shared_ptr<PayloadSerializer> > pubsubSerializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h
index c5bb75b..80830ac 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventSubscription.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubEventSubscriptionSerializer : public GenericPayloadSerializer<PubSubEventSubscription> {
         public:
             PubSubEventSubscriptionSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubEventSubscriptionSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventSubscriptionSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubEventSubscription>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubEventSubscription>) const override;
 
         private:
             static std::string serializeSubscriptionType(PubSubEventSubscription::SubscriptionType);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h
index 024a2a4..54a8ead 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItem.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubItemSerializer : public GenericPayloadSerializer<PubSubItem> {
         public:
             PubSubItemSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubItemSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubItem>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubItem>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h
index a80ad8e..416c47e 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItems.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubItemsSerializer : public GenericPayloadSerializer<PubSubItems> {
         public:
             PubSubItemsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubItemsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubItems>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubItems>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOptionsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOptionsSerializer.h
index 69b6e97..6f30756 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOptionsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOptionsSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOptions.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOptionsSerializer : public GenericPayloadSerializer<PubSubOptions> {
         public:
             PubSubOptionsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOptionsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOptionsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOptions>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOptions>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h
index 6703401..ae97086 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerAffiliationSerializer : public GenericPayloadSerializer<PubSubOwnerAffiliation> {
         public:
             PubSubOwnerAffiliationSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerAffiliationSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerAffiliation>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerAffiliation>) const override;
 
         private:
             static std::string serializeType(PubSubOwnerAffiliation::Type);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h
index 6480e9b..ed244ff 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliations.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerAffiliationsSerializer : public GenericPayloadSerializer<PubSubOwnerAffiliations> {
         public:
             PubSubOwnerAffiliationsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerAffiliationsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerAffiliations>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerAffiliations>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerConfigureSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerConfigureSerializer.h
index 8ef72fe..4512eda 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerConfigureSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerConfigureSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerConfigure.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerConfigureSerializer : public GenericPayloadSerializer<PubSubOwnerConfigure> {
         public:
             PubSubOwnerConfigureSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerConfigureSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerConfigureSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerConfigure>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerConfigure>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerDefaultSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerDefaultSerializer.h
index 624693c..c19b250 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerDefaultSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerDefaultSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDefault.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerDefaultSerializer : public GenericPayloadSerializer<PubSubOwnerDefault> {
         public:
             PubSubOwnerDefaultSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerDefaultSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDefaultSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerDefault>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerDefault>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerDeleteSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerDeleteSerializer.h
index d01dee1..7a0cecc 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerDeleteSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerDeleteSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDelete.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerDeleteSerializer : public GenericPayloadSerializer<PubSubOwnerDelete> {
         public:
             PubSubOwnerDeleteSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerDeleteSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDeleteSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerDelete>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerDelete>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h
index 1a5e30f..13889b6 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h
@@ -1,30 +1,29 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPubSub.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerPubSubSerializer : public GenericPayloadSerializer<PubSubOwnerPubSub> {
         public:
             PubSubOwnerPubSubSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerPubSubSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerPubSubSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerPubSub>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerPubSub>) const override;
 
         private:
             std::vector< std::shared_ptr<PayloadSerializer> > pubsubSerializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerPurgeSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerPurgeSerializer.h
index 5c79b66..d361928 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerPurgeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerPurgeSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPurge.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerPurgeSerializer : public GenericPayloadSerializer<PubSubOwnerPurge> {
         public:
             PubSubOwnerPurgeSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerPurgeSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerPurgeSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerPurge>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerPurge>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerRedirectSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerRedirectSerializer.h
index 508ba6d..c35b3ea 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerRedirectSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerRedirectSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerRedirect.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerRedirectSerializer : public GenericPayloadSerializer<PubSubOwnerRedirect> {
         public:
             PubSubOwnerRedirectSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerRedirectSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerRedirectSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerRedirect>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerRedirect>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h
index adc42c4..52089b7 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerSubscriptionSerializer : public GenericPayloadSerializer<PubSubOwnerSubscription> {
         public:
             PubSubOwnerSubscriptionSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerSubscriptionSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerSubscription>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerSubscription>) const override;
 
         private:
             static std::string serializeSubscriptionType(PubSubOwnerSubscription::SubscriptionType);
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h
index b3d968c..42956cf 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscriptions.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubOwnerSubscriptionsSerializer : public GenericPayloadSerializer<PubSubOwnerSubscriptions> {
         public:
             PubSubOwnerSubscriptionsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubOwnerSubscriptionsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerSubscriptions>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubOwnerSubscriptions>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubPublishSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubPublishSerializer.h
index 8a95f17..5eeb8bf 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubPublishSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubPublishSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubPublish.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubPublishSerializer : public GenericPayloadSerializer<PubSubPublish> {
         public:
             PubSubPublishSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubPublishSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubPublishSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubPublish>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubPublish>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h
index 23f94b0..23b6b59 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubRetract.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubRetractSerializer : public GenericPayloadSerializer<PubSubRetract> {
         public:
             PubSubRetractSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubRetractSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubRetractSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubRetract>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubRetract>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubSerializer.h
index b8534a1..fb14c29 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSerializer.h
@@ -1,30 +1,29 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSub.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubSerializer : public GenericPayloadSerializer<PubSub> {
         public:
             PubSubSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSub>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSub>) const override;
 
         private:
             std::vector< std::shared_ptr<PayloadSerializer> > pubsubSerializers;
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h
index 1862a9b..028a437 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribeOptions.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubSubscribeOptionsSerializer : public GenericPayloadSerializer<PubSubSubscribeOptions> {
         public:
             PubSubSubscribeOptionsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubSubscribeOptionsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeOptionsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubSubscribeOptions>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubSubscribeOptions>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeSerializer.h
index 1b479cd..1c0070b 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscribeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscribeSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribe.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubSubscribeSerializer : public GenericPayloadSerializer<PubSubSubscribe> {
         public:
             PubSubSubscribeSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubSubscribeSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubSubscribe>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubSubscribe>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h
index 096b5d3..b849269 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h
@@ -1,32 +1,31 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubSubscriptionSerializer : public GenericPayloadSerializer<PubSubSubscription> {
         public:
             PubSubSubscriptionSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubSubscriptionSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubSubscription>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubSubscription>) const override;
 
         private:
             static std::string serializeSubscriptionType(PubSubSubscription::SubscriptionType);
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.h
index a56c37f..1430cdf 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.h
@@ -1,29 +1,28 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscriptions.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubSubscriptionsSerializer : public GenericPayloadSerializer<PubSubSubscriptions> {
         public:
             PubSubSubscriptionsSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubSubscriptionsSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionsSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubSubscriptions>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubSubscriptions>) const override;
 
         private:
             PayloadSerializerCollection* serializers;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubUnsubscribeSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubUnsubscribeSerializer.h
index f245924..002d337 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubUnsubscribeSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubUnsubscribeSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubUnsubscribe.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API PubSubUnsubscribeSerializer : public GenericPayloadSerializer<PubSubUnsubscribe> {
         public:
             PubSubUnsubscribeSerializer(PayloadSerializerCollection* serializers);
-            virtual ~PubSubUnsubscribeSerializer() SWIFTEN_OVERRIDE;
+            virtual ~PubSubUnsubscribeSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<PubSubUnsubscribe>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<PubSubUnsubscribe>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
index b97458e..6f850eb 100644
--- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
@@ -1,24 +1,23 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ResultSet.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class SWIFTEN_API ResultSetSerializer : public GenericPayloadSerializer<ResultSet> {
         public:
             ResultSetSerializer();
-            virtual ~ResultSetSerializer() SWIFTEN_OVERRIDE;
+            virtual ~ResultSetSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<ResultSet>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<ResultSet>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h b/Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h
index a1ab519..9c2f2db 100644
--- a/Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserLocation.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API UserLocationSerializer : public GenericPayloadSerializer<UserLocation> {
         public:
             UserLocationSerializer(PayloadSerializerCollection* serializers);
-            virtual ~UserLocationSerializer() SWIFTEN_OVERRIDE;
+            virtual ~UserLocationSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<UserLocation>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<UserLocation>) const override;
     };
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h b/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h
index cc24d48..1d5737a 100644
--- a/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h
@@ -1,26 +1,25 @@
 /*
  * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserTune.h>
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
     class PayloadSerializerCollection;
 
     class SWIFTEN_API UserTuneSerializer : public GenericPayloadSerializer<UserTune> {
         public:
             UserTuneSerializer(PayloadSerializerCollection* serializers);
-            virtual ~UserTuneSerializer() SWIFTEN_OVERRIDE;
+            virtual ~UserTuneSerializer() override;
 
-            virtual std::string serializePayload(std::shared_ptr<UserTune>) const SWIFTEN_OVERRIDE;
+            virtual std::string serializePayload(std::shared_ptr<UserTune>) const override;
     };
 }
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
parent	8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download	swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2