Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-08-02 09:00:25 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-08-02 09:00:25 (GMT) |
| commit | 091f6e520694360a0407ab0cf3bb036fb461e6e3 (patch) | |
| tree | 717ff863e8cd799842e5c82fc2d833ae026c9b20 /Swiften/Session/Session.h | |
| parent | 80f74201f0a35718642e434c58b631b238fd85df (diff) | |
| download | swift-091f6e520694360a0407ab0cf3bb036fb461e6e3.zip swift-091f6e520694360a0407ab0cf3bb036fb461e6e3.tar.bz2 | |
Have StreamStack own the top and bottom layer
Test-Information:
Builds, unit tests and integration tests pass on macOS with
clang 7.0 master.
Change-Id: I0db411e49339ccb2301edd1a16612cb1ad2c927c
Diffstat (limited to 'Swiften/Session/Session.h')
| -rw-r--r-- | Swiften/Session/Session.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h index 04153ec..e6a0d53 100644 --- a/Swiften/Session/Session.h +++ b/Swiften/Session/Session.h @@ -1,7 +1,7 @@ /* - * Copyright (c) 2010-2017 Isode Limited. + * Copyright (c) 2010-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once @@ -83,17 +83,12 @@ namespace Swift { virtual void handleElement(std::shared_ptr<ToplevelElement>) = 0; virtual void handleStreamStart(const ProtocolHeader&) = 0; void initializeStreamStack(); - XMPPLayer* getXMPPLayer() const { - return xmppLayer; - } - - StreamStack* getStreamStack() const { - return streamStack; - } + XMPPLayer* getXMPPLayer() const; + StreamStack* getStreamStack() const; void setFinished(); private: void handleDisconnected(const boost::optional<Connection::Error>& error); @@ -103,11 +98,10 @@ namespace Swift { JID remoteJID; std::shared_ptr<Connection> connection; PayloadParserFactoryCollection* payloadParserFactories; PayloadSerializerCollection* payloadSerializers; XMLParserFactory* xmlParserFactory; - XMPPLayer* xmppLayer; - ConnectionLayer* connectionLayer; - StreamStack* streamStack; + + std::unique_ptr<StreamStack> streamStack; bool finishing; }; } |