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 9761ada43e82222dcfb5a9e762c5ffd806e86810..331de4b6b4383406639f112b18237a1796a04ccb 100644 (file)
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -8,17 +8,30 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include "Config.h"
-#include "Config_Message.h"
+#include <Config.h>
 
+#include <cstdarg>
 #include <string>
 
-//Forward declaration for xmlNodePtr.
+//>> Forward declaration of xmlNodePtr.
 typedef struct _xmlNode xmlNode;
 typedef xmlNode *xmlNodePtr;
 struct _xmlNode;
+//<<
 
-class CONFIG_EXPORT Config_XMLReader {
+//>> Forward declaration of xmlDocPtr.
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+struct _xmlDoc;
+//<<
+
+/*
+ * Base class for all libxml readers. Provides high-level API
+ * for all xml operations.
+ *
+ */
+class CONFIG_EXPORT Config_XMLReader
+{
 public:
   Config_XMLReader(const std::string& theXmlFile);
   virtual ~Config_XMLReader();
@@ -34,10 +47,18 @@ protected:
 
   xmlNodePtr node(void* theNode);
   std::string getProperty(xmlNodePtr theNode, const char* property);
-  bool isNode(xmlNodePtr theNode, const char* name);
+  /*
+   * 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);
 
-private:
-  std::string m_DocumentPath;
+protected:
+  std::string myDocumentPath;
+  xmlDocPtr   myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */