1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Client/UnitTest/ClientSessionTest.cpp b/Swiften/Client/UnitTest/ClientSessionTest.cpp
index 4ef6727..4e1fc31 100644
--- a/Swiften/Client/UnitTest/ClientSessionTest.cpp
+++ b/Swiften/Client/UnitTest/ClientSessionTest.cpp
@@ -1,37 +1,37 @@
 /*
- * 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 <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <deque>
 #include <boost/bind.hpp>
 #include <boost/optional.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/AuthChallenge.h>
 #include <Swiften/Elements/StartTLSRequest.h>
 #include <Swiften/Elements/StreamFeatures.h>
 #include <Swiften/Elements/StreamError.h>
 #include <Swiften/Elements/TLSProceed.h>
 #include <Swiften/Elements/StartTLSFailure.h>
 #include <Swiften/Elements/AuthRequest.h>
 #include <Swiften/Elements/AuthSuccess.h>
 #include <Swiften/Elements/AuthFailure.h>
 #include <Swiften/Elements/StreamManagementEnabled.h>
 #include <Swiften/Elements/StreamManagementFailed.h>
 #include <Swiften/Elements/StanzaAck.h>
 #include <Swiften/Elements/EnableStreamManagement.h>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Elements/ResourceBind.h>
 #include <Swiften/TLS/SimpleCertificate.h>
 #include <Swiften/TLS/BlindCertificateTrustChecker.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
@@ -349,99 +349,99 @@ class ClientSessionTest : public CppUnit::TestFixture {
 			session->onFinished.connect(boost::bind(&ClientSessionTest::handleSessionFinished, this, _1));
 			session->onNeedCredentials.connect(boost::bind(&ClientSessionTest::handleSessionNeedCredentials, this));
 			session->setAllowPLAINOverNonTLS(true);
 			return session;
 		}
 
 		void initializeSession(boost::shared_ptr<ClientSession> session) {
 			session->start();
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->sendStreamFeaturesWithPLAINAuthentication();
 			session->sendCredentials(createSafeByteArray("mypass"));
 			server->receiveAuthRequest("PLAIN");
 			server->sendAuthSuccess();
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->sendStreamFeaturesWithBindAndStreamManagement();
 			server->receiveBind();
 			server->sendBindResult();
 			server->receiveStreamManagementEnable();
 			server->sendStreamManagementEnabled();
 		}
 
 		void handleSessionFinished(boost::shared_ptr<Error> error) {
 			sessionFinishedReceived = true;
 			sessionFinishedError = error;
 		}
 
 		void handleSessionNeedCredentials() {
 			needCredentials = true;
 		}
 
 		class MockSessionStream : public SessionStream {
 			public:
 				struct Event {
-					Event(boost::shared_ptr<Element> element) : element(element), footer(false) {}
+					Event(boost::shared_ptr<ToplevelElement> element) : element(element), footer(false) {}
 					Event(const ProtocolHeader& header) : header(header), footer(false) {}
 					Event() : footer(true) {}
 					
-					boost::shared_ptr<Element> element;
+					boost::shared_ptr<ToplevelElement> element;
 					boost::optional<ProtocolHeader> header;
 					bool footer;
 				};
 
 				MockSessionStream() : available(true), canTLSEncrypt(true), tlsEncrypted(false), compressed(false), whitespacePingEnabled(false), resetCount(0) {
 				}
 
 				virtual void close() {
 					onClosed(boost::shared_ptr<Error>());
 				}
 
 				virtual bool isOpen() {
 					return available;
 				}
 
 				virtual void writeHeader(const ProtocolHeader& header) {
 					receivedEvents.push_back(Event(header));
 				}
 
 				virtual void writeFooter() {
 					receivedEvents.push_back(Event());
 				}
 
-				virtual void writeElement(boost::shared_ptr<Element> element) {
+				virtual void writeElement(boost::shared_ptr<ToplevelElement> element) {
 					receivedEvents.push_back(Event(element));
 				}
 
 				virtual void writeData(const std::string&) {
 				}
 
 				virtual bool supportsTLSEncryption() {
 					return canTLSEncrypt;
 				}
 
 				virtual void addTLSEncryption() {
 					tlsEncrypted = true;
 				}
 
 				virtual bool isTLSEncrypted() {
 					return tlsEncrypted;
 				}
 
 				virtual ByteArray getTLSFinishMessage() const {
 					return ByteArray();
 				}
 
 				virtual Certificate::ref getPeerCertificate() const {
 					return Certificate::ref(new SimpleCertificate());
 				}
 
 				virtual std::vector<Certificate::ref> getPeerCertificateChain() const {
 					 return std::vector<Certificate::ref>();
 				}
 
 				virtual boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const {
 					return boost::shared_ptr<CertificateVerificationError>();
 				}
 
 				virtual bool supportsZLibCompression() {