3 files changed, 27 insertions, 28 deletions
diff --git a/Swiften/StreamStack/StreamStack.cpp b/Swiften/StreamStack/StreamStack.cpp
index 75fb1ce..cf80fb1 100644
--- a/Swiften/StreamStack/StreamStack.cpp
+++ b/Swiften/StreamStack/StreamStack.cpp
@@ -10,5 +10,5 @@
 
+#include <Swiften/StreamStack/HighLayer.h>
 #include <Swiften/StreamStack/LowLayer.h>
 #include <Swiften/StreamStack/StreamLayer.h>
-#include <Swiften/StreamStack/HighLayer.h>
 
@@ -16,5 +16,5 @@ namespace Swift {
 
-StreamStack::StreamStack(HighLayer* topLayer, LowLayer* bottomLayer) : topLayer_(topLayer), bottomLayer_(bottomLayer) {
-    bottomLayer_->setParentLayer(topLayer_);
-    topLayer_->setChildLayer(bottomLayer_);
+StreamStack::StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer) : topLayer_(std::move(topLayer)), bottomLayer_(std::move(bottomLayer)) {
+    bottomLayer_->setParentLayer(topLayer_.get());
+    topLayer_->setChildLayer(bottomLayer_.get());
 }
@@ -25,6 +25,6 @@ StreamStack::~StreamStack() {
 void StreamStack::addLayer(std::unique_ptr<StreamLayer> streamLayer) {
-    LowLayer* lowLayer = layers_.empty() ? bottomLayer_ : layers_.rbegin()->get();
+    auto* lowLayer = layers_.empty() ? bottomLayer_.get() : layers_.rbegin()->get();
 
     topLayer_->setChildLayer(streamLayer.get());
-    streamLayer->setParentLayer(topLayer_);
+    streamLayer->setParentLayer(topLayer_.get());
 
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h
index bd95811..263b1f5 100644
--- a/Swiften/StreamStack/StreamStack.h
+++ b/Swiften/StreamStack/StreamStack.h
@@ -23,3 +23,3 @@ namespace Swift {
         public:
-            StreamStack(HighLayer* topLayer, LowLayer* bottomLayer);
+            StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer);
             ~StreamStack();
@@ -29,3 +29,3 @@ namespace Swift {
             HighLayer* getTopLayer() const {
-                return topLayer_;
+                return topLayer_.get();
             }
@@ -39,2 +39,8 @@ namespace Swift {
                 }
+                if (T* layer = dynamic_cast<T*>(topLayer_.get())) {
+                    return layer;
+                }
+                if (T* layer = dynamic_cast<T*>(bottomLayer_.get())) {
+                    return layer;
+                }
                 return nullptr;
@@ -43,4 +49,4 @@ namespace Swift {
         private:
-            HighLayer* topLayer_;
-            LowLayer* bottomLayer_;
+            std::unique_ptr<HighLayer> topLayer_;
+            std::unique_ptr<LowLayer> bottomLayer_;
             std::vector<std::unique_ptr<StreamLayer>> layers_;
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index 0b520f1..b074736 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -41,4 +41,5 @@ class StreamStackTest : public CppUnit::TestFixture {
         void setUp() {
-            physicalStream_ = new TestLowLayer();
-            xmppStream_ = new XMPPLayer(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType);
+            testling_ = std::make_unique<StreamStack>(std::make_unique<XMPPLayer>(&parserFactories_, &serializers_, &xmlParserFactory_, ClientStreamType), std::make_unique<TestLowLayer>());
+            physicalStream_ = testling_->getLayer<TestLowLayer>();
+            xmppStream_ = testling_->getLayer<XMPPLayer>();
             elementsReceived_ = 0;
@@ -48,4 +49,2 @@ class StreamStackTest : public CppUnit::TestFixture {
         void tearDown() {
-            delete physicalStream_;
-            delete xmppStream_;
         }
@@ -53,3 +52,2 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testWriteData_NoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
 
@@ -62,5 +60,4 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testWriteData_OneIntermediateStream() {
-            StreamStack testling(xmppStream_, physicalStream_);
             std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
-            testling.addLayer(std::move(xStream));
+            testling_->addLayer(std::move(xStream));
 
@@ -73,7 +70,6 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testWriteData_TwoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
             std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
             std::unique_ptr<MyStreamLayer> yStream(new MyStreamLayer("Y"));
-            testling.addLayer(std::move(xStream));
-            testling.addLayer(std::move(yStream));
+            testling_->addLayer(std::move(xStream));
+            testling_->addLayer(std::move(yStream));
 
@@ -86,3 +82,2 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testReadData_NoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
@@ -95,6 +90,5 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testReadData_OneIntermediateStream() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
             std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("<"));
-            testling.addLayer(std::move(xStream));
+            testling_->addLayer(std::move(xStream));
 
@@ -106,3 +100,2 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testReadData_TwoIntermediateStreamStack() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onElement.connect(boost::bind(&StreamStackTest::handleElement, this, _1));
@@ -110,4 +103,4 @@ class StreamStackTest : public CppUnit::TestFixture {
             std::unique_ptr<MyStreamLayer> yStream(new MyStreamLayer("<"));
-            testling.addLayer(std::move(xStream));
-            testling.addLayer(std::move(yStream));
+            testling_->addLayer(std::move(xStream));
+            testling_->addLayer(std::move(yStream));
 
@@ -119,6 +112,5 @@ class StreamStackTest : public CppUnit::TestFixture {
         void testAddLayer_ExistingOnWriteDataSlot() {
-            StreamStack testling(xmppStream_, physicalStream_);
             xmppStream_->onWriteData.connect(boost::bind(&StreamStackTest::handleWriteData, this, _1));
             std::unique_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
-            testling.addLayer(std::move(xStream));
+            testling_->addLayer(std::move(xStream));
 
@@ -178,2 +170,3 @@ class StreamStackTest : public CppUnit::TestFixture {
         XMPPLayer* xmppStream_;
+        std::unique_ptr<StreamStack> testling_;
         int elementsReceived_;