Move Forge to the appropriate namespace.

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

17 files changed, 35 insertions, 34 deletions

diff --git a/ingen/shared/AtomReader.hpp b/ingen/shared/AtomReader.hpp
index 9bab2588..7e8cd93f 100644
--- a/ingen/shared/AtomReader.hpp
+++ b/ingen/shared/AtomReader.hpp
@@ -23,12 +23,10 @@
 #include "serd/serd.h"
 
 namespace Ingen {
-
-class Forge;
-
 namespace Shared {
 
 class AtomSink;
+class Forge;
 class URIMap;
 
 /** An AtomSink that calls methods on an Interface. */
diff --git a/ingen/shared/Forge.hpp b/ingen/shared/Forge.hpp
index 16629683..f9d225cd 100644
--- a/ingen/shared/Forge.hpp
+++ b/ingen/shared/Forge.hpp
@@ -19,12 +19,12 @@
 
 #include <string>
 
-#include "ingen/shared/Forge.hpp"
 #include "raul/Atom.hpp"
 
 namespace Ingen {
+namespace Shared {
 
-namespace Shared { class URIMap; }
+class URIMap;
 
 class Forge : public Raul::Forge {
 public:
@@ -33,6 +33,7 @@ public:
 	std::string str(const Raul::Atom& atom);
 };
 
+} // namespace Shared
 } // namespace Ingen
 
 #endif // INGEN_SHARED_FORGE_HPP
diff --git a/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index 17181269..f724d81d 100644
--- a/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
@@ -35,17 +35,17 @@ class URIMap;
 
 class URIs : public boost::noncopyable {
 public:
-	URIs(Ingen::Forge& forge, URIMap* map);
+	URIs(Ingen::Shared::Forge& forge, URIMap* map);
 
 	struct Quark : public Raul::URI {
-		Quark(Ingen::Forge& forge, URIMap* map, const char* str);
+		Quark(Ingen::Shared::Forge& forge, URIMap* map, const char* str);
 		operator LV2_URID()   const { return id; }
 		operator Raul::Atom() const { return atom; }
 		uint32_t   id;
 		Raul::Atom atom;
 	};
 
-	Ingen::Forge& forge;
+	Ingen::Shared::Forge& forge;
 
 	const Quark atom_AtomPort;
 	const Quark atom_Blank;
diff --git a/ingen/shared/World.hpp b/ingen/shared/World.hpp
index 9ea5b3cb..7864c581 100644
--- a/ingen/shared/World.hpp
+++ b/ingen/shared/World.hpp
@@ -30,7 +30,6 @@ namespace Sord { class World; }
 namespace Ingen {
 
 class EngineBase;
-class Forge;
 class Interface;
 
 namespace Serialisation {
@@ -41,6 +40,7 @@ class Serialiser;
 namespace Shared {
 
 class Configuration;
+class Forge;
 class LV2Features;
 class Store;
 class URIMap;
@@ -131,10 +131,10 @@ public:
 	virtual Sord::World* rdf_world();
 	virtual LilvWorld*   lilv_world();
 
-	virtual LV2Features&  lv2_features();
-	virtual Ingen::Forge& forge();
-	virtual URIMap&       uri_map();
-	virtual URIs&         uris();
+	virtual LV2Features&          lv2_features();
+	virtual Ingen::Shared::Forge& forge();
+	virtual URIMap&               uri_map();
+	virtual URIs&                 uris();
 
 	virtual void        set_jack_uuid(const std::string& uuid);
 	virtual std::string jack_uuid();
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 3b9b530c..2a9897a5 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -105,7 +105,7 @@ public:
 
 	Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size);
 
-	Ingen::Forge&                         forge()     const { return _world->forge(); }
+	Ingen::Shared::Forge&                 forge()     const { return _world->forge(); }
 	SharedPtr<Ingen::Interface>           interface() const { return _world->interface(); }
 	SharedPtr<Client::SigClientInterface> client()    const { return _client; }
 	SharedPtr<Client::ClientStore>        store()     const { return _store; }
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index f1ee032d..d7f781a7 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -125,7 +125,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model)
 Gtk::Widget*
 PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& value)
 {
-	Ingen::Forge& forge = _app->forge();
+	Ingen::Shared::Forge& forge = _app->forge();
 	if (value.type() == forge.Int) {
 		Gtk::SpinButton* widget = manage(new Gtk::SpinButton(0.0, 0));
 		widget->property_numeric() = true;
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index c785d857..f4b1aa96 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -60,7 +60,7 @@ struct IngenLV2UI {
 
 	int                                          argc;
 	char**                                       argv;
-	Ingen::Forge*                                forge;
+	Ingen::Shared::Forge*                        forge;
 	Ingen::Shared::World*                        world;
 	IngenLV2AtomSink*                            sink;
 	SharedPtr<Ingen::GUI::App>                   app;
@@ -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());
+	ui->forge = new Ingen::Shared::Forge(ui->world->uri_map());
 
 	if (!ui->world->load_module("client")) {
 		delete ui;
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index f43fa7a4..cc02ba08 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -45,7 +45,7 @@ BufferFactory::~BufferFactory()
 	free_list(_free_object.get());
 }
 
-Ingen::Forge&
+Shared::Forge&
 BufferFactory::forge()
 {
 	return _engine.world()->forge();
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 04b9bf9d..84fb813d 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -58,9 +58,9 @@ public:
 
 	void set_block_length(SampleCount block_length);
 
-	Forge&        forge();
-	Shared::URIs& uris()   { return _uris; }
-	Engine&       engine() { return _engine; }
+	Shared::Forge& forge();
+	Shared::URIs&  uris()   { return _uris; }
+	Engine&        engine() { return _engine; }
 
 private:
 	friend class Buffer;
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 8029e607..fde08f15 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -150,7 +150,7 @@ Engine::activate()
 	_message_context->Thread::start();
 
 	const Ingen::Shared::URIs& uris  = world()->uris();
-	Ingen::Forge&              forge = world()->forge();
+	Shared::Forge&             forge = world()->forge();
 
 	// Create root patch
 	if (!_root_patch) {
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index f1bf2d3d..de714aa7 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -142,7 +142,7 @@ LV2Node::instantiate(BufferFactory& bufs)
 	const Ingen::Shared::URIs& uris  = bufs.uris();
 	SharedPtr<LV2Info>         info  = _lv2_plugin->lv2_info();
 	const LilvPlugin*          plug  = _lv2_plugin->lilv_plugin();
-	Ingen::Forge&              forge = bufs.forge();
+	Ingen::Shared::Forge&      forge = bufs.forge();
 
 	uint32_t num_ports = lilv_plugin_get_num_ports(plug);
 	assert(num_ports > 0);
diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp
index b4c55da1..c95311c9 100644
--- a/src/server/Notification.cpp
+++ b/src/server/Notification.cpp
@@ -29,7 +29,7 @@ Notification::post_process(Notification& note,
                            Engine&       engine)
 {
 	const Ingen::Shared::URIs& uris  = engine.world()->uris();
-	Ingen::Forge&              forge = engine.world()->forge();
+	Ingen::Shared::Forge&      forge = engine.world()->forge();
 	switch (note.type) {
 	case PORT_VALUE:
 		engine.broadcaster()->set_property(note.port->path(),
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 1e5cc11c..e18ced10 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -216,7 +216,7 @@ PortImpl::clear_buffers()
 void
 PortImpl::broadcast_value(Context& context, bool force)
 {
-	Ingen::Forge&      forge = context.engine().world()->forge();
+	Shared::Forge&     forge = context.engine().world()->forge();
 	Notification::Type ntype = Notification::PORT_VALUE;
 	Raul::Atom         val;
 	switch (_type.symbol()) {
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index d6602173..0de22ed3 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -329,7 +329,7 @@ private:
 };
 
 struct IngenPlugin {
-	Ingen::Forge          forge;
+	Ingen::Shared::Forge  forge;
 	Ingen::Shared::World* world;
 	MainThread*           main;
 	LV2_URID_Map*         map;
diff --git a/src/shared/Forge.cpp b/src/shared/Forge.cpp
index 8565f249..e5a9dd9b 100644
--- a/src/shared/Forge.cpp
+++ b/src/shared/Forge.cpp
@@ -22,6 +22,7 @@
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 
 namespace Ingen {
+namespace Shared {
 
 Forge::Forge(Shared::URIMap& map)
 {
@@ -52,4 +53,5 @@ Forge::str(const Raul::Atom& atom)
 	return ss.str();
 }
 
+} // namespace Shared
 } // namespace Ingen
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index 712a0cb2..6cc32c0b 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -36,7 +36,7 @@ using namespace std;
 namespace Ingen {
 namespace Shared {
 
-URIs::Quark::Quark(Ingen::Forge& forge, URIMap* map, const char* c_str)
+URIs::Quark::Quark(Shared::Forge& forge, URIMap* map, const char* c_str)
 	: Raul::URI(c_str)
 	, id(map->map_uri(c_str))
 	, atom(forge.alloc_uri(c_str))
@@ -47,7 +47,7 @@ URIs::Quark::Quark(Ingen::Forge& forge, URIMap* map, const char* c_str)
 #define NS_RDF   "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 #define NS_RDFS  "http://www.w3.org/2000/01/rdf-schema#"
 
-URIs::URIs(Ingen::Forge& f, URIMap* map)
+URIs::URIs(Shared::Forge& f, URIMap* map)
 	: forge(f)
 	, atom_AtomPort         (forge, map, LV2_ATOM__AtomPort)
 	, atom_Blank            (forge, map, LV2_ATOM__Blank)
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index aeb9e641..b71ea8c8 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -108,7 +108,7 @@ public:
 		, lv2_features(NULL)
 		, rdf_world(new Sord::World())
 		, uri_map(new Ingen::Shared::URIMap(map, unmap))
-		, forge(new Ingen::Forge(*uri_map))
+		, forge(new Ingen::Shared::Forge(*uri_map))
 		, uris(new Shared::URIs(*forge, uri_map))
 		, lilv_world(lilv_world_new())
 	{
@@ -168,7 +168,7 @@ public:
 	LV2Features*                         lv2_features;
 	Sord::World*                         rdf_world;
 	URIMap*                              uri_map;
-	Ingen::Forge*                        forge;
+	Shared::Forge*                       forge;
 	URIs*                                uris;
 	SharedPtr<Interface>                 interface;
 	SharedPtr<EngineBase>                engine;
@@ -212,10 +212,10 @@ Shared::Configuration& World::conf() { return _impl->conf; }
 Sord::World* World::rdf_world()  { return _impl->rdf_world; }
 LilvWorld*   World::lilv_world() { return _impl->lilv_world; }
 
-LV2Features&  World::lv2_features() { return *_impl->lv2_features; }
-Ingen::Forge& World::forge()        { return *_impl->forge; }
-URIs&         World::uris()         { return *_impl->uris; }
-URIMap&       World::uri_map()      { return *_impl->uri_map; }
+LV2Features&   World::lv2_features() { return *_impl->lv2_features; }
+Shared::Forge& World::forge()        { return *_impl->forge; }
+URIs&          World::uris()         { return *_impl->uris; }
+URIMap&        World::uri_map()      { return *_impl->uri_map; }
 
 bool
 World::load_module(const char* name)