Handle variant element names, merge in wildcard class, add test cases.

[shibboleth/xmltooling.git] / xmltooling / AbstractXMLObject.h

diff --git a/xmltooling/AbstractXMLObject.h b/xmltooling/AbstractXMLObject.h
index c3aa289..d5ebc71 100644 (file)
--- a/xmltooling/AbstractXMLObject.h
+++ b/xmltooling/AbstractXMLObject.h
@@ -23,7 +23,6 @@
 #if !defined(__xmltooling_abstractxmlobj_h__)\r
 #define __xmltooling_abstractxmlobj_h__\r
 \r
-#include <algorithm>\r
 #include <xmltooling/XMLObject.h>\r
 \r
 #if defined (_MSC_VER)\r
@@ -39,10 +38,7 @@ namespace xmltooling {
     class XMLTOOL_API AbstractXMLObject : public virtual XMLObject\r
     {\r
     public:\r
-        virtual ~AbstractXMLObject() {\r
-            delete m_typeQname;\r
-            std::for_each(m_children.begin(), m_children.end(), cleanup<XMLObject>());\r
-        }\r
+        virtual ~AbstractXMLObject();\r
 \r
         /**\r
          * @see XMLObject::getElementQName()\r
@@ -56,6 +52,7 @@ namespace xmltooling {
          */\r
         void setElementNamespacePrefix(const XMLCh* prefix) {\r
             m_elementQname.setPrefix(prefix);\r
+            addNamespace(Namespace(m_elementQname.getNamespaceURI(),prefix));\r
         }\r
 \r
         /**\r
@@ -68,7 +65,7 @@ namespace xmltooling {
         /**\r
          * @see XMLObject::addNamespace()\r
          */\r
-        void addNamespace(const Namespace& ns) {\r
+        void addNamespace(const Namespace& ns) const {\r
             if (ns.alwaysDeclare() || m_namespaces.find(ns)==m_namespaces.end()) {\r
                 m_namespaces.insert(ns);\r
             }\r
@@ -141,23 +138,30 @@ namespace xmltooling {
          * \r
          * @param namespaceURI the namespace the element is in\r
          * @param elementLocalName the local name of the XML element this Object represents\r
+         * @param namespacePrefix the namespace prefix to use\r
          */\r
-        AbstractXMLObject(const XMLCh* namespaceURI=NULL, const XMLCh* elementLocalName=NULL, const XMLCh* namespacePrefix=NULL)\r
-            : m_elementQname(namespaceURI,elementLocalName, namespacePrefix), m_typeQname(NULL), m_parent(NULL) {\r
-            addNamespace(Namespace(namespaceURI, namespacePrefix));\r
-        }\r
+        AbstractXMLObject(const XMLCh* namespaceURI=NULL, const XMLCh* elementLocalName=NULL, const XMLCh* namespacePrefix=NULL);\r
 \r
         /**\r
          * Underlying list of child objects.\r
          * Manages the lifetime of the children.\r
          */\r
         std::list<XMLObject*> m_children;\r
-        \r
+\r
+        /**\r
+         * Set of namespaces associated with the object.\r
+         */\r
+        mutable std::set<Namespace> m_namespaces;\r
+\r
+        /**\r
+         * Logging object.\r
+         */\r
+        void* m_log;\r
+\r
     private:\r
         XMLObject* m_parent;\r
         QName m_elementQname;\r
         QName* m_typeQname;\r
-        std::set<Namespace> m_namespaces;\r
     };\r
 \r
 };\r