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,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
@@ -85,13 +85,8 @@ namespace Swift {
            void initializeStreamStack();
-            XMPPLayer* getXMPPLayer() const {
+            XMPPLayer* getXMPPLayer() const;
-                return xmppLayer;
+            StreamStack* getStreamStack() const;
-            }
-            StreamStack* getStreamStack() const {
-                return streamStack;
-            }
            void setFinished();
@@ -105,9 +100,8 @@ namespace Swift {
            PayloadParserFactoryCollection* payloadParserFactories;
            PayloadSerializerCollection* payloadSerializers;
            XMLParserFactory* xmlParserFactory;
-            XMPPLayer* xmppLayer;
-            ConnectionLayer* connectionLayer;
+            std::unique_ptr<StreamStack> streamStack;
-            StreamStack* streamStack;
            bool finishing;
    };
 }

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,5 +1,5 @@
1	/*	1	/*
2	* Copyright (c) 2010-2017 Isode Limited.	2	* Copyright (c) 2010-2018 Isode Limited.
3	* All rights reserved.	3	* All rights reserved.
4	* See the COPYING file for more information.	4	* See the COPYING file for more information.
5	*/	5	*/
@@ -85,13 +85,8 @@ namespace Swift {
85		85
86	void initializeStreamStack();	86	void initializeStreamStack();
87		87
88	XMPPLayer* getXMPPLayer() const {	88	XMPPLayer* getXMPPLayer() const;
89	return xmppLayer;	89	StreamStack* getStreamStack() const;
90	}
91
92	StreamStack* getStreamStack() const {
93	return streamStack;
94	}
95		90
96	void setFinished();	91	void setFinished();
97		92
@@ -105,9 +100,8 @@ namespace Swift {
105	PayloadParserFactoryCollection* payloadParserFactories;	100	PayloadParserFactoryCollection* payloadParserFactories;
106	PayloadSerializerCollection* payloadSerializers;	101	PayloadSerializerCollection* payloadSerializers;
107	XMLParserFactory* xmlParserFactory;	102	XMLParserFactory* xmlParserFactory;
108	XMPPLayer* xmppLayer;	103
109	ConnectionLayer* connectionLayer;	104	std::unique_ptr<StreamStack> streamStack;
110	StreamStack* streamStack;
111	bool finishing;	105	bool finishing;
112	};	106	};
113	}	107	}