Merge branch 'master' of newgeom:newgeom.git

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

diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h
index 01ad541a4eefcb0c036aa70abad39d184f669016..47fc97b7b0d997d17b7ea4c8ce04959d9d37729d 100644 (file)
--- 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,30 +30,26 @@ struct _xmlDoc;
  * for all xml operations.
  *
  */
-class CONFIG_EXPORT Config_XMLReader
+class Config_XMLReader
 {
 public:
-  Config_XMLReader(const std::string& theXmlFile);
-  virtual ~Config_XMLReader();
+  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);
+  CONFIG_EXPORT virtual ~Config_XMLReader();
 
-  void readAll();
+  CONFIG_EXPORT void readAll();
+
+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, ...);
+  void processValidator(xmlNodePtr theNode);
 
 protected:
   std::string myDocumentPath;