From 19928bb583e72802746b89e322f71ecc0fcb7427 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 May 2009 04:05:32 +0000 Subject: The great ID refactoring of 2009. Path is now actually URI (scheme path: for now). Therefore ingen nodes and such live in the same namespace as ... well, everything. Including plugins. Thar be profit, laddies. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1992 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/PluginModel.hpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'src/client/PluginModel.hpp') diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index c50aef6f..b2f4cd0e 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -19,7 +19,6 @@ #define PLUGINMODEL_H #include "ingen-config.h" -#include #include #include "raul/SharedPtr.hpp" #include "redlandmm/World.hpp" @@ -31,8 +30,6 @@ #include "module/World.hpp" #include "shared/ResourceImpl.hpp" -using std::string; - namespace Ingen { namespace Client { @@ -49,16 +46,16 @@ class PluginModel : public Ingen::Shared::Plugin , public Ingen::Shared::ResourceImpl { public: - PluginModel(const string& uri, const string& type_uri); + PluginModel(const Raul::URI& uri, const Raul::URI& type_uri); Type type() const { return _type; } - const string symbol() const { return string_property("lv2:symbol"); } - const string name() const { return string_property("doap:name"); } + const std::string symbol() const { return string_property("lv2:symbol"); } + const std::string name() const { return string_property("doap:name"); } - string default_node_symbol() const; - string human_name(); - string port_human_name(uint32_t index) const; + std::string default_node_symbol() const; + std::string human_name(); + std::string port_human_name(uint32_t index) const; #ifdef HAVE_SLV2 static SLV2World slv2_world() { return _slv2_world; } @@ -80,8 +77,8 @@ public: SharedPtr ui(Ingen::Shared::World* world, SharedPtr node) const; - const string& icon_path() const; - static string get_lv2_icon_path(SLV2Plugin plugin); + const std::string& icon_path() const; + static std::string get_lv2_icon_path(SLV2Plugin plugin); #endif static void set_rdf_world(Redland::World& world) { @@ -93,14 +90,14 @@ public: private: const Type _type; - const string string_property(const std::string& name) const; + const std::string string_property(const std::string& name) const; #ifdef HAVE_SLV2 static SLV2World _slv2_world; static SLV2Plugins _slv2_plugins; - SLV2Plugin _slv2_plugin; - mutable string _icon_path; + SLV2Plugin _slv2_plugin; + mutable std::string _icon_path; #endif static Redland::World* _rdf_world; -- cgit v1.2.1