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 bdff8a00e9bf94425e747adecaf46ac370f9c41a..331de4b6b4383406639f112b18237a1796a04ccb 100644 (file)
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -8,17 +8,28 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include "Config.h"
-#include "Config_FeatureMessage.h"
+#include <Config.h>
 
-#include <string>
 #include <cstdarg>
+#include <string>
 
-//Forward declaration for xmlNodePtr.
+//>> Forward declaration of xmlNodePtr.
 typedef struct _xmlNode xmlNode;
 typedef xmlNode *xmlNodePtr;
 struct _xmlNode;
+//<<
 
+//>> 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:
@@ -43,9 +54,11 @@ protected:
    * TODO(sbh): find a way to simplify calling this method.
    */
   bool isNode(xmlNodePtr theNode, const char* name, ...);
+  bool hasChild(xmlNodePtr theNode);
 
-private:
+protected:
   std::string myDocumentPath;
+  xmlDocPtr   myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */