From 5d950cc1044134cfbc265ce6825479be46388016 Mon Sep 17 00:00:00 2001
From: Ashwin Bhat <ashwin.bhat@autodesk.com>
Date: Tue, 15 Oct 2024 10:28:26 -0700
Subject: [PATCH] Remove overrides from mx::Document

Remove getChildOfType and getChildrenOfType from Document and introduce datalibrary handling in Element.
---
 source/MaterialXCore/Document.h  | 27 ---------------------------
 source/MaterialXCore/Element.cpp | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/source/MaterialXCore/Document.h b/source/MaterialXCore/Document.h
index e5e16fcfc0..ab01bbbc11 100644
--- a/source/MaterialXCore/Document.h
+++ b/source/MaterialXCore/Document.h
@@ -121,33 +121,6 @@ class MX_CORE_API Document : public GraphElement
     /// nodes, and include both Input and Output elements.
     vector<PortElementPtr> getMatchingPorts(const string& nodeName) const;
 
-    /// Return the child element, if any, with the given document and data library
-    template <class T> shared_ptr<T> getChildOfType(const string& name) const
-    {
-        ElementPtr child = hasDataLibrary() ? getDataLibrary()->getChild(name) : nullptr;
-        if (!child)
-        {
-            child = getChild(name);
-        }
-        return child ? child->asA<T>() : shared_ptr<T>();
-    }
-
-    /// Return a vector of all child elements within the document and data library
-    template <class T> vector<shared_ptr<T>> getChildrenOfType(const string& category = EMPTY_STRING) const
-    {
-        vector<shared_ptr<T>> children = hasDataLibrary() ? getDataLibrary()->getChildrenOfType<T>(category) : vector<shared_ptr<T>>();
-        for (ElementPtr child : _childOrder)
-        {
-            shared_ptr<T> instance = child->asA<T>();
-            if (!instance)
-                continue;
-            if (!category.empty() && child->getCategory() != category)
-                continue;
-            children.push_back(instance);
-        }
-        return children;
-    }
-
     /// @}
     /// @name GeomInfo Elements
     /// @{
diff --git a/source/MaterialXCore/Element.cpp b/source/MaterialXCore/Element.cpp
index 1a48142962..f8d5117de7 100644
--- a/source/MaterialXCore/Element.cpp
+++ b/source/MaterialXCore/Element.cpp
@@ -286,13 +286,27 @@ ElementPtr Element::changeChildCategory(ElementPtr child, const string& category
 
 template <class T> shared_ptr<T> Element::getChildOfType(const string& name) const
 {
-    ElementPtr child = getChild(name);
+    ElementPtr child = nullptr;
+    if (isA<Document>() && asA<Document>()->hasDataLibrary())
+    {
+        child = asA<Document>()->getDataLibrary()->getChild(name);
+    }
+    
+    if (!child)
+    {
+        child = getChild(name);
+    }
     return child ? child->asA<T>() : shared_ptr<T>();
 }
 
 template <class T> vector<shared_ptr<T>> Element::getChildrenOfType(const string& category) const
 {
     vector<shared_ptr<T>> children;
+    if (isA<Document>() && asA<Document>()->hasDataLibrary())
+    {
+        children = asA<Document>()->getDataLibrary()->getChildrenOfType<T>(category);
+    }
+
     for (ElementPtr child : _childOrder)
     {
         shared_ptr<T> instance = child->asA<T>();