diff options
| author | David Robillard <d@drobilla.net> | 2012-05-11 04:55:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-11 04:55:56 +0000 |
| commit | e64eabe64ee966364bc5f6704c5227687ea309d8 (patch) | |
| tree | a62c6044a1b4cc4f070958dfaf29f16231a7c2d8 /src/shared | |
| parent | 908a001ea84dcf3a1204746d110068454c637119 (diff) | |
| download | ingen-e64eabe64ee966364bc5f6704c5227687ea309d8.tar.gz ingen-e64eabe64ee966364bc5f6704c5227687ea309d8.tar.bz2 ingen-e64eabe64ee966364bc5f6704c5227687ea309d8.zip | |
Move Forge to the appropriate namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4350 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/Forge.cpp | 2 | ||||
| -rw-r--r-- | src/shared/URIs.cpp | 4 | ||||
| -rw-r--r-- | src/shared/World.cpp | 12 |
3 files changed, 10 insertions, 8 deletions
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) |