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/LinkLocal | |
| 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/LinkLocal')
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h | 3 | ||||
| -rw-r--r-- | Swiften/LinkLocal/LinkLocalConnector.h | 9 | ||||
| -rw-r--r-- | Swiften/LinkLocal/OutgoingLinkLocalSession.h | 7 |
3 files changed, 7 insertions, 12 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h index 633ca6d..5d4fefd 100644 --- a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h +++ b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h @@ -1,53 +1,52 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <list> #include <memory> #include <set> #include <string> #include <Swiften/Base/API.h> #include <Swiften/Base/ByteArray.h> #include <Swiften/EventLoop/EventOwner.h> #include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h> #include <Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h> #include <Swiften/Network/HostAddress.h> namespace Swift { class FakeDNSSDQuery; - class FakeDNSSDBrowseQuery; class EventLoop; class SWIFTEN_API FakeDNSSDQuerier : public DNSSDQuerier, public EventOwner, public std::enable_shared_from_this<FakeDNSSDQuerier> { public: FakeDNSSDQuerier(const std::string& domain, EventLoop* eventLoop); ~FakeDNSSDQuerier(); void start() {} void stop() {} void clearAllQueriesEverRun() { allQueriesEverRun.clear(); } std::shared_ptr<DNSSDBrowseQuery> createBrowseQuery(); std::shared_ptr<DNSSDRegisterQuery> createRegisterQuery( const std::string& name, int port, const ByteArray& info); std::shared_ptr<DNSSDResolveServiceQuery> createResolveServiceQuery( const DNSSDServiceID&); std::shared_ptr<DNSSDResolveHostnameQuery> createResolveHostnameQuery( const std::string& hostname, int interfaceIndex); void addRunningQuery(std::shared_ptr<FakeDNSSDQuery>); void removeRunningQuery(std::shared_ptr<FakeDNSSDQuery>); void addService(const DNSSDServiceID& id); void removeService(const DNSSDServiceID& id); diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h index 2c49185..044b74f 100644 --- a/Swiften/LinkLocal/LinkLocalConnector.h +++ b/Swiften/LinkLocal/LinkLocalConnector.h @@ -1,55 +1,52 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <vector> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/LinkLocal/LinkLocalService.h> #include <Swiften/Network/Connection.h> namespace Swift { - class ConnectionFactory; - class HostAddress; - class ToplevelElement; - class PayloadParserFactoryCollection; - class PayloadSerializerCollection; class DNSSDQuerier; class DNSSDResolveHostnameQuery; + class HostAddress; + class ToplevelElement; class SWIFTEN_API LinkLocalConnector : public std::enable_shared_from_this<LinkLocalConnector> { public: LinkLocalConnector( const LinkLocalService& service, std::shared_ptr<DNSSDQuerier> querier, std::shared_ptr<Connection> connection); ~LinkLocalConnector(); const LinkLocalService& getService() const { return service; } void connect(); void cancel(); void queueElement(std::shared_ptr<ToplevelElement> element); const std::vector<std::shared_ptr<ToplevelElement> >& getQueuedElements() const { return queuedElements; } std::shared_ptr<Connection> getConnection() const { return connection; } boost::signals2::signal<void (bool)> onConnectFinished; private: void handleHostnameResolved(const boost::optional<HostAddress>& address); void handleConnected(bool error); diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.h b/Swiften/LinkLocal/OutgoingLinkLocalSession.h index 34f7af9..93f8c9d 100644 --- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h +++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h @@ -1,45 +1,44 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <vector> #include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/JID/JID.h> #include <Swiften/Session/Session.h> namespace Swift { - class ConnectionFactory; - class XMLParserFactory; - class ToplevelElement; class PayloadParserFactoryCollection; class PayloadSerializerCollection; + class ToplevelElement; + class XMLParserFactory; class SWIFTEN_API OutgoingLinkLocalSession : public Session { public: OutgoingLinkLocalSession( const JID& localJID, const JID& remoteJID, std::shared_ptr<Connection> connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers, XMLParserFactory* xmlParserFactory); void queueElement(std::shared_ptr<ToplevelElement> element); private: void handleSessionStarted(); void handleElement(std::shared_ptr<ToplevelElement>); void handleStreamStart(const ProtocolHeader&); private: std::vector<std::shared_ptr<ToplevelElement> > queuedElements_; }; } |