4 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index 213948a..35146d6 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Base/ByteArray.h>
 #include <QA/Checker/IO.h>
 
 #include <vector>
 #include <boost/bind.hpp>
@@ -120,19 +120,19 @@ class StreamStackTest : public CppUnit::TestFixture {
 			xmppStream_->onWriteData.connect(boost::bind(&StreamStackTest::handleWriteData, this, _1));
 			boost::shared_ptr<MyStreamLayer> xStream(new MyStreamLayer("X"));
 			testling.addLayer(xStream.get());
 
 			xmppStream_->writeData("foo");
 
 			CPPUNIT_ASSERT_EQUAL(1, dataWriteReceived_);
 		}
 
-		void handleElement(boost::shared_ptr<Element>) {
+		void handleElement(boost::shared_ptr<ToplevelElement>) {
 			++elementsReceived_;
 		}
 
 		void handleWriteData(const SafeByteArray&) {
 			++dataWriteReceived_;
 		}
 
 	private:
 		class MyStreamLayer : public StreamLayer {
diff --git a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
index a6098f1..ced9ec3 100644
--- a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
+++ b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <vector>
 #include <boost/bind.hpp>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
@@ -88,23 +88,23 @@ class XMPPLayerTest : public CppUnit::TestFixture {
 			CPPUNIT_ASSERT_EQUAL(std::string("<presence/>"), lowLayer_->writtenData);
 		}
 
 		void testWriteFooter() {
 			testling_->writeFooter();
 
 			CPPUNIT_ASSERT_EQUAL(std::string("</stream:stream>"), lowLayer_->writtenData);
 		}
 
-		void handleElement(boost::shared_ptr<Element>) {
+		void handleElement(boost::shared_ptr<ToplevelElement>) {
 			++elementsReceived_;
 		}
 
-		void handleElementAndReset(boost::shared_ptr<Element>) {
+		void handleElementAndReset(boost::shared_ptr<ToplevelElement>) {
 			++elementsReceived_;
 			testling_->resetParser();
 		}
 
 		void handleError() {
 			++errorReceived_;
 		}
 
 	private:
diff --git a/Swiften/StreamStack/XMPPLayer.cpp b/Swiften/StreamStack/XMPPLayer.cpp
index 94afcf9..59418a2 100644
--- a/Swiften/StreamStack/XMPPLayer.cpp
+++ b/Swiften/StreamStack/XMPPLayer.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/StreamStack/XMPPLayer.h>
 #include <Swiften/Parser/XMPPParser.h>
 #include <Swiften/Serializer/XMPPSerializer.h>
 #include <Swiften/Elements/ProtocolHeader.h>
 
@@ -32,19 +32,19 @@ XMPPLayer::~XMPPLayer() {
 
 void XMPPLayer::writeHeader(const ProtocolHeader& header) {
 	writeDataInternal(createSafeByteArray(xmppSerializer_->serializeHeader(header)));
 }
 
 void XMPPLayer::writeFooter() {
 	writeDataInternal(createSafeByteArray(xmppSerializer_->serializeFooter()));
 }
 
-void XMPPLayer::writeElement(boost::shared_ptr<Element> element) {
+void XMPPLayer::writeElement(boost::shared_ptr<ToplevelElement> element) {
 	writeDataInternal(xmppSerializer_->serializeElement(element));
 }
 
 void XMPPLayer::writeData(const std::string& data) {
 	writeDataInternal(createSafeByteArray(data));
 }
 
 void XMPPLayer::writeDataInternal(const SafeByteArray& data) {
 	onWriteData(data);
@@ -72,19 +72,19 @@ void XMPPLayer::doResetParser() {
 	delete xmppParser_;
 	xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory_);
 	resetParserAfterParse_ = false;
 }
 
 void XMPPLayer::handleStreamStart(const ProtocolHeader& header) {
 	onStreamStart(header);
 }
 
-void XMPPLayer::handleElement(boost::shared_ptr<Element> stanza) {
+void XMPPLayer::handleElement(boost::shared_ptr<ToplevelElement> stanza) {
 	onElement(stanza);
 }
 
 void XMPPLayer::handleStreamEnd() {
 }
 
 void XMPPLayer::resetParser() {
 	if (inParser_) {
 		resetParserAfterParse_ = true;
diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h
index f0e88aa..bb0e498 100644
--- a/Swiften/StreamStack/XMPPLayer.h
+++ b/Swiften/StreamStack/XMPPLayer.h
@@ -1,25 +1,25 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/noncopyable.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/StreamStack/HighLayer.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/Elements/StreamType.h>
 #include <Swiften/Parser/XMPPParserClient.h>
 
 namespace Swift {
 	class ProtocolHeader;
 	class XMPPParser;
 	class PayloadParserFactoryCollection;
 	class XMPPSerializer;
 	class PayloadSerializerCollection;
@@ -32,37 +32,37 @@ namespace Swift {
 			XMPPLayer(
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					XMLParserFactory* xmlParserFactory,
 					StreamType streamType);
 			~XMPPLayer();
 
 			void writeHeader(const ProtocolHeader& header);
 			void writeFooter();
-			void writeElement(boost::shared_ptr<Element>);
+			void writeElement(boost::shared_ptr<ToplevelElement>);
 			void writeData(const std::string& data);
 
 			void resetParser();
 
 		protected:
 			void handleDataRead(const SafeByteArray& data);
 			void writeDataInternal(const SafeByteArray& data);
 
 		public:
 			boost::signal<void (const ProtocolHeader&)> onStreamStart;
-			boost::signal<void (boost::shared_ptr<Element>)> onElement;
+			boost::signal<void (boost::shared_ptr<ToplevelElement>)> onElement;
 			boost::signal<void (const SafeByteArray&)> onWriteData;
 			boost::signal<void (const SafeByteArray&)> onDataRead;
 			boost::signal<void ()> onError;
 
 		private:
 			void handleStreamStart(const ProtocolHeader&);
-			void handleElement(boost::shared_ptr<Element>);
+			void handleElement(boost::shared_ptr<ToplevelElement>);
 			void handleStreamEnd();
 
 			void doResetParser();
 
 		private:
 			PayloadParserFactoryCollection* payloadParserFactories_;
 			XMPPParser* xmppParser_;
 			PayloadSerializerCollection* payloadSerializers_;
 			XMLParserFactory* xmlParserFactory_;