X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_XMLReader.h;h=bd9392841b131eb63816f3517db82a3c0543f5b2;hb=24f1ad2fd93475684288c899fb4fffcf05f6c21e;hp=01ad541a4eefcb0c036aa70abad39d184f669016;hpb=637bc35625b89379def6b9f9ff0915d32664babd;p=modules%2Fshaper.git

diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h
index 01ad541a4..bd9392841 100644
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -8,7 +8,7 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include <Config.h>
+#include <Config_def.h>
 
 #include <cstdarg>
 #include <string>
@@ -30,34 +30,33 @@ struct _xmlDoc;
  * for all xml operations.
  *
  */
-class CONFIG_EXPORT Config_XMLReader
+class Config_XMLReader
 {
-public:
-  Config_XMLReader(const std::string& theXmlFile);
-  virtual ~Config_XMLReader();
+ public:
+  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);CONFIG_EXPORT virtual ~Config_XMLReader();
 
-  void readAll();
+  CONFIG_EXPORT void readAll();
 
-protected:
+ public:
+  CONFIG_EXPORT xmlNodePtr findRoot();
+
+ protected:
   virtual void processNode(xmlNodePtr aNode);
   virtual bool processChildren(xmlNodePtr aNode);
 
-  xmlNodePtr findRoot();
   void readRecursively(xmlNodePtr theParent);
 
   xmlNodePtr node(void* theNode);
+  std::string getNodeName(xmlNodePtr theNode);
   std::string getProperty(xmlNodePtr theNode, const char* property);
-  /*
-   * Please note that this function should be called with NULL last argument. 
-   * In example: isNode(aNode, "type1", ["type2", ...], NULL);
-   * ", NULL" is required to use unlimited number of arguments.
-   * TODO(sbh): find a way to simplify calling this method.
-   */
-  bool isNode(xmlNodePtr theNode, const char* name, ...);
-
-protected:
+  void processValidator(xmlNodePtr theNode);
+
+ protected:
+  std::string myCurrentFeature;
+
+ protected:
   std::string myDocumentPath;
-  xmlDocPtr   myXmlDoc;
+  xmlDocPtr myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */