Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2013-12-20 16:33:18 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-05-18 19:50:47 (GMT) |
| commit | d594bc3e3aace883f1e98e699a30428a52a78d50 (patch) | |
| tree | e0c5b98f963b991684af2726379d2af3cc90e402 | |
| parent | fa8fd85f5c451648bb7cfbe275db19efa921d850 (diff) | |
| download | swift-contrib-d594bc3e3aace883f1e98e699a30428a52a78d50.zip swift-contrib-d594bc3e3aace883f1e98e699a30428a52a78d50.tar.bz2 | |
Replace accidental cerr with SWIFT_LOG
Change-Id: I1801265c1b65eacf97e1cd3c69bedeef63cca898
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Client/CoreClient.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp | 5 |
3 files changed, 7 insertions, 6 deletions
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,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/Avatars/VCardUpdateAvatarManager.h> #include <boost/bind.hpp> #include <Swiften/Client/StanzaChannel.h> @@ -40,19 +40,19 @@ void VCardUpdateAvatarManager::handlePresenceReceived(boost::shared_ptr<Presence setAvatarHash(from, update->getPhotoHash()); } else { vcardManager_->requestVCard(from); } } 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; } if (vCard->getPhoto().empty()) { setAvatarHash(from, ""); } else { std::string hash = Hexify::hexify(crypto_->getSHA1Hash(vCard->getPhoto())); if (!avatarStorage_->hasAvatar(hash)) { 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 @@ -444,19 +444,19 @@ void CoreClient::resetSession() { else if (boost::dynamic_pointer_cast<BOSHSessionStream>(sessionStream_)) { sessionStream_->close(); } sessionStream_.reset(); connection_.reset(); } 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 @@ -5,18 +5,19 @@ */ #include <Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h> #include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> #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> #include <Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h> #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h> #include <Swiften/Serializer/PayloadSerializers/JingleFileTransferReceivedSerializer.h> #include <Swiften/Serializer/PayloadSerializerCollection.h> @@ -87,29 +88,29 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action case JinglePayload::TransportAccept: return "transport-accept"; case JinglePayload::TransportInfo: return "transport-info"; case JinglePayload::TransportReject: return "transport-reject"; 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); return ""; } 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"; case JinglePayload::Reason::Busy: return "busy"; case JinglePayload::Reason::Cancel: return "cancel"; case JinglePayload::Reason::ConnectivityError: return "connectivity-error"; |