From 3acaae2bedf7f74d97128e951d5e86720d53ba54 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 2 Nov 2011 02:22:09 +0000 Subject: Use ingen namespace for canvas-x and canvas-y and remove ingenuity namespace. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3597 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/LoadPatchWindow.cpp | 4 ++-- src/gui/LoadPluginWindow.cpp | 4 ++-- src/gui/NodeModule.cpp | 16 ++++++++-------- src/gui/PatchCanvas.cpp | 8 ++++---- src/gui/PatchPortModule.cpp | 16 ++++++++-------- src/gui/SubpatchModule.cpp | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/gui') diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 8c121b5e..33094bbd 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -176,9 +176,9 @@ LoadPatchWindow::ok_clicked() std::list uri_list = get_uris(); for (std::list::iterator i = uri_list.begin(); i != uri_list.end(); ++i) { // Cascade - Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second; + Atom& x = _initial_data.find(uris.ingen_canvas_x)->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second; + Atom& y = _initial_data.find(uris.ingen_canvas_y)->second; y = Atom(y.get_float() + 20.0f); Raul::Symbol symbol(symbol_from_filename(*i)); diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index c89b4c46..238cf7cb 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -354,9 +354,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) } // Cascade next node - Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second; + Atom& x = _initial_data.find(uris.ingen_canvas_x)->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second; + Atom& y = _initial_data.find(uris.ingen_canvas_y)->second; y = Atom(y.get_float() + 20.0f); } } diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 5a8e30ad..0767a175 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -365,16 +365,16 @@ NodeModule::store_location() const URIs& uris = app().uris(); - const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x); - const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y); + const Atom& existing_x = _node->get_property(uris.ingen_canvas_x); + const Atom& existing_y = _node->get_property(uris.ingen_canvas_y); if (x != existing_x && y != existing_y) { Resource::Properties remove; - remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard)); - remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard)); Resource::Properties add; - add.insert(make_pair(uris.ingenui_canvas_x, x)); - add.insert(make_pair(uris.ingenui_canvas_y, y)); + add.insert(make_pair(uris.ingen_canvas_x, x)); + add.insert(make_pair(uris.ingen_canvas_y, y)); app().engine()->delta(_node->path(), remove, add); } } @@ -385,9 +385,9 @@ NodeModule::property_changed(const URI& key, const Atom& value) const Shared::URIs& uris = app().uris(); switch (value.type()) { case Atom::FLOAT: - if (key == uris.ingenui_canvas_x) { + if (key == uris.ingen_canvas_x) { move_to(value.get_float(), property_y()); - } else if (key == uris.ingenui_canvas_y) { + } else if (key == uris.ingen_canvas_y) { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 299336cf..71facb23 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -717,11 +717,11 @@ PatchCanvas::paste() GraphObject::Properties& props = i->second->properties(); - GraphObject::Properties::iterator x = props.find(uris.ingenui_canvas_x); + GraphObject::Properties::iterator x = props.find(uris.ingen_canvas_x); if (x != i->second->properties().end()) x->second = x->second.get_float() + (20.0f * _paste_count); - GraphObject::Properties::iterator y = props.find(uris.ingenui_canvas_y); + GraphObject::Properties::iterator y = props.find(uris.ingen_canvas_y); if (y != i->second->properties().end()) y->second = y->second.get_float() + (20.0f * _paste_count); @@ -821,9 +821,9 @@ PatchCanvas::get_initial_data(Resource::Graph ctx) { GraphObject::Properties result; const URIs& uris = _app.uris(); - result.insert(make_pair(uris.ingenui_canvas_x, + result.insert(make_pair(uris.ingen_canvas_x, Resource::Property((float)_last_click_x, ctx))); - result.insert(make_pair(uris.ingenui_canvas_y, + result.insert(make_pair(uris.ingen_canvas_y, Resource::Property((float)_last_click_y, ctx))); return result; } diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 3a00c344..51669f6d 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -91,17 +91,17 @@ PatchPortModule::store_location() const URIs& uris = app().uris(); - const Atom& existing_x = _model->get_property(uris.ingenui_canvas_x); - const Atom& existing_y = _model->get_property(uris.ingenui_canvas_y); + const Atom& existing_x = _model->get_property(uris.ingen_canvas_x); + const Atom& existing_y = _model->get_property(uris.ingen_canvas_y); if (x != existing_x && y != existing_y) { Resource::Properties remove; - remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard)); - remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard)); Resource::Properties add; - add.insert(make_pair(uris.ingenui_canvas_x, + add.insert(make_pair(uris.ingen_canvas_x, Resource::Property(x, Resource::INTERNAL))); - add.insert(make_pair(uris.ingenui_canvas_y, + add.insert(make_pair(uris.ingen_canvas_y, Resource::Property(y, Resource::INTERNAL))); app().engine()->delta(_model->path(), remove, add); } @@ -131,9 +131,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value) const URIs& uris = app().uris(); switch (value.type()) { case Atom::FLOAT: - if (key == uris.ingenui_canvas_x) { + if (key == uris.ingen_canvas_x) { move_to(value.get_float(), property_y()); - } else if (key == uris.ingenui_canvas_y) { + } else if (key == uris.ingen_canvas_y) { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index 72bcd8af..4dbb56a5 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -68,17 +68,17 @@ SubpatchModule::store_location() const URIs& uris = app().uris(); - const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x); - const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y); + const Atom& existing_x = _node->get_property(uris.ingen_canvas_x); + const Atom& existing_y = _node->get_property(uris.ingen_canvas_y); if (x != existing_x && y != existing_y) { Resource::Properties remove; - remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard)); - remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard)); + remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard)); Resource::Properties add; - add.insert(make_pair(uris.ingenui_canvas_x, + add.insert(make_pair(uris.ingen_canvas_x, Resource::Property(x, Resource::EXTERNAL))); - add.insert(make_pair(uris.ingenui_canvas_y, + add.insert(make_pair(uris.ingen_canvas_y, Resource::Property(y, Resource::EXTERNAL))); app().engine()->delta(_node->path(), remove, add); } -- cgit v1.2.1