1 files changed, 47 insertions, 46 deletions
diff --git a/Swiften/Component/ComponentSessionStanzaChannel.cpp b/Swiften/Component/ComponentSessionStanzaChannel.cpp
index fa58d4b..fd61594 100644
--- a/Swiften/Component/ComponentSessionStanzaChannel.cpp
+++ b/Swiften/Component/ComponentSessionStanzaChannel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,73 +7,74 @@
 #include <Swiften/Component/ComponentSessionStanzaChannel.h>
 
 #include <boost/bind.hpp>
-#include <iostream>
+
+#include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-void ComponentSessionStanzaChannel::setSession(boost::shared_ptr<ComponentSession> session) {
-	assert(!this->session);
-	this->session = session;
-	session->onInitialized.connect(boost::bind(&ComponentSessionStanzaChannel::handleSessionInitialized, this));
-	session->onFinished.connect(boost::bind(&ComponentSessionStanzaChannel::handleSessionFinished, this, _1));
-	session->onStanzaReceived.connect(boost::bind(&ComponentSessionStanzaChannel::handleStanza, this, _1));
+void ComponentSessionStanzaChannel::setSession(std::shared_ptr<ComponentSession> session) {
+    assert(!this->session);
+    this->session = session;
+    session->onInitialized.connect(boost::bind(&ComponentSessionStanzaChannel::handleSessionInitialized, this));
+    session->onFinished.connect(boost::bind(&ComponentSessionStanzaChannel::handleSessionFinished, this, _1));
+    session->onStanzaReceived.connect(boost::bind(&ComponentSessionStanzaChannel::handleStanza, this, _1));
 }
 
-void ComponentSessionStanzaChannel::sendIQ(boost::shared_ptr<IQ> iq) {
-	send(iq);
+void ComponentSessionStanzaChannel::sendIQ(std::shared_ptr<IQ> iq) {
+    send(iq);
 }
 
-void ComponentSessionStanzaChannel::sendMessage(boost::shared_ptr<Message> message) {
-	send(message);
+void ComponentSessionStanzaChannel::sendMessage(std::shared_ptr<Message> message) {
+    send(message);
 }
 
-void ComponentSessionStanzaChannel::sendPresence(boost::shared_ptr<Presence> presence) {
-	send(presence);
+void ComponentSessionStanzaChannel::sendPresence(std::shared_ptr<Presence> presence) {
+    send(presence);
 }
 
 std::string ComponentSessionStanzaChannel::getNewIQID() {
-	return idGenerator.generateID();
+    return idGenerator.generateID();
 }
 
-void ComponentSessionStanzaChannel::send(boost::shared_ptr<Stanza> stanza) {
-	if (!isAvailable()) {
-		std::cerr << "Warning: Component: Trying to send a stanza while disconnected." << std::endl;
-		return;
-	}
-	session->sendStanza(stanza);
+void ComponentSessionStanzaChannel::send(std::shared_ptr<Stanza> stanza) {
+    if (!isAvailable()) {
+        SWIFT_LOG(warning) << "Component: Trying to send a stanza while disconnected." << std::endl;
+        return;
+    }
+    session->sendStanza(stanza);
 }
 
-void ComponentSessionStanzaChannel::handleSessionFinished(boost::shared_ptr<Error>) {
-	session->onFinished.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleSessionFinished, this, _1));
-	session->onStanzaReceived.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleStanza, this, _1));
-	session->onInitialized.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleSessionInitialized, this));
-	session.reset();
+void ComponentSessionStanzaChannel::handleSessionFinished(std::shared_ptr<Error>) {
+    session->onFinished.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleSessionFinished, this, _1));
+    session->onStanzaReceived.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleStanza, this, _1));
+    session->onInitialized.disconnect(boost::bind(&ComponentSessionStanzaChannel::handleSessionInitialized, this));
+    session.reset();
 
-	onAvailableChanged(false);
+    onAvailableChanged(false);
 }
 
-void ComponentSessionStanzaChannel::handleStanza(boost::shared_ptr<Stanza> stanza) {
-	boost::shared_ptr<Message> message = boost::dynamic_pointer_cast<Message>(stanza);
-	if (message) {
-		onMessageReceived(message);
-		return;
-	}
-
-	boost::shared_ptr<Presence> presence = boost::dynamic_pointer_cast<Presence>(stanza);
-	if (presence) {
-		onPresenceReceived(presence);
-		return;
-	}
-
-	boost::shared_ptr<IQ> iq = boost::dynamic_pointer_cast<IQ>(stanza);
-	if (iq) {
-		onIQReceived(iq);
-		return;
-	}
+void ComponentSessionStanzaChannel::handleStanza(std::shared_ptr<Stanza> stanza) {
+    std::shared_ptr<Message> message = std::dynamic_pointer_cast<Message>(stanza);
+    if (message) {
+        onMessageReceived(message);
+        return;
+    }
+
+    std::shared_ptr<Presence> presence = std::dynamic_pointer_cast<Presence>(stanza);
+    if (presence) {
+        onPresenceReceived(presence);
+        return;
+    }
+
+    std::shared_ptr<IQ> iq = std::dynamic_pointer_cast<IQ>(stanza);
+    if (iq) {
+        onIQReceived(iq);
+        return;
+    }
 }
 
 void ComponentSessionStanzaChannel::handleSessionInitialized() {
-	onAvailableChanged(true);
+    onAvailableChanged(true);
 }
 
 }