From 0e1bf6ddfc77866ff6477a3f394c030c2a5e1b39 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 30 Jul 2012 23:00:13 +0000 Subject: 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 --- ingen/shared/LV2Features.hpp | 6 +++--- ingen/shared/URIMap.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ingen/shared') diff --git a/ingen/shared/LV2Features.hpp b/ingen/shared/LV2Features.hpp index 76d64b42..822df818 100644 --- a/ingen/shared/LV2Features.hpp +++ b/ingen/shared/LV2Features.hpp @@ -26,7 +26,7 @@ namespace Ingen { -class Node; +class GraphObject; namespace Shared { @@ -44,7 +44,7 @@ public: virtual ~Feature() {} virtual SharedPtr feature(Shared::World* world, - Node* node) = 0; + GraphObject* node) = 0; }; class FeatureArray : public Raul::Noncopyable { @@ -65,7 +65,7 @@ public: void add_feature(SharedPtr feature); SharedPtr lv2_features(Shared::World* world, - Node* node) const; + GraphObject* node) const; private: typedef std::vector< SharedPtr > Features; diff --git a/ingen/shared/URIMap.hpp b/ingen/shared/URIMap.hpp index bb3e55be..d30b843d 100644 --- a/ingen/shared/URIMap.hpp +++ b/ingen/shared/URIMap.hpp @@ -46,7 +46,7 @@ public: _feature.data = data; } - SharedPtr feature(Shared::World*, Node*) { + SharedPtr feature(Shared::World*, GraphObject*) { return SharedPtr(&_feature, NullDeleter); } -- cgit v1.2.1