3 files changed, 5 insertions, 8 deletions
diff --git a/Swiften/Component/ComponentConnector.cpp b/Swiften/Component/ComponentConnector.cpp
index 632eb84..a7375a7 100644
--- a/Swiften/Component/ComponentConnector.cpp
+++ b/Swiften/Component/ComponentConnector.cpp
@@ -6,8 +6,6 @@
 
 #include <Swiften/Component/ComponentConnector.h>
 
-#include <iostream>
-
 #include <boost/bind.hpp>
 
 #include <Swiften/Network/ConnectionFactory.h>
diff --git a/Swiften/Component/ComponentSessionStanzaChannel.cpp b/Swiften/Component/ComponentSessionStanzaChannel.cpp
index 282d9f1..fd61594 100644
--- a/Swiften/Component/ComponentSessionStanzaChannel.cpp
+++ b/Swiften/Component/ComponentSessionStanzaChannel.cpp
@@ -6,10 +6,10 @@
 
 #include <Swiften/Component/ComponentSessionStanzaChannel.h>
 
-#include <iostream>
-
 #include <boost/bind.hpp>
 
+#include <Swiften/Base/Log.h>
+
 namespace Swift {
 
 void ComponentSessionStanzaChannel::setSession(std::shared_ptr<ComponentSession> session) {
@@ -38,7 +38,7 @@ std::string ComponentSessionStanzaChannel::getNewIQID() {
 
 void ComponentSessionStanzaChannel::send(std::shared_ptr<Stanza> stanza) {
     if (!isAvailable()) {
-        std::cerr << "Warning: Component: Trying to send a stanza while disconnected." << std::endl;
+        SWIFT_LOG(warning) << "Component: Trying to send a stanza while disconnected." << std::endl;
         return;
     }
     session->sendStanza(stanza);
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp
index dfa0896..3896bdd 100644
--- a/Swiften/Component/CoreComponent.cpp
+++ b/Swiften/Component/CoreComponent.cpp
@@ -6,11 +6,10 @@
 
 #include <Swiften/Component/CoreComponent.h>
 
-#include <iostream>
-
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Base/Log.h>
 #include <Swiften/Component/ComponentSession.h>
 #include <Swiften/Component/ComponentSessionStanzaChannel.h>
 #include <Swiften/Network/Connector.h>
@@ -34,7 +33,7 @@ CoreComponent::CoreComponent(const JID& jid, const std::string& secret, NetworkF
 
 CoreComponent::~CoreComponent() {
     if (session_ || connection_) {
-        std::cerr << "Warning: Component not disconnected properly" << std::endl;
+        SWIFT_LOG(warning) << "Component not disconnected properly" << std::endl;
     }
     delete iqRouter_;