From acb958e95d0e8ca1b0dd912fe8bbf2e14e5f74e9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Mar 2019 09:06:55 +0100 Subject: Pass World everywhere by reference --- src/gui/ingen_gui.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/gui/ingen_gui.cpp') diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp index 441993f7..4504d3fe 100644 --- a/src/gui/ingen_gui.cpp +++ b/src/gui/ingen_gui.cpp @@ -27,26 +27,26 @@ namespace gui { struct GUIModule : public Module { using SigClientInterface = client::SigClientInterface; - void load(World* world) override { - URI uri(world->conf().option("connect").ptr()); - if (!world->interface()) { - world->set_interface( - world->new_interface(URI(uri), make_client(world))); + void load(World& world) override { + URI uri(world.conf().option("connect").ptr()); + if (!world.interface()) { + world.set_interface( + world.new_interface(URI(uri), make_client(world))); } else if (!dynamic_ptr_cast( - world->interface()->respondee())) { - world->interface()->set_respondee(make_client(world)); + world.interface()->respondee())) { + world.interface()->set_respondee(make_client(world)); } app = gui::App::create(world); } - void run(World* world) override { + void run(World& world) override { app->run(); } - SPtr make_client(World* const world) { + SPtr make_client(World& world) { SPtr sci(new SigClientInterface()); - return world->engine() ? sci : SPtr(new QueuedInterface(sci)); + return world.engine() ? sci : SPtr(new QueuedInterface(sci)); } SPtr app; -- cgit v1.2.1