1 files changed, 42 insertions, 35 deletions
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h
index 8bbb235..263b1f5 100644
--- a/Swiften/StreamStack/StreamStack.h
+++ b/Swiften/StreamStack/StreamStack.h
@@ -1,47 +1,54 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
-#include <Swiften/Base/boost_bsignals.h>
+#include <memory>
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Stanza.h>
 
 namespace Swift {
-	class XMPPLayer;
-	class LowLayer;
-	class StreamLayer;
-
-	class SWIFTEN_API StreamStack {
-		public:
-			StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer);
-			~StreamStack();
-
-			void addLayer(StreamLayer*);
-
-			XMPPLayer* getXMPPLayer() const {
-				return xmppLayer_;
-			}
-
-			template<typename T> T* getLayer() {
-				for (size_t i = 0; i < layers_.size(); ++i) {
-					T* layer = dynamic_cast<T*>(layers_[i]);
-					if (layer) {
-						return layer;
-					}
-				}
-				return NULL;
-			}
-
-		private:
-			XMPPLayer* xmppLayer_;
-			LowLayer* physicalLayer_;
-			std::vector<StreamLayer*> layers_;
-	};
+    class HighLayer;
+    class LowLayer;
+    class StreamLayer;
+
+    class SWIFTEN_API StreamStack {
+        public:
+            StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer);
+            ~StreamStack();
+
+            void addLayer(std::unique_ptr<StreamLayer> /* streamLayer */);
+
+            HighLayer* getTopLayer() const {
+                return topLayer_.get();
+            }
+
+            template<typename T> T* getLayer() const {
+                for (const auto& i : layers_) {
+                    T* layer = dynamic_cast<T*>(i.get());
+                    if (layer) {
+                        return layer;
+                    }
+                }
+                if (T* layer = dynamic_cast<T*>(topLayer_.get())) {
+                    return layer;
+                }
+                if (T* layer = dynamic_cast<T*>(bottomLayer_.get())) {
+                    return layer;
+                }
+                return nullptr;
+            }
+
+        private:
+            std::unique_ptr<HighLayer> topLayer_;
+            std::unique_ptr<LowLayer> bottomLayer_;
+            std::vector<std::unique_ptr<StreamLayer>> layers_;
+    };
 }