Public interfaces: part 2

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

diff --git a/libs/srvconf/parsers/simple.h b/libs/srvconf/parsers/simple.h
index 244e8ef08eef544193510b844da534870c7b0461..48a0d808521aa8c45b853aa8a8034331127fe3d4 100644 (file)
--- a/libs/srvconf/parsers/simple.h
+++ b/libs/srvconf/parsers/simple.h
@@ -18,8 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_STGLIBS_SRVCONF_PARSER_SIMPLE_H__
-#define __STG_STGLIBS_SRVCONF_PARSER_SIMPLE_H__
+#pragma once
 
 #include "base.h"
 
@@ -29,28 +28,27 @@
 
 namespace STG
 {
-namespace SIMPLE
+namespace Simple
 {
 
-class PARSER: public STG::PARSER
+class Parser: public STG::Parser
 {
-public:
-    PARSER(const std::string & tag, 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:
-    std::string tag;
-    CALLBACK callback;
-    void * data;
-    std::string encoding;
-    int depth;
-
-    void ParseAnswer(const char * el, const char ** attr);
+    public:
+        Parser(const std::string& tag, 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:
+        std::string tag;
+        Callback callback;
+        void* data;
+        std::string encoding;
+        int depth;
+
+        void ParseAnswer(const char* el, const char** attr);
 };
 
 } // namespace SIMPLE
 } // namespace STG
-
-#endif