diff options
-rw-r--r-- | Swiften/StreamStack/StreamStack.cpp | 14 | ||||
-rw-r--r-- | Swiften/StreamStack/StreamStack.h | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/StreamStack/StreamStack.cpp b/Swiften/StreamStack/StreamStack.cpp index f14f95c..75fb1ce 100644 --- a/Swiften/StreamStack/StreamStack.cpp +++ b/Swiften/StreamStack/StreamStack.cpp @@ -12,3 +12,3 @@ #include <Swiften/StreamStack/StreamLayer.h> -#include <Swiften/StreamStack/XMPPLayer.h> +#include <Swiften/StreamStack/HighLayer.h> @@ -16,5 +16,5 @@ namespace Swift { -StreamStack::StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer) : xmppLayer_(xmppLayer), physicalLayer_(physicalLayer) { - physicalLayer_->setParentLayer(xmppLayer_); - xmppLayer_->setChildLayer(physicalLayer_); +StreamStack::StreamStack(HighLayer* topLayer, LowLayer* bottomLayer) : topLayer_(topLayer), bottomLayer_(bottomLayer) { + bottomLayer_->setParentLayer(topLayer_); + topLayer_->setChildLayer(bottomLayer_); } @@ -25,6 +25,6 @@ StreamStack::~StreamStack() { void StreamStack::addLayer(std::unique_ptr<StreamLayer> streamLayer) { - LowLayer* lowLayer = layers_.empty() ? physicalLayer_ : layers_.rbegin()->get(); + LowLayer* lowLayer = layers_.empty() ? bottomLayer_ : layers_.rbegin()->get(); - xmppLayer_->setChildLayer(streamLayer.get()); - streamLayer->setParentLayer(xmppLayer_); + topLayer_->setChildLayer(streamLayer.get()); + streamLayer->setParentLayer(topLayer_); diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h index 5b77085..bd95811 100644 --- a/Swiften/StreamStack/StreamStack.h +++ b/Swiften/StreamStack/StreamStack.h @@ -17,3 +17,3 @@ namespace Swift { - class XMPPLayer; + class HighLayer; class LowLayer; @@ -23,3 +23,3 @@ namespace Swift { public: - StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer); + StreamStack(HighLayer* topLayer, LowLayer* bottomLayer); ~StreamStack(); @@ -28,4 +28,4 @@ namespace Swift { - XMPPLayer* getXMPPLayer() const { - return xmppLayer_; + HighLayer* getTopLayer() const { + return topLayer_; } @@ -43,4 +43,4 @@ namespace Swift { private: - XMPPLayer* xmppLayer_; - LowLayer* physicalLayer_; + HighLayer* topLayer_; + LowLayer* bottomLayer_; std::vector<std::unique_ptr<StreamLayer>> layers_; |