From ec0b87a18623c17c16f6a648fcf277abe14142b7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 2 Aug 2020 15:09:52 +0200 Subject: Remove redundant pointer get() calls --- src/gui/App.cpp | 2 +- src/gui/GraphBox.cpp | 4 ++-- src/gui/GraphCanvas.cpp | 6 +++--- src/gui/LoadPluginWindow.cpp | 8 ++++---- src/gui/ingen_gui_lv2.cpp | 9 ++++----- src/server/Engine.cpp | 2 +- src/server/SocketServer.hpp | 2 +- src/server/events/Connect.cpp | 2 +- src/server/events/Disconnect.cpp | 2 +- src/server/ingen_lv2.cpp | 4 ++-- 10 files changed, 20 insertions(+), 21 deletions(-) (limited to 'src') 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& 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& 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 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& 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 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( - new ingen::AtomReader(ui->world->uri_map(), - ui->world->uris(), - ui->world->log(), - *ui->client.get())); + ui->reader = std::make_shared(ui->world->uri_map(), + ui->world->uris(), + ui->world->log(), + *ui->client.get()); // Create empty root graph model ingen::Properties props; diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index efc152d5..0d5a57bb 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -161,7 +161,7 @@ Engine::~Engine() const SPtr store = this->store(); if (store) { - for (auto& s : *store.get()) { + for (auto& s : *store) { if (!std::dynamic_pointer_cast(s.second)->parent()) { s.second.reset(); } diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp index 26e1456b..9f762ddf 100644 --- a/src/server/SocketServer.hpp +++ b/src/server/SocketServer.hpp @@ -49,7 +49,7 @@ public: stderr, ColorContext::Color::CYAN))})) : SPtr(new EventWriter(engine))) - , _reader(new SocketReader(world, *_sink.get(), sock)) + , _reader(new SocketReader(world, *_sink, sock)) , _writer(new SocketWriter(world.uri_map(), world.uris(), URI(sock->uri()), diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index eabcad73..b269ca45 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -154,7 +154,7 @@ void Connect::execute(RunContext& ctx) { if (_status == Status::SUCCESS) { - _head->add_arc(ctx, *_arc.get()); + _head->add_arc(ctx, *_arc); if (!_head->is_driver_port()) { _head->set_voices(ctx, std::move(_voices)); } diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 2c689a6a..3df5fd64 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -171,7 +171,7 @@ Disconnect::Impl::execute(RunContext& ctx, bool set_head_buffers) return false; } - _head->remove_arc(*_arc.get()); + _head->remove_arc(*_arc); if (_head->is_driver_port()) { return true; } diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index e5abcc92..ed86ee03 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -119,7 +119,7 @@ public: , _reader(engine.world().uri_map(), engine.world().uris(), engine.world().log(), - *engine.world().interface().get()) + *engine.world().interface()) , _writer(engine.world().uri_map(), engine.world().uris(), *this) @@ -583,7 +583,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, server::ThreadManager::set_flag(server::THREAD_PRE_PROCESS); server::ThreadManager::single_threaded = true; - auto* driver = new LV2Driver(*engine.get(), block_length, seq_size, rate); + auto* driver = new LV2Driver(*engine, block_length, seq_size, rate); engine->set_driver(SPtr(driver)); engine->activate(); -- cgit v1.2.1