summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/UnixProxyProvider.cpp5
-rw-r--r--Swiften/Network/WindowsProxyProvider.cpp6
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;