From 0c1576d21588ece4e226da04523f36adac3a14c3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 27 May 2009 18:22:56 +0000 Subject: Rename 'destroy' 'delete' ('del' in code) (WebDAV DELETE). Rename 'rename' 'move' (WebDAV MOVE). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2012 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/BreadCrumbBox.cpp | 2 +- src/gui/BreadCrumbBox.hpp | 2 +- src/gui/NodeModule.cpp | 2 +- src/gui/ObjectMenu.cpp | 2 +- src/gui/PatchCanvas.cpp | 4 ++-- src/gui/PatchTreeWindow.cpp | 2 +- src/gui/PatchTreeWindow.hpp | 2 +- src/gui/Port.cpp | 4 ++-- src/gui/Port.hpp | 2 +- src/gui/RenameWindow.cpp | 2 +- src/gui/SubpatchModule.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/gui') diff --git a/src/gui/BreadCrumbBox.cpp b/src/gui/BreadCrumbBox.cpp index 0213e84e..4fab5628 100644 --- a/src/gui/BreadCrumbBox.cpp +++ b/src/gui/BreadCrumbBox.cpp @@ -199,7 +199,7 @@ BreadCrumbBox::object_destroyed(const Path& path) void -BreadCrumbBox::object_renamed(const Path& old_path, const Path& new_path) +BreadCrumbBox::object_moved(const Path& old_path, const Path& new_path) { for (std::list::iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) { if ((*i)->path() == old_path) diff --git a/src/gui/BreadCrumbBox.hpp b/src/gui/BreadCrumbBox.hpp index d8084b66..6938c154 100644 --- a/src/gui/BreadCrumbBox.hpp +++ b/src/gui/BreadCrumbBox.hpp @@ -56,7 +56,7 @@ private: void breadcrumb_clicked(BreadCrumb* crumb); void object_destroyed(const Raul::Path& path); - void object_renamed(const Raul::Path& old_path, const Raul::Path& new_path); + void object_moved(const Raul::Path& old_path, const Raul::Path& new_path); Raul::Path _active_path; Raul::Path _full_path; diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 74276301..74f3bc9e 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -54,7 +54,7 @@ NodeModule::NodeModule(boost::shared_ptr canvas, SharedPtrsignal_removed_port.connect(sigc::hide_return(sigc::mem_fun(this, &NodeModule::remove_port))); node->signal_variable.connect(sigc::mem_fun(this, &NodeModule::set_property)); node->signal_property.connect(sigc::mem_fun(this, &NodeModule::set_property)); - node->signal_renamed.connect(sigc::mem_fun(this, &NodeModule::rename)); + node->signal_moved.connect(sigc::mem_fun(this, &NodeModule::rename)); } diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 88614264..6096ec7c 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -98,7 +98,7 @@ ObjectMenu::variable_changed(const URI& predicate, const Atom& value) void ObjectMenu::on_menu_destroy() { - App::instance().engine()->destroy(_object->path()); + App::instance().engine()->del(_object->path()); } diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 9f676303..6bc9cbad 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -596,11 +596,11 @@ PatchCanvas::destroy_selection() for (list >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) { boost::shared_ptr module = boost::dynamic_pointer_cast(*m); if (module) { - App::instance().engine()->destroy(module->node()->path()); + App::instance().engine()->del(module->node()->path()); } else { boost::shared_ptr port_module = boost::dynamic_pointer_cast(*m); if (port_module) - App::instance().engine()->destroy(port_module->port()->path()); + App::instance().engine()->del(port_module->port()->path()); } } } diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 8c271d81..efbbd78f 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -219,7 +219,7 @@ PatchTreeWindow::patch_variable_changed(const URI& key, const Atom& value, const void -PatchTreeWindow::patch_renamed(const Path& old_path, const Path& new_path) +PatchTreeWindow::patch_moved(const Path& old_path, const Path& new_path) { _enable_signal = false; diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index 12c37378..915b11d4 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -47,7 +47,7 @@ public: void new_object(SharedPtr object); void patch_variable_changed(const Raul::URI& key, const Raul::Atom& value, const Raul::Path& path); - void patch_renamed(const Raul::Path& old_path, const Raul::Path& new_path); + void patch_moved(const Raul::Path& old_path, const Raul::Path& new_path); void add_patch(SharedPtr pm); void remove_patch(const Raul::Path& path); diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 8ae512d9..6283df86 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -55,7 +55,7 @@ Port::Port( delete _menu; _menu = NULL; - pm->signal_renamed.connect(sigc::mem_fun(this, &Port::renamed)); + pm->signal_moved.connect(sigc::mem_fun(this, &Port::moved)); if (pm->type().is_control()) { set_toggled(pm->is_toggle()); @@ -97,7 +97,7 @@ Port::create_menu() void -Port::renamed() +Port::moved() { set_name(model()->path().name()); module().lock()->resize(); diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index cdd64f0a..763cfd7b 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -60,7 +60,7 @@ private: void variable_changed(const Raul::URI& key, const Raul::Atom& value); - void renamed(); + void moved(); WeakPtr _port_model; bool _flipped; diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 9819bfac..a13ffd48 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -121,7 +121,7 @@ RenameWindow::ok_clicked() assert(name.length() > 0); assert(name.find("/") == string::npos); - App::instance().engine()->rename(_object->path(), _object->path().parent().base() + name); + App::instance().engine()->move(_object->path(), _object->path().parent().base() + name); hide(); } diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index 672a5d93..e25e7068 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -87,7 +87,7 @@ SubpatchModule::show_dialog() void SubpatchModule::menu_remove() { - App::instance().engine()->destroy(_patch->path()); + App::instance().engine()->del(_patch->path()); } } // namespace GUI -- cgit v1.2.1