From 25177612b20f7d3ebd4138fed9cd9acffec7e756 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 25 Dec 2017 13:50:13 -0500 Subject: Fix inconsistent parameter names --- ingen/LV2Features.hpp | 2 +- ingen/Resource.hpp | 6 +++--- ingen/Serialiser.hpp | 2 +- ingen/Store.hpp | 2 +- ingen/URIMap.hpp | 6 +++--- ingen/World.hpp | 2 +- ingen/client/BlockModel.hpp | 2 +- ingen/client/ClientStore.hpp | 2 +- ingen/client/GraphModel.hpp | 2 +- ingen/client/ObjectModel.hpp | 2 +- ingen/client/PluginModel.hpp | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'ingen') diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp index f8006fc4..9995ff47 100644 --- a/ingen/LV2Features.hpp +++ b/ingen/LV2Features.hpp @@ -83,7 +83,7 @@ protected: bool is_supported(const std::string& uri) const; SPtr lv2_features(World* world, - Node* block) const; + Node* node) const; private: typedef std::vector< SPtr > Features; diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index aa047e51..8cfdb02a 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -142,17 +142,17 @@ public: * for one property may exist in `p` will all be set (unlike simply * calling set_property in a loop which would only set one value). */ - void set_properties(const Properties& p); + void set_properties(const Properties& props); /** Add several properties at once. */ - void add_properties(const Properties& p); + void add_properties(const Properties& props); /** Remove several properties at once. * * This removes all matching properties (both key and value), or all * properties with a matching key if the value in `p` is patch:wildcard. */ - void remove_properties(const Properties& p); + void remove_properties(const Properties& props); /** Hook called whenever a property is added. * diff --git a/ingen/Serialiser.hpp b/ingen/Serialiser.hpp index c7a71627..00466350 100644 --- a/ingen/Serialiser.hpp +++ b/ingen/Serialiser.hpp @@ -45,7 +45,7 @@ public: /** Write a graph and all its contents as a complete bundle. */ virtual void write_bundle(SPtr graph, - const std::string& path); + const std::string& uri); /** Begin a serialization to a string. * diff --git a/ingen/Store.hpp b/ingen/Store.hpp index f439c523..485b7355 100644 --- a/ingen/Store.hpp +++ b/ingen/Store.hpp @@ -70,7 +70,7 @@ public: * * Note this invalidates `i`. */ - void rename(iterator i, const Raul::Path& new_path); + void rename(iterator top, const Raul::Path& new_path); unsigned child_name_offset(const Raul::Path& parent, const Raul::Symbol& symbol, diff --git a/ingen/URIMap.hpp b/ingen/URIMap.hpp index b07d4f50..6ad8c684 100644 --- a/ingen/URIMap.hpp +++ b/ingen/URIMap.hpp @@ -63,7 +63,7 @@ public: }; struct URIDMapFeature : public Feature { - URIDMapFeature(URIMap* map, LV2_URID_Map* urid_map, Log& log); + URIDMapFeature(URIMap* map, LV2_URID_Map* impl, Log& log); LV2_URID map(const char* uri); static LV2_URID default_map(LV2_URID_Map_Handle h, const char* uri); LV2_URID_Map urid_map; @@ -71,9 +71,9 @@ public: }; struct URIDUnmapFeature : public Feature { - URIDUnmapFeature(URIMap* map, LV2_URID_Unmap* urid_unmap); + URIDUnmapFeature(URIMap* map, LV2_URID_Unmap* impl); const char* unmap(const LV2_URID urid); - static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID uri); + static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID urid); LV2_URID_Unmap urid_unmap; }; diff --git a/ingen/World.hpp b/ingen/World.hpp index 30f71a61..21d6c33b 100644 --- a/ingen/World.hpp +++ b/ingen/World.hpp @@ -111,7 +111,7 @@ public: const std::string& filename); virtual void set_engine(SPtr e); - virtual void set_interface(SPtr e); + virtual void set_interface(SPtr i); virtual void set_store(SPtr s); virtual SPtr engine(); diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp index e689414c..22613eca 100644 --- a/ingen/client/BlockModel.hpp +++ b/ingen/client/BlockModel.hpp @@ -96,7 +96,7 @@ protected: void add_child(SPtr c); bool remove_child(SPtr c); void add_port(SPtr pm); - void remove_port(SPtr pm); + void remove_port(SPtr port); void remove_port(const Raul::Path& port_path); void set(SPtr model); diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 45662afb..8850f401 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -105,7 +105,7 @@ private: void add_object(SPtr object); SPtr remove_object(const Raul::Path& path); - void add_plugin(SPtr plugin); + void add_plugin(SPtr pm); SPtr connection_graph(const Raul::Path& tail_path, const Raul::Path& head_path); diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index 52c5ed2c..ef072d87 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -60,7 +60,7 @@ private: void clear(); void add_child(SPtr c); - bool remove_child(SPtr c); + bool remove_child(SPtr o); void remove_arcs_on(SPtr p); void add_arc(SPtr arc); diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index a8210ac0..4250efc5 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -89,7 +89,7 @@ protected: virtual void add_child(SPtr c) {} virtual bool remove_child(SPtr c) { return true; } - virtual void set(SPtr model); + virtual void set(SPtr o); SPtr _parent; diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index d6b253f3..585ac7d7 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -65,7 +65,7 @@ public: Raul::Symbol default_block_symbol() const; std::string human_name() const; - std::string port_human_name(uint32_t index) const; + std::string port_human_name(uint32_t i) const; typedef std::map ScalePoints; ScalePoints port_scale_points(uint32_t i) const; -- cgit v1.2.1