From 62f5c3124b991abe9b9423a4908ca076079d5327 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 2 Aug 2020 14:09:03 +0200 Subject: Use auto with pointer casts to remove redundancy --- src/gui/App.cpp | 2 +- src/gui/ConnectWindow.cpp | 4 ++-- src/gui/GraphBox.cpp | 4 ++-- src/gui/GraphCanvas.cpp | 6 +++--- src/gui/GraphTreeWindow.cpp | 2 +- src/gui/NodeModule.cpp | 2 +- src/gui/Port.cpp | 22 +++++++++++----------- src/gui/PortMenu.cpp | 22 +++++++++++----------- src/gui/SubgraphModule.cpp | 4 ++-- src/gui/ingen_gui_lv2.cpp | 6 +++--- 10 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/gui') diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 49e3bb67..4be4bbd5 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -218,7 +218,7 @@ App::request_plugins_if_necessary() SPtr App::sig_client() { - SPtr qi = std::dynamic_pointer_cast(_client); + auto qi = std::dynamic_pointer_cast(_client); if (qi) { return std::dynamic_pointer_cast(qi->sink()); } diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 2f13e522..16e88235 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -231,7 +231,7 @@ ConnectWindow::connect(bool existing) if (existing) { uri_str = world.interface()->uri(); _connect_stage = 1; - SPtr client = std::dynamic_pointer_cast( + auto client = std::dynamic_pointer_cast( world.interface()); if (client) { _app->attach(client->respondee()); @@ -528,7 +528,7 @@ ConnectWindow::gtk_callback() next_stage(); } else if (_connect_stage == 4) { if (!_app->store()->empty()) { - SPtr root = std::dynamic_pointer_cast( + auto root = std::dynamic_pointer_cast( _app->store()->object(Raul::Path("/"))); if (root) { set_connected_to(_app->interface()); diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index e245fb0a..56bb45d2 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -251,7 +251,7 @@ GraphBox::set_graph_from_path(const Raul::Path& path, assert(view->graph()->path() == path); _app->window_factory()->present_graph(view->graph(), _window, view); } else { - SPtr model = std::dynamic_pointer_cast( + auto model = std::dynamic_pointer_cast( _app->store()->object(path)); if (model) { _app->window_factory()->present_graph(model, _window); @@ -810,7 +810,7 @@ GraphBox::event_arrange() void GraphBox::event_parent_activated() { - SPtr parent = + auto parent = std::dynamic_pointer_cast(_graph->parent()); if (parent) { diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index f923e3bb..30c67326 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -237,7 +237,7 @@ GraphCanvas::build() // Create modules for blocks for (Store::const_iterator i = kids.first; i != kids.second; ++i) { - SPtr block = std::dynamic_pointer_cast(i->second); + auto block = std::dynamic_pointer_cast(i->second); if (block && block->parent() == _graph) { add_block(block); } @@ -325,8 +325,8 @@ GraphCanvas::remove_plugin(const URI& uri) void GraphCanvas::add_block(const SPtr& bm) { - SPtr pm = std::dynamic_pointer_cast(bm); - NodeModule* module = nullptr; + auto pm = std::dynamic_pointer_cast(bm); + NodeModule* module = nullptr; if (pm) { module = SubgraphModule::create(*this, pm, _human_names); } else { diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp index f4b1a0df..4242c69e 100644 --- a/src/gui/GraphTreeWindow.cpp +++ b/src/gui/GraphTreeWindow.cpp @@ -77,7 +77,7 @@ GraphTreeWindow::init(App& app, ClientStore& store) void GraphTreeWindow::new_object(const SPtr& object) { - SPtr graph = std::dynamic_pointer_cast(object); + auto graph = std::dynamic_pointer_cast(object); if (graph) { add_graph(graph); } diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index c5015a39..8e6dc0cf 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -138,7 +138,7 @@ NodeModule::create(GraphCanvas& canvas, SPtr block, bool human) { - SPtr graph = std::dynamic_pointer_cast(block); + auto graph = std::dynamic_pointer_cast(block); NodeModule* ret = (graph) ? new SubgraphModule(canvas, graph) diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 643cca5f..3da9cf46 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -125,8 +125,8 @@ Port::port_label(App& app, SPtr pm) if (name.type() == app.forge().String) { label = name.ptr(); } else { - const SPtr parent( - std::dynamic_pointer_cast(pm->parent())); + const auto parent = + std::dynamic_pointer_cast(pm->parent()); if (parent && parent->plugin_model()) { label = parent->plugin_model()->port_human_name(pm->index()); } @@ -151,7 +151,7 @@ Port::update_metadata() { SPtr pm = _port_model.lock(); if (pm && _app.can_control(pm.get()) && pm->is_numeric()) { - SPtr parent = std::dynamic_pointer_cast(pm->parent()); + auto parent = std::dynamic_pointer_cast(pm->parent()); if (parent) { float min = 0.0f; float max = 1.0f; @@ -231,8 +231,8 @@ Port::on_scale_point_activated(float f) Gtk::Menu* Port::build_enum_menu() { - SPtr block = std::dynamic_pointer_cast(model()->parent()); - Gtk::Menu* menu = Gtk::manage(new Gtk::Menu()); + auto block = std::dynamic_pointer_cast(model()->parent()); + Gtk::Menu* menu = Gtk::manage(new Gtk::Menu()); PluginModel::ScalePoints points = block->plugin_model()->port_scale_points( model()->index()); @@ -259,9 +259,9 @@ Port::on_uri_activated(const URI& uri) Gtk::Menu* Port::build_uri_menu() { - World& world = _app.world(); - SPtr block = std::dynamic_pointer_cast(model()->parent()); - Gtk::Menu* menu = Gtk::manage(new Gtk::Menu()); + World& world = _app.world(); + auto block = std::dynamic_pointer_cast(model()->parent()); + Gtk::Menu* menu = Gtk::manage(new Gtk::Menu()); // Get the port designation, which should be a rdf:Property const Atom& designation_atom = model()->get_property( @@ -374,8 +374,8 @@ Port::activity(const Atom& value) GraphBox* Port::get_graph_box() const { - SPtr graph = std::dynamic_pointer_cast(model()->parent()); - GraphBox* box = _app.window_factory()->graph_box(graph); + auto graph = std::dynamic_pointer_cast(model()->parent()); + GraphBox* box = _app.window_factory()->graph_box(graph); if (!box) { graph = std::dynamic_pointer_cast(model()->parent()->parent()); box = _app.window_factory()->graph_box(graph); @@ -515,7 +515,7 @@ Port::on_selected(gboolean b) if (b) { SPtr pm = _port_model.lock(); if (pm) { - SPtr block = + auto block = std::dynamic_pointer_cast(pm->parent()); GraphWindow* win = _app.window_factory()->parent_graph_window(block); diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index fc25e1c1..fb706c9b 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -108,9 +108,9 @@ PortMenu::on_menu_disconnect() void PortMenu::on_menu_set_min() { - const URIs& uris = _app->uris(); - SPtr model = std::dynamic_pointer_cast(_object); - const Atom& value = model->get_property(uris.ingen_value); + const URIs& uris = _app->uris(); + auto model = std::dynamic_pointer_cast(_object); + const Atom& value = model->get_property(uris.ingen_value); if (value.is_valid()) { _app->set_property(_object->uri(), uris.lv2_minimum, value); } @@ -119,9 +119,9 @@ PortMenu::on_menu_set_min() void PortMenu::on_menu_set_max() { - const URIs& uris = _app->uris(); - SPtr model = std::dynamic_pointer_cast(_object); - const Atom& value = model->get_property(uris.ingen_value); + const URIs& uris = _app->uris(); + auto model = std::dynamic_pointer_cast(_object); + const Atom& value = model->get_property(uris.ingen_value); if (value.is_valid()) { _app->set_property(_object->uri(), uris.lv2_maximum, value); } @@ -130,8 +130,8 @@ PortMenu::on_menu_set_max() void PortMenu::on_menu_reset_range() { - const URIs& uris = _app->uris(); - SPtr model = std::dynamic_pointer_cast(_object); + const URIs& uris = _app->uris(); + auto model = std::dynamic_pointer_cast(_object); // Remove lv2:minimum and lv2:maximum properties Properties remove; @@ -143,9 +143,9 @@ PortMenu::on_menu_reset_range() void PortMenu::on_menu_expose() { - const URIs& uris = _app->uris(); - SPtr port = std::dynamic_pointer_cast(_object); - SPtr block = std::dynamic_pointer_cast(port->parent()); + const URIs& uris = _app->uris(); + auto port = std::dynamic_pointer_cast(_object); + auto block = std::dynamic_pointer_cast(port->parent()); const std::string label = block->label() + " " + block->port_label(port); const Raul::Path path = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol())); diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp index 999e06a2..1c89d564 100644 --- a/src/gui/SubgraphModule.cpp +++ b/src/gui/SubgraphModule.cpp @@ -49,7 +49,7 @@ SubgraphModule::on_double_click(GdkEventButton* event) { assert(_graph); - SPtr parent = std::dynamic_pointer_cast(_graph->parent()); + auto parent = std::dynamic_pointer_cast(_graph->parent()); GraphWindow* const preferred = ( (parent && (event->state & GDK_SHIFT_MASK)) ? nullptr @@ -85,7 +85,7 @@ SubgraphModule::browse_to_graph() { assert(_graph->parent()); - SPtr parent = std::dynamic_pointer_cast(_graph->parent()); + auto parent = std::dynamic_pointer_cast(_graph->parent()); GraphWindow* const preferred = (parent) ? app().window_factory()->graph_window(parent) diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index c90efa4b..72d3fc66 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -168,9 +168,9 @@ instantiate(const LV2UI_Descriptor* descriptor, ui->app->store()->put(ingen::main_uri(), props); // Create a GraphBox for the root and set as the UI widget - SPtr root = - std::dynamic_pointer_cast( - ui->app->store()->object(Raul::Path("/"))); + auto root = std::dynamic_pointer_cast( + ui->app->store()->object(Raul::Path("/"))); + ui->view = ingen::gui::GraphBox::create(*ui->app, root); ui->view->unparent(); *widget = ui->view->gobj(); -- cgit v1.2.1