summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-05-25 14:04:15 (GMT)
committerTobias Markmann <tm@ayena.de>2016-05-25 14:04:15 (GMT)
commit57eb5cdb61b34a83030eee6a3fe2973d2c2fd48f (patch)
tree6035bb5883faed4e84261473bc77a1318c92c977 /Slimber
parentb2d3eae9fd085cd91b3efac53dca81fd450d5393 (diff)
downloadswift-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 'Slimber')
-rw-r--r--Slimber/MainController.cpp2
-rw-r--r--Slimber/MenuletController.cpp1
-rw-r--r--Slimber/Server.cpp4
3 files changed, 2 insertions, 5 deletions
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp
index 90a1b94..dcec6d5 100644
--- a/Slimber/MainController.cpp
+++ b/Slimber/MainController.cpp
@@ -6,8 +6,6 @@
#include <Slimber/MainController.h>
-#include <iostream>
-
#include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
diff --git a/Slimber/MenuletController.cpp b/Slimber/MenuletController.cpp
index 5868128..fdf2fc7 100644
--- a/Slimber/MenuletController.cpp
+++ b/Slimber/MenuletController.cpp
@@ -6,7 +6,6 @@
#include <Slimber/MenuletController.h>
-#include <iostream>
#include <string>
#include <Swiften/Base/foreach.h>
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index ff5f883..7e24abe 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -6,11 +6,11 @@
#include <Slimber/Server.h>
-#include <iostream>
#include <string>
#include <boost/bind.hpp>
+#include <Swiften/Base/Log.h>
#include <Swiften/Base/String.h>
#include <Swiften/Base/foreach.h>
#include <Swiften/Elements/IQ.h>
@@ -306,7 +306,7 @@ void Server::handleLinkLocalElementReceived(std::shared_ptr<ToplevelElement> ele
void Server::handleConnectFinished(std::shared_ptr<LinkLocalConnector> connector, bool error) {
if (error) {
- std::cerr << "Error connecting" << std::endl;
+ SWIFT_LOG(warning) << "Error connecting" << std::endl;
// TODO: Send back queued stanzas
}
else {