From 4675e82dae45a70ee27bf11d10aa6872485c8847 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Oct 2007 02:57:21 +0000 Subject: Eliminate redundant object collections (ObjectModel having a separate collection of its children). Fix renaming/creation of children (fix ticket 97). git-svn-id: http://svn.drobilla.net/lad/ingen@844 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/LoadPluginWindow.cpp | 2 +- src/libs/gui/NewSubpatchWindow.cpp | 2 +- src/libs/gui/PatchCanvas.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libs/gui') diff --git a/src/libs/gui/LoadPluginWindow.cpp b/src/libs/gui/LoadPluginWindow.cpp index 6d698f94..2c9161c3 100644 --- a/src/libs/gui/LoadPluginWindow.cpp +++ b/src/libs/gui/LoadPluginWindow.cpp @@ -127,7 +127,7 @@ LoadPluginWindow::name_changed() if (!Path::is_valid_name(name)) { //m_message_label->set_text("Name contains invalid characters."); _add_button->property_sensitive() = false; - } else if (_patch->get_node(name)) { + } else if (_patch->find_child(name)) { //m_message_label->set_text("An object already exists with that name."); _add_button->property_sensitive() = false; } else if (name.length() == 0) { diff --git a/src/libs/gui/NewSubpatchWindow.cpp b/src/libs/gui/NewSubpatchWindow.cpp index d327d257..54a0abb9 100644 --- a/src/libs/gui/NewSubpatchWindow.cpp +++ b/src/libs/gui/NewSubpatchWindow.cpp @@ -71,7 +71,7 @@ NewSubpatchWindow::name_changed() if (!Path::is_valid_name(name)) { _message_label->set_text("Name contains invalid characters."); _ok_button->property_sensitive() = false; - } else if (_patch->get_node(name)) { + } else if (_patch->find_child(name)) { _message_label->set_text("An object already exists with that name."); _ok_button->property_sensitive() = false; } else if (name.length() == 0) { diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index bbff476f..ac86b3fb 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -195,8 +195,8 @@ PatchCanvas::build() boost::dynamic_pointer_cast(shared_from_this()); // Create modules for nodes - for (ObjectModel::Children::const_iterator i = _patch->children().begin(); - i != _patch->children().end(); ++i) { + for (ObjectModel::const_iterator i = _patch->children_begin(); + i != _patch->children_end(); ++i) { SharedPtr node = PtrCast(i->second); if (node) add_node(node); -- cgit v1.2.1