From a42744e1068a8630d8034df73bb344ca21a53b32 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 16 Aug 2012 13:19:39 +0000 Subject: Remove all 'using namespace Raul'. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4715 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/App.cpp | 10 ++--- src/gui/BreadCrumbs.cpp | 13 +++---- src/gui/Configuration.cpp | 3 +- src/gui/ConnectWindow.cpp | 3 +- src/gui/LoadPatchWindow.cpp | 11 +++--- src/gui/LoadPluginWindow.cpp | 25 ++++++------ src/gui/NewSubpatchWindow.cpp | 10 ++--- src/gui/NodeModule.cpp | 28 +++++++------- src/gui/ObjectMenu.cpp | 4 +- src/gui/PatchBox.cpp | 4 +- src/gui/PatchCanvas.cpp | 27 +++++++------ src/gui/PatchPortModule.cpp | 18 ++++----- src/gui/PatchTreeWindow.cpp | 12 +++--- src/gui/PatchView.cpp | 5 +-- src/gui/Port.cpp | 5 +-- src/gui/PortPropertiesWindow.cpp | 4 +- src/gui/PropertiesWindow.cpp | 15 ++++---- src/gui/RenameWindow.cpp | 21 +++++----- src/gui/SubpatchModule.cpp | 12 +++--- src/gui/ThreadedLoader.cpp | 7 ++-- src/gui/WidgetFactory.cpp | 7 ++-- src/serialisation/Parser.cpp | 82 ++++++++++++++++++++-------------------- src/serialisation/Serialiser.cpp | 17 ++++----- 23 files changed, 159 insertions(+), 184 deletions(-) diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 2c561dfc..e9c9c663 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -52,8 +52,6 @@ #define LOG(s) (s("[GUI] ")) using namespace std; -using namespace Raul; -using namespace Ingen::Client; namespace Raul { class Deletable; } @@ -150,7 +148,7 @@ App::run() break; _main->run(); - LOG(info)("Exiting\n"); + LOG(Raul::info)("Exiting\n"); } void @@ -231,10 +229,10 @@ App::property_change(const Raul::URI& subject, { if (subject == uris().ingen_engine && key == uris().ingen_sampleRate) { if (value.type() == forge().Int) { - LOG(info)(Raul::fmt("Sample rate: %1%\n") % uris().forge.str(value)); + LOG(Raul::info)(Raul::fmt("Sample rate: %1%\n") % uris().forge.str(value)); _sample_rate = value.get_int32(); } else { - error << "Engine sample rate property is not an integer" << std::endl; + Raul::error << "Engine sample rate property is not an integer" << std::endl; } } } @@ -380,7 +378,7 @@ App::icon_from_path(const string& path, int size) new IconDestroyNotification(*this, make_pair(path, size)), &App::icon_destroyed); } catch (const Glib::Error& e) { - warn << "Error loading icon: " << e.what() << endl; + Raul::warn << "Error loading icon: " << e.what() << endl; } return buf; } diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index e496e32b..29b149a5 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -26,7 +26,6 @@ namespace Ingen { namespace GUI { using namespace std; -using namespace Raul; BreadCrumbs::BreadCrumbs(App& app) : Gtk::HBox() @@ -41,7 +40,7 @@ BreadCrumbs::BreadCrumbs(App& app) } SharedPtr -BreadCrumbs::view(const Path& path) +BreadCrumbs::view(const Raul::Path& path) { for (std::list::const_iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) if ((*i)->path() == path) @@ -56,7 +55,7 @@ BreadCrumbs::view(const Path& path) * children preserved. */ void -BreadCrumbs::build(Path path, SharedPtr view) +BreadCrumbs::build(Raul::Path path, SharedPtr view) { bool old_enable_signal = _enable_signal; _enable_signal = false; @@ -121,7 +120,7 @@ BreadCrumbs::build(Path path, SharedPtr view) _breadcrumbs.push_front(root_but); root_but->set_active(root_but->path() == _active_path); - Path working_path("/"); + Raul::Path working_path("/"); string suffix = path.substr(1); while (suffix.length() > 0) { if (suffix[0] == '/') @@ -147,7 +146,7 @@ BreadCrumbs::build(Path path, SharedPtr view) * match, otherwise ignoring @a view. */ BreadCrumbs::BreadCrumb* -BreadCrumbs::create_crumb(const Path& path, +BreadCrumbs::create_crumb(const Raul::Path& path, SharedPtr view) { BreadCrumb* but = manage(new BreadCrumb(path, @@ -178,7 +177,7 @@ BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb) } void -BreadCrumbs::object_destroyed(const URI& uri) +BreadCrumbs::object_destroyed(const Raul::URI& uri) { for (std::list::iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) { if ((*i)->path() == uri.c_str()) { @@ -194,7 +193,7 @@ BreadCrumbs::object_destroyed(const URI& uri) } void -BreadCrumbs::object_moved(const Path& old_path, const Path& new_path) +BreadCrumbs::object_moved(const Raul::Path& old_path, const Raul::Path& new_path) { for (std::list::iterator i = _breadcrumbs.begin(); i != _breadcrumbs.end(); ++i) { if ((*i)->path() == old_path) diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp index c6737fe7..f7f8977c 100644 --- a/src/gui/Configuration.cpp +++ b/src/gui/Configuration.cpp @@ -31,7 +31,6 @@ #include "Port.hpp" using namespace std; -using namespace Raul; namespace Ingen { namespace GUI { @@ -96,7 +95,7 @@ Configuration::get_port_color(const Client::PortModel* p) return _event_port_color; } - warn << "[Configuration] No known port type for " << p->path() << endl; + Raul::warn << "[Configuration] No known port type for " << p->path() << endl; return 0x666666FF; } diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 4257b8c5..0aef8dbd 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -38,7 +38,6 @@ using namespace Ingen::Client; using namespace std; -using namespace Raul; namespace Ingen { namespace GUI { @@ -210,7 +209,7 @@ ConnectWindow::connect(bool existing) Glib::signal_timeout().connect( sigc::mem_fun(this, &ConnectWindow::gtk_callback), 40); } else { - error << "Failed to launch ingen process." << endl; + Raul::error << "Failed to launch ingen process." << endl; } return; } diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 9170ed9b..57c932af 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -34,7 +34,6 @@ #include "ThreadedLoader.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -163,8 +162,8 @@ LoadPatchWindow::ok_clicked() if (_import) { // If unset load_patch will load value - boost::optional parent; - boost::optional symbol; + boost::optional parent; + boost::optional symbol; if (!_patch->path().is_root()) { parent = _patch->path().parent(); symbol = _patch->symbol(); @@ -177,14 +176,14 @@ LoadPatchWindow::ok_clicked() std::list uri_list = get_filenames(); for (std::list::iterator i = uri_list.begin(); i != uri_list.end(); ++i) { // Cascade - Atom& x = _initial_data.find(uris.ingen_canvasX)->second; + Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second; x = _app->forge().make(x.get_float() + 20.0f); - Atom& y = _initial_data.find(uris.ingen_canvasY)->second; + Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second; y = _app->forge().make(y.get_float() + 20.0f); Raul::Symbol symbol(symbol_from_filename(*i)); if (uri_list.size() == 1 && _symbol_entry->get_text() != "") - symbol = Symbol::symbolify(_symbol_entry->get_text()); + symbol = Raul::Symbol::symbolify(_symbol_entry->get_text()); symbol = avoid_symbol_clash(symbol); diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index f87eba25..69a4f53c 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -34,7 +34,6 @@ #include "ingen_config.h" using namespace std; -using namespace Raul; namespace Ingen { @@ -133,9 +132,9 @@ LoadPluginWindow::name_changed() // Toggle add button sensitivity according name legality if (_selection->get_selected_rows().size() == 1) { const string sym = _node_name_entry->get_text(); - if (!Symbol::is_valid(sym)) { + if (!Raul::Symbol::is_valid(sym)) { _add_button->property_sensitive() = false; - } else if (_app->store()->find(_patch->path().child(Symbol(sym))) + } else if (_app->store()->find(_patch->path().child(Raul::Symbol(sym))) != _app->store()->end()) { _add_button->property_sensitive() = false; } else { @@ -226,8 +225,8 @@ void LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr plugin) { - const URIs& uris = _app->uris(); - const Atom& name = plugin->get_property(uris.doap_name); + const URIs& uris = _app->uris(); + const Raul::Atom& name = plugin->get_property(uris.doap_name); if (name.is_valid() && name.type() == uris.forge.String) row[_plugins_columns._col_name] = name.get_string(); @@ -336,14 +335,14 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) if (name.empty()) name = generate_module_name(plugin, _name_offset); - if (name.empty() || !Symbol::is_valid(name)) { + if (name.empty() || !Raul::Symbol::is_valid(name)) { Gtk::MessageDialog dialog(*this, "Unable to chose a default name for this node. Please enter a name.", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); dialog.run(); } else { - Path path = _patch->path().child(Symbol::symbolify(name)); + Raul::Path path = _patch->path().child(Raul::Symbol::symbolify(name)); Resource::Properties props = _initial_data; props.insert(make_pair(uris.rdf_type, uris.ingen_Node)); @@ -359,9 +358,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) } // Cascade next node - Atom& x = _initial_data.find(uris.ingen_canvasX)->second; + Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second; x = _app->forge().make(x.get_float() + 20.0f); - Atom& y = _initial_data.find(uris.ingen_canvasY)->second; + Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second; y = _app->forge().make(y.get_float() + 20.0f); } } @@ -396,7 +395,7 @@ LoadPluginWindow::filter_changed() i != _app->store()->plugins()->end(); ++i) { const SharedPtr plugin = (*i).second; - const Atom& name = plugin->get_property(uris.doap_name); + const Raul::Atom& name = plugin->get_property(uris.doap_name); switch (criteria) { case CriteriaColumns::NAME: @@ -441,9 +440,9 @@ LoadPluginWindow::on_key_press_event(GdkEventKey* event) } void -LoadPluginWindow::plugin_property_changed(const URI& plugin, - const URI& predicate, - const Atom& value) +LoadPluginWindow::plugin_property_changed(const Raul::URI& plugin, + const Raul::URI& predicate, + const Raul::Atom& value) { const URIs& uris = _app->uris(); if (predicate == uris.doap_name) { diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index 0026f8ef..fbdc5f0d 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -25,7 +25,6 @@ #include "PatchView.hpp" using namespace std; -using namespace Raul; namespace Ingen { namespace GUI { @@ -75,10 +74,10 @@ void NewSubpatchWindow::name_changed() { string name = _name_entry->get_text(); - if (!Symbol::is_valid(name)) { + if (!Raul::Symbol::is_valid(name)) { _message_label->set_text("Name contains invalid characters."); _ok_button->property_sensitive() = false; - } else if (_app->store()->find(_patch->path().child(Symbol(name))) + } else if (_app->store()->find(_patch->path().child(Raul::Symbol(name))) != _app->store()->end()) { _message_label->set_text("An object already exists with that name."); _ok_button->property_sensitive() = false; @@ -91,8 +90,9 @@ NewSubpatchWindow::name_changed() void NewSubpatchWindow::ok_clicked() { - const Path path = _patch->path().child(Symbol::symbolify(_name_entry->get_text())); - const uint32_t poly = _poly_spinbutton->get_value_as_int(); + const uint32_t poly = _poly_spinbutton->get_value_as_int(); + const Raul::Path path = _patch->path().child( + Raul::Symbol::symbolify(_name_entry->get_text())); // Create patch Resource::Properties props; diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index f6df0673..c2305e03 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -42,7 +42,6 @@ #include "WindowFactory.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -165,7 +164,7 @@ NodeModule::show_human_names(bool b) } void -NodeModule::value_changed(uint32_t index, const Atom& value) +NodeModule::value_changed(uint32_t index, const Raul::Atom& value) { if (!_plugin_ui) return; @@ -183,7 +182,7 @@ NodeModule::value_changed(uint32_t index, const Atom& value) } void -NodeModule::port_activity(uint32_t index, const Atom& value) +NodeModule::port_activity(uint32_t index, const Raul::Atom& value) { if (!_plugin_ui) return; @@ -221,7 +220,7 @@ NodeModule::embed_gui(bool embed) { if (embed) { if (_gui_window) { - warn << "LV2 GUI already popped up, cannot embed" << endl; + Raul::warn << "LV2 GUI already popped up, cannot embed" << endl; return; } @@ -240,7 +239,7 @@ NodeModule::embed_gui(bool embed) container->add(*_gui_widget); Ganv::Module::embed(container); } else { - error << "Failed to create LV2 UI" << endl; + Raul::error << "Failed to create LV2 UI" << endl; } if (_gui_widget) { @@ -295,7 +294,7 @@ NodeModule::delete_port_view(SharedPtr model) if (p) { delete p; } else { - warn << "Failed to find port on module " << model->path() << endl; + Raul::warn << "Failed to find port on module " << model->path() << endl; } } @@ -304,7 +303,7 @@ NodeModule::popup_gui() { if (_node->plugin() && _node->plugin()->type() == PluginModel::LV2) { if (_plugin_ui) { - warn << "LV2 GUI already embedded, cannot pop up" << endl; + Raul::warn << "LV2 GUI already embedded, cannot pop up" << endl; return false; } @@ -333,7 +332,7 @@ NodeModule::popup_gui() return true; } else { - warn << "No LV2 GUI for " << _node->path() << endl; + Raul::warn << "No LV2 GUI for " << _node->path() << endl; } } @@ -382,15 +381,14 @@ NodeModule::on_event(GdkEvent* ev) void NodeModule::store_location(double ax, double ay) { - const Atom x(app().forge().make(static_cast(ax))); - const Atom y(app().forge().make(static_cast(ay))); - const URIs& uris = app().uris(); - const Atom& existing_x = _node->get_property(uris.ingen_canvasX); - const Atom& existing_y = _node->get_property(uris.ingen_canvasY); + const Raul::Atom x(app().forge().make(static_cast(ax))); + const Raul::Atom y(app().forge().make(static_cast(ay))); - if (x != existing_x && y != existing_y) { + if (x != _node->get_property(uris.ingen_canvasX) || + y != _node->get_property(uris.ingen_canvasY)) + { Resource::Properties remove; remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard)); remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard)); @@ -402,7 +400,7 @@ NodeModule::store_location(double ax, double ay) } void -NodeModule::property_changed(const URI& key, const Atom& value) +NodeModule::property_changed(const Raul::URI& key, const Raul::Atom& value) { const URIs& uris = app().uris(); if (value.type() == uris.forge.Float) { diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 0cfb2482..5c784d33 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -24,8 +24,6 @@ #include "WidgetFactory.hpp" #include "WindowFactory.hpp" -using namespace Raul; - namespace Ingen { using namespace Client; @@ -119,7 +117,7 @@ ObjectMenu::on_menu_polyphonic() } void -ObjectMenu::property_changed(const URI& predicate, const Atom& value) +ObjectMenu::property_changed(const Raul::URI& predicate, const Raul::Atom& value) { const URIs& uris = _app->uris(); _enable_signal = false; diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp index c5a5a6c2..9150585a 100644 --- a/src/gui/PatchBox.cpp +++ b/src/gui/PatchBox.cpp @@ -48,8 +48,6 @@ #include #endif -using namespace Raul; - namespace Ingen { using namespace Client; @@ -494,7 +492,7 @@ PatchBox::event_save_as() const std::string symbol(basename.substr(0, basename.find('.'))); - if (!Symbol::is_valid(symbol)) { + if (!Raul::Symbol::is_valid(symbol)) { message_dialog( "Ingen bundle names must be valid symbols.", "All characters must be _, a-z, A-Z, or 0-9, but the first may not be 0-9.", diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 6061eeb2..25552202 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -57,7 +57,6 @@ (iter) != coll.end(); ++(iter)) using namespace std; -using namespace Raul; namespace Ingen { @@ -229,8 +228,8 @@ PatchCanvas::build_plugin_class_menu( const char* sub_label_str = lilv_node_as_string(lilv_plugin_class_get_label(c)); const char* sub_uri_str = lilv_node_as_string(lilv_plugin_class_get_uri(c)); if (ancestors.find(sub_uri_str) != ancestors.end()) { - LOG(warn) << "Infinite LV2 class recursion: " << class_uri_str - << " <: " << sub_uri_str << endl; + LOG(Raul::warn) << "Infinite LV2 class recursion: " << class_uri_str + << " <: " << sub_uri_str << endl; return 0; } @@ -491,8 +490,8 @@ PatchCanvas::connection(SharedPtr cm) if (tail && head) { new GUI::Edge(*this, cm, tail, head, tail->get_fill_color()); } else { - LOG(error) << "Unable to find ports to connect " - << cm->tail_path() << " -> " << cm->head_path() << endl; + LOG(Raul::error) << "Unable to find ports to connect " + << cm->tail_path() << " -> " << cm->head_path() << endl; } } @@ -505,8 +504,8 @@ PatchCanvas::disconnection(SharedPtr cm) if (src && dst) remove_edge(src, dst); else - LOG(error) << "Unable to find ports to disconnect " - << cm->tail_path() << " -> " << cm->head_path() << endl; + LOG(Raul::error) << "Unable to find ports to disconnect " + << cm->tail_path() << " -> " << cm->head_path() << endl; } void @@ -704,7 +703,7 @@ PatchCanvas::paste() Glib::ustring str = Gtk::Clipboard::get()->wait_for_text(); SharedPtr parser = _app.loader()->parser(); if (!parser) { - LOG(error) << "Unable to load parser, paste unavailable" << endl; + LOG(Raul::error) << "Unable to load parser, paste unavailable" << endl; return; } @@ -731,8 +730,8 @@ PatchCanvas::paste() while (to_create != "/" && !to_create.empty() && (first_slash = to_create.find("/")) != string::npos) { created += to_create.substr(0, first_slash); - assert(Path::is_valid(created)); - clipboard.put(GraphObject::path_to_uri(Path(created)), props); + assert(Raul::Path::is_valid(created)); + clipboard.put(GraphObject::path_to_uri(Raul::Path(created)), props); to_create = to_create.substr(first_slash + 1); } @@ -792,7 +791,7 @@ PatchCanvas::generate_port_name( break; } - assert(Path::is_valid(string("/") + symbol)); + assert(Raul::Path::is_valid(string("/") + symbol)); name.append(" ").append(num_buf); } @@ -803,7 +802,7 @@ PatchCanvas::menu_add_port(const string& sym_base, const string& name_base, { string sym, name; generate_port_name(sym_base, sym, name_base, name); - const Path& path = _patch->path().child(Raul::Symbol(sym)); + const Raul::Path& path = _patch->path().child(Raul::Symbol(sym)); const URIs& uris = _app.uris(); @@ -838,8 +837,8 @@ PatchCanvas::load_plugin(WeakPtr weak_plugin) symbol = Raul::Symbol(ss.str()); } - const URIs& uris = _app.uris(); - const Path path = _patch->path().child(symbol); + const URIs& uris = _app.uris(); + const Raul::Path path = _patch->path().child(symbol); // FIXME: polyphony? GraphObject::Properties props = get_initial_data(); diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 3ccf8d07..a260c35e 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -34,7 +34,6 @@ #include "WindowFactory.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -92,15 +91,14 @@ PatchPortModule::show_menu(GdkEventButton* ev) void PatchPortModule::store_location(double ax, double ay) { - const Atom x(app().forge().make(static_cast(ax))); - const Atom y(app().forge().make(static_cast(ay))); - const URIs& uris = app().uris(); - const Atom& existing_x = _model->get_property(uris.ingen_canvasX); - const Atom& existing_y = _model->get_property(uris.ingen_canvasY); + const Raul::Atom x(app().forge().make(static_cast(ax))); + const Raul::Atom y(app().forge().make(static_cast(ay))); - if (x != existing_x && y != existing_y) { + if (x != _model->get_property(uris.ingen_canvasX) || + y != _model->get_property(uris.ingen_canvasY)) + { Resource::Properties remove; remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard)); remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard)); @@ -116,8 +114,8 @@ PatchPortModule::store_location(double ax, double ay) void PatchPortModule::show_human_names(bool b) { - const URIs& uris = app().uris(); - const Atom& name = _model->get_property(uris.lv2_name); + const URIs& uris = app().uris(); + const Raul::Atom& name = _model->get_property(uris.lv2_name); if (b && name.type() == uris.forge.String) { set_name(name.get_string()); } else { @@ -132,7 +130,7 @@ PatchPortModule::set_name(const std::string& n) } void -PatchPortModule::property_changed(const URI& key, const Atom& value) +PatchPortModule::property_changed(const Raul::URI& key, const Raul::Atom& value) { const URIs& uris = app().uris(); if (value.type() == uris.forge.Float) { diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 24c56f1e..06eed694 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -27,7 +27,6 @@ #define LOG(s) s << "[PatchTreeWindow] " using namespace std; -using namespace Raul; namespace Ingen { @@ -162,7 +161,7 @@ PatchTreeWindow::show_patch_menu(GdkEventButton* ev) Gtk::TreeModel::Row row = *active; SharedPtr pm = row[_patch_tree_columns.patch_model_col]; if (pm) - warn << "TODO: patch menu from tree window" << endl; + Raul::warn << "TODO: patch menu from tree window" << endl; } } @@ -194,8 +193,9 @@ PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str) } void -PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value, - SharedPtr patch) +PatchTreeWindow::patch_property_changed(const Raul::URI& key, + const Raul::Atom& value, + SharedPtr patch) { const URIs& uris = _app->uris(); _enable_signal = false; @@ -205,7 +205,7 @@ PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value, Gtk::TreeModel::Row row = *i; row[_patch_tree_columns.enabled_col] = value.get_bool(); } else { - LOG(error) << "Unable to find patch " << patch->path() << endl; + LOG(Raul::error) << "Unable to find patch " << patch->path() << endl; } } _enable_signal = true; @@ -223,7 +223,7 @@ PatchTreeWindow::patch_moved(SharedPtr patch) Gtk::TreeModel::Row row = *i; row[_patch_tree_columns.name_col] = patch->symbol().c_str(); } else { - LOG(error) << "Unable to find patch " << patch->path() << endl; + LOG(Raul::error) << "Unable to find patch " << patch->path() << endl; } _enable_signal = true; diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp index 0d2bf21b..f1f4c96d 100644 --- a/src/gui/PatchView.cpp +++ b/src/gui/PatchView.cpp @@ -28,7 +28,6 @@ #include "WidgetFactory.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -194,13 +193,13 @@ PatchView::property_changed(const Raul::URI& predicate, const Raul::Atom& value) if (value.type() == _app->uris().forge.Bool) { _process_but->set_active(value.get_bool()); } else { - warn << "Bad type for ingen:enabled: " << value.type() << endl; + Raul::warn << "Bad type for ingen:enabled: " << value.type() << endl; } } else if (predicate == _app->uris().ingen_polyphony) { if (value.type() == _app->uris().forge.Int) { _poly_spin->set_value(value.get_int32()); } else { - warn << "Bad type for ingen:polyphony: " << value.type() << endl; + Raul::warn << "Bad type for ingen:polyphony: " << value.type() << endl; } } _enable_signal = true; diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 5744a84d..a238d60f 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -33,7 +33,6 @@ using namespace Ingen::Client; using namespace std; -using namespace Raul; namespace Ingen { namespace GUI { @@ -165,7 +164,7 @@ Port::on_value_changed(GVariant* value) } void -Port::value_changed(const Atom& value) +Port::value_changed(const Raul::Atom& value) { if (!_pressed && value.type() == _app.forge().Float) { Ganv::Port::set_control_value(value.get_float()); @@ -319,7 +318,7 @@ Port::get_patch_box() const } void -Port::property_changed(const URI& key, const Atom& value) +Port::property_changed(const Raul::URI& key, const Raul::Atom& value) { const URIs& uris = _app.uris(); if (value.type() == uris.forge.Float) { diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 4ef6d89b..f6af2563 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -25,7 +25,6 @@ #include "PortPropertiesWindow.hpp" using namespace std; -using namespace Raul; namespace Ingen { using namespace Client; @@ -93,7 +92,8 @@ PortPropertiesWindow::present(SharedPtr pm) } void -PortPropertiesWindow::property_changed(const URI& key, const Atom& value) +PortPropertiesWindow::property_changed(const Raul::URI& key, + const Raul::Atom& value) { const URIs& uris = _app->uris(); if (value.type() == uris.forge.Float) { diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index c12aefd5..b146d412 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -32,7 +32,6 @@ #define LOG(s) s << "[PropertiesWindow] " using namespace std; -using namespace Raul; namespace Ingen { @@ -352,7 +351,7 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va return widget; } - LOG(error) << "Unable to create widget for value " << forge.str(value) << endl; + LOG(Raul::error) << "Unable to create widget for value " << forge.str(value) << endl; return NULL; } @@ -409,7 +408,7 @@ PropertiesWindow::value_edited(const Raul::URI& predicate) { Records::iterator r = _records.find(predicate); if (r == _records.end()) { - LOG(error) << "Unknown property `" << predicate << "' edited" << endl; + LOG(Raul::error) << "Unknown property `" << predicate << "' edited" << endl; return; } @@ -441,7 +440,7 @@ PropertiesWindow::value_edited(const Raul::URI& predicate) return; bad_type: - LOG(error) << "Property `" << predicate << "' value widget has wrong type" << endl; + LOG(Raul::error) << "Property `" << predicate << "' value widget has wrong type" << endl; return; } @@ -518,21 +517,21 @@ PropertiesWindow::cancel_clicked() void PropertiesWindow::apply_clicked() { - LOG(debug) << "apply {" << endl; + LOG(Raul::debug) << "apply {" << endl; Resource::Properties properties; for (Records::const_iterator r = _records.begin(); r != _records.end(); ++r) { const Raul::URI& uri = r->first; const Record& record = r->second; if (!_model->has_property(uri, record.value)) { - LOG(debug) << "\t" << uri - << " = " << _app->forge().str(record.value) << endl; + LOG(Raul::debug) << "\t" << uri + << " = " << _app->forge().str(record.value) << endl; properties.insert(make_pair(uri, record.value)); } } _app->interface()->put(_model->uri(), properties); - LOG(debug) << "}" << endl; + LOG(Raul::debug) << "}" << endl; } void diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index ea1ae6f1..df22a3c0 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -26,7 +26,6 @@ #include "RenameWindow.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -64,7 +63,7 @@ RenameWindow::set_object(SharedPtr object) { _object = object; _symbol_entry->set_text(object->path().symbol()); - const Atom& name_atom = object->get_property(_app->uris().lv2_name); + const Raul::Atom& name_atom = object->get_property(_app->uris().lv2_name); _label_entry->set_text( (name_atom.type() == _app->forge().String) ? name_atom.get_string() : ""); } @@ -82,7 +81,7 @@ RenameWindow::values_changed() { const string& symbol = _symbol_entry->get_text(); const string& label = _label_entry->get_text(); - if (!Symbol::is_valid(symbol)) { + if (!Raul::Symbol::is_valid(symbol)) { _message_label->set_text("Invalid symbol"); _ok_button->property_sensitive() = false; } else if (_object->symbol() != symbol && @@ -112,14 +111,14 @@ RenameWindow::cancel_clicked() void RenameWindow::ok_clicked() { - const URIs& uris = _app->uris(); - const string& symbol_str = _symbol_entry->get_text(); - const string& label = _label_entry->get_text(); - Path path = _object->path(); - const Atom& name_atom = _object->get_property(uris.lv2_name); - - if (Symbol::is_valid(symbol_str)) { - const Symbol symbol(symbol_str); + const URIs& uris = _app->uris(); + const string& symbol_str = _symbol_entry->get_text(); + const string& label = _label_entry->get_text(); + Raul::Path path = _object->path(); + const Raul::Atom& name_atom = _object->get_property(uris.lv2_name); + + if (Raul::Symbol::is_valid(symbol_str)) { + const Raul::Symbol symbol(symbol_str); if (symbol != _object->symbol()) { path = _object->path().parent().child(symbol); _app->interface()->move(_object->path(), path); diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index dd09e992..5425677c 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -29,7 +29,6 @@ #include "WindowFactory.hpp" using namespace std; -using namespace Raul; namespace Ingen { @@ -63,15 +62,14 @@ SubpatchModule::on_double_click(GdkEventButton* event) void SubpatchModule::store_location(double ax, double ay) { - const Atom x(app().forge().make(static_cast(ax))); - const Atom y(app().forge().make(static_cast(ay))); - const URIs& uris = app().uris(); - const Atom& existing_x = _node->get_property(uris.ingen_canvasX); - const Atom& existing_y = _node->get_property(uris.ingen_canvasY); + const Raul::Atom x(app().forge().make(static_cast(ax))); + const Raul::Atom y(app().forge().make(static_cast(ay))); - if (x != existing_x && y != existing_y) { + if (x != _node->get_property(uris.ingen_canvasX) || + y != _node->get_property(uris.ingen_canvasY)) + { Resource::Properties remove; remove.insert(make_pair(uris.ingen_canvasX, uris.wildcard)); remove.insert(make_pair(uris.ingen_canvasY, uris.wildcard)); diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index c8f65e2b..3154dfbb 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -24,7 +24,6 @@ #include "App.hpp" #include "ThreadedLoader.hpp" -using namespace Raul; using namespace boost; using namespace std; @@ -40,7 +39,7 @@ ThreadedLoader::ThreadedLoader(App& app, SharedPtr engine) if (parser()) start(); else - warn << "Failed to load ingen_serialisation module, load disabled." << endl; + Raul::warn << "Failed to load ingen_serialisation module, load disabled." << endl; } ThreadedLoader::~ThreadedLoader() @@ -76,8 +75,8 @@ ThreadedLoader::_run() void ThreadedLoader::load_patch(bool merge, const Glib::ustring& document_uri, - optional engine_parent, - optional engine_symbol, + optional engine_parent, + optional engine_symbol, optional engine_data) { _mutex.lock(); diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index 5e5b987a..31749ffe 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -24,7 +24,6 @@ #include "WidgetFactory.hpp" using namespace std; -using namespace Raul; namespace Ingen { namespace GUI { @@ -60,8 +59,8 @@ WidgetFactory::find_ui_file() if (is_readable(ui_filename)) return; - error << "[WidgetFactory] Unable to find ingen_gui.ui in " - << INGEN_DATA_DIR << endl; + Raul::error << "[WidgetFactory] Unable to find ingen_gui.ui in " + << INGEN_DATA_DIR << endl; throw std::runtime_error("Unable to find UI file"); } @@ -77,7 +76,7 @@ WidgetFactory::create(const string& toplevel_widget) else return Gtk::Builder::create_from_file(ui_filename, toplevel_widget.c_str()); } catch (const Gtk::BuilderError& ex) { - error << "[WidgetFactory] " << ex.what() << endl; + Raul::error << "[WidgetFactory] " << ex.what() << endl; throw ex; } } diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index a32fa9fd..6a34a04b 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -42,7 +42,6 @@ #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" using namespace std; -using namespace Raul; typedef set RDFNodes; @@ -118,7 +117,7 @@ get_properties(Ingen::World* world, sratom_read(sratom, &forge, world->rdf_world()->c_obj(), model.c_obj(), i.get_object().c_obj()); const LV2_Atom* atom = (const LV2_Atom*)out.buf; - Atom atomm; + Raul::Atom atomm; // FIXME: Don't bloat out all URIs if (atom->type == forge.URID) { atomm = world->forge().alloc_uri( @@ -137,7 +136,7 @@ get_properties(Ingen::World* world, return props; } -typedef std::pair PortRecord; +typedef std::pair PortRecord; static boost::optional get_port(Ingen::World* world, @@ -156,7 +155,7 @@ get_port(Ingen::World* world, if (i == props.end() || i->second.type() != world->forge().Int || i->second.get_int32() < 0) { - LOG(error) << "Port " << subject << " has no valid index" << endl; + LOG(Raul::error) << "Port " << subject << " has no valid index" << endl; return boost::optional(); } index = i->second.get_int32(); @@ -164,11 +163,11 @@ get_port(Ingen::World* world, // Get symbol Resource::Properties::const_iterator s = props.find(uris.lv2_symbol); if (s == props.end()) { - LOG(error) << "Port " << subject << " has no symbol" << endl; + LOG(Raul::error) << "Port " << subject << " has no symbol" << endl; return boost::optional(); } - const Symbol port_sym(s->second.get_string()); - const Path port_path = parent.child(port_sym); + const Raul::Symbol port_sym(s->second.get_string()); + const Raul::Path port_path = parent.child(port_sym); return make_pair(port_path, props); } @@ -220,7 +219,7 @@ parse_edges( const Sord::Node& subject, const Raul::Path& patch); -static boost::optional +static boost::optional parse_node(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, @@ -235,8 +234,8 @@ parse_node(Ingen::World* world, Sord::Iter i = model.find(subject, ingen_prototype, nil); if (i.end() || i.get_object().type() != Sord::Node::URI) { - LOG(error) << "Node missing mandatory ingen:prototype" << endl; - return boost::optional(); + LOG(Raul::error) << "Node missing mandatory ingen:prototype" << endl; + return boost::optional(); } const std::string type_uri = relative_uri( @@ -283,7 +282,7 @@ parse_node(Ingen::World* world, return path; } -static boost::optional +static boost::optional parse_patch(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, @@ -312,20 +311,20 @@ parse_patch(Ingen::World* world, if (parent && a_symbol) patch_path_str = parent->child(*a_symbol); - if (!Path::is_valid(patch_path_str)) { - LOG(error) << "Patch has invalid path: " << patch_path_str << endl; + if (!Raul::Path::is_valid(patch_path_str)) { + LOG(Raul::error) << "Patch has invalid path: " << patch_path_str << endl; return boost::optional(); } // Create patch - Path patch_path(patch_path_str); + Raul::Path patch_path(patch_path_str); Resource::Properties props = get_properties(world, model, subject_node); target->put(GraphObject::path_to_uri(patch_path), props); // For each node in this patch for (Sord::Iter n = model.find(subject_node, ingen_node, nil); !n.end(); ++n) { - Sord::Node node = n.get_object(); - const Path node_path = patch_path.child( + Sord::Node node = n.get_object(); + const Raul::Path node_path = patch_path.child( Raul::Symbol(get_basename(node.to_string()))); // Parse and create node @@ -341,8 +340,8 @@ parse_patch(Ingen::World* world, boost::optional port_record = get_port( world, model, port, node_path, index); if (!port_record) { - LOG(error) << "Invalid port " << port << endl; - return boost::optional(); + LOG(Raul::error) << "Invalid port " << port << endl; + return boost::optional(); } // Create port and/or set all port properties @@ -363,7 +362,7 @@ parse_patch(Ingen::World* world, world, model, port, patch_path, index); if (!port_record) { LOG(Raul::error) << "Invalid port " << port << endl; - return boost::optional(); + return boost::optional(); } // Store port information in ports map @@ -398,36 +397,36 @@ parse_edge(Ingen::World* world, const Glib::ustring& base_uri = model.base_uri().to_string(); if (t.end()) { - LOG(error) << "Edge has no tail" << endl; + LOG(Raul::error) << "Edge has no tail" << endl; return false; } else if (h.end()) { - LOG(error) << "Edge has no head" << endl; + LOG(Raul::error) << "Edge has no head" << endl; return false; } const std::string tail_str = relative_uri( base_uri, t.get_object().to_string(), true); - if (!Path::is_valid(tail_str)) { - LOG(error) << "Edge tail has invalid URI" << endl; + if (!Raul::Path::is_valid(tail_str)) { + LOG(Raul::error) << "Edge tail has invalid URI" << endl; return false; } const std::string head_str = relative_uri( base_uri, h.get_object().to_string(), true); - if (!Path::is_valid(head_str)) { - LOG(error) << "Edge head has invalid URI" << endl; + if (!Raul::Path::is_valid(head_str)) { + LOG(Raul::error) << "Edge head has invalid URI" << endl; return false; } if (!(++t).end()) { - LOG(error) << "Edge has multiple tails" << endl; + LOG(Raul::error) << "Edge has multiple tails" << endl; return false; } else if (!(++h).end()) { - LOG(error) << "Edge has multiple heads" << endl; + LOG(Raul::error) << "Edge has multiple heads" << endl; return false; } - target->connect(Path(tail_str), Path(head_str)); + target->connect(Raul::Path(tail_str), Raul::Path(head_str)); return true; } @@ -468,7 +467,7 @@ parse_properties(Ingen::World* world, return true; } -static boost::optional +static boost::optional parse(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, @@ -515,7 +514,7 @@ parse(Ingen::World* world, for (Subjects::const_iterator i = subjects.begin(); i != subjects.end(); ++i) { const Sord::Node& s = i->first; const std::set& types = i->second; - boost::optional ret; + boost::optional ret; const Raul::Path path( relative_uri( model.base_uri().to_string(), s.to_string(), true)); if (types.find(patch_class) != types.end()) { @@ -528,24 +527,24 @@ parse(Ingen::World* world, world, target, model, s, GraphObject::path_to_uri(path), data); ret = path; } else if (types.find(edge_class) != types.end()) { - Path parent_path(parent ? parent.get() : Path("/")); + Raul::Path parent_path(parent ? parent.get() : Raul::Path("/")); parse_edge(world, target, model, s, parent_path); } else { - LOG(error) << "Subject has no known types" << endl; + LOG(Raul::error) << "Subject has no known types" << endl; } if (!ret) { - LOG(error) << "Failed to parse " << path << endl; - LOG(error) << "Types:" << endl; + LOG(Raul::error) << "Failed to parse " << path << endl; + LOG(Raul::error) << "Types:" << endl; for (std::set::const_iterator t = types.begin(); t != types.end(); ++t) { - LOG(error) << " :: " << *t << endl; + LOG(Raul::error) << " :: " << *t << endl; assert((*t).is_uri()); } } } - return boost::optional(); + return boost::optional(); } /** Parse a patch from RDF into a Interface (engine or client). @@ -572,7 +571,7 @@ Parser::parse_file(Ingen::World* world, try { uri = Glib::filename_to_uri(path, ""); } catch (const Glib::ConvertError& e) { - LOG(error) << "Path to URI conversion error: " << e.what() << endl; + LOG(Raul::error) << "Path to URI conversion error: " << e.what() << endl; return false; } @@ -593,7 +592,7 @@ Parser::parse_file(Ingen::World* world, LOG(Raul::info)(Raul::fmt("Symbol: %1%\n") % symbol->c_str()); Sord::Node subject(*world->rdf_world(), Sord::Node::URI, uri); - boost::optional parsed_path + boost::optional parsed_path = parse(world, target, model, path, subject, parent, symbol, data); if (parsed_path) { @@ -625,9 +624,10 @@ Parser::parse_string(Ingen::World* world, serd_env_free(env); LOG(Raul::info) << "Parsing string"; - if (!base_uri.empty()) - info << " (base " << base_uri << ")"; - info << endl; + if (!base_uri.empty()) { + Raul::info << " (base " << base_uri << ")"; + } + Raul::info << endl; Sord::Node subject; return parse(world, target, model, base_uri, subject, parent, symbol, data); diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index cff178d6..c8ee42c0 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -46,7 +46,6 @@ #define LOG(s) s << "[Serialiser] " using namespace std; -using namespace Raul; using namespace Sord; using namespace Ingen; @@ -187,7 +186,7 @@ Serialiser::Impl::write_bundle(SharedPtr patch, const string root_file = Glib::build_filename(path, symbol + ".ttl"); start_to_filename(root_file); - const Path old_root_path = _root_path; + const Raul::Path old_root_path = _root_path; _root_path = patch->path(); serialise_patch(patch, Sord::URI(_model->world(), root_file, _base_uri)); _root_path = old_root_path; @@ -255,8 +254,8 @@ Serialiser::Impl::finish() if (_mode == TO_FILE) { SerdStatus st = _model->write_to_file(_base_uri, SERD_TURTLE); if (st) { - LOG(error) << "Error writing file `" << _base_uri << "' (" - << serd_strerror(st) << ")" << std::endl; + LOG(Raul::error) << "Error writing file `" << _base_uri << "' (" + << serd_strerror(st) << ")" << std::endl; } } else { ret = _model->write_to_string(_base_uri, SERD_TURTLE); @@ -270,7 +269,7 @@ Serialiser::Impl::finish() } Sord::Node -Serialiser::Impl::path_rdf_node(const Path& path) +Serialiser::Impl::path_rdf_node(const Raul::Path& path) { assert(_model); assert(path == _root_path || path.is_child_of(_root_path)); @@ -296,8 +295,8 @@ Serialiser::serialise(SharedPtr object) throw (std::logic_err Resource::DEFAULT, me->path_rdf_node(object->path())); } else { - LOG(warn) << "Unsupported object type, " - << object->path() << " not serialised." << endl; + LOG(Raul::warn) << "Unsupported object type, " + << object->path() << " not serialised." << endl; } } @@ -331,10 +330,10 @@ Serialiser::Impl::serialise_patch(SharedPtr patch, GraphObject::Properties::const_iterator s = patch->properties().find(uris.lv2_symbol); if (s == patch->properties().end() || !s->second.type() == _world.forge().String - || !Symbol::is_valid(s->second.get_string())) { + || !Raul::Symbol::is_valid(s->second.get_string())) { const std::string base = Glib::path_get_basename( _model->base_uri().to_c_string()); - symbol = Symbol::symbolify(base.substr(0, base.find('.'))); + symbol = Raul::Symbol::symbolify(base.substr(0, base.find('.'))); _model->add_statement( patch_id, Sord::Curie(world, "lv2:symbol"), -- cgit v1.2.1