Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractDOMCachingXMLObject.h

diff --git a/xmltooling/AbstractDOMCachingXMLObject.h b/xmltooling/AbstractDOMCachingXMLObject.h
index 9bb7cca..ed5862e 100644 (file)
--- a/xmltooling/AbstractDOMCachingXMLObject.h
+++ b/xmltooling/AbstractDOMCachingXMLObject.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 
 /**
- * @file AbstractDOMCachingXMLObject.h
+ * @file xmltooling/AbstractDOMCachingXMLObject.h
  * 
- * AbstractXMLObject mixin that implements DOM caching
+ * AbstractXMLObject mixin that implements DOM caching.
  */
 
-#if !defined(__xmltooling_abstractdomxmlobj_h__)
+#ifndef __xmltooling_abstractdomxmlobj_h__
 #define __xmltooling_abstractdomxmlobj_h__
 
 #include <xmltooling/AbstractXMLObject.h>
@@ -40,43 +40,30 @@ namespace xmltooling {
     {
     public:
         virtual ~AbstractDOMCachingXMLObject();
-        
-        xercesc::DOMElement* getDOM() const {
-            return m_dom;
-        }
-        
+
+        // Virtual function overrides.
+        xercesc::DOMElement* getDOM() const;
         void setDOM(xercesc::DOMElement* dom, bool bindDocument=false) const;
-        
-        void setDocument(xercesc::DOMDocument* doc) const {
-            if (m_document)
-                m_document->release();
-            m_document=doc;
-        }
-    
-        virtual void releaseDOM() const;
-        
-        virtual void releaseParentDOM(bool propagateRelease=true) const;
-        
-        virtual void releaseChildrenDOM(bool propagateRelease=true) const;
-    
+        void setDocument(xercesc::DOMDocument* doc) const;
+        void releaseDOM() const;
+        void releaseParentDOM(bool propagateRelease=true) const;
+        void releaseChildrenDOM(bool propagateRelease=true) const;
         XMLObject* clone() const;
-
         void detach();
 
      protected:
-        AbstractDOMCachingXMLObject() : m_dom(NULL), m_document(NULL) {}
+        AbstractDOMCachingXMLObject();
 
         /** Copy constructor. */
-        AbstractDOMCachingXMLObject(const AbstractDOMCachingXMLObject& src)
-            : AbstractXMLObject(src), m_dom(NULL), m_document(NULL) {}
+        AbstractDOMCachingXMLObject(const AbstractDOMCachingXMLObject& src);
 
         /**
          * If a DOM representation exists, this clones it into a new document.
          * 
-         * @param doc   the document to clone into, or NULL, in which case a new document is created
+         * @param doc   the document to clone into, or nullptr, in which case a new document is created
          * @return  the cloned DOM
          */
-        xercesc::DOMElement* cloneDOM(xercesc::DOMDocument* doc=NULL) const;
+        xercesc::DOMElement* cloneDOM(xercesc::DOMDocument* doc=nullptr) const;
 
     private:
         mutable xercesc::DOMElement* m_dom;