LV2URIMap => URIMap.

Trim unnecessary includes.


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

19 files changed, 41 insertions, 48 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 525a5885..c4c9cfe6 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -21,20 +21,18 @@
 #include <gtk/gtkwindow.h>
 
 #include "ganv/Edge.hpp"
-#include "ingen/Interface.hpp"
 #include "ingen/EngineBase.hpp"
+#include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
+#include "ingen/shared/World.hpp"
 #include "ingen/shared/runtime_paths.hpp"
 #include "lilv/lilv.h"
 #include "raul/Path.hpp"
 #include "raul/log.hpp"
 
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/shared/World.hpp"
-
 #include "App.hpp"
 #include "Configuration.hpp"
 #include "ConnectWindow.hpp"
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index a6d06487..6754fd42 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -14,18 +14,19 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Configuration.hpp"
 #include <cstdlib>
 #include <cassert>
 #include <fstream>
 #include <map>
-#include "raul/log.hpp"
-#include "ingen/client/PortModel.hpp"
+
+#include "ganv/Port.hpp"
 #include "ingen/client/PluginModel.hpp"
+#include "ingen/client/PortModel.hpp"
 #include "ingen/serialisation/Parser.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ganv/Port.hpp"
+#include "raul/log.hpp"
+
 #include "App.hpp"
+#include "Configuration.hpp"
 #include "Port.hpp"
 
 using namespace std;
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 75c0b4d8..68d51d2d 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -15,21 +15,22 @@
 */
 
 #include <cassert>
+
 #include <boost/optional.hpp>
 #include <glibmm/miscutils.h>
+
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/client/ClientStore.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/client/ClientStore.hpp"
 #include "ingen/shared/runtime_paths.hpp"
+
 #include "App.hpp"
+#include "Configuration.hpp"
 #include "LoadPatchWindow.hpp"
 #include "PatchView.hpp"
-#include "Configuration.hpp"
 #include "ThreadedLoader.hpp"
 
-using boost::optional;
 using namespace std;
 using namespace Raul;
 
@@ -161,8 +162,8 @@ LoadPatchWindow::ok_clicked()
 
 	if (_import) {
 		// If unset load_patch will load value
-		optional<Path>   parent;
-		optional<Symbol> symbol;
+		boost::optional<Path>   parent;
+		boost::optional<Symbol> symbol;
 		if (!_patch->path().is_root()) {
 			parent = _patch->path().parent();
 			symbol = _patch->symbol();
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 2977ceca..09830642 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -22,7 +22,6 @@
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 
 #include "App.hpp"
 #include "LoadPluginWindow.hpp"
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 720f8876..8b99a921 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -14,11 +14,11 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "App.hpp"
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ClientStore.hpp"
+#include "ingen/client/PatchModel.hpp"
+
+#include "App.hpp"
 #include "NewSubpatchWindow.hpp"
 #include "PatchView.hpp"
 
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 08f27c2a..750baf08 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -19,7 +19,6 @@
 #include "ingen/Interface.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PluginModel.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 
 #include "App.hpp"
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 510d63bf..b471d525 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -15,25 +15,26 @@
 */
 
 #include <cassert>
-#include "raul/log.hpp"
-#include "raul/Atom.hpp"
+
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/client/PatchModel.hpp"
 #include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PatchModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PluginUI.hpp"
+#include "raul/Atom.hpp"
+#include "raul/log.hpp"
+
 #include "App.hpp"
-#include "WidgetFactory.hpp"
+#include "Configuration.hpp"
+#include "NodeMenu.hpp"
 #include "NodeModule.hpp"
 #include "PatchCanvas.hpp"
 #include "PatchWindow.hpp"
 #include "Port.hpp"
 #include "RenameWindow.hpp"
 #include "SubpatchModule.hpp"
+#include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
-#include "Configuration.hpp"
-#include "NodeMenu.hpp"
 
 using namespace std;
 using namespace Raul;
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 60b170f7..b1d1a766 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -20,7 +20,6 @@
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/ObjectModel.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 
 #include "App.hpp"
 #include "ObjectMenu.hpp"
diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp
index 188e1df1..9988b252 100644
--- a/src/gui/PatchBox.cpp
+++ b/src/gui/PatchBox.cpp
@@ -24,7 +24,6 @@
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/PatchModel.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 
 #include "App.hpp"
 #include "BreadCrumbs.hpp"
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 8cb9d384..9bbf3bc5 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -30,7 +30,6 @@
 #include "ingen/serialisation/Serialiser.hpp"
 #include "ingen/shared/Builder.hpp"
 #include "ingen/shared/ClashAvoider.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/World.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "raul/log.hpp"
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 16451821..c663f926 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -16,19 +16,20 @@
 
 #include <cassert>
 #include <utility>
-#include "PatchPortModule.hpp"
+
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/client/PatchModel.hpp"
 #include "ingen/client/NodeModel.hpp"
+#include "ingen/client/PatchModel.hpp"
+
 #include "App.hpp"
 #include "Configuration.hpp"
-#include "WidgetFactory.hpp"
 #include "PatchCanvas.hpp"
+#include "PatchPortModule.hpp"
 #include "PatchWindow.hpp"
 #include "Port.hpp"
 #include "PortMenu.hpp"
 #include "RenameWindow.hpp"
+#include "WidgetFactory.hpp"
 #include "WindowFactory.hpp"
 
 using namespace std;
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index 638ba7fc..b17e8a71 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -17,7 +17,6 @@
 #include "raul/log.hpp"
 #include "raul/Path.hpp"
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 252772a9..282e83bc 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -18,7 +18,6 @@
 #include <fstream>
 #include "raul/log.hpp"
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "App.hpp"
 #include "PatchView.hpp"
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index e99b0285..c9c858cb 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -18,7 +18,6 @@
 #include "raul/log.hpp"
 #include "ganv/Module.hpp"
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "App.hpp"
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index e774dc29..19a6770a 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -16,11 +16,12 @@
 
 #include <math.h>
 #include <gtkmm.h>
-#include "raul/SharedPtr.hpp"
+
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/PortModel.hpp"
+#include "raul/SharedPtr.hpp"
+
 #include "App.hpp"
 #include "PortMenu.hpp"
 #include "WindowFactory.hpp"
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 62e7d4ac..ca48e239 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -16,10 +16,11 @@
 
 #include <cassert>
 #include <string>
+
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PluginModel.hpp"
+
 #include "App.hpp"
 #include "PortPropertiesWindow.hpp"
 
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 5a426eeb..e10c3fcf 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -17,11 +17,10 @@
 #include <cassert>
 #include <string>
 
-#include "ingen/shared/LV2URIMap.hpp"
-
 #include "ingen/Interface.hpp"
-#include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/ClientStore.hpp"
+#include "ingen/client/ObjectModel.hpp"
+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
 #include "App.hpp"
 #include "RenameWindow.hpp"
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index cbdc8a8f..6c74ec69 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -20,8 +20,6 @@
 #include "ingen/Interface.hpp"
 #include "ingen/client/PatchModel.hpp"
 
-#include "ingen/shared/LV2URIMap.hpp"
-
 #include "App.hpp"
 #include "NodeModule.hpp"
 #include "PatchCanvas.hpp"
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index ae70e441..3448f4a9 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -99,7 +99,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	ui->world = new Ingen::Shared::World(
 		&ui->conf, ui->argc, ui->argv, map, unmap);
 
-	ui->forge = new Ingen::Forge(*ui->world->lv2_uri_map().get());
+	ui->forge = new Ingen::Forge(*ui->world->uri_map().get());
 
 	if (!ui->world->load_module("client")) {
 		delete ui;
@@ -111,7 +111,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 
 	// Set up an engine interface that writes LV2 atoms
 	ui->engine = SharedPtr<Ingen::Interface>(
-		new Ingen::Shared::AtomWriter(*ui->world->lv2_uri_map().get(),
+		new Ingen::Shared::AtomWriter(*ui->world->uri_map().get(),
 		                              *ui->world->uris().get(),
 		                              *ui->sink));
 
@@ -124,7 +124,7 @@ instantiate(const LV2UI_Descriptor*   descriptor,
 	ui->app->attach(ui->client);
 
 	ui->reader = SharedPtr<Ingen::Shared::AtomReader>(
-		new Ingen::Shared::AtomReader(*ui->world->lv2_uri_map().get(),
+		new Ingen::Shared::AtomReader(*ui->world->uri_map().get(),
 		                              *ui->world->uris().get(),
 		                              ui->world->forge(),
 		                              *ui->client.get()));