diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/App.cpp | 2 | ||||
| -rw-r--r-- | src/gui/GraphBox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/GraphCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/gui/LoadPluginWindow.cpp | 8 | ||||
| -rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 9 |
5 files changed, 14 insertions, 15 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index c5727617..76048edb 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -185,7 +185,7 @@ App::attach(const SPtr<ingen::Interface>& client) ColorContext::Color::CYAN); sig_client()->signal_message().connect( - sigc::mem_fun(*_dumper.get(), &StreamWriter::message)); + sigc::mem_fun(*_dumper, &StreamWriter::message)); } _graph_tree_window->init(*this, *_store); diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index 571bc61a..2f561959 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -304,11 +304,11 @@ GraphBox::set_graph(const SPtr<const GraphModel>& graph, // Add view to our alignment if (_view->get_parent()) { - _view->get_parent()->remove(*_view.get()); + _view->get_parent()->remove(*_view); } _alignment->remove(); - _alignment->add(*_view.get()); + _alignment->add(*_view); if (_breadcrumbs->get_parent()) { _breadcrumbs->get_parent()->remove(*_breadcrumbs); diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index 30c67326..688e034b 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -222,8 +222,8 @@ GraphCanvas::build_menus() } // Add known plugins to menu heirarchy - SPtr<const ClientStore::Plugins> plugins = _app.store()->plugins(); - for (const auto& p : *plugins.get()) { + auto plugins = _app.store()->plugins(); + for (const auto& p : *plugins) { add_plugin(p.second); } @@ -726,7 +726,7 @@ GraphCanvas::paste() _app.interface()->bundle_begin(); // Put each top level object in the clipboard store - ClashAvoider avoider(*_app.store().get()); + ClashAvoider avoider(*_app.store()); for (const auto& c : clipboard) { if (c.first.is_root() || c.first.parent() != Raul::Path("/")) { continue; diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 737db840..41702884 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -201,7 +201,7 @@ LoadPluginWindow::set_plugins(const SPtr<const ClientStore::Plugins>& plugins) _rows.clear(); _plugins_liststore->clear(); - for (const auto& p : *plugins.get()) { + for (const auto& p : *plugins) { add_plugin(p.second); } @@ -432,9 +432,9 @@ LoadPluginWindow::filter_changed() size_t num_visible = 0; const URIs& uris = _app->uris(); - for (const auto& p : *_app->store()->plugins().get()) { - const SPtr<PluginModel> plugin = p.second; - const Atom& name = plugin->get_property(uris.doap_name); + for (const auto& p : *_app->store()->plugins()) { + const auto plugin = p.second; + const Atom& name = plugin->get_property(uris.doap_name); switch (criteria) { case CriteriaColumns::Criteria::NAME: diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 72d3fc66..0bd3c5ec 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -155,11 +155,10 @@ instantiate(const LV2UI_Descriptor* descriptor, ui->app->set_is_plugin(true); ui->app->attach(ui->client); - ui->reader = SPtr<ingen::AtomReader>( - new ingen::AtomReader(ui->world->uri_map(), - ui->world->uris(), - ui->world->log(), - *ui->client.get())); + ui->reader = std::make_shared<ingen::AtomReader>(ui->world->uri_map(), + ui->world->uris(), + ui->world->log(), + *ui->client.get()); // Create empty root graph model ingen::Properties props; |