Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-24 19:24:28 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-26 04:18:34 (GMT) |
| commit | bd0e671455f6b042bbbd385f1551e9a5011badf5 (patch) | |
| tree | 9a496a300584d2b09220117af6fb52568102e5ee /Swiften/Parser/PayloadParsers | |
| parent | 02763529a75970a1d57d9abf3448848f728c4101 (diff) | |
| download | swift-bd0e671455f6b042bbbd385f1551e9a5011badf5.zip swift-bd0e671455f6b042bbbd385f1551e9a5011badf5.tar.bz2 | |
Remove unneeded forward declarations from Swiften headers
Found by cppclean.
Test-Information:
Still builds on macOS 10.12.5 with clang trunk.
Change-Id: Ie8a154e12b196587c956c8b333abf529a36f6bb3
Diffstat (limited to 'Swiften/Parser/PayloadParsers')
10 files changed, 17 insertions, 28 deletions
diff --git a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h index cf226cc..3f9b3d3 100644 --- a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h +++ b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h @@ -1,32 +1,30 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/ChatStateParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API ChatStateParserFactory : public PayloadParserFactory { public: ChatStateParserFactory() { } virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const { return ns == "http://jabber.org/protocol/chatstates" && (element == "active" || element == "composing" || element == "paused" || element == "inactive" || element == "gone"); } virtual PayloadParser* createPayloadParser() { return new ChatStateParser(); } }; } diff --git a/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h index 95617a1..61f7012 100644 --- a/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h +++ b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h @@ -1,31 +1,35 @@ /* * Copyright (c) 2017 Tarun Gupta. * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2017 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #pragma once #include <Swiften/Base/API.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/ClientStateParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API ClientStateParserFactory : public PayloadParserFactory { public: ClientStateParserFactory() { } virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const { return ns == "urn:xmpp:csi:0" && (element == "active" || element == "inactive"); } virtual PayloadParser* createPayloadParser() { return new ClientStateParser(); } }; } diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h index dc0c311..322ef94 100644 --- a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h +++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h @@ -1,36 +1,34 @@ /* * Copyright (c) 2011 Tobias Markmann * Licensed under the BSD license. * See http://www.opensource.org/licenses/bsd-license.php for more information. */ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API DeliveryReceiptParserFactory : public PayloadParserFactory { public: DeliveryReceiptParserFactory() { } virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const { return ns == "urn:xmpp:receipts" && element == "received"; } virtual PayloadParser* createPayloadParser() { return new DeliveryReceiptParser(); } }; } diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h index a858285..cef5d8f 100644 --- a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h +++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h @@ -1,36 +1,34 @@ /* * Copyright (c) 2011 Tobias Markmann * Licensed under the BSD license. * See http://www.opensource.org/licenses/bsd-license.php for more information. */ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API DeliveryReceiptRequestParserFactory : public PayloadParserFactory { public: DeliveryReceiptRequestParserFactory() { } virtual bool canParse(const std::string& element, const std::string& ns, const AttributeMap&) const { return ns == "urn:xmpp:receipts" && element == "request"; } virtual PayloadParser* createPayloadParser() { return new DeliveryReceiptRequestParser(); } }; } diff --git a/Swiften/Parser/PayloadParsers/DiscoInfoParser.h b/Swiften/Parser/PayloadParsers/DiscoInfoParser.h index 28bfff1..9c26310 100644 --- a/Swiften/Parser/PayloadParsers/DiscoInfoParser.h +++ b/Swiften/Parser/PayloadParsers/DiscoInfoParser.h @@ -1,30 +1,32 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/Parser/GenericPayloadParser.h> namespace Swift { + class FormParser; + class SWIFTEN_API DiscoInfoParser : public GenericPayloadParser<DiscoInfo> { public: DiscoInfoParser(); virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes); virtual void handleEndElement(const std::string& element, const std::string&); virtual void handleCharacterData(const std::string& data); private: enum Level { TopLevel = 0, PayloadLevel = 1 }; int level_; FormParser* formParser_; }; } diff --git a/Swiften/Parser/PayloadParsers/FormParserFactory.h b/Swiften/Parser/PayloadParsers/FormParserFactory.h index 851b302..296fcd1 100644 --- a/Swiften/Parser/PayloadParsers/FormParserFactory.h +++ b/Swiften/Parser/PayloadParsers/FormParserFactory.h @@ -1,30 +1,28 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Parser/PayloadParsers/FormParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API FormParserFactory : public PayloadParserFactory { public: FormParserFactory() { } virtual bool canParse(const std::string& /*element*/, const std::string& ns, const AttributeMap&) const { return ns == "jabber:x:data"; } virtual PayloadParser* createPayloadParser() { return new FormParser(); } }; } diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h index adc36e9..9c41095 100644 --- a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h +++ b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h @@ -1,35 +1,32 @@ /* - * Copyright (c) 2013-2016 Isode Limited. + * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <Swiften/Base/API.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/PubSubError.h> #include <Swiften/Parser/EnumParser.h> #include <Swiften/Parser/GenericPayloadParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class PayloadParser; - class SWIFTEN_API PubSubErrorParser : public GenericPayloadParser<PubSubError> { public: PubSubErrorParser(); virtual ~PubSubErrorParser(); virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE; virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE; virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE; private: int level; EnumParser<PubSubError::Type> typeParser; EnumParser<PubSubError::UnsupportedFeatureType> unsupportedTypeParser; }; } diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.h b/Swiften/Parser/PayloadParsers/ResultSetParser.h index aa18ae6..819c0a5 100644 --- a/Swiften/Parser/PayloadParsers/ResultSetParser.h +++ b/Swiften/Parser/PayloadParsers/ResultSetParser.h @@ -1,36 +1,34 @@ /* - * Copyright (c) 2014-2016 Isode Limited. + * Copyright (c) 2014-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <Swiften/Base/API.h> #include <Swiften/Base/Override.h> #include <Swiften/Elements/ResultSet.h> #include <Swiften/Parser/GenericPayloadParser.h> namespace Swift { - class PayloadParserFactoryCollection; - class SWIFTEN_API ResultSetParser : public GenericPayloadParser<ResultSet> { public: ResultSetParser(); virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) SWIFTEN_OVERRIDE; virtual void handleEndElement(const std::string& element, const std::string&) SWIFTEN_OVERRIDE; virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE; enum Level { TopLevel = 0, PayloadLevel = 1 }; private: std::string currentText_; int level_; }; } diff --git a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h index 40e010a..1fd1113 100644 --- a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h +++ b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h @@ -1,41 +1,39 @@ /* * Copyright (c) 2011 Jan Kaluza * Licensed under the Simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Elements/RosterItemExchangePayload.h> #include <Swiften/Parser/GenericPayloadParser.h> namespace Swift { - class SerializingParser; - class SWIFTEN_API RosterItemExchangeParser : public GenericPayloadParser<RosterItemExchangePayload> { public: RosterItemExchangeParser(); virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes); virtual void handleEndElement(const std::string& element, const std::string&); virtual void handleCharacterData(const std::string& data); private: enum Level { TopLevel = 0, PayloadLevel = 1, ItemLevel = 2 }; int level_; bool inItem_; RosterItemExchangePayload::Item currentItem_; std::string currentText_; }; } diff --git a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h index 914f138..91837fb 100644 --- a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h +++ b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h @@ -1,32 +1,30 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <Swiften/Elements/VCardUpdate.h> #include <Swiften/Parser/GenericPayloadParser.h> namespace Swift { - class SerializingParser; - class SWIFTEN_API VCardUpdateParser : public GenericPayloadParser<VCardUpdate> { public: VCardUpdateParser(); virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes); virtual void handleEndElement(const std::string& element, const std::string&); virtual void handleCharacterData(const std::string& data); private: enum Level { TopLevel = 0, PayloadLevel = 1 }; int level_; std::string currentText_; }; } |