summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-11 04:55:56 +0000
committerDavid Robillard <d@drobilla.net>2012-05-11 04:55:56 +0000
commite64eabe64ee966364bc5f6704c5227687ea309d8 (patch)
treea62c6044a1b4cc4f070958dfaf29f16231a7c2d8 /ingen
parent908a001ea84dcf3a1204746d110068454c637119 (diff)
downloadingen-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 'ingen')
-rw-r--r--ingen/shared/AtomReader.hpp4
-rw-r--r--ingen/shared/Forge.hpp5
-rw-r--r--ingen/shared/URIs.hpp6
-rw-r--r--ingen/shared/World.hpp10
4 files changed, 12 insertions, 13 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();