diff options
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/ElementConvertors/PresenceConvertor.h | |
parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
download | swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2 |
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
Diffstat (limited to 'Sluift/ElementConvertors/PresenceConvertor.h')
-rw-r--r-- | Sluift/ElementConvertors/PresenceConvertor.h | 9 |
1 files changed, 4 insertions, 5 deletions
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); |