From d594bc3e3aace883f1e98e699a30428a52a78d50 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Fri, 20 Dec 2013 16:33:18 +0000
Subject: Replace accidental cerr with SWIFT_LOG

Change-Id: I1801265c1b65eacf97e1cd3c69bedeef63cca898

diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
index adbefd5..3a32889 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -46,7 +46,7 @@ void VCardUpdateAvatarManager::handlePresenceReceived(boost::shared_ptr<Presence
 
 void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vCard) {
 	if (!vCard) {
-		std::cerr << "Warning: " << from << ": null vcard payload" << std::endl;
+		SWIFT_LOG(debug) << "Missing element: " << from << ": null vcard payload" << std::endl;
 		return;
 	}
 
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index d927c0b..da755b1 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -450,11 +450,11 @@ void CoreClient::resetSession() {
 
 void CoreClient::forceReset() {
 	if (connector_) {
-		std::cerr << "Warning: Client not disconnected properly: Connector still active" << std::endl;
+		SWIFT_LOG(warning) << "Client not disconnected properly: Connector still active" << std::endl;
 		resetConnector();
 	}
 	if (sessionStream_ || connection_) {
-		std::cerr << "Warning: Client not disconnected properly: Session still active" << std::endl;
+		SWIFT_LOG(warning) << "Client not disconnected properly: Session still active" << std::endl;
 		resetSession();
 	}
 }
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
index a04687b..2e8ae4a 100644
--- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
@@ -11,6 +11,7 @@
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 #include <Swiften/Base/foreach.h>
+#include <Swiften/Base/Log.h>
 #include <Swiften/Serializer/XML/XMLNode.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
@@ -93,7 +94,7 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action
 		case JinglePayload::TransportReplace:
 			return "transport-replace";
 		case JinglePayload::UnknownAction:
-			std::cerr << "Serializing unknown action value." << std::endl;
+			SWIFT_LOG(warning) << "Serializing unknown action value." << std::endl;
 			return "";
 	}
 	assert(false);
@@ -103,7 +104,7 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action
 std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const {
 	switch(type) {
 		case JinglePayload::Reason::UnknownType:
-			std::cerr << "Unknown jingle reason type!" << std::endl;
+			SWIFT_LOG(warning) << "Unknown jingle reason type!" << std::endl;
 			return "";
 		case JinglePayload::Reason::AlternativeSession:
 			return "alternative-session";
-- 
cgit v0.10.2-6-g49f6