From 483ecd16de6801aed536eca64ed51a6a4c669e39 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 1 Aug 2020 15:48:53 +0200
Subject: Don't access static methods through instances

---
 src/Parser.cpp            | 2 +-
 src/client/PluginUI.cpp   | 6 +++---
 src/gui/App.cpp           | 4 ++--
 src/server/RunContext.cpp | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Parser.cpp b/src/Parser.cpp
index e7bd0163..55ab4695 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -121,7 +121,7 @@ get_properties(ingen::World&                      world,
 				*world.rdf_world(), model.c_obj(), i.get_object().c_obj());
 			const LV2_Atom* atom = forge.atom();
 			Atom            atomm;
-			atomm = world.forge().alloc(
+			atomm = Forge::alloc(
 				atom->size, atom->type, LV2_ATOM_BODY_CONST(atom));
 			props.emplace(i.get_predicate(), Property(atomm, ctx));
 		}
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 9c759696..1074be3e 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -81,9 +81,9 @@ lv2_ui_write(SuilController controller,
 
 	} else if (format == uris.atom_eventTransfer.urid()) {
 		const auto* atom = static_cast<const LV2_Atom*>(buffer);
-		Atom        val  = ui->world().forge().alloc(atom->size,
-		                                             atom->type,
-		                                             LV2_ATOM_BODY_CONST(atom));
+		Atom        val  = Forge::alloc(atom->size,
+		                                atom->type,
+		                                LV2_ATOM_BODY_CONST(atom));
 		ui->signal_property_changed()(port->uri(),
 		                              uris.ingen_activity,
 		                              val,
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index fa48cb18..dc8f605a 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -151,12 +151,12 @@ App::run()
 	// with 'ingen -egl' we'd get a bunch of notifications about load
 	// immediately before even knowing about the root graph or plugins)
 	while (!_connect_window->attached()) {
-		if (_main->iteration()) {
+		if (Gtk::Main::iteration()) {
 			break;
 		}
 	}
 
-	_main->run();
+	Gtk::Main::run();
 }
 
 void
diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp
index 57aaa299..b4b8156e 100644
--- a/src/server/RunContext.cpp
+++ b/src/server/RunContext.cpp
@@ -124,8 +124,7 @@ RunContext::emit_notifications(FrameTime end)
 			return;
 		}
 		if (_event_sink->read(sizeof(note), &note) == sizeof(note)) {
-			Atom value = _engine.world().forge().alloc(
-				note.size, note.type, nullptr);
+			Atom value = Forge::alloc(note.size, note.type, nullptr);
 			if (_event_sink->read(note.size, value.get_body()) == note.size) {
 				i += note.size;
 				const char* key = _engine.world().uri_map().unmap_uri(note.key);
-- 
cgit v1.2.1