folder: revise child exists to find child function

olive-editor · Dec 8, 2022 · af76fbf · af76fbf
1 parent b99d1e5
commit af76fbf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/app/node/project/folder/folder.cpp b/app/node/project/folder/folder.cpp
@@ -49,28 +49,26 @@ void Folder::Retranslate()
   SetInputName(kChildInput, tr("Children"));
 }
 
-bool ChildExistsWithNameInternal(const Folder* n, const QString& s)
+Node *GetChildWithNameInternal(const Folder* n, const QString& s)
 {
   for (int i=0; i<n->item_child_count(); i++) {
     Node* child = n->item_child(i);
 
     if (child->GetLabel() == s) {
-      return true;
-    } else {
-      Folder* subfolder = dynamic_cast<Folder*>(child);
-
-      if (subfolder && ChildExistsWithNameInternal(subfolder, s)) {
-        return true;
+      return child;
+    } else if (Folder* subfolder = dynamic_cast<Folder*>(child)) {
+      if (Node *n2 = GetChildWithNameInternal(subfolder, s)) {
+        return n2;
       }
     }
   }
 
-  return false;
+  return nullptr;
 }
 
-bool Folder::ChildExistsWithName(const QString &s) const
+Node *Folder::GetChildWithName(const QString &s) const
 {
-  return ChildExistsWithNameInternal(this, s);
+  return GetChildWithNameInternal(this, s);
 }
 
 bool Folder::HasChildRecursive(Node *child) const

diff --git a/app/node/project/folder/folder.h b/app/node/project/folder/folder.h
@@ -63,7 +63,11 @@ class Folder : public Node
 
   virtual void Retranslate() override;
 
-  bool ChildExistsWithName(const QString& s) const;
+  Node *GetChildWithName(const QString& s) const;
+  bool ChildExistsWithName(const QString& s) const
+  {
+    return GetChildWithName(s);
+  }
 
   bool HasChildRecursive(Node *child) const;