1 files changed, 4 insertions, 5 deletions
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp
index d92f0db..561f404 100644
--- a/Sluift/sluift.cpp
+++ b/Sluift/sluift.cpp
@@ -1,49 +1,48 @@
 /*
  * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/sluift.h>
 
 #include <string>
 
 #include <boost/assign/list_of.hpp>
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <lua.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Base/sleep.h>
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
 #include <Swiften/Serializer/PayloadSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 #include <Swiften/StringCodecs/Base64.h>
 #include <Swiften/StringCodecs/Hexify.h>
 #include <Swiften/TLS/Certificate.h>
 #include <Swiften/TLS/CertificateFactory.h>
 
 #include <Sluift/ITunesInterface.h>
 #include <Sluift/Lua/Check.h>
 #include <Sluift/Lua/Debug.h>
 #include <Sluift/Lua/Exception.h>
 #include <Sluift/Lua/FunctionRegistration.h>
 #include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/LuaElementConvertor.h>
 #include <Sluift/SluiftClient.h>
 #include <Sluift/SluiftComponent.h>
 #include <Sluift/Watchdog.h>
 #include <Sluift/globals.h>
 
 using namespace Swift;
 
 namespace Swift {
     namespace Sluift {
         SluiftGlobals globals;
     }
@@ -434,69 +433,69 @@ SLUIFT_API int luaopen_sluift(lua_State* L) {
 
     // Load core lib code
     if (luaL_loadbuffer(L, core_lua, core_lua_size, "core.lua") != 0) {
         lua_error(L);
     }
     lua_pushvalue(L, -2);
     lua_call(L, 1, 1);
     Sluift::globals.coreLibIndex = luaL_ref(L, LUA_REGISTRYINDEX);
 
     // Register functions
     Lua::FunctionRegistry::getInstance().addFunctionsToTable(L, "Sluift");
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "JID");
     lua_setfield(L, -2, "jid");
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "Base64");
     lua_setfield(L, -2, "base64");
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "IDN");
     lua_setfield(L, -2, "idn");
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "Crypto");
     lua_setfield(L, -2, "crypto");
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "FS");
     lua_setfield(L, -2, "fs");
 #ifdef HAVE_ITUNES
     Lua::FunctionRegistry::getInstance().createFunctionTable(L, "iTunes");
     lua_setfield(L, -2, "itunes");
 #endif
 
     // Register convenience functions
     lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
     std::vector<std::string> coreLibExports = boost::assign::list_of
         ("tprint")("disco")("help")("get_help")("copy")("with")("read_file")("create_form");
-    foreach (const std::string& coreLibExport, coreLibExports) {
+    for (const auto& coreLibExport : coreLibExports) {
         lua_getfield(L, -1, coreLibExport.c_str());
         lua_setfield(L, -3, coreLibExport.c_str());
     }
     lua_pop(L, 1);
 
     // Load client metatable
     lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
     std::vector<std::string> tables = boost::assign::list_of("Client");
-    foreach(const std::string& table, tables) {
+    for (const auto& table : tables) {
         lua_getfield(L, -1, table.c_str());
         Lua::FunctionRegistry::getInstance().addFunctionsToTable(L, table);
         lua_pop(L, 1);
     }
     lua_pop(L, 1);
 
     // Load component metatable
     lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
     std::vector<std::string> comp_tables = boost::assign::list_of("Component");
-    foreach(const std::string& table, comp_tables) {
+    for (const auto& table : comp_tables) {
         lua_getfield(L, -1, table.c_str());
         Lua::FunctionRegistry::getInstance().addFunctionsToTable(L, table);
         lua_pop(L, 1);
     }
     lua_pop(L, 1);
 
     // Register documentation for all elements
-    foreach (std::shared_ptr<LuaElementConvertor> convertor, Sluift::globals.elementConvertor.getConvertors()) {
+    for (auto&& convertor : Sluift::globals.elementConvertor.getConvertors()) {
         boost::optional<LuaElementConvertor::Documentation> documentation = convertor->getDocumentation();
         if (documentation) {
             Lua::registerClassHelp(L, documentation->className, documentation->description);
         }
     }
 
     // Register global documentation
     Lua::registerExtraHelp(L, -1, "sluift");
 
     return 1;
 }