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/Network | |
| 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/Network')
| -rw-r--r-- | Swiften/Network/UnixProxyProvider.cpp | 5 | ||||
| -rw-r--r-- | Swiften/Network/WindowsProxyProvider.cpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Swiften/Network/UnixProxyProvider.cpp b/Swiften/Network/UnixProxyProvider.cpp index 848de52..6c23add 100644 --- a/Swiften/Network/UnixProxyProvider.cpp +++ b/Swiften/Network/UnixProxyProvider.cpp @@ -10,12 +10,9 @@ * See the COPYING file for more information. */ -#include <stdio.h> -#include <stdlib.h> -#include <iostream> +#include <Swiften/Network/UnixProxyProvider.h> #include <Swiften/Base/foreach.h> -#include <Swiften/Network/UnixProxyProvider.h> #if defined(HAVE_GCONF) # include "Swiften/Network/GConfProxyProvider.h" #endif diff --git a/Swiften/Network/WindowsProxyProvider.cpp b/Swiften/Network/WindowsProxyProvider.cpp index 8f90d1e..75e087a 100644 --- a/Swiften/Network/WindowsProxyProvider.cpp +++ b/Swiften/Network/WindowsProxyProvider.cpp @@ -16,15 +16,13 @@ #include <stdio.h> #include <stdlib.h> -#include <iostream> - #include <boost/lexical_cast.hpp> #include <windows.h> #include <Swiften/Base/ByteArray.h> +#include <Swiften/Base/Log.h> #include <Swiften/Base/foreach.h> -#include <Swiften/Base/log.h> namespace Swift { @@ -86,7 +84,7 @@ HostAddressPort WindowsProxyProvider::getAsHostAddressPort(std::string proxy) { ret = HostAddressPort(HostAddress(tmp.first), port); } catch(...) { - std::cerr << "Exception occured while parsing windows proxy \"getHostAddressPort\"." << std::endl; + SWIFT_LOG(error) << "Exception occured while parsing windows proxy \"getHostAddressPort\"." << std::endl; } return ret; |