Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / Config / Config_XMLReader.h

diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h
index 95d3ea651c49b4df5c83fd46d133d30b2f1b423e..119bd71c132542d662f3fb5b9f152207d4955fb1 100644 (file)
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_XMLReader.h
  *
@@ -8,7 +10,7 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include <Config.h>
+#include <Config_def.h>
 
 #include <cstdarg>
 #include <string>
@@ -32,33 +34,31 @@ struct _xmlDoc;
  */
 class Config_XMLReader
 {
-public:
-  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);
-  CONFIG_EXPORT virtual ~Config_XMLReader();
+ public:
+  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);CONFIG_EXPORT virtual ~Config_XMLReader();
 
   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 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, ...);
-  bool hasChild(xmlNodePtr theNode);
+  std::string getNodeName(xmlNodePtr theNode);
+  void processValidator(xmlNodePtr theNode);
+  void processSelectionFilter(xmlNodePtr theNode);
+
+ protected:
+  std::string myCurrentFeature;
 
-protected:
+ protected:
   std::string myDocumentPath;
-  xmlDocPtr   myXmlDoc;
+  xmlDocPtr myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */