Clean up and better document World interface.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4344 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 12 insertions, 13 deletions

diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 64eed0ff..3b9b530c 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -24,13 +24,13 @@
 
 #include <gtkmm.h>
 
+#include "ingen/Status.hpp"
+#include "ingen/shared/World.hpp"
+#include "raul/Atom.hpp"
 #include "raul/Deletable.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
 
-#include "ingen/Status.hpp"
-#include "ingen/shared/World.hpp"
-
 namespace Ingen {
 	class Interface;
 	class Port;
@@ -117,7 +117,7 @@ public:
 	void run();
 
 	inline Ingen::Shared::World* world() const { return _world; }
-	inline Ingen::Shared::URIs&  uris()  const { return *_world->uris(); }
+	inline Ingen::Shared::URIs&  uris()  const { return _world->uris(); }
 
 protected:
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index fb32a9ac..cbb98268 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -144,7 +144,7 @@ Port::on_value_changed(GVariant* value)
 	if (atom != model()->value()) {
 		Ingen::Shared::World* const world = _app.world();
 		_app.interface()->set_property(model()->path(),
-		                               world->uris()->ingen_value,
+		                               world->uris().ingen_value,
 		                               atom);
 	}
 
@@ -166,7 +166,7 @@ void
 Port::on_scale_point_activated(float f)
 {
 	_app.interface()->set_property(model()->path(),
-	                               _app.world()->uris()->ingen_value,
+	                               _app.world()->uris().ingen_value,
 	                               _app.world()->forge().make(f));
 }
 
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 6afe7f68..c785d857 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -96,7 +96,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	ui->world = new Ingen::Shared::World(
 		ui->argc, ui->argv, map, unmap);
 
-	ui->forge = new Ingen::Forge(*ui->world->uri_map().get());
+	ui->forge = new Ingen::Forge(ui->world->uri_map());
 
 	if (!ui->world->load_module("client")) {
 		delete ui;
@@ -104,13 +104,12 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	}
 
 	ui->sink = new IngenLV2AtomSink(
-		*ui->world->uris().get(), write_function, controller);
+		ui->world->uris(), write_function, controller);
 
 	// Set up an engine interface that writes LV2 atoms
 	ui->engine = SharedPtr<Ingen::Interface>(
-		new Ingen::Shared::AtomWriter(*ui->world->uri_map().get(),
-		                              *ui->world->uris().get(),
-		                              *ui->sink));
+		new Ingen::Shared::AtomWriter(
+			ui->world->uri_map(), ui->world->uris(), *ui->sink));
 
 	ui->world->set_interface(ui->engine);
 
@@ -121,8 +120,8 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	ui->app->attach(ui->client);
 
 	ui->reader = SharedPtr<Ingen::Shared::AtomReader>(
-		new Ingen::Shared::AtomReader(*ui->world->uri_map().get(),
-		                              *ui->world->uris().get(),
+		new Ingen::Shared::AtomReader(ui->world->uri_map(),
+		                              ui->world->uris(),
 		                              ui->world->forge(),
 		                              *ui->client.get()));