Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-05-25 14:04:15 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-05-25 14:04:15 (GMT) |
| commit | 57eb5cdb61b34a83030eee6a3fe2973d2c2fd48f (patch) | |
| tree | 6035bb5883faed4e84261473bc77a1318c92c977 /Swiften/Disco | |
| parent | b2d3eae9fd085cd91b3efac53dca81fd450d5393 (diff) | |
| download | swift-57eb5cdb61b34a83030eee6a3fe2973d2c2fd48f.zip swift-57eb5cdb61b34a83030eee6a3fe2973d2c2fd48f.tar.bz2 | |
Remove unnecessary include of iostream header
Move std::cout/cerr logging to SWIFT_LOG.
Test-Information:
Builds and all tests pass on OS X 10.11.5.
Change-Id: I0a0c24654a8b3abf3244a79fd6d970eee90559d0
Diffstat (limited to 'Swiften/Disco')
| -rw-r--r-- | Swiften/Disco/CapsManager.cpp | 5 | ||||
| -rw-r--r-- | Swiften/Disco/DummyEntityCapsProvider.cpp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp index 337bad6..794cf74 100644 --- a/Swiften/Disco/CapsManager.cpp +++ b/Swiften/Disco/CapsManager.cpp @@ -6,10 +6,9 @@ #include <Swiften/Disco/CapsManager.h> -#include <iostream> - #include <boost/bind.hpp> +#include <Swiften/Base/Log.h> #include <Swiften/Client/StanzaChannel.h> #include <Swiften/Disco/CapsInfoGenerator.h> #include <Swiften/Disco/CapsStorage.h> @@ -54,7 +53,7 @@ void CapsManager::handleDiscoInfoReceived(const JID& from, const std::string& ha requestedDiscoInfos.erase(hash); if (error || !discoInfo || CapsInfoGenerator("", crypto).generateCapsInfo(*discoInfo.get()).getVersion() != hash) { if (warnOnInvalidHash && !error && discoInfo) { - std::cerr << "Warning: Caps from " << from.toString() << " do not verify" << std::endl; + SWIFT_LOG(warning) << "Caps from " << from.toString() << " do not verify" << std::endl; } failingCaps.insert(std::make_pair(from, hash)); std::map<std::string, std::set< std::pair<JID, std::string> > >::iterator i = fallbacks.find(hash); diff --git a/Swiften/Disco/DummyEntityCapsProvider.cpp b/Swiften/Disco/DummyEntityCapsProvider.cpp index 6e9d898..fce38fe 100644 --- a/Swiften/Disco/DummyEntityCapsProvider.cpp +++ b/Swiften/Disco/DummyEntityCapsProvider.cpp @@ -1,13 +1,11 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Disco/DummyEntityCapsProvider.h> -#include <iostream> - namespace Swift { DiscoInfo::ref DummyEntityCapsProvider::getCaps(const JID& jid) const { |