GraphObject => Node

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

4 files changed, 17 insertions, 17 deletions

diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index 865f081c..cacba04c 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -149,12 +149,12 @@ BlockModel::get_port(const Raul::Symbol& symbol) const
 	return SharedPtr<PortModel>();
 }
 
-Ingen::GraphObject*
+Ingen::Node*
 BlockModel::port(uint32_t index) const
 {
 	assert(index < num_ports());
-	return const_cast<Ingen::GraphObject*>(
-		dynamic_cast<const Ingen::GraphObject*>(_ports[index].get()));
+	return const_cast<Ingen::Node*>(
+		dynamic_cast<const Ingen::Node*>(_ports[index].get()));
 }
 
 void
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 6d4cbfd4..20928d33 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -165,8 +165,8 @@ ClientStore::object(const Raul::Path& path) const
 SharedPtr<Resource>
 ClientStore::_resource(const Raul::URI& uri)
 {
-	if (GraphObject::uri_is_path(uri)) {
-		return _object(GraphObject::uri_to_path(uri));
+	if (Node::uri_is_path(uri)) {
+		return _object(Node::uri_to_path(uri));
 	} else {
 		return _plugin(uri);
 	}
@@ -195,8 +195,8 @@ ClientStore::add_plugin(SharedPtr<PluginModel> pm)
 void
 ClientStore::del(const Raul::URI& uri)
 {
-	if (GraphObject::uri_is_path(uri)) {
-		remove_object(GraphObject::uri_to_path(uri));
+	if (Node::uri_is_path(uri)) {
+		remove_object(Node::uri_to_path(uri));
 	}
 }
 
@@ -243,13 +243,13 @@ ClientStore::put(const Raul::URI&            uri,
 		}
 	}
 
-	if (!GraphObject::uri_is_path(uri)) {
+	if (!Node::uri_is_path(uri)) {
 		_log.error(Raul::fmt("Put for unknown subject <%1%>\n")
 		           % uri.c_str());
 		return;
 	}
 
-	const Raul::Path path(GraphObject::uri_to_path(uri));
+	const Raul::Path path(Node::uri_to_path(uri));
 
 	SharedPtr<ObjectModel> obj = PtrCast<ObjectModel>(_object(path));
 	if (obj) {
@@ -326,13 +326,13 @@ ClientStore::delta(const Raul::URI&            uri,
 	std::cerr << "}" << endl;
 #endif
 
-	if (!GraphObject::uri_is_path(uri)) {
+	if (!Node::uri_is_path(uri)) {
 		_log.error(Raul::fmt("Delta for unknown subject <%1%>\n")
 		           % uri.c_str());
 		return;
 	}
 
-	const Raul::Path path(GraphObject::uri_to_path(uri));
+	const Raul::Path path(Node::uri_to_path(uri));
 
 	SharedPtr<ObjectModel> obj = _object(path);
 	if (obj) {
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 88943978..fe838725 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -93,7 +93,7 @@ GraphModel::clear()
 }
 
 SharedPtr<EdgeModel>
-GraphModel::get_edge(const GraphObject* tail, const GraphObject* head)
+GraphModel::get_edge(const Node* tail, const Node* head)
 {
 	Edges::iterator i = _edges.find(make_pair(tail, head));
 	if (i != _edges.end())
@@ -138,7 +138,7 @@ GraphModel::add_edge(SharedPtr<EdgeModel> cm)
 }
 
 void
-GraphModel::remove_edge(const GraphObject* tail, const GraphObject* head)
+GraphModel::remove_edge(const Node* tail, const Node* head)
 {
 	Edges::iterator i = _edges.find(make_pair(tail, head));
 	if (i != _edges.end()) {
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index fb077a94..5c2bae00 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -14,22 +14,22 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/GraphObject.hpp"
-#include "ingen/client/ObjectModel.hpp"
+#include "ingen/Node.hpp"
 #include "ingen/URIs.hpp"
+#include "ingen/client/ObjectModel.hpp"
 
 namespace Ingen {
 namespace Client {
 
 ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path)
-	: GraphObject(uris, path)
+	: Node(uris, path)
 	, _path(path)
 	, _symbol((path == "/") ? "root" : path.symbol())
 {
 }
 
 ObjectModel::ObjectModel(const ObjectModel& copy)
-	: GraphObject(copy)
+	: Node(copy)
 	, _parent(copy._parent)
 	, _path(copy._path)
 	, _symbol(copy._symbol)