Move projects back into subfolder.

[stg.git] / libs / srvconf / parsers / chg_user.h

diff --git a/libs/srvconf/parsers/chg_user.h b/libs/srvconf/parsers/chg_user.h
index 9ac559e043738906b517ebceda7a37a97e81a7c5..56514919bba590d5979018342377e4480ee17f8b 100644 (file)
--- a/libs/srvconf/parsers/chg_user.h
+++ b/libs/srvconf/parsers/chg_user.h
@@ -19,41 +19,40 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
-#define __STG_STGLIBS_SRVCONF_PARSER_CHG_USER_H__
+#pragma once
 
 #include "base.h"
 
 #include "stg/servconf_types.h"
 
-struct USER_CONF_RES;
-struct USER_STAT_RES;
-
 namespace STG
 {
-namespace CHG_USER
+
+struct UserConfOpt;
+struct UserStatOpt;
+
+namespace ChgUser
 {
 
-class PARSER: public STG::PARSER
+class Parser: public STG::Parser
 {
-public:
-    PARSER(SIMPLE::CALLBACK f, void * data, const std::string & encoding);
-    int  ParseStart(const char * el, const char ** attr);
-    void ParseEnd(const char * el);
-    void Failure(const std::string & reason) { callback(false, reason, data); }
-
-private:
-    SIMPLE::CALLBACK callback;
-    void * data;
-    std::string encoding;
-    int depth;
-
-    void ParseAnswer(const char * el, const char ** attr);
+    public:
+        Parser(Simple::Callback f, void* data, const std::string& encoding);
+
+        int  ParseStart(const char* el, const char** attr) override;
+        void ParseEnd(const char* el) override;
+        void Failure(const std::string & reason) override { callback(false, reason, data); }
+
+    private:
+        Simple::Callback callback;
+        void* data;
+        std::string encoding;
+        int depth;
+
+        void ParseAnswer(const char* el, const char** attr);
 };
 
-std::string Serialize(const USER_CONF_RES & conf, const USER_STAT_RES & stat, const std::string & encoding);
+std::string serialize(const UserConfOpt& conf, const UserStatOpt& stat, const std::string& encoding);
 
-} // namespace CHG_USER
+} // namespace ChgUser
 } // namespace STG
-
-#endif