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 /Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.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 'Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h')
-rw-r--r-- | Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h b/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h index 4b11bb5..e028873 100644 --- a/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h +++ b/Swiften/Parser/PayloadParsers/MIXSetNickParserFactory.h @@ -4,10 +4,15 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2017 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Base/Override.h> #include <Swiften/Parser/GenericPayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/MIXSetNickParser.h> @@ -17,11 +22,11 @@ namespace Swift { MIXSetNickParserFactory() { } - virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const SWIFTEN_OVERRIDE { + virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const override { return element == "setnick" && ns == "urn:xmpp:mix:0"; } - virtual PayloadParser* createPayloadParser() SWIFTEN_OVERRIDE { + virtual PayloadParser* createPayloadParser() override { return new MIXSetNickParser(); } }; |