summaryrefslogtreecommitdiffstats
path: root/Sluift
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 /Sluift
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 'Sluift')
-rw-r--r--Sluift/ElementConvertors/DOMElementConvertor.cpp1
-rw-r--r--Sluift/ElementConvertors/DefaultElementConvertor.cpp5
-rw-r--r--Sluift/ElementConvertors/RawXMLElementConvertor.cpp1
-rw-r--r--Sluift/Lua/Check.cpp1
-rw-r--r--Sluift/Lua/LuaUtils.cpp1
-rw-r--r--Sluift/client.cpp2
-rw-r--r--Sluift/component.cpp2
7 files changed, 3 insertions, 10 deletions
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.cpp b/Sluift/ElementConvertors/DOMElementConvertor.cpp
index 1e0e1bb..c03eb8c 100644
--- a/Sluift/ElementConvertors/DOMElementConvertor.cpp
+++ b/Sluift/ElementConvertors/DOMElementConvertor.cpp
@@ -6,7 +6,6 @@
#include <Sluift/ElementConvertors/DOMElementConvertor.h>
-#include <iostream>
#include <memory>
#include <lua.hpp>
diff --git a/Sluift/ElementConvertors/DefaultElementConvertor.cpp b/Sluift/ElementConvertors/DefaultElementConvertor.cpp
index f422139..75e6706 100644
--- a/Sluift/ElementConvertors/DefaultElementConvertor.cpp
+++ b/Sluift/ElementConvertors/DefaultElementConvertor.cpp
@@ -6,10 +6,11 @@
#include <Sluift/ElementConvertors/DefaultElementConvertor.h>
-#include <iostream>
#include <string>
#include <typeinfo>
+#include <Swiften/Base/Log.h>
+
using namespace Swift;
DefaultElementConvertor::DefaultElementConvertor() {
@@ -19,7 +20,7 @@ DefaultElementConvertor::~DefaultElementConvertor() {
}
std::shared_ptr<Element> DefaultElementConvertor::convertFromLua(lua_State*, int, const std::string& type) {
- std::cerr << "Warning: Unable to convert type '" << type << "'" << std::endl;
+ SWIFT_LOG(warning) << "Unable to convert type '" << type << "'" << std::endl;
return std::shared_ptr<Element>();
}
diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
index a8ccb91..9688677 100644
--- a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
+++ b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
@@ -6,7 +6,6 @@
#include <Sluift/ElementConvertors/RawXMLElementConvertor.h>
-#include <iostream>
#include <memory>
#include <lua.hpp>
diff --git a/Sluift/Lua/Check.cpp b/Sluift/Lua/Check.cpp
index 74a247a..b956623 100644
--- a/Sluift/Lua/Check.cpp
+++ b/Sluift/Lua/Check.cpp
@@ -6,7 +6,6 @@
#include <Sluift/Lua/Check.h>
-#include <iostream>
#include <sstream>
#include <boost/numeric/conversion/cast.hpp>
diff --git a/Sluift/Lua/LuaUtils.cpp b/Sluift/Lua/LuaUtils.cpp
index 1088624..c677381 100644
--- a/Sluift/Lua/LuaUtils.cpp
+++ b/Sluift/Lua/LuaUtils.cpp
@@ -7,7 +7,6 @@
#include <Sluift/Lua/LuaUtils.h>
#include <cassert>
-#include <iostream>
#include <sstream>
#include <boost/algorithm/string/trim.hpp>
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index f82d314..7d0924f 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -4,8 +4,6 @@
* See the COPYING file for more information.
*/
-#include <iostream>
-
#include <boost/assign/list_of.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>
diff --git a/Sluift/component.cpp b/Sluift/component.cpp
index 0196a09..9c2bc3a 100644
--- a/Sluift/component.cpp
+++ b/Sluift/component.cpp
@@ -4,8 +4,6 @@
* See the COPYING file for more information.
*/
-#include <iostream>
-
#include <boost/assign/list_of.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>