aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-12-17 18:42:46 +0000
committerDavid Robillard <d@drobilla.net>2010-12-17 18:42:46 +0000
commite34d99d54d37dd4f130c3d11d1c94fcac22bf99d (patch)
treeca84c6b757bbf5258e05e500d283bcbb090c13de /src/engine
parentc3c8acb6c62ad740bf8acedd8e21f50f735c2629 (diff)
downloadmachina-e34d99d54d37dd4f130c3d11d1c94fcac22bf99d.tar.gz
machina-e34d99d54d37dd4f130c3d11d1c94fcac22bf99d.tar.bz2
machina-e34d99d54d37dd4f130c3d11d1c94fcac22bf99d.zip
Simplify blank node ID stuff (and remove circular dependency of World and Node).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2744 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/Action.cpp2
-rw-r--r--src/engine/Edge.cpp2
-rw-r--r--src/engine/Node.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp
index e11810c..6cd419d 100644
--- a/src/engine/Action.cpp
+++ b/src/engine/Action.cpp
@@ -27,7 +27,7 @@ Action::write_state(Redland::Model& model)
using namespace Raul;
if (!_id.is_valid())
- set_id(model.world().blank_id());
+ set_id(Redland::Node::blank_id(model.world()));
model.add_statement(_id,
Redland::Node(model.world(), Redland::Node::RESOURCE, "rdf:type"),
diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp
index 6bef290..d8f64d6 100644
--- a/src/engine/Edge.cpp
+++ b/src/engine/Edge.cpp
@@ -31,7 +31,7 @@ Edge::write_state(Redland::Model& model)
using namespace Raul;
if (!_id.is_valid())
- set_id(model.world().blank_id());
+ set_id(Redland::Node::blank_id(model.world()));
model.add_statement(_id,
"rdf:type",
diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp
index 3f61121..f9a7e11 100644
--- a/src/engine/Node.cpp
+++ b/src/engine/Node.cpp
@@ -210,7 +210,7 @@ Node::write_state(Redland::Model& model)
using namespace Raul;
if (!_id.is_valid())
- set_id(model.world().blank_id());
+ set_id(Redland::Node::blank_id(model.world()));
if (_is_selector)
model.add_statement(_id,