diff options
Diffstat (limited to 'src/conf/conf.cpp')
| -rw-r--r-- | src/conf/conf.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp index 14268d1..dee678c 100644 --- a/src/conf/conf.cpp +++ b/src/conf/conf.cpp @@ -30,7 +30,7 @@ using namespace std; -conf::conf( string s_conf, map<string,string>* p_main_loop_params ) : name::name( s_conf ) +conf::conf( string s_conf, map<string,string>* p_start_params ) : name::name( s_conf ) { string s_check[] = { get_name(), @@ -82,7 +82,7 @@ conf::conf( string s_conf, map<string,string>* p_main_loop_params ) : name::name // Overrides ychat.conf values with command line options (ychat -o key1 value1 -o key2 value2 ...) map<string,string>::iterator iter; - for ( iter = p_main_loop_params->begin(); iter != p_main_loop_params->end(); iter++ ) + for ( iter = p_start_params->begin(); iter != p_start_params->end(); iter++ ) { shashmap<string>::del_elem_insecure(iter->first); shashmap<string>::add_elem_insecure(iter->second, iter->first); @@ -198,7 +198,7 @@ conf::colored_error_msg(string s_key) int conf::get_int(string s_key) { - return tool::string2int(get_elem(s_key)); + return tool::string2int(get_elem(s_key)); } vector<string> |