Eliminate pure virtual base classes Patch, Node, and Port, and the virtual inheritance they imposed.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index df6f63c0..7acb8aec 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -53,7 +53,7 @@ PatchModel::remove_child(SharedPtr<ObjectModel> o)
 
 	// Remove any connections which referred to this object,
 	// since they can't possibly exist anymore
-	for (Edges::iterator j = _edges->begin(); j != _edges->end();) {
+	for (Edges::iterator j = _edges.begin(); j != _edges.end();) {
 		Edges::iterator next = j;
 		++next;
 
@@ -65,7 +65,7 @@ PatchModel::remove_child(SharedPtr<ObjectModel> o)
 				|| cm->head_path().parent() == o->path()
 				|| cm->head_path() == o->path()) {
 			_signal_removed_edge.emit(cm);
-			_edges->erase(j); // cuts our reference
+			_edges.erase(j); // cuts our reference
 		}
 		j = next;
 	}
@@ -84,19 +84,19 @@ PatchModel::remove_child(SharedPtr<ObjectModel> o)
 void
 PatchModel::clear()
 {
-	_edges->clear();
+	_edges.clear();
 
 	NodeModel::clear();
 
-	assert(_edges->empty());
+	assert(_edges.empty());
 	assert(_ports.empty());
 }
 
 SharedPtr<EdgeModel>
-PatchModel::get_edge(const Port* tail, const Ingen::Port* head)
+PatchModel::get_edge(const GraphObject* tail, const GraphObject* head)
 {
-	Edges::iterator i = _edges->find(make_pair(tail, head));
-	if (i != _edges->end())
+	Edges::iterator i = _edges.find(make_pair(tail, head));
+	if (i != _edges.end())
 		return PtrCast<EdgeModel>(i->second);
 	else
 		return SharedPtr<EdgeModel>();
@@ -131,20 +131,20 @@ PatchModel::add_edge(SharedPtr<EdgeModel> cm)
 		assert(cm->tail() == existing->tail());
 		assert(cm->head() == existing->head());
 	} else {
-		_edges->insert(make_pair(make_pair(cm->tail().get(),
+		_edges.insert(make_pair(make_pair(cm->tail().get(),
 		                                         cm->head().get()), cm));
 		_signal_new_edge.emit(cm);
 	}
 }
 
 void
-PatchModel::remove_edge(const Port* tail, const Ingen::Port* head)
+PatchModel::remove_edge(const GraphObject* tail, const GraphObject* head)
 {
-	Edges::iterator i = _edges->find(make_pair(tail, head));
-	if (i != _edges->end()) {
+	Edges::iterator i = _edges.find(make_pair(tail, head));
+	if (i != _edges.end()) {
 		SharedPtr<EdgeModel> c = PtrCast<EdgeModel>(i->second);
 		_signal_removed_edge.emit(c);
-		_edges->erase(i);
+		_edges.erase(i);
 	} else {
 		Raul::warn(Raul::fmt("Failed to remove patch connection %1% => %2%\n")
 		           % tail->path() % head->path());