Move Atom implementation out of Raul so it can depend on LV2.

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

28 files changed, 85 insertions, 85 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 1fb40495..e64465ea 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -235,9 +235,9 @@ App::error_message(const string& str)
 }
 
 void
-App::property_change(const Raul::URI&  subject,
-                     const Raul::URI&  key,
-                     const Raul::Atom& value)
+App::property_change(const Raul::URI& subject,
+                     const Raul::URI& key,
+                     const Atom&      value)
 {
 	if (subject == uris().ingen_engine && key == uris().ingen_sampleRate) {
 		if (value.type() == forge().Int) {
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index e435c4a5..1fca42ea 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -26,10 +26,10 @@
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
+#include "ingen/Atom.hpp"
 #include "ingen/Status.hpp"
 #include "ingen/World.hpp"
 #include "ingen/types.hpp"
-#include "raul/Atom.hpp"
 #include "raul/Deletable.hpp"
 #include "raul/URI.hpp"
 
@@ -144,9 +144,9 @@ protected:
 	bool animate();
 	void response(int32_t id, Ingen::Status status, const std::string& subject);
 
-	void property_change(const Raul::URI&  subject,
-	                     const Raul::URI&  key,
-	                     const Raul::Atom& value);
+	void property_change(const Raul::URI& subject,
+	                     const Raul::URI& key,
+	                     const Atom&      value);
 
 	static void* icon_destroyed(void* data);
 
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 53dd085f..d1f76ea4 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -353,7 +353,7 @@ GraphBox::show_status(const ObjectModel* model)
 }
 
 void
-GraphBox::show_port_status(const PortModel* port, const Raul::Atom& value)
+GraphBox::show_port_status(const PortModel* port, const Atom& value)
 {
 	std::stringstream msg;
 	msg << port->path();
@@ -418,7 +418,7 @@ GraphBox::event_import()
 void
 GraphBox::event_save()
 {
-	const Raul::Atom& document = _graph->get_property(_app->uris().ingen_document);
+	const Atom& document = _graph->get_property(_app->uris().ingen_document);
 	if (!document.is_valid() || document.type() != _app->uris().forge.URI) {
 		event_save_as();
 	} else {
@@ -464,8 +464,8 @@ GraphBox::event_save_as()
 		dialog.set_filter(filt);
 
 		// Set current folder to most sensible default
-		const Raul::Atom& document = _graph->get_property(uris.ingen_document);
-		const Raul::Atom& dir      = _app->world()->conf().option("graph-directory");
+		const Atom& document = _graph->get_property(uris.ingen_document);
+		const Atom& dir      = _app->world()->conf().option("graph-directory");
 		if (document.type() == uris.forge.URI)
 			dialog.set_uri(document.ptr<char>());
 		else if (dir.is_valid())
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index 0b44ba99..530e03ff 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -84,7 +84,7 @@ public:
 	SPtr<GraphView>                view()  const { return _view; }
 
 	void show_port_status(const Client::PortModel* model,
-	                      const Raul::Atom&        value);
+	                      const Atom&        value);
 
 	void set_graph_from_path(const Raul::Path& path, SPtr<GraphView> view);
 
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index bdd4abd8..77d8a6fe 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -98,8 +98,8 @@ GraphPortModule::store_location(double ax, double ay)
 {
 	const URIs& uris = app().uris();
 
-	const Raul::Atom x(app().forge().make(static_cast<float>(ax)));
-	const Raul::Atom y(app().forge().make(static_cast<float>(ay)));
+	const Atom x(app().forge().make(static_cast<float>(ax)));
+	const Atom y(app().forge().make(static_cast<float>(ay)));
 
 	if (x != _model->get_property(uris.ingen_canvasX) ||
 	    y != _model->get_property(uris.ingen_canvasY))
@@ -121,8 +121,8 @@ GraphPortModule::store_location(double ax, double ay)
 void
 GraphPortModule::show_human_names(bool b)
 {
-	const URIs&       uris = app().uris();
-	const Raul::Atom& name = _model->get_property(uris.lv2_name);
+	const URIs& uris = app().uris();
+	const Atom& name = _model->get_property(uris.lv2_name);
 	if (b && name.type() == uris.forge.String) {
 		set_name(name.ptr<char>());
 	} else {
@@ -137,7 +137,7 @@ GraphPortModule::set_name(const std::string& n)
 }
 
 void
-GraphPortModule::property_changed(const Raul::URI& key, const Raul::Atom& value)
+GraphPortModule::property_changed(const Raul::URI& key, const Atom& value)
 {
 	const URIs& uris = app().uris();
 	if (value.type() == uris.forge.Float) {
diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp
index 0bf0d68c..f9292363 100644
--- a/src/gui/GraphPortModule.hpp
+++ b/src/gui/GraphPortModule.hpp
@@ -69,7 +69,7 @@ protected:
 
 	void set_port(Port* port) { _port = port; }
 
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
+	void property_changed(const Raul::URI& predicate, const Atom& value);
 
 	SPtr<const Client::PortModel> _model;
 	Port*                         _port;
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index 9b9cf71c..249e3e73 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -192,9 +192,9 @@ GraphTreeWindow::event_graph_enabled_toggled(const Glib::ustring& path_str)
 }
 
 void
-GraphTreeWindow::graph_property_changed(const Raul::URI&  key,
-                                        const Raul::Atom& value,
-                                        SPtr<GraphModel>  graph)
+GraphTreeWindow::graph_property_changed(const Raul::URI& key,
+                                        const Atom&      value,
+                                        SPtr<GraphModel> graph)
 {
 	const URIs& uris = _app->uris();
 	_enable_signal = false;
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index eec8b0d8..3a4f465d 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -50,7 +50,7 @@ public:
 	void new_object(SPtr<Client::ObjectModel> object);
 
 	void graph_property_changed(const Raul::URI&         key,
-	                            const Raul::Atom&        value,
+	                            const Atom&              value,
 	                            SPtr<Client::GraphModel> gm);
 
 	void graph_moved(SPtr<Client::GraphModel> graph);
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index a74a11bf..737b0a3a 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -150,7 +150,7 @@ GraphView::refresh_clicked()
 }
 
 void
-GraphView::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
+GraphView::property_changed(const Raul::URI& predicate, const Atom& value)
 {
 	_enable_signal = false;
 	if (predicate == _app->uris().ingen_enabled) {
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index d571b3b3..dbf81eed 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -76,7 +76,7 @@ private:
 	void clear_clicked();
 	void refresh_clicked();
 
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
+	void property_changed(const Raul::URI& predicate, const Atom& value);
 
 	void zoom_full();
 
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index bbb25a27..46126589 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -58,7 +58,7 @@ public:
 	}
 
 	void show_port_status(const Client::PortModel* model,
-	                      const Raul::Atom&        value) {
+	                      const Atom&              value) {
 		_box->show_port_status(model, value);
 	}
 
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index 40b04aa0..babfb632 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -126,7 +126,7 @@ LoadGraphWindow::set_graph(SPtr<const GraphModel> graph)
 void
 LoadGraphWindow::on_show()
 {
-	const Raul::Atom& dir = _app->world()->conf().option("graph-directory");
+	const Atom& dir = _app->world()->conf().option("graph-directory");
 	if (dir.is_valid()) {
 		set_current_folder(dir.ptr<char>());
 	}
@@ -179,9 +179,9 @@ LoadGraphWindow::ok_clicked()
 		std::list<Glib::ustring> uri_list = get_filenames();
 		for (auto u : uri_list) {
 			// Cascade
-			Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
+			Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
 			x = _app->forge().make(x.get<float>() + 20.0f);
-			Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
+			Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
 			y = _app->forge().make(y.get<float>() + 20.0f);
 
 			Raul::Symbol symbol(symbol_from_filename(u));
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index c13b1882..018856fe 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -268,11 +268,11 @@ get_author_name(SPtr<const PluginModel> plugin)
 }
 
 void
-LoadPluginWindow::set_row(Gtk::TreeModel::Row&         row,
+LoadPluginWindow::set_row(Gtk::TreeModel::Row&    row,
                           SPtr<const PluginModel> plugin)
 {
 	const URIs&       uris = _app->uris();
-	const Raul::Atom& name = plugin->get_property(uris.doap_name);
+	const Atom& name = plugin->get_property(uris.doap_name);
 	if (name.is_valid() && name.type() == uris.forge.String)
 		row[_plugins_columns._col_name] = name.ptr<char>();
 
@@ -412,9 +412,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 		}
 
 		// Cascade next block
-		Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
+		Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
 		x = _app->forge().make(x.get<float>() + 20.0f);
-		Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
+		Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
 		y = _app->forge().make(y.get<float>() + 20.0f);
 	}
 }
@@ -447,7 +447,7 @@ LoadPluginWindow::filter_changed()
 
 	for (const auto& p : *_app->store()->plugins().get()) {
 		const SPtr<PluginModel> plugin = p.second;
-		const Raul::Atom& name = plugin->get_property(uris.doap_name);
+		const Atom& name = plugin->get_property(uris.doap_name);
 
 		switch (criteria) {
 		case CriteriaColumns::Criteria::NAME:
@@ -496,9 +496,9 @@ LoadPluginWindow::on_key_press_event(GdkEventKey* event)
 }
 
 void
-LoadPluginWindow::plugin_property_changed(const Raul::URI&  plugin,
-                                          const Raul::URI&  predicate,
-                                          const Raul::Atom& value)
+LoadPluginWindow::plugin_property_changed(const Raul::URI& plugin,
+                                          const Raul::URI& predicate,
+                                          const Atom&      value)
 {
 	const URIs& uris = _app->uris();
 	if (predicate == uris.doap_name) {
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 5c8fad19..fff10be1 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -116,9 +116,9 @@ private:
 
 	void new_plugin(SPtr<const Client::PluginModel> plugin);
 
-	void plugin_property_changed(const Raul::URI&  plugin,
-	                             const Raul::URI&  predicate,
-	                             const Raul::Atom& value);
+	void plugin_property_changed(const Raul::URI& plugin,
+	                             const Raul::URI& predicate,
+	                             const Atom&      value);
 
 	void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col);
 	void plugin_selection_changed();
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index e55cf131..43cf266f 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -66,7 +66,7 @@ NodeMenu::init(App& app, SPtr<const Client::BlockModel> block)
 	if (plugin && plugin->type() == PluginModel::LV2 && plugin->has_ui()) {
 		_popup_gui_menuitem->show();
 		_embed_gui_menuitem->show();
-		const Raul::Atom& ui_embedded = block->get_property(
+		const Atom& ui_embedded = block->get_property(
 			_app->uris().ingen_uiEmbedded);
 		_embed_gui_menuitem->set_active(
 			ui_embedded.is_valid() && ui_embedded.get<int32_t>());
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 068642b1..54b30227 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -21,6 +21,7 @@
 
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Configuration.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Log.hpp"
@@ -28,7 +29,6 @@
 #include "ingen/client/GraphModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PluginUI.hpp"
-#include "raul/Atom.hpp"
 
 #include "App.hpp"
 #include "GraphCanvas.hpp"
@@ -148,7 +148,7 @@ NodeModule::show_human_names(bool b)
 		Ingen::GUI::Port* const port = dynamic_cast<Ingen::GUI::Port*>(*i);
 		Glib::ustring label(port->model()->symbol().c_str());
 		if (b) {
-			const Raul::Atom& name_property = port->model()->get_property(uris.lv2_name);
+			const Atom& name_property = port->model()->get_property(uris.lv2_name);
 			if (name_property.type() == uris.forge.String) {
 				label = name_property.ptr<char>();
 			} else {
@@ -163,7 +163,7 @@ NodeModule::show_human_names(bool b)
 }
 
 void
-NodeModule::port_activity(uint32_t index, const Raul::Atom& value)
+NodeModule::port_activity(uint32_t index, const Atom& value)
 {
 	const URIs& uris = app().uris();
 	if (!_plugin_ui) {
@@ -383,8 +383,8 @@ NodeModule::store_location(double ax, double ay)
 {
 	const URIs& uris = app().uris();
 
-	const Raul::Atom x(app().forge().make(static_cast<float>(ax)));
-	const Raul::Atom y(app().forge().make(static_cast<float>(ay)));
+	const Atom x(app().forge().make(static_cast<float>(ax)));
+	const Atom y(app().forge().make(static_cast<float>(ay)));
 
 	if (x != _block->get_property(uris.ingen_canvasX) ||
 	    y != _block->get_property(uris.ingen_canvasY))
@@ -402,7 +402,7 @@ NodeModule::store_location(double ax, double ay)
 }
 
 void
-NodeModule::property_changed(const Raul::URI& key, const Raul::Atom& value)
+NodeModule::property_changed(const Raul::URI& key, const Atom& value)
 {
 	const URIs& uris = app().uris();
 	if (value.type() == uris.forge.Float) {
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 6edad27b..1092cdf3 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -78,11 +78,11 @@ protected:
 	bool on_selected(gboolean selected);
 
 	void rename();
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
+	void property_changed(const Raul::URI& predicate, const Atom& value);
 
 	void new_port_view(SPtr<const Client::PortModel> port);
 
-	void port_activity(uint32_t index, const Raul::Atom& value);
+	void port_activity(uint32_t index, const Atom& value);
 	void plugin_changed();
 	void set_control_values();
 
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 7ff25b2d..3bd0be38 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -117,7 +117,7 @@ ObjectMenu::on_menu_polyphonic()
 }
 
 void
-ObjectMenu::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
+ObjectMenu::property_changed(const Raul::URI& predicate, const Atom& value)
 {
 	const URIs& uris = _app->uris();
 	_enable_signal = false;
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index 63ca666d..fc63c7a8 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -52,7 +52,7 @@ protected:
 	void         on_menu_destroy();
 	void         on_menu_properties();
 
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
+	void property_changed(const Raul::URI& predicate, const Atom& value);
 
 	App*                            _app;
 	SPtr<const Client::ObjectModel> _object;
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 0ab079c5..253a395b 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -49,7 +49,7 @@ Port::create(App&                  app,
 	Glib::ustring label;
 	if (app.world()->conf().option("port-labels").get<int32_t>()) {
 		if (human_name) {
-			const Raul::Atom& name = pm->get_property(app.uris().lv2_name);
+			const Atom& name = pm->get_property(app.uris().lv2_name);
 			if (name.type() == app.forge().String) {
 				label = name.ptr<char>();
 			} else {
@@ -154,7 +154,7 @@ Port::moved()
 void
 Port::on_value_changed(double value)
 {
-	const Raul::Atom atom = _app.forge().make(float(value));
+	const Atom atom = _app.forge().make(float(value));
 	if (atom != model()->value()) {
 		Ingen::World* const world = _app.world();
 		_app.interface()->set_property(model()->uri(),
@@ -171,7 +171,7 @@ Port::on_value_changed(double value)
 }
 
 void
-Port::value_changed(const Raul::Atom& value)
+Port::value_changed(const Atom& value)
 {
 	if (!_pressed && value.type() == _app.forge().Float) {
 		Ganv::Port::set_control_value(value.get<float>());
@@ -224,7 +224,7 @@ Port::build_uri_menu()
 	Gtk::Menu*             menu  = Gtk::manage(new Gtk::Menu());
 
 	// Get the port designation, which should be a rdf:Property
-	const Raul::Atom& designation_atom = model()->get_property(
+	const Atom& designation_atom = model()->get_property(
 		_app.uris().lv2_designation);
 	if (!designation_atom.is_valid()) {
 		return NULL;
@@ -359,7 +359,7 @@ peak_color(float peak)
 /* End peak colour stuff */
 
 void
-Port::activity(const Raul::Atom& value)
+Port::activity(const Atom& value)
 {
 	if (model()->is_a(_app.uris().lv2_AudioPort)) {
 		set_fill_color(peak_color(value.get<float>()));
@@ -403,7 +403,7 @@ Port::port_properties_changed()
 }
 
 void
-Port::property_changed(const Raul::URI& key, const Raul::Atom& value)
+Port::property_changed(const Raul::URI& key, const Atom& value)
 {
 	const URIs& uris = _app.uris();
 	if (value.type() == uris.forge.Float) {
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index 7d95009a..16fc5cde 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -60,8 +60,8 @@ public:
 	bool show_menu(GdkEventButton* ev);
 	void update_metadata();
 
-	void value_changed(const Raul::Atom& value);
-	void activity(const Raul::Atom& value);
+	void value_changed(const Atom& value);
+	void activity(const Atom& value);
 	void disconnected_from(SPtr<Client::PortModel> port);
 
 	void set_selected(gboolean b);
@@ -77,7 +77,7 @@ private:
 	Gtk::Menu* build_uri_menu();
 	GraphBox* get_graph_box() const;
 
-	void property_changed(const Raul::URI& key, const Raul::Atom& value);
+	void property_changed(const Raul::URI& key, const Atom& value);
 	void moved();
 
 	void on_value_changed(double value);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 204ffcbc..babc37a1 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -103,7 +103,7 @@ PortMenu::on_menu_set_min()
 {
 	const URIs&           uris  = _app->uris();
 	SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
-	const Raul::Atom&     value = model->get_property(uris.ingen_value);
+	const Atom&     value = model->get_property(uris.ingen_value);
 	if (value.is_valid())
 		_app->interface()->set_property(_object->uri(), uris.lv2_minimum, value);
 }
@@ -113,7 +113,7 @@ PortMenu::on_menu_set_max()
 {
 	const URIs&           uris  = _app->uris();
 	SPtr<const PortModel> model = dynamic_ptr_cast<const PortModel>(_object);
-	const Raul::Atom&     value = model->get_property(uris.ingen_value);
+	const Atom&     value = model->get_property(uris.ingen_value);
 	if (value.is_valid())
 		_app->interface()->set_property(_object->uri(), uris.lv2_maximum, value);
 }
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 10400a00..e4aec41d 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -92,8 +92,8 @@ PortPropertiesWindow::present(SPtr<const PortModel> pm)
 }
 
 void
-PortPropertiesWindow::property_changed(const Raul::URI&  key,
-                                       const Raul::Atom& value)
+PortPropertiesWindow::property_changed(const Raul::URI& key,
+                                       const Atom&      value)
 {
 	const URIs& uris = _app->uris();
 	if (value.type() == uris.forge.Float) {
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index 1cf86aa8..684a2dfb 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -45,7 +45,7 @@ public:
 	void present(SPtr<const Client::PortModel> port_model);
 
 private:
-	void property_changed(const Raul::URI& key, const Raul::Atom& value);
+	void property_changed(const Raul::URI& key, const Atom& value);
 	void min_changed();
 	void max_changed();
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 30e9649f..2e3ef35d 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -104,7 +104,7 @@ PropertiesWindow::present(SPtr<const ObjectModel> model)
 }
 
 void
-PropertiesWindow::add_property(const Raul::URI& uri, const Raul::Atom& value)
+PropertiesWindow::add_property(const Raul::URI& uri, const Atom& value)
 {
 	World* world = _app->world();
 
@@ -211,7 +211,7 @@ PropertiesWindow::set_object(SPtr<const ObjectModel> model)
 }
 
 Gtk::Widget*
-PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& value)
+PropertiesWindow::create_value_widget(const Raul::URI& uri, const Atom& value)
 {
 	Ingen::Forge& forge = _app->forge();
 	if (value.type() == forge.Int) {
@@ -301,8 +301,8 @@ PropertiesWindow::on_show()
 }
 
 void
-PropertiesWindow::property_changed(const Raul::URI&  predicate,
-                                   const Raul::Atom& value)
+PropertiesWindow::property_changed(const Raul::URI& predicate,
+                                   const Atom&      value)
 {
 	Records::iterator r = _records.find(predicate);
 	if (r == _records.end()) {
@@ -332,9 +332,9 @@ PropertiesWindow::value_edited(const Raul::URI& predicate)
 		return;
 	}
 
-	Forge&             forge  = _app->forge();
-	Record&            record = r->second;
-	Raul::Atom::TypeID type   = record.value.type();
+	Forge&   forge  = _app->forge();
+	Record&  record = r->second;
+	LV2_URID type   = record.value.type();
 	if (type == forge.Int) {
 		Gtk::SpinButton* widget = dynamic_cast<Gtk::SpinButton*>(record.value_widget->get_child());
 		if (!widget) goto bad_type;
@@ -428,7 +428,7 @@ PropertiesWindow::add_clicked()
 	Glib::ustring             key_uri   = krow[_combo_columns.uri_col];
 	Glib::ustring             value_uri = vrow[_combo_columns.uri_col];
 
-	Raul::Atom value = _app->forge().alloc_uri(value_uri);
+	Atom value = _app->forge().alloc_uri(value_uri);
 
 	Resource::Properties properties;
 	properties.insert(make_pair(Raul::URI(key_uri.c_str()),
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index ad4d3d90..7725706b 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -57,10 +57,10 @@ public:
 private:
 	/** Record of a property (row in the table) */
 	struct Record {
-		Record(const Raul::Atom& v, Gtk::Alignment* vw, int r)
+		Record(const Atom& v, Gtk::Alignment* vw, int r)
 			: value(v), value_widget(vw), row(r)
 		{}
-		Raul::Atom      value;
+		Atom            value;
 		Gtk::Alignment* value_widget;
 		int             row;
 	};
@@ -75,16 +75,16 @@ private:
 	};
 
 	void add_property(const Raul::URI&  uri,
-	                  const Raul::Atom& value);
+	                  const Atom& value);
 
 	Gtk::Widget* create_value_widget(const Raul::URI&  uri,
-	                                 const Raul::Atom& value);
+	                                 const Atom& value);
 
 	void init();
 	void reset();
 	void on_show();
 
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
+	void property_changed(const Raul::URI& predicate, const Atom& value);
 	void value_edited(const Raul::URI& predicate);
 	void key_changed();
 	void add_clicked();
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 86ca0172..e4d6fe05 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -63,7 +63,7 @@ RenameWindow::set_object(SPtr<const ObjectModel> object)
 {
 	_object = object;
 	_symbol_entry->set_text(object->path().symbol());
-	const Raul::Atom& name_atom = object->get_property(_app->uris().lv2_name);
+	const Atom& name_atom = object->get_property(_app->uris().lv2_name);
 	_label_entry->set_text(
 		(name_atom.type() == _app->forge().String) ? name_atom.ptr<char>() : "");
 }
@@ -110,11 +110,11 @@ RenameWindow::cancel_clicked()
 void
 RenameWindow::ok_clicked()
 {
-	const URIs&       uris       = _app->uris();
-	const string&     symbol_str = _symbol_entry->get_text();
-	const string&     label      = _label_entry->get_text();
-	Raul::Path        path       = _object->path();
-	const Raul::Atom& name_atom  = _object->get_property(uris.lv2_name);
+	const URIs&   uris       = _app->uris();
+	const string& symbol_str = _symbol_entry->get_text();
+	const string& label      = _label_entry->get_text();
+	Raul::Path    path       = _object->path();
+	const Atom&   name_atom  = _object->get_property(uris.lv2_name);
 
 	if (Raul::Symbol::is_valid(symbol_str)) {
 		const Raul::Symbol symbol(symbol_str);
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index f4e9dc23..63c70278 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -64,8 +64,8 @@ SubgraphModule::store_location(double ax, double ay)
 {
 	const URIs& uris = app().uris();
 
-	const Raul::Atom x(app().forge().make(static_cast<float>(ax)));
-	const Raul::Atom y(app().forge().make(static_cast<float>(ay)));
+	const Atom x(app().forge().make(static_cast<float>(ax)));
+	const Atom y(app().forge().make(static_cast<float>(ay)));
 
 	if (x != _block->get_property(uris.ingen_canvasX) ||
 	    y != _block->get_property(uris.ingen_canvasY))