diff options
Diffstat (limited to 'src/gui')
30 files changed, 123 insertions, 127 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 719fe694..3dc08609 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -369,8 +369,8 @@ App::can_control(const Client::PortModel* port) const return port->is_a(uris().lv2_ControlPort) || port->is_a(uris().lv2_CVPort) || (port->is_a(uris().atom_AtomPort) - && (port->supports(uris().atom_Float) - || port->supports(uris().atom_String))); + && (port->supports(uris().atom_Float) + || port->supports(uris().atom_String))); } uint32_t @@ -381,4 +381,3 @@ App::sample_rate() const } // namespace GUI } // namespace Ingen - diff --git a/src/gui/App.hpp b/src/gui/App.hpp index dbb0465c..4adee828 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -34,20 +34,20 @@ #include "raul/URI.hpp" namespace Ingen { - class Interface; - class Log; - class Port; - class World; - namespace Client { - class ClientStore; - class GraphModel; - class PluginModel; - class PortModel; - class SigClientInterface; - } - namespace Serialisation { - class Serialiser; - } +class Interface; +class Log; +class Port; +class World; +namespace Client { +class ClientStore; +class GraphModel; +class PluginModel; +class PortModel; +class SigClientInterface; +} +namespace Serialisation { +class Serialiser; +} } namespace Ingen { @@ -160,4 +160,3 @@ protected: } // namespace Ingen #endif // INGEN_GUI_APP_HPP - diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index 8073f933..6ed0bfca 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -34,7 +34,7 @@ BreadCrumbs::BreadCrumbs(App& app) , _enable_signal(true) { app.client()->signal_object_deleted().connect( - sigc::mem_fun(this, &BreadCrumbs::object_destroyed)); + sigc::mem_fun(this, &BreadCrumbs::object_destroyed)); set_can_focus(false); } @@ -60,8 +60,8 @@ BreadCrumbs::build(Raul::Path path, SPtr<GraphView> view) bool old_enable_signal = _enable_signal; _enable_signal = false; - // Moving to a path we already contain, just switch the active button if (!_breadcrumbs.empty() && (path.is_parent_of(_full_path) || path == _full_path)) { + // Moving to a path we already contain, just switch the active button for (const auto& b : _breadcrumbs) { if (b->path() == path) { b->set_active(true); @@ -79,8 +79,8 @@ BreadCrumbs::build(Raul::Path path, SPtr<GraphView> view) _active_path = path; _enable_signal = old_enable_signal; - // Moving to a child of the full path, just append crumbs (preserve view cache) } else if (!_breadcrumbs.empty() && path.is_child_of(_full_path)) { + // Moving to a child of the full path, just append crumbs (preserve view cache) string suffix = path.substr(_full_path.length()); while (suffix.length() > 0) { @@ -102,9 +102,9 @@ BreadCrumbs::build(Raul::Path path, SPtr<GraphView> view) b->set_active(false); _breadcrumbs.back()->set_active(true); - // Rebuild from scratch - // Getting here is bad unless absolutely necessary, since the GraphView cache is lost } else { + // Rebuild from scratch + // Getting here is bad unless absolutely necessary, since the GraphView cache is lost _full_path = path; _active_path = path; @@ -149,11 +149,14 @@ BreadCrumbs::BreadCrumb* BreadCrumbs::create_crumb(const Raul::Path& path, SPtr<GraphView> view) { - BreadCrumb* but = manage(new BreadCrumb(path, - (view && path == view->graph()->path()) ? view : SPtr<GraphView>())); + BreadCrumb* but = manage( + new BreadCrumb(path, + ((view && path == view->graph()->path()) + ? view : SPtr<GraphView>()))); - but->signal_toggled().connect(sigc::bind(sigc::mem_fun( - this, &BreadCrumbs::breadcrumb_clicked), but)); + but->signal_toggled().connect( + sigc::bind(sigc::mem_fun(this, &BreadCrumbs::breadcrumb_clicked), + but)); return but; } @@ -203,4 +206,3 @@ BreadCrumbs::object_moved(const Raul::Path& old_path, const Raul::Path& new_path } // namespace GUI } // namespace Ingen - diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp index 933a28dc..235709b4 100644 --- a/src/gui/BreadCrumbs.hpp +++ b/src/gui/BreadCrumbs.hpp @@ -99,7 +99,7 @@ private: }; BreadCrumb* create_crumb(const Raul::Path& path, - SPtr<GraphView> view = SPtr<GraphView>()); + SPtr<GraphView> view = SPtr<GraphView>()); void breadcrumb_clicked(BreadCrumb* crumb); diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp index 47d267d2..f076e919 100644 --- a/src/gui/GraphCanvas.hpp +++ b/src/gui/GraphCanvas.hpp @@ -100,7 +100,7 @@ private: void build_menus(); - void auto_menu_position(int& x, int& y, bool& push_in); + void auto_menu_position(int& x, int& y, bool& push_in); typedef std::multimap<const std::string, const LilvPluginClass*> LV2Children; diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp index 3c9004e3..dc781a35 100644 --- a/src/gui/GraphPortModule.cpp +++ b/src/gui/GraphPortModule.cpp @@ -55,7 +55,7 @@ GraphPortModule::GraphPortModule(GraphCanvas& canvas, set_stacked(model->polyphonic()); if (model->is_input() && !model->is_numeric()) { set_is_source(true); - } + } model->signal_property().connect( sigc::mem_fun(this, &GraphPortModule::property_changed)); diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp index f9292363..5cffa7bc 100644 --- a/src/gui/GraphPortModule.hpp +++ b/src/gui/GraphPortModule.hpp @@ -27,7 +27,7 @@ namespace Raul { class Atom; } namespace Ingen { namespace Client { - class PortModel; +class PortModel; } } namespace Ingen { diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp index 7ebb405d..ae4e522d 100644 --- a/src/gui/GraphTreeWindow.cpp +++ b/src/gui/GraphTreeWindow.cpp @@ -43,10 +43,10 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject, _graph_treestore = Gtk::TreeStore::create(_graph_tree_columns); _graphs_treeview->set_window(this); _graphs_treeview->set_model(_graph_treestore); - Gtk::TreeViewColumn* name_col = Gtk::manage(new Gtk::TreeViewColumn( - "Graph", _graph_tree_columns.name_col)); - Gtk::TreeViewColumn* enabled_col = Gtk::manage(new Gtk::TreeViewColumn( - "Run", _graph_tree_columns.enabled_col)); + Gtk::TreeViewColumn* name_col = Gtk::manage( + new Gtk::TreeViewColumn("Graph", _graph_tree_columns.name_col)); + Gtk::TreeViewColumn* enabled_col = Gtk::manage( + new Gtk::TreeViewColumn("Run", _graph_tree_columns.enabled_col)); name_col->set_resizable(true); name_col->set_expand(true); diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index 3a4f465d..67f6304c 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -66,8 +66,8 @@ protected: void event_graph_enabled_toggled(const Glib::ustring& path_str); Gtk::TreeModel::iterator find_graph( - Gtk::TreeModel::Children root, - SPtr<Client::ObjectModel> graph); + Gtk::TreeModel::Children root, + SPtr<Client::ObjectModel> graph); GraphTreeView* _graphs_treeview; diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp index 7b2e9842..414f21f9 100644 --- a/src/gui/GraphView.cpp +++ b/src/gui/GraphView.cpp @@ -95,7 +95,7 @@ GraphView::set_graph(SPtr<const GraphModel> graph) sigc::mem_fun(this, &GraphView::refresh_clicked)); _poly_spin->signal_value_changed().connect( - sigc::mem_fun(*this, &GraphView::poly_changed)); + sigc::mem_fun(*this, &GraphView::poly_changed)); _canvas->widget().grab_focus(); } diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp index b052028c..f0524673 100644 --- a/src/gui/GraphView.hpp +++ b/src/gui/GraphView.hpp @@ -34,10 +34,10 @@ namespace Raul { class Atom; } namespace Ingen { namespace Client { - class PortModel; - class MetadataModel; - class GraphModel; - class ObjectModel; +class PortModel; +class MetadataModel; +class GraphModel; +class ObjectModel; } namespace GUI { diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp index 46126589..593ef048 100644 --- a/src/gui/GraphWindow.hpp +++ b/src/gui/GraphWindow.hpp @@ -29,7 +29,7 @@ namespace Ingen { namespace Client { - class GraphModel; +class GraphModel; } namespace GUI { diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp index babfb632..064b728e 100644 --- a/src/gui/LoadGraphWindow.cpp +++ b/src/gui/LoadGraphWindow.cpp @@ -60,22 +60,22 @@ LoadGraphWindow::LoadGraphWindow(BaseObjectType* cobject, xml->get_widget("load_graph_cancel_button", _cancel_button); _cancel_button->signal_clicked().connect( - sigc::mem_fun(this, &LoadGraphWindow::cancel_clicked)); + sigc::mem_fun(this, &LoadGraphWindow::cancel_clicked)); _ok_button->signal_clicked().connect( - sigc::mem_fun(this, &LoadGraphWindow::ok_clicked)); + sigc::mem_fun(this, &LoadGraphWindow::ok_clicked)); _merge_ports_radio->signal_toggled().connect( - sigc::mem_fun(this, &LoadGraphWindow::merge_ports_selected)); + sigc::mem_fun(this, &LoadGraphWindow::merge_ports_selected)); _insert_ports_radio->signal_toggled().connect( - sigc::mem_fun(this, &LoadGraphWindow::insert_ports_selected)); - _poly_from_file_radio->signal_toggled().connect(sigc::bind( - sigc::mem_fun(_poly_spinbutton, &Gtk::SpinButton::set_sensitive), - false)); - _poly_voices_radio->signal_toggled().connect(sigc::bind( - sigc::mem_fun(_poly_spinbutton, &Gtk::SpinButton::set_sensitive), - true)); + sigc::mem_fun(this, &LoadGraphWindow::insert_ports_selected)); + _poly_from_file_radio->signal_toggled().connect( + sigc::bind(sigc::mem_fun(_poly_spinbutton, &Gtk::SpinButton::set_sensitive), + false)); + _poly_voices_radio->signal_toggled().connect( + sigc::bind(sigc::mem_fun(_poly_spinbutton, &Gtk::SpinButton::set_sensitive), + true)); signal_selection_changed().connect( - sigc::mem_fun(this, &LoadGraphWindow::selection_changed)); + sigc::mem_fun(this, &LoadGraphWindow::selection_changed)); Gtk::FileFilter filt; filt.add_pattern("*.ttl"); @@ -172,8 +172,8 @@ LoadGraphWindow::ok_clicked() symbol = _graph->symbol(); } - _app->loader()->load_graph(true, get_filename(), - parent, symbol, _initial_data); + _app->loader()->load_graph( + true, get_filename(), parent, symbol, _initial_data); } else { std::list<Glib::ustring> uri_list = get_filenames(); @@ -190,8 +190,8 @@ LoadGraphWindow::ok_clicked() symbol = avoid_symbol_clash(symbol); - _app->loader()->load_graph(false, u, - _graph->path(), symbol, _initial_data); + _app->loader()->load_graph( + false, u, _graph->path(), symbol, _initial_data); } } @@ -222,7 +222,7 @@ Raul::Symbol LoadGraphWindow::avoid_symbol_clash(const Raul::Symbol& symbol) { unsigned offset = _app->store()->child_name_offset( - _graph->path(), symbol); + _graph->path(), symbol); if (offset != 0) { std::stringstream ss; @@ -243,8 +243,8 @@ LoadGraphWindow::selection_changed() _symbol_entry->set_text(""); _symbol_entry->set_sensitive(false); } else { - _symbol_entry->set_text(avoid_symbol_clash( - symbol_from_filename(get_filename())).c_str()); + _symbol_entry->set_text( + avoid_symbol_clash(symbol_from_filename(get_filename())).c_str()); _symbol_entry->set_sensitive(true); } } diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 018856fe..fd8a8868 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -510,4 +510,3 @@ LoadPluginWindow::plugin_property_changed(const Raul::URI& plugin, } // namespace GUI } // namespace Ingen - diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index de744226..ed764904 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -54,8 +54,8 @@ NodeMenu::init(App& app, SPtr<const Client::BlockModel> block) { ObjectMenu::init(app, block); - _learn_menuitem->signal_activate().connect(sigc::mem_fun(this, - &NodeMenu::on_menu_learn)); + _learn_menuitem->signal_activate().connect( + sigc::mem_fun(this, &NodeMenu::on_menu_learn)); _popup_gui_menuitem->signal_activate().connect( sigc::mem_fun(signal_popup_gui, &sigc::signal<void>::emit)); _embed_gui_menuitem->signal_toggled().connect( @@ -132,7 +132,7 @@ NodeMenu::init(App& app, SPtr<const Client::BlockModel> block) _randomize_menuitem->hide(); if (plugin && (plugin->uri() == "http://drobilla.net/ns/ingen-internals#Controller" - || plugin->uri() == "http://drobilla.net/ns/ingen-internals#Trigger")) + || plugin->uri() == "http://drobilla.net/ns/ingen-internals#Trigger")) _learn_menuitem->show(); else _learn_menuitem->hide(); @@ -188,7 +188,7 @@ set_port_value(const char* port_symbol, fmt("Preset with invalid port symbol `%1'\n") % port_symbol); return; } - + menu->app()->interface()->set_property( Node::path_to_uri(block->path().child(Raul::Symbol(port_symbol))), menu->app()->uris().ingen_value, diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index cd801a05..aa2b543c 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -153,7 +153,7 @@ NodeModule::show_human_names(bool b) label = name_property.ptr<char>(); } else { Glib::ustring hn = block()->plugin_model()->port_human_name( - port->model()->index()); + port->model()->index()); if (!hn.empty()) label = hn; } @@ -326,7 +326,7 @@ NodeModule::popup_gui() set_control_values(); _gui_window->signal_unmap().connect( - sigc::mem_fun(this, &NodeModule::on_gui_window_close)); + sigc::mem_fun(this, &NodeModule::on_gui_window_close)); _gui_window->present(); return true; diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index e38859ef..e163735e 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -25,9 +25,9 @@ namespace Raul { class Atom; } namespace Ingen { namespace Client { - class BlockModel; - class PluginUI; - class PortModel; +class BlockModel; +class PluginUI; +class PortModel; } } namespace Ingen { diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index f19913ac..8432e7b7 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -57,28 +57,28 @@ ObjectMenu::init(App& app, SPtr<const ObjectModel> object) _object = object; _polyphonic_menuitem->signal_toggled().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_polyphonic)); + sigc::mem_fun(this, &ObjectMenu::on_menu_polyphonic)); _polyphonic_menuitem->set_active(object->polyphonic()); _learn_menuitem->signal_activate().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_learn)); + sigc::mem_fun(this, &ObjectMenu::on_menu_learn)); _unlearn_menuitem->signal_activate().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_unlearn)); + sigc::mem_fun(this, &ObjectMenu::on_menu_unlearn)); _disconnect_menuitem->signal_activate().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_disconnect)); + sigc::mem_fun(this, &ObjectMenu::on_menu_disconnect)); - _rename_menuitem->signal_activate().connect(sigc::bind( - sigc::mem_fun(_app->window_factory(), &WindowFactory::present_rename), - object)); + _rename_menuitem->signal_activate().connect( + sigc::bind(sigc::mem_fun(_app->window_factory(), &WindowFactory::present_rename), + object)); _destroy_menuitem->signal_activate().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_destroy)); + sigc::mem_fun(this, &ObjectMenu::on_menu_destroy)); _properties_menuitem->signal_activate().connect( - sigc::mem_fun(this, &ObjectMenu::on_menu_properties)); + sigc::mem_fun(this, &ObjectMenu::on_menu_properties)); object->signal_property().connect(sigc::mem_fun(this, &ObjectMenu::property_changed)); @@ -140,4 +140,3 @@ ObjectMenu::on_menu_properties() } // namespace GUI } // namespace Ingen - diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp index 54624104..da75ef0b 100644 --- a/src/gui/PluginMenu.hpp +++ b/src/gui/PluginMenu.hpp @@ -35,7 +35,7 @@ namespace GUI { /** Type-hierarchical plugin menu. - + @ingroup GUI */ class PluginMenu : public Gtk::Menu diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 3357a553..31850120 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -73,8 +73,8 @@ Port::Port(App& app, const string& name, bool flip) : Ganv::Port(module, name, - flip ? (!pm->is_input()) : pm->is_input(), - app.style()->get_port_color(pm.get())) + flip ? (!pm->is_input()) : pm->is_input(), + app.style()->get_port_color(pm.get())) , _app(app) , _port_model(pm) , _entered(false) @@ -109,7 +109,7 @@ Port::Port(App& app, sigc::mem_fun(this, &Port::on_event)); set_is_controllable(pm->is_numeric() && pm->is_input()); - + update_metadata(); value_changed(pm->value()); } @@ -341,8 +341,8 @@ rgba_interpolate(uint32_t c1, uint32_t c2, float f) { return rgba_to_uint( mono_interpolate(RGBA_R(c1), RGBA_R(c2), f), - mono_interpolate(RGBA_G(c1), RGBA_G(c2), f), - mono_interpolate(RGBA_B(c1), RGBA_B(c2), f), + mono_interpolate(RGBA_G(c1), RGBA_G(c2), f), + mono_interpolate(RGBA_B(c1), RGBA_B(c2), f), mono_interpolate(RGBA_A(c1), RGBA_A(c2), f)); } diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 138ee397..d1d1a923 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -91,10 +91,10 @@ PortMenu::on_menu_disconnect() { if (_is_graph_port) { _app->interface()->disconnect_all( - _object->parent()->path(), _object->path()); + _object->parent()->path(), _object->path()); } else { _app->interface()->disconnect_all( - _object->parent()->path().parent(), _object->path()); + _object->parent()->path().parent(), _object->path()); } } @@ -165,4 +165,3 @@ PortMenu::on_menu_expose() } // namespace GUI } // namespace Ingen - diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 2db38c8e..f6524e77 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -211,9 +211,9 @@ PropertiesWindow::set_object(SPtr<const ObjectModel> model) _table->show_all(); _property_connection = model->signal_property().connect( - sigc::mem_fun(this, &PropertiesWindow::property_changed)); + sigc::mem_fun(this, &PropertiesWindow::property_changed)); _property_removed_connection = model->signal_property_removed().connect( - sigc::mem_fun(this, &PropertiesWindow::property_removed)); + sigc::mem_fun(this, &PropertiesWindow::property_removed)); } Gtk::Widget* @@ -226,9 +226,9 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Atom& value) widget->set_range(INT_MIN, INT_MAX); widget->set_increments(1, 10); widget->set_value(value.get<int32_t>()); - widget->signal_value_changed().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_value_changed().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } else if (value.type() == forge.Float) { Gtk::SpinButton* widget = manage(new Gtk::SpinButton(0.0, 4)); @@ -237,23 +237,23 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Atom& value) widget->set_range(-FLT_MAX, FLT_MAX); widget->set_value(value.get<float>()); widget->set_increments(0.1, 1.0); - widget->signal_value_changed().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_value_changed().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } else if (value.type() == forge.Bool) { Gtk::CheckButton* widget = manage(new Gtk::CheckButton()); widget->set_active(value.get<int32_t>()); - widget->signal_toggled().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_toggled().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } else if (value.type() == forge.URI) { Gtk::Entry* widget = manage(new Gtk::Entry()); widget->set_text(value.ptr<char>()); - widget->signal_changed().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_changed().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } else if (value.type() == forge.URID) { const char* val_uri = _app->world()->uri_map().unmap_uri(value.get<int32_t>()); @@ -261,16 +261,16 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Atom& value) if (val_uri) { widget->set_text(val_uri); } - widget->signal_changed().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_changed().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } else if (value.type() == forge.String) { Gtk::Entry* widget = manage(new Gtk::Entry()); widget->set_text(value.ptr<char>()); - widget->signal_changed().connect(sigc::bind( - sigc::mem_fun(this, &PropertiesWindow::value_edited), - uri)); + widget->signal_changed().connect( + sigc::bind(sigc::mem_fun(this, &PropertiesWindow::value_edited), + uri)); return widget; } diff --git a/src/gui/Style.hpp b/src/gui/Style.hpp index e871e3fa..13fa0546 100644 --- a/src/gui/Style.hpp +++ b/src/gui/Style.hpp @@ -56,4 +56,3 @@ private: } // namespace Ingen #endif // INGEN_GUI_STYLE_HPP - diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp index 295d3d16..c299eccc 100644 --- a/src/gui/SubgraphModule.cpp +++ b/src/gui/SubgraphModule.cpp @@ -52,8 +52,8 @@ SubgraphModule::on_double_click(GdkEventButton* event) SPtr<GraphModel> parent = dynamic_ptr_cast<GraphModel>(_graph->parent()); GraphWindow* const preferred = ( (parent && (event->state & GDK_SHIFT_MASK)) - ? NULL - : app().window_factory()->graph_window(parent) ); + ? NULL + : app().window_factory()->graph_window(parent) ); app().window_factory()->present_graph(_graph, preferred); return true; diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp index a439c324..7235d93a 100644 --- a/src/gui/SubgraphModule.hpp +++ b/src/gui/SubgraphModule.hpp @@ -23,9 +23,9 @@ #include "GraphPortModule.hpp" namespace Ingen { namespace Client { - class GraphModel; - class GraphWindow; - class PortModel; +class GraphModel; +class GraphWindow; +class PortModel; } } namespace Ingen { diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 5c33c1de..3dffa7f9 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -113,9 +113,10 @@ ThreadedLoader::save_graph(SPtr<const Client::GraphModel> model, { _mutex.lock(); - _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(this, &ThreadedLoader::save_graph_event), - model, filename))); + _events.push_back( + sigc::hide_return( + sigc::bind(sigc::mem_fun(this, &ThreadedLoader::save_graph_event), + model, filename))); _mutex.unlock(); _sem.post(); diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 7f4de063..68f6a3f1 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -54,10 +54,10 @@ public: ~ThreadedLoader(); void load_graph(bool merge, - const Glib::ustring& document_uri, + const Glib::ustring& document_uri, boost::optional<Raul::Path> engine_parent, - boost::optional<Raul::Symbol> engine_symbol, - boost::optional<Node::Properties> engine_data); + boost::optional<Raul::Symbol> engine_symbol, + boost::optional<Node::Properties> engine_data); void save_graph(SPtr<const Client::GraphModel> model, const std::string& filename); diff --git a/src/gui/Window.cpp b/src/gui/Window.cpp index 52df075e..2c4ee0e4 100644 --- a/src/gui/Window.cpp +++ b/src/gui/Window.cpp @@ -33,4 +33,3 @@ Window::key_press_handler(Gtk::Window* win, GdkEventKey* event) } // namespace GUI } // namespace Ingen - diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index f8738f40..66038776 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -162,8 +162,9 @@ WindowFactory::new_graph_window(SPtr<const GraphModel> graph, win->box()->set_graph(graph, view); _graph_windows[graph->path()] = win; - win->signal_delete_event().connect(sigc::bind<0>( - sigc::mem_fun(this, &WindowFactory::remove_graph_window), win)); + win->signal_delete_event().connect( + sigc::bind<0>(sigc::mem_fun(this, &WindowFactory::remove_graph_window), + win)); return win; } diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp index d8dc59ab..662d4682 100644 --- a/src/gui/ingen_gui.cpp +++ b/src/gui/ingen_gui.cpp @@ -43,4 +43,3 @@ ingen_module_load() } } // extern "C" - |