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 /Sluift
parent: 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download: swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip
swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2
75 files changed, 267 insertions, 349 deletions
diff --git a/Sluift/Console.h b/Sluift/Console.h
index dc51dab..0d5ceb0 100644
--- a/Sluift/Console.h
+++ b/Sluift/Console.h
@@ -10,8 +10,6 @@
 
 #include <boost/optional/optional.hpp>
 
-#include <Swiften/Base/Override.h>
-
 #include <Sluift/Completer.h>
 
 struct lua_State;
@@ -22,7 +20,7 @@ namespace Swift {
     class Console : public Completer {
         public:
             Console(lua_State* L, Terminal* terminal);
-            virtual ~Console() SWIFTEN_OVERRIDE;
+            virtual ~Console() override;
 
             void run();
 
@@ -34,7 +32,7 @@ namespace Swift {
             bool readCommand();
             int tryLoadCommand(const std::string& command);
 
-            virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) SWIFTEN_OVERRIDE;
+            virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) override;
 
         private:
             lua_State* L;
diff --git a/Sluift/EditlineTerminal.h b/Sluift/EditlineTerminal.h
index 1cee0d7..8f4624b 100644
--- a/Sluift/EditlineTerminal.h
+++ b/Sluift/EditlineTerminal.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
-
 #include <Sluift/Terminal.h>
 
 namespace Swift {
@@ -17,10 +15,10 @@ namespace Swift {
 
         private:
             EditlineTerminal();
-            virtual ~EditlineTerminal() SWIFTEN_OVERRIDE;
+            virtual ~EditlineTerminal() override;
 
-            virtual boost::optional<std::string> readLine(const std::string& prompt) SWIFTEN_OVERRIDE;
-            virtual void printError(const std::string& message) SWIFTEN_OVERRIDE;
-            virtual void addToHistory(const std::string& command) SWIFTEN_OVERRIDE;
+            virtual boost::optional<std::string> readLine(const std::string& prompt) override;
+            virtual void printError(const std::string& message) override;
+            virtual void addToHistory(const std::string& command) override;
     };
 }
diff --git a/Sluift/ElementConvertors/BodyConvertor.h b/Sluift/ElementConvertors/BodyConvertor.h
index 05c1adf..574fca9 100644
--- a/Sluift/ElementConvertors/BodyConvertor.h
+++ b/Sluift/ElementConvertors/BodyConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Body.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,9 +16,9 @@ namespace Swift {
     class BodyConvertor : public GenericLuaElementConvertor<Body> {
         public:
             BodyConvertor();
-            virtual ~BodyConvertor() SWIFTEN_OVERRIDE;
+            virtual ~BodyConvertor() override;
 
-            virtual std::shared_ptr<Body> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Body>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Body> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Body>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/CarbonsReceivedConvertor.h b/Sluift/ElementConvertors/CarbonsReceivedConvertor.h
index 3d5c453..cc4e6dc 100644
--- a/Sluift/ElementConvertors/CarbonsReceivedConvertor.h
+++ b/Sluift/ElementConvertors/CarbonsReceivedConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/CarbonsReceived.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class CarbonsReceivedConvertor : public GenericLuaElementConvertor<CarbonsReceived> {
         public:
             CarbonsReceivedConvertor(LuaElementConvertors* convertors);
-            virtual ~CarbonsReceivedConvertor() SWIFTEN_OVERRIDE;
+            virtual ~CarbonsReceivedConvertor() override;
 
-            virtual std::shared_ptr<CarbonsReceived> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<CarbonsReceived>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<CarbonsReceived> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<CarbonsReceived>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/CarbonsSentConvertor.h b/Sluift/ElementConvertors/CarbonsSentConvertor.h
index a503f8e..794e0ed 100644
--- a/Sluift/ElementConvertors/CarbonsSentConvertor.h
+++ b/Sluift/ElementConvertors/CarbonsSentConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/CarbonsSent.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class CarbonsSentConvertor : public GenericLuaElementConvertor<CarbonsSent> {
         public:
             CarbonsSentConvertor(LuaElementConvertors* convertors);
-            virtual ~CarbonsSentConvertor() SWIFTEN_OVERRIDE;
+            virtual ~CarbonsSentConvertor() override;
 
-            virtual std::shared_ptr<CarbonsSent> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<CarbonsSent>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<CarbonsSent> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<CarbonsSent>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/CommandConvertor.h b/Sluift/ElementConvertors/CommandConvertor.h
index 1d86575..274eaa6 100644
--- a/Sluift/ElementConvertors/CommandConvertor.h
+++ b/Sluift/ElementConvertors/CommandConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Command.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class CommandConvertor : public GenericLuaElementConvertor<Command> {
         public:
             CommandConvertor(LuaElementConvertors* convertors);
-            virtual ~CommandConvertor() SWIFTEN_OVERRIDE;
+            virtual ~CommandConvertor() override;
 
-            virtual std::shared_ptr<Command> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Command>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Command> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Command>) override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.cpp b/Sluift/ElementConvertors/DOMElementConvertor.cpp
index b957686..56b45aa 100644
--- a/Sluift/ElementConvertors/DOMElementConvertor.cpp
+++ b/Sluift/ElementConvertors/DOMElementConvertor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -34,7 +34,7 @@ namespace {
 
             virtual void handleStartElement(
                     const std::string& element, const std::string& ns,
-                    const AttributeMap& attributes) SWIFTEN_OVERRIDE {
+                    const AttributeMap& attributes) override {
                 lua_checkstack(L, 6);
                 lua_pushnumber(L, currentIndex);
                 lua_newtable(L);
@@ -70,7 +70,7 @@ namespace {
             }
 
             virtual void handleEndElement(
-                    const std::string&, const std::string&) SWIFTEN_OVERRIDE {
+                    const std::string&, const std::string&) override {
                 lua_setfield(L, -2, "children");
                 lua_settable(L, -3);
                 currentIndex = indexStack.back();
@@ -78,7 +78,7 @@ namespace {
                 currentIndex++;
             }
 
-            virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE {
+            virtual void handleCharacterData(const std::string& data) override {
                 lua_checkstack(L, 2);
                 lua_pushnumber(L, currentIndex);
                 lua_pushstring(L, data.c_str());
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.h b/Sluift/ElementConvertors/DOMElementConvertor.h
index bf3f168..dd8d79b 100644
--- a/Sluift/ElementConvertors/DOMElementConvertor.h
+++ b/Sluift/ElementConvertors/DOMElementConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
@@ -16,10 +15,10 @@ namespace Swift {
     class DOMElementConvertor : public LuaElementConvertor {
         public:
             DOMElementConvertor();
-            virtual ~DOMElementConvertor() SWIFTEN_OVERRIDE;
+            virtual ~DOMElementConvertor() override;
 
-            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) SWIFTEN_OVERRIDE;
-            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) override;
+            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) override;
 
         private:
             PlatformXMLParserFactory parsers;
diff --git a/Sluift/ElementConvertors/DefaultElementConvertor.h b/Sluift/ElementConvertors/DefaultElementConvertor.h
index 1703c5e..dfef3e8 100644
--- a/Sluift/ElementConvertors/DefaultElementConvertor.h
+++ b/Sluift/ElementConvertors/DefaultElementConvertor.h
@@ -6,17 +6,15 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
-
 #include <Sluift/LuaElementConvertor.h>
 
 namespace Swift {
     class DefaultElementConvertor : public LuaElementConvertor {
         public:
             DefaultElementConvertor();
-            virtual ~DefaultElementConvertor() SWIFTEN_OVERRIDE;
+            virtual ~DefaultElementConvertor() override;
 
-            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) SWIFTEN_OVERRIDE;
-            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) override;
+            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/DelayConvertor.h b/Sluift/ElementConvertors/DelayConvertor.h
index 60866c7..ad340da 100644
--- a/Sluift/ElementConvertors/DelayConvertor.h
+++ b/Sluift/ElementConvertors/DelayConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Delay.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class DelayConvertor : public GenericLuaElementConvertor<Delay> {
         public:
             DelayConvertor();
-            virtual ~DelayConvertor() SWIFTEN_OVERRIDE;
+            virtual ~DelayConvertor() override;
 
-            virtual std::shared_ptr<Delay> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Delay>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Delay> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Delay>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/DiscoInfoConvertor.h b/Sluift/ElementConvertors/DiscoInfoConvertor.h
index 243a190..b0e0849 100644
--- a/Sluift/ElementConvertors/DiscoInfoConvertor.h
+++ b/Sluift/ElementConvertors/DiscoInfoConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/DiscoInfo.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class DiscoInfoConvertor : public GenericLuaElementConvertor<DiscoInfo> {
         public:
             DiscoInfoConvertor(LuaElementConvertors* convertors);
-            virtual ~DiscoInfoConvertor() SWIFTEN_OVERRIDE;
+            virtual ~DiscoInfoConvertor() override;
 
-            virtual std::shared_ptr<DiscoInfo> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<DiscoInfo>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<DiscoInfo> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<DiscoInfo>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/DiscoItemsConvertor.h b/Sluift/ElementConvertors/DiscoItemsConvertor.h
index ff7ac74..98dcb5c 100644
--- a/Sluift/ElementConvertors/DiscoItemsConvertor.h
+++ b/Sluift/ElementConvertors/DiscoItemsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/DiscoItems.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class DiscoItemsConvertor : public GenericLuaElementConvertor<DiscoItems> {
         public:
             DiscoItemsConvertor();
-            virtual ~DiscoItemsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~DiscoItemsConvertor() override;
 
-            virtual std::shared_ptr<DiscoItems> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<DiscoItems>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<DiscoItems> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<DiscoItems>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/FormConvertor.h b/Sluift/ElementConvertors/FormConvertor.h
index 0b8db56..8ca20cc 100644
--- a/Sluift/ElementConvertors/FormConvertor.h
+++ b/Sluift/ElementConvertors/FormConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Form.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class FormConvertor : public GenericLuaElementConvertor<Form> {
         public:
             FormConvertor();
-            virtual ~FormConvertor() SWIFTEN_OVERRIDE;
+            virtual ~FormConvertor() override;
 
-            virtual std::shared_ptr<Form> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Form>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Form> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Form>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/ForwardedConvertor.h b/Sluift/ElementConvertors/ForwardedConvertor.h
index c985aef..32d29e6 100644
--- a/Sluift/ElementConvertors/ForwardedConvertor.h
+++ b/Sluift/ElementConvertors/ForwardedConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Forwarded.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class ForwardedConvertor : public GenericLuaElementConvertor<Forwarded> {
         public:
             ForwardedConvertor(LuaElementConvertors* convertors);
-            virtual ~ForwardedConvertor() SWIFTEN_OVERRIDE;
+            virtual ~ForwardedConvertor() override;
 
-            virtual std::shared_ptr<Forwarded> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Forwarded>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Forwarded> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Forwarded>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/IQConvertor.h b/Sluift/ElementConvertors/IQConvertor.h
index 5649d14..6ccaa46 100644
--- a/Sluift/ElementConvertors/IQConvertor.h
+++ b/Sluift/ElementConvertors/IQConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IQ.h>
 
 #include <Sluift/ElementConvertors/StanzaConvertor.h>
@@ -17,12 +16,12 @@ namespace Swift {
     class IQConvertor : public StanzaConvertor<IQ> {
         public:
             IQConvertor(LuaElementConvertors* convertors);
-            virtual ~IQConvertor() SWIFTEN_OVERRIDE;
+            virtual ~IQConvertor() override;
 
-            virtual std::shared_ptr<IQ> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<IQ>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<IQ> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<IQ>) override;
 
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
             static std::string convertIQTypeToString(IQ::Type type);
             static IQ::Type convertIQTypeFromString(const std::string& type);
diff --git a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
index 224cf14..f573b13 100644
--- a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
+++ b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/IsodeIQDelegation.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class IsodeIQDelegationConvertor : public GenericLuaElementConvertor<IsodeIQDelegation> {
         public:
             IsodeIQDelegationConvertor(LuaElementConvertors* convertors);
-            virtual ~IsodeIQDelegationConvertor() SWIFTEN_OVERRIDE;
+            virtual ~IsodeIQDelegationConvertor() override;
 
-            virtual std::shared_ptr<IsodeIQDelegation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<IsodeIQDelegation>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<IsodeIQDelegation> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<IsodeIQDelegation>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/MAMFinConvertor.h b/Sluift/ElementConvertors/MAMFinConvertor.h
index ffa6df3..6e5d58c 100644
--- a/Sluift/ElementConvertors/MAMFinConvertor.h
+++ b/Sluift/ElementConvertors/MAMFinConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMFin.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class MAMFinConvertor : public GenericLuaElementConvertor<MAMFin> {
         public:
             MAMFinConvertor(LuaElementConvertors* convertors);
-            virtual ~MAMFinConvertor() SWIFTEN_OVERRIDE;
+            virtual ~MAMFinConvertor() override;
 
-            virtual std::shared_ptr<MAMFin> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMFin>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<MAMFin> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMFin>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/MAMQueryConvertor.h b/Sluift/ElementConvertors/MAMQueryConvertor.h
index bfff8af..3e9d387 100644
--- a/Sluift/ElementConvertors/MAMQueryConvertor.h
+++ b/Sluift/ElementConvertors/MAMQueryConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMQuery.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class MAMQueryConvertor : public GenericLuaElementConvertor<MAMQuery> {
         public:
             MAMQueryConvertor(LuaElementConvertors* convertors);
-            virtual ~MAMQueryConvertor() SWIFTEN_OVERRIDE;
+            virtual ~MAMQueryConvertor() override;
 
-            virtual std::shared_ptr<MAMQuery> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMQuery>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<MAMQuery> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMQuery>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/MAMResultConvertor.h b/Sluift/ElementConvertors/MAMResultConvertor.h
index 4d6074c..cd1d27d 100644
--- a/Sluift/ElementConvertors/MAMResultConvertor.h
+++ b/Sluift/ElementConvertors/MAMResultConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/MAMResult.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class MAMResultConvertor : public GenericLuaElementConvertor<MAMResult> {
         public:
             MAMResultConvertor(LuaElementConvertors* convertors);
-            virtual ~MAMResultConvertor() SWIFTEN_OVERRIDE;
+            virtual ~MAMResultConvertor() override;
 
-            virtual std::shared_ptr<MAMResult> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMResult>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<MAMResult> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<MAMResult>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/MessageConvertor.h b/Sluift/ElementConvertors/MessageConvertor.h
index c63b577..723e1b1 100644
--- a/Sluift/ElementConvertors/MessageConvertor.h
+++ b/Sluift/ElementConvertors/MessageConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Message.h>
 
 #include <Sluift/ElementConvertors/StanzaConvertor.h>
@@ -17,12 +16,12 @@ namespace Swift {
     class MessageConvertor : public StanzaConvertor<Message> {
         public:
             MessageConvertor(LuaElementConvertors* convertors);
-            virtual ~MessageConvertor() SWIFTEN_OVERRIDE;
+            virtual ~MessageConvertor() override;
 
-            virtual std::shared_ptr<Message> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Message>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Message> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Message>) override;
 
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
             static std::string convertMessageTypeToString(Message::Type type);
             static Message::Type convertMessageTypeFromString(const std::string& type);
diff --git a/Sluift/ElementConvertors/PresenceConvertor.h b/Sluift/ElementConvertors/PresenceConvertor.h
index df3892d..b13398d 100644
--- a/Sluift/ElementConvertors/PresenceConvertor.h
+++ b/Sluift/ElementConvertors/PresenceConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Presence.h>
 
 #include <Sluift/ElementConvertors/StanzaConvertor.h>
@@ -17,12 +16,12 @@ namespace Swift {
     class PresenceConvertor : public StanzaConvertor<Presence> {
         public:
             PresenceConvertor(LuaElementConvertors* convertors);
-            virtual ~PresenceConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PresenceConvertor() override;
 
-            virtual std::shared_ptr<Presence> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Presence>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Presence> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Presence>) override;
 
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
             static std::string convertPresenceTypeToString(Presence::Type type);
             static Presence::Type convertPresenceTypeFromString(const std::string& type);
diff --git a/Sluift/ElementConvertors/PubSubAffiliationConvertor.h b/Sluift/ElementConvertors/PubSubAffiliationConvertor.h
index 3fe58cf..1b5cd60 100644
--- a/Sluift/ElementConvertors/PubSubAffiliationConvertor.h
+++ b/Sluift/ElementConvertors/PubSubAffiliationConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliation.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubAffiliationConvertor : public GenericLuaElementConvertor<PubSubAffiliation> {
         public:
             PubSubAffiliationConvertor();
-            virtual ~PubSubAffiliationConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationConvertor() override;
 
-            virtual std::shared_ptr<PubSubAffiliation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubAffiliation>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubAffiliation> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubAffiliation>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
index dfaad85..eda218b 100644
--- a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubAffiliationsConvertor : public GenericLuaElementConvertor<PubSubAffiliations> {
         public:
             PubSubAffiliationsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubAffiliationsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubAffiliationsConvertor() override;
 
-            virtual std::shared_ptr<PubSubAffiliations> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubAffiliations>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubAffiliations> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubAffiliations>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubConfigureConvertor.h b/Sluift/ElementConvertors/PubSubConfigureConvertor.h
index ff6ed34..f1848c2 100644
--- a/Sluift/ElementConvertors/PubSubConfigureConvertor.h
+++ b/Sluift/ElementConvertors/PubSubConfigureConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubConfigure.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubConfigureConvertor : public GenericLuaElementConvertor<PubSubConfigure> {
         public:
             PubSubConfigureConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubConfigureConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubConfigureConvertor() override;
 
-            virtual std::shared_ptr<PubSubConfigure> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubConfigure>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubConfigure> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubConfigure>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubCreateConvertor.h b/Sluift/ElementConvertors/PubSubCreateConvertor.h
index 18db6e8..f3b11bd 100644
--- a/Sluift/ElementConvertors/PubSubCreateConvertor.h
+++ b/Sluift/ElementConvertors/PubSubCreateConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubCreate.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubCreateConvertor : public GenericLuaElementConvertor<PubSubCreate> {
         public:
             PubSubCreateConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubCreateConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubCreateConvertor() override;
 
-            virtual std::shared_ptr<PubSubCreate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubCreate>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubCreate> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubCreate>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubDefaultConvertor.h b/Sluift/ElementConvertors/PubSubDefaultConvertor.h
index 4a39c46..1049cd4 100644
--- a/Sluift/ElementConvertors/PubSubDefaultConvertor.h
+++ b/Sluift/ElementConvertors/PubSubDefaultConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubDefault.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubDefaultConvertor : public GenericLuaElementConvertor<PubSubDefault> {
         public:
             PubSubDefaultConvertor();
-            virtual ~PubSubDefaultConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubDefaultConvertor() override;
 
-            virtual std::shared_ptr<PubSubDefault> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubDefault>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubDefault> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubDefault>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h
index fec8111..e84460f 100644
--- a/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventAssociateConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventAssociate.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventAssociateConvertor : public GenericLuaElementConvertor<PubSubEventAssociate> {
         public:
             PubSubEventAssociateConvertor();
-            virtual ~PubSubEventAssociateConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventAssociateConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventAssociate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventAssociate>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventAssociate> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventAssociate>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
index 42fd05d..cab3b97 100644
--- a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventCollection.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubEventCollectionConvertor : public GenericLuaElementConvertor<PubSubEventCollection> {
         public:
             PubSubEventCollectionConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventCollectionConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventCollectionConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventCollection> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventCollection>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventCollection> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventCollection>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
index 93991c6..c2d82a5 100644
--- a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventConfiguration.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubEventConfigurationConvertor : public GenericLuaElementConvertor<PubSubEventConfiguration> {
         public:
             PubSubEventConfigurationConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventConfigurationConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventConfigurationConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventConfiguration> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventConfiguration>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventConfiguration> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventConfiguration>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventConvertor.h b/Sluift/ElementConvertors/PubSubEventConvertor.h
index 25fa640..b116c68 100644
--- a/Sluift/ElementConvertors/PubSubEventConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEvent.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventConvertor : public GenericLuaElementConvertor<PubSubEvent> {
         public:
             PubSubEventConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventConvertor() override;
 
-            virtual std::shared_ptr<PubSubEvent> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEvent>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEvent> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEvent>) override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
index f5847b3..66c706f 100644
--- a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDelete.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubEventDeleteConvertor : public GenericLuaElementConvertor<PubSubEventDelete> {
         public:
             PubSubEventDeleteConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventDeleteConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDeleteConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventDelete> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventDelete>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventDelete> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventDelete>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h
index 8bc8e2f..17f9ae9 100644
--- a/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventDisassociateConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventDisassociate.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventDisassociateConvertor : public GenericLuaElementConvertor<PubSubEventDisassociate> {
         public:
             PubSubEventDisassociateConvertor();
-            virtual ~PubSubEventDisassociateConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventDisassociateConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventDisassociate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventDisassociate>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventDisassociate> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventDisassociate>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventItemConvertor.h b/Sluift/ElementConvertors/PubSubEventItemConvertor.h
index cf2bec4..9e29ce8 100644
--- a/Sluift/ElementConvertors/PubSubEventItemConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventItemConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItem.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubEventItemConvertor : public GenericLuaElementConvertor<PubSubEventItem> {
         public:
             PubSubEventItemConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventItemConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventItem> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventItem>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventItem> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventItem>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h b/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
index 28971d2..8f7e3fe 100644
--- a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventItems.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubEventItemsConvertor : public GenericLuaElementConvertor<PubSubEventItems> {
         public:
             PubSubEventItemsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubEventItemsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventItemsConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventItems> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventItems>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventItems> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventItems>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h
index 9c0ed1a..1c2cdbb 100644
--- a/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventPurgeConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventPurge.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventPurgeConvertor : public GenericLuaElementConvertor<PubSubEventPurge> {
         public:
             PubSubEventPurgeConvertor();
-            virtual ~PubSubEventPurgeConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventPurgeConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventPurge> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventPurge>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventPurge> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventPurge>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h
index 796ef00..a61cb79 100644
--- a/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventRedirectConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRedirect.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventRedirectConvertor : public GenericLuaElementConvertor<PubSubEventRedirect> {
         public:
             PubSubEventRedirectConvertor();
-            virtual ~PubSubEventRedirectConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRedirectConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventRedirect> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventRedirect>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventRedirect> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventRedirect>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventRetractConvertor.h b/Sluift/ElementConvertors/PubSubEventRetractConvertor.h
index 52ac813..f437ad5 100644
--- a/Sluift/ElementConvertors/PubSubEventRetractConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventRetractConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventRetract.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventRetractConvertor : public GenericLuaElementConvertor<PubSubEventRetract> {
         public:
             PubSubEventRetractConvertor();
-            virtual ~PubSubEventRetractConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventRetractConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventRetract> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventRetract>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventRetract> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventRetract>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h
index 4407e48..61d1f21 100644
--- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubEventSubscription.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubEventSubscriptionConvertor : public GenericLuaElementConvertor<PubSubEventSubscription> {
         public:
             PubSubEventSubscriptionConvertor();
-            virtual ~PubSubEventSubscriptionConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubEventSubscriptionConvertor() override;
 
-            virtual std::shared_ptr<PubSubEventSubscription> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventSubscription>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubEventSubscription> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubEventSubscription>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubItemConvertor.h b/Sluift/ElementConvertors/PubSubItemConvertor.h
index be19c57..87c3809 100644
--- a/Sluift/ElementConvertors/PubSubItemConvertor.h
+++ b/Sluift/ElementConvertors/PubSubItemConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItem.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubItemConvertor : public GenericLuaElementConvertor<PubSubItem> {
         public:
             PubSubItemConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubItemConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemConvertor() override;
 
-            virtual std::shared_ptr<PubSubItem> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubItem>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubItem> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubItem>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.h b/Sluift/ElementConvertors/PubSubItemsConvertor.h
index c40495f..9e0f73a 100644
--- a/Sluift/ElementConvertors/PubSubItemsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubItemsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubItems.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubItemsConvertor : public GenericLuaElementConvertor<PubSubItems> {
         public:
             PubSubItemsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubItemsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubItemsConvertor() override;
 
-            virtual std::shared_ptr<PubSubItems> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubItems>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubItems> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubItems>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.h b/Sluift/ElementConvertors/PubSubOptionsConvertor.h
index 69a5915..add661a 100644
--- a/Sluift/ElementConvertors/PubSubOptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOptions.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOptionsConvertor : public GenericLuaElementConvertor<PubSubOptions> {
         public:
             PubSubOptionsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOptionsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOptionsConvertor() override;
 
-            virtual std::shared_ptr<PubSubOptions> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOptions>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOptions> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOptions>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h
index e970b82..92b001b 100644
--- a/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliation.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubOwnerAffiliationConvertor : public GenericLuaElementConvertor<PubSubOwnerAffiliation> {
         public:
             PubSubOwnerAffiliationConvertor();
-            virtual ~PubSubOwnerAffiliationConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerAffiliation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerAffiliation>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerAffiliation> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerAffiliation>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
index ea188d2..f0c45a3 100644
--- a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerAffiliations.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOwnerAffiliationsConvertor : public GenericLuaElementConvertor<PubSubOwnerAffiliations> {
         public:
             PubSubOwnerAffiliationsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOwnerAffiliationsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerAffiliationsConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerAffiliations> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerAffiliations>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerAffiliations> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerAffiliations>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
index c1aa1ab..9f0ed9f 100644
--- a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerConfigure.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOwnerConfigureConvertor : public GenericLuaElementConvertor<PubSubOwnerConfigure> {
         public:
             PubSubOwnerConfigureConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOwnerConfigureConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerConfigureConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerConfigure> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerConfigure>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerConfigure> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerConfigure>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
index c03ac45..ab4a25b 100644
--- a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDefault.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOwnerDefaultConvertor : public GenericLuaElementConvertor<PubSubOwnerDefault> {
         public:
             PubSubOwnerDefaultConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOwnerDefaultConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDefaultConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerDefault> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerDefault>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerDefault> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerDefault>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
index 52678de..8c44b5c 100644
--- a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerDelete.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOwnerDeleteConvertor : public GenericLuaElementConvertor<PubSubOwnerDelete> {
         public:
             PubSubOwnerDeleteConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOwnerDeleteConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerDeleteConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerDelete> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerDelete>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerDelete> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerDelete>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h
index e22352f..b2cb565 100644
--- a/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerPurgeConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerPurge.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubOwnerPurgeConvertor : public GenericLuaElementConvertor<PubSubOwnerPurge> {
         public:
             PubSubOwnerPurgeConvertor();
-            virtual ~PubSubOwnerPurgeConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerPurgeConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerPurge> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerPurge>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerPurge> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerPurge>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h
index 12636dd..433303f 100644
--- a/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerRedirectConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerRedirect.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubOwnerRedirectConvertor : public GenericLuaElementConvertor<PubSubOwnerRedirect> {
         public:
             PubSubOwnerRedirectConvertor();
-            virtual ~PubSubOwnerRedirectConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerRedirectConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerRedirect> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerRedirect>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerRedirect> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerRedirect>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h
index 91ce2e4..bf054b3 100644
--- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscription.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubOwnerSubscriptionConvertor : public GenericLuaElementConvertor<PubSubOwnerSubscription> {
         public:
             PubSubOwnerSubscriptionConvertor();
-            virtual ~PubSubOwnerSubscriptionConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerSubscription> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerSubscription>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerSubscription> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerSubscription>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
index c05c3bf..2e3f9be 100644
--- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubOwnerSubscriptions.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubOwnerSubscriptionsConvertor : public GenericLuaElementConvertor<PubSubOwnerSubscriptions> {
         public:
             PubSubOwnerSubscriptionsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubOwnerSubscriptionsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubOwnerSubscriptionsConvertor() override;
 
-            virtual std::shared_ptr<PubSubOwnerSubscriptions> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerSubscriptions>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubOwnerSubscriptions> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubOwnerSubscriptions>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubPublishConvertor.h b/Sluift/ElementConvertors/PubSubPublishConvertor.h
index 9f52d44..ae28f14 100644
--- a/Sluift/ElementConvertors/PubSubPublishConvertor.h
+++ b/Sluift/ElementConvertors/PubSubPublishConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubPublish.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubPublishConvertor : public GenericLuaElementConvertor<PubSubPublish> {
         public:
             PubSubPublishConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubPublishConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubPublishConvertor() override;
 
-            virtual std::shared_ptr<PubSubPublish> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubPublish>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubPublish> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubPublish>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubRetractConvertor.h b/Sluift/ElementConvertors/PubSubRetractConvertor.h
index db37041..ca15ca7 100644
--- a/Sluift/ElementConvertors/PubSubRetractConvertor.h
+++ b/Sluift/ElementConvertors/PubSubRetractConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubRetract.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubRetractConvertor : public GenericLuaElementConvertor<PubSubRetract> {
         public:
             PubSubRetractConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubRetractConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubRetractConvertor() override;
 
-            virtual std::shared_ptr<PubSubRetract> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubRetract>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubRetract> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubRetract>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h b/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
index 7b3c0fd..5f9d224 100644
--- a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribe.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubSubscribeConvertor : public GenericLuaElementConvertor<PubSubSubscribe> {
         public:
             PubSubSubscribeConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubSubscribeConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeConvertor() override;
 
-            virtual std::shared_ptr<PubSubSubscribe> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscribe>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubSubscribe> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscribe>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h
index a573137..d853989 100644
--- a/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscribeOptionsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscribeOptions.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubSubscribeOptionsConvertor : public GenericLuaElementConvertor<PubSubSubscribeOptions> {
         public:
             PubSubSubscribeOptionsConvertor();
-            virtual ~PubSubSubscribeOptionsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscribeOptionsConvertor() override;
 
-            virtual std::shared_ptr<PubSubSubscribeOptions> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscribeOptions>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubSubscribeOptions> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscribeOptions>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
index 4b2410b..9cad963 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscription.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubSubscriptionConvertor : public GenericLuaElementConvertor<PubSubSubscription> {
         public:
             PubSubSubscriptionConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubSubscriptionConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionConvertor() override;
 
-            virtual std::shared_ptr<PubSubSubscription> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscription>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubSubscription> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscription>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
index c472a53..94b4533 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubSubscriptions.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class PubSubSubscriptionsConvertor : public GenericLuaElementConvertor<PubSubSubscriptions> {
         public:
             PubSubSubscriptionsConvertor(LuaElementConvertors* convertors);
-            virtual ~PubSubSubscriptionsConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubSubscriptionsConvertor() override;
 
-            virtual std::shared_ptr<PubSubSubscriptions> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscriptions>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubSubscriptions> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubSubscriptions>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
 
         private:
             LuaElementConvertors* convertors;
diff --git a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h
index eaf5b2b..f76f2b1 100644
--- a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h
+++ b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/PubSubUnsubscribe.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class PubSubUnsubscribeConvertor : public GenericLuaElementConvertor<PubSubUnsubscribe> {
         public:
             PubSubUnsubscribeConvertor();
-            virtual ~PubSubUnsubscribeConvertor() SWIFTEN_OVERRIDE;
+            virtual ~PubSubUnsubscribeConvertor() override;
 
-            virtual std::shared_ptr<PubSubUnsubscribe> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubUnsubscribe>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<PubSubUnsubscribe> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<PubSubUnsubscribe>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.h b/Sluift/ElementConvertors/RawXMLElementConvertor.h
index d315f73..af3625b 100644
--- a/Sluift/ElementConvertors/RawXMLElementConvertor.h
+++ b/Sluift/ElementConvertors/RawXMLElementConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
 #include <Sluift/LuaElementConvertor.h>
@@ -15,10 +14,10 @@ namespace Swift {
     class RawXMLElementConvertor : public LuaElementConvertor {
         public:
             RawXMLElementConvertor();
-            virtual ~RawXMLElementConvertor() SWIFTEN_OVERRIDE;
+            virtual ~RawXMLElementConvertor() override;
 
-            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) SWIFTEN_OVERRIDE;
-            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Element> convertFromLua(lua_State*, int index, const std::string& type) override;
+            virtual boost::optional<std::string> convertToLua(lua_State*, std::shared_ptr<Element>) override;
 
         private:
             FullPayloadSerializerCollection serializers;
diff --git a/Sluift/ElementConvertors/ResultSetConvertor.h b/Sluift/ElementConvertors/ResultSetConvertor.h
index 02fec11..e098605 100644
--- a/Sluift/ElementConvertors/ResultSetConvertor.h
+++ b/Sluift/ElementConvertors/ResultSetConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/ResultSet.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,11 +16,11 @@ namespace Swift {
     class ResultSetConvertor : public GenericLuaElementConvertor<ResultSet> {
         public:
             ResultSetConvertor();
-            virtual ~ResultSetConvertor() SWIFTEN_OVERRIDE;
+            virtual ~ResultSetConvertor() override;
 
-            virtual std::shared_ptr<ResultSet> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<ResultSet>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<ResultSet> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<ResultSet>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
 
diff --git a/Sluift/ElementConvertors/SecurityLabelConvertor.h b/Sluift/ElementConvertors/SecurityLabelConvertor.h
index 265c8af..22d11ca 100644
--- a/Sluift/ElementConvertors/SecurityLabelConvertor.h
+++ b/Sluift/ElementConvertors/SecurityLabelConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/SecurityLabel.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class SecurityLabelConvertor : public GenericLuaElementConvertor<SecurityLabel> {
         public:
             SecurityLabelConvertor();
-            virtual ~SecurityLabelConvertor() SWIFTEN_OVERRIDE;
+            virtual ~SecurityLabelConvertor() override;
 
-            virtual std::shared_ptr<SecurityLabel> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<SecurityLabel>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<SecurityLabel> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<SecurityLabel>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/SoftwareVersionConvertor.h b/Sluift/ElementConvertors/SoftwareVersionConvertor.h
index 4b1c27c..791aede 100644
--- a/Sluift/ElementConvertors/SoftwareVersionConvertor.h
+++ b/Sluift/ElementConvertors/SoftwareVersionConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/SoftwareVersion.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class SoftwareVersionConvertor : public GenericLuaElementConvertor<SoftwareVersion> {
         public:
             SoftwareVersionConvertor();
-            virtual ~SoftwareVersionConvertor() SWIFTEN_OVERRIDE;
+            virtual ~SoftwareVersionConvertor() override;
 
-            virtual std::shared_ptr<SoftwareVersion> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<SoftwareVersion>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<SoftwareVersion> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<SoftwareVersion>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/StatusConvertor.h b/Sluift/ElementConvertors/StatusConvertor.h
index 41a223e..994cee5 100644
--- a/Sluift/ElementConvertors/StatusConvertor.h
+++ b/Sluift/ElementConvertors/StatusConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Status.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class StatusConvertor : public GenericLuaElementConvertor<Status> {
         public:
             StatusConvertor();
-            virtual ~StatusConvertor() SWIFTEN_OVERRIDE;
+            virtual ~StatusConvertor() override;
 
-            virtual std::shared_ptr<Status> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Status>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Status> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Status>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.h b/Sluift/ElementConvertors/StatusShowConvertor.h
index d80d57e..41be6b3 100644
--- a/Sluift/ElementConvertors/StatusShowConvertor.h
+++ b/Sluift/ElementConvertors/StatusShowConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/StatusShow.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,10 +14,10 @@ namespace Swift {
     class StatusShowConvertor : public GenericLuaElementConvertor<StatusShow> {
         public:
             StatusShowConvertor();
-            virtual ~StatusShowConvertor() SWIFTEN_OVERRIDE;
+            virtual ~StatusShowConvertor() override;
 
-            virtual std::shared_ptr<StatusShow> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<StatusShow>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<StatusShow> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<StatusShow>) override;
 
             static std::string convertStatusShowTypeToString(const StatusShow::Type &show);
             static StatusShow::Type convertStatusShowTypeFromString(const std::string& show);
diff --git a/Sluift/ElementConvertors/SubjectConvertor.h b/Sluift/ElementConvertors/SubjectConvertor.h
index 29f3e4d..f8eb152 100644
--- a/Sluift/ElementConvertors/SubjectConvertor.h
+++ b/Sluift/ElementConvertors/SubjectConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/Subject.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,9 +16,9 @@ namespace Swift {
     class SubjectConvertor : public GenericLuaElementConvertor<Subject> {
         public:
             SubjectConvertor();
-            virtual ~SubjectConvertor() SWIFTEN_OVERRIDE;
+            virtual ~SubjectConvertor() override;
 
-            virtual std::shared_ptr<Subject> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<Subject>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<Subject> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<Subject>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/UserLocationConvertor.h b/Sluift/ElementConvertors/UserLocationConvertor.h
index 188d2dd..b667d2a 100644
--- a/Sluift/ElementConvertors/UserLocationConvertor.h
+++ b/Sluift/ElementConvertors/UserLocationConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserLocation.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class UserLocationConvertor : public GenericLuaElementConvertor<UserLocation> {
         public:
             UserLocationConvertor();
-            virtual ~UserLocationConvertor() SWIFTEN_OVERRIDE;
+            virtual ~UserLocationConvertor() override;
 
-            virtual std::shared_ptr<UserLocation> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<UserLocation>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<UserLocation> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<UserLocation>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/UserTuneConvertor.h b/Sluift/ElementConvertors/UserTuneConvertor.h
index 9ab1e9d..90bda41 100644
--- a/Sluift/ElementConvertors/UserTuneConvertor.h
+++ b/Sluift/ElementConvertors/UserTuneConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/UserTune.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -17,10 +16,10 @@ namespace Swift {
     class UserTuneConvertor : public GenericLuaElementConvertor<UserTune> {
         public:
             UserTuneConvertor();
-            virtual ~UserTuneConvertor() SWIFTEN_OVERRIDE;
+            virtual ~UserTuneConvertor() override;
 
-            virtual std::shared_ptr<UserTune> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<UserTune>) SWIFTEN_OVERRIDE;
-            virtual boost::optional<Documentation> getDocumentation() const SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<UserTune> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<UserTune>) override;
+            virtual boost::optional<Documentation> getDocumentation() const override;
     };
 }
diff --git a/Sluift/ElementConvertors/VCardConvertor.h b/Sluift/ElementConvertors/VCardConvertor.h
index 84daf51..1d59c69 100644
--- a/Sluift/ElementConvertors/VCardConvertor.h
+++ b/Sluift/ElementConvertors/VCardConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/VCard.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class VCardConvertor : public GenericLuaElementConvertor<VCard> {
         public:
             VCardConvertor();
-            virtual ~VCardConvertor() SWIFTEN_OVERRIDE;
+            virtual ~VCardConvertor() override;
 
-            virtual std::shared_ptr<VCard> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<VCard>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<VCard> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<VCard>) override;
     };
 }
diff --git a/Sluift/ElementConvertors/VCardUpdateConvertor.h b/Sluift/ElementConvertors/VCardUpdateConvertor.h
index 68dc6b8..19e42c6 100644
--- a/Sluift/ElementConvertors/VCardUpdateConvertor.h
+++ b/Sluift/ElementConvertors/VCardUpdateConvertor.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
 #include <Swiften/Elements/VCardUpdate.h>
 
 #include <Sluift/GenericLuaElementConvertor.h>
@@ -15,9 +14,9 @@ namespace Swift {
     class VCardUpdateConvertor : public GenericLuaElementConvertor<VCardUpdate> {
         public:
             VCardUpdateConvertor();
-            virtual ~VCardUpdateConvertor() SWIFTEN_OVERRIDE;
+            virtual ~VCardUpdateConvertor() override;
 
-            virtual std::shared_ptr<VCardUpdate> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE;
-            virtual void doConvertToLua(lua_State*, std::shared_ptr<VCardUpdate>) SWIFTEN_OVERRIDE;
+            virtual std::shared_ptr<VCardUpdate> doConvertFromLua(lua_State*) override;
+            virtual void doConvertToLua(lua_State*, std::shared_ptr<VCardUpdate>) override;
     };
 }
diff --git a/Sluift/GenericLuaElementConvertor.h b/Sluift/GenericLuaElementConvertor.h
index 10ad851..4e52d9e 100644
--- a/Sluift/GenericLuaElementConvertor.h
+++ b/Sluift/GenericLuaElementConvertor.h
@@ -10,8 +10,6 @@
 
 #include <lua.hpp>
 
-#include <Swiften/Base/Override.h>
-
 #include <Sluift/Lua/Check.h>
 #include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/LuaElementConvertor.h>
@@ -23,9 +21,9 @@ namespace Swift {
             GenericLuaElementConvertor(const std::string& type) : type(type) {
             }
 
-            virtual ~GenericLuaElementConvertor() SWIFTEN_OVERRIDE {}
+            virtual ~GenericLuaElementConvertor() override {}
 
-            virtual std::shared_ptr<Element> convertFromLua(lua_State* L, int index, const std::string& payloadType) SWIFTEN_OVERRIDE {
+            virtual std::shared_ptr<Element> convertFromLua(lua_State* L, int index, const std::string& payloadType) override {
                 if (payloadType == type) {
                     Lua::checkType(L, index, LUA_TTABLE);
                     lua_pushvalue(L, index);
@@ -37,7 +35,7 @@ namespace Swift {
             }
 
             virtual boost::optional<std::string> convertToLua(
-                    lua_State* L, std::shared_ptr<Element> payload) SWIFTEN_OVERRIDE {
+                    lua_State* L, std::shared_ptr<Element> payload) override {
                 if (std::shared_ptr<T> actualPayload = std::dynamic_pointer_cast<T>(payload)) {
                     doConvertToLua(L, actualPayload);
                     assert(lua_type(L, -1) == LUA_TTABLE);
diff --git a/Sluift/Helpers.h b/Sluift/Helpers.h
index 6af3906..41bfc97 100644
--- a/Sluift/Helpers.h
+++ b/Sluift/Helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,7 +9,6 @@
 #include <string>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 
 namespace Swift {
     class ClientError;
diff --git a/Sluift/Lua/FunctionRegistration.h b/Sluift/Lua/FunctionRegistration.h
index 8e1410d..285c3d0 100644
--- a/Sluift/Lua/FunctionRegistration.h
+++ b/Sluift/Lua/FunctionRegistration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,7 +11,6 @@
 #include <lua.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/Override.h>
 
 #include <Sluift/Lua/FunctionRegistry.h>
 
diff --git a/Sluift/Lua/FunctionRegistry.h b/Sluift/Lua/FunctionRegistry.h
index acab3aa..88e15d5 100644
--- a/Sluift/Lua/FunctionRegistry.h
+++ b/Sluift/Lua/FunctionRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 
 #include <lua.hpp>
 
-#include <Swiften/Base/Override.h>
-
 namespace Swift {
     namespace Lua {
         class FunctionRegistry {
diff --git a/Sluift/LuaElementConvertor.h b/Sluift/LuaElementConvertor.h
index 2cf98e7..eb3a24f 100644
--- a/Sluift/LuaElementConvertor.h
+++ b/Sluift/LuaElementConvertor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 
 #include <boost/optional.hpp>
 
-#include <Swiften/Base/Override.h>
-
 struct lua_State;
 
 namespace Swift {
diff --git a/Sluift/LuaElementConvertors.h b/Sluift/LuaElementConvertors.h
index 8e1d10b..bfcffdd 100644
--- a/Sluift/LuaElementConvertors.h
+++ b/Sluift/LuaElementConvertors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 
 #include <boost/optional.hpp>
 
-#include <Swiften/Base/Override.h>
-
 struct lua_State;
 
 namespace Swift {
diff --git a/Sluift/StandardTerminal.h b/Sluift/StandardTerminal.h
index 7582f7e..f32bd1c 100644
--- a/Sluift/StandardTerminal.h
+++ b/Sluift/StandardTerminal.h
@@ -6,18 +6,16 @@
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
-
 #include <Sluift/Terminal.h>
 
 namespace Swift {
     class StandardTerminal : public Terminal {
         public:
             StandardTerminal();
-            virtual ~StandardTerminal() SWIFTEN_OVERRIDE;
+            virtual ~StandardTerminal() override;
 
-            virtual boost::optional<std::string> readLine(const std::string& prompt) SWIFTEN_OVERRIDE;
-            virtual void printError(const std::string& message) SWIFTEN_OVERRIDE;
-            virtual void addToHistory(const std::string& command) SWIFTEN_OVERRIDE;
+            virtual boost::optional<std::string> readLine(const std::string& prompt) override;
+            virtual void printError(const std::string& message) override;
+            virtual void addToHistory(const std::string& command) 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 /Sluift
parent	8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
download	swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2