updated to the new pikotools api: snake_case names of methods from SpaceParser

winixd/core/app.cpp

@@ -1154,7 +1154,7 @@ void App::ReadPostJson()
 
 	if( !post_buffer.empty() )
 	{
-		pt::SpaceParser::Status status = space_parser.ParseJSON(post_buffer.c_str(), cur.request->post_in);
+		pt::SpaceParser::Status status = space_parser.parse_json(post_buffer.c_str(), cur.request->post_in);
 		post_buffer.clear();
 
 		if( status != pt::SpaceParser::ok )

winixd/core/config.cpp

@@ -102,7 +102,7 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)
 	}
 
 	log << log2 << "Config: reading a config file" << logend;
-	pt::SpaceParser::Status status = parser.ParseSpaceFile(config_file, space);
+	pt::SpaceParser::Status status = parser.parse_space_file(config_file, space);
 
 	if( status == pt::SpaceParser::ok )
 	{

winixd/core/sessionidmanager.cpp

@@ -144,7 +144,7 @@ pt::Space space;
 pt::SpaceParser parser;
 pt::Date date;
 
-	pt::SpaceParser::Status status = parser.ParseSpaceFile(file, space);
+	pt::SpaceParser::Status status = parser.parse_space_file(file, space);
 
 	if( status == pt::SpaceParser::ok )
 	{

winixd/core/timezones.cpp

@@ -168,7 +168,7 @@ void TimeZones::ParseZones()
 bool TimeZones::ReadTimeZones(const wchar_t * path)
 {
 	zone_tab.clear();
-	pt::SpaceParser::Status status = parser.ParseSpaceFile(path, temp_space);
+	pt::SpaceParser::Status status = parser.parse_space_file(path, temp_space);
 
 	if( status == pt::SpaceParser::ok )
 	{

winixd/db/dbbase.cpp

@@ -259,7 +259,7 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, pt::Space & space)
 {
 	const char * res = AssertValue(r, row, col);
 
-	pt::SpaceParser::Status status = conf_parser.ParseSpace(res, space);
+	pt::SpaceParser::Status status = conf_parser.parse_space(res, space);
 
 	if( status != pt::SpaceParser::ok )
 	{

winixd/functions/env.cpp

@@ -70,7 +70,7 @@ return true;
 
 bool Env::Parse(const std::wstring & env_str)
 {
-	return (conf_parser.ParseSpace(env_str, space) == pt::SpaceParser::ok);
+	return (conf_parser.parse_space(env_str, space) == pt::SpaceParser::ok);
 }
 
 

winixd/functions/meta.cpp

@@ -62,7 +62,7 @@ bool Meta::HasAccess()
 
 bool Meta::Parse(const std::wstring & meta_str)
 {
-	return (conf_parser.ParseSpace(meta_str, space) == pt::SpaceParser::ok);
+	return (conf_parser.parse_space(meta_str, space) == pt::SpaceParser::ok);
 }
 
 

winixd/plugins/group/groupinfo.cpp

@@ -79,7 +79,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
 	groups.Clear();
 	pt::Space & space = *groups.GetSpace();
 
-	if( conf_parser.ParseSpace(str, space) == pt::SpaceParser::ok )
+	if( conf_parser.parse_space(str, space) == pt::SpaceParser::ok )
 	{
 		groups.Reindex();
 	}

winixd/plugins/mailregister/init.cpp

@@ -76,7 +76,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
 	pt::Space space;
 	pt::SpaceParser parser;
 
-	pt::SpaceParser::Status status = parser.ParseSpace(file.item_content.content_raw, space);
+	pt::SpaceParser::Status status = parser.parse_space(file.item_content.content_raw, space);
 
 	if( status == pt::SpaceParser::syntax_error )
 	{

winixd/plugins/ticket/ticketinfo.cpp

@@ -168,7 +168,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
 	conf_tab[mount_dir_id].file_name = path;
 	pt::Space & space = conf_tab[mount_dir_id].conf;
 
-	return (conf_parser.ParseSpace(config_file.item_content.content_raw, space) == pt::SpaceParser::ok);
+	return (conf_parser.parse_space(config_file.item_content.content_raw, space) == pt::SpaceParser::ok);
 }
 
 

winixd/templates/locale.cpp

@@ -112,7 +112,7 @@ bool read = false;
 	file_name += '/';
 	file_name += file;
 
-	pt::SpaceParser::Status status = loc_parser.ParseSpaceFile(file_name, temp_space, false);
+	pt::SpaceParser::Status status = loc_parser.parse_space_file(file_name, temp_space, false);
 
 	if( status == pt::SpaceParser::ok )
 	{
@@ -184,7 +184,7 @@ bool read = false;
 	file_name += '/';
 	file_name += "substitute";
 
-	if( loc_parser.ParseSpaceFile(file_name, temp_space, false) == pt::SpaceParser::ok )
+	if( loc_parser.parse_space_file(file_name, temp_space, false) == pt::SpaceParser::ok )
 	{
 		read = true;
 		CreateSubstVector(subst_url,		temp_space.to_wstr(L"url_original"), temp_space.to_wstr(L"url_changeto"));