Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractComplexElement.cpp

diff --git a/xmltooling/AbstractComplexElement.cpp b/xmltooling/AbstractComplexElement.cpp
index 5555971..cc8f68d 100644 (file)
--- a/xmltooling/AbstractComplexElement.cpp
+++ b/xmltooling/AbstractComplexElement.cpp
@@ -1,5 +1,5 @@
 /*
-*  Copyright 2001-2006 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.
@@ -28,21 +28,50 @@
 using namespace xmltooling;
 using namespace std;
 
+using xercesc::XMLString;
+
+namespace {
+    bool _nonnull(const XMLObject* ptr) {
+        return (ptr!=nullptr);
+    }
+}
+
+AbstractComplexElement::AbstractComplexElement()
+{
+}
+
+AbstractComplexElement::AbstractComplexElement(const AbstractComplexElement& src)
+{
+    for (vector<XMLCh*>::const_iterator i=src.m_text.begin(); i!=src.m_text.end(); ++i)
+        m_text.push_back(XMLString::replicate(*i));
+}
+
 AbstractComplexElement::~AbstractComplexElement() {
     for_each(m_children.begin(), m_children.end(), cleanup<XMLObject>());
     for (vector<XMLCh*>::iterator i=m_text.begin(); i!=m_text.end(); ++i)
         XMLString::release(&(*i));
 }
 
+bool AbstractComplexElement::hasChildren() const
+{
+    if (m_children.empty())
+        return false;
+    return (find_if(m_children.begin(), m_children.end(), _nonnull) != m_children.end());
+}
+
+const list<XMLObject*>& AbstractComplexElement::getOrderedChildren() const
+{
+    return m_children;
+}
+
 void AbstractComplexElement::removeChild(XMLObject* child)
 {
     m_children.erase(remove(m_children.begin(), m_children.end(), child), m_children.end());
 }
 
-AbstractComplexElement::AbstractComplexElement(const AbstractComplexElement& src)
+const XMLCh* AbstractComplexElement::getTextContent(unsigned int position) const
 {
-    for (vector<XMLCh*>::const_iterator i=src.m_text.begin(); i!=src.m_text.end(); ++i)
-        m_text.push_back(XMLString::replicate(*i));
+    return (m_text.size() > position) ? m_text[position] : nullptr;
 }
 
 void AbstractComplexElement::setTextContent(const XMLCh* value, unsigned int position)
@@ -51,7 +80,7 @@ void AbstractComplexElement::setTextContent(const XMLCh* value, unsigned int pos
         throw XMLObjectException("Can't set text content relative to non-existent child position.");
     vector<XMLCh*>::size_type size = m_text.size();
     while (position >= size) {
-        m_text.push_back(NULL);
+        m_text.push_back(nullptr);
         ++size;
     }
     m_text[position]=prepareForAssignment(m_text[position],value);