protocol:

	still thinking of...
client:
	bits of proto implementation
server:
	config variables
	sigint handler
	bits of proto implementation

1 files changed, 11 insertions, 11 deletions

diff --git a/server/src/modules_handler.cpp b/server/src/modules_handler.cpp
index 78a6ad7..32c3b9f 100644
--- a/server/src/modules_handler.cpp
+++ b/server/src/modules_handler.cpp
@@ -123,21 +123,21 @@ std::string modules_handler::list_modules()
 std::string modules_handler::list_modules_single_type_internal(const std::list<module_base*> &modules)
 {
 	std::string buf;
-	for(auto i = modules.begin(), end = modules.end(); i != end; ++i)
+	for(auto i : modules)
 	{
         buf += "\tName: ";
-        buf += (*i)->get_module_info().name;
-        buf += "\n\tDescription: " +(*i)->get_module_info().description;
-        buf += "\n\tVersion: " + (*i)->get_module_info().version;
+        buf += i->get_module_info().name;
+        buf += "\n\tDescription: " + i->get_module_info().description;
+        buf += "\n\tVersion: " + i->get_module_info().version;
         if(runtime_config.settings.verbosity >= 1)
         {
 			buf += "\n\tAvailable options:";
-			for(auto i1 = (*i)->get_module_info().default_settings.begin(), end =  (*i)->get_module_info().default_settings.end(); i1 != end; ++i1)
+			for(auto i1 : i->get_module_info().default_settings)
 			{
 				buf += "\n\t\t";
-				buf += i1->first;
+				buf += i1.first;
 				buf += " = ";
-				buf += i1->second;
+				buf += i1.second;
 			}
         }
         buf += "\n\n";
@@ -147,12 +147,12 @@ std::string modules_handler::list_modules_single_type_internal(const std::list<m
 
 void modules_handler::sync_module_settings(module_base *m)
 {
-	for(auto i = m->get_module_info().default_settings.begin(), end = m->get_module_info().default_settings.end(); i != end; ++i)
+	for(auto i : m->get_module_info().default_settings)
 	{
-		std::string setting = "modules." + m->get_module_info().name + "." + i->first;
-		std::string current_val = runtime_config.config_file.get<std::string>(setting, "not set"), default_val = i->second;
+		std::string setting = "modules." + m->get_module_info().name + "." + i.first;
+		std::string current_val = runtime_config.config_file.get<std::string>(setting, "not set"), default_val = i.second;
 		if(current_val == "not set" || current_val != default_val)
-			runtime_config.config_file.put(setting, i->second);
+			runtime_config.config_file.put(setting, i.second);
 	}
 }