summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 13:50:13 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commit25177612b20f7d3ebd4138fed9cd9acffec7e756 (patch)
tree8f060c9cb370eeb4a94f63a0fa5386b44f65efa6 /ingen
parent3f6d53e423bd809b9c8ae807d28c61e99ce0a2f2 (diff)
downloadingen-25177612b20f7d3ebd4138fed9cd9acffec7e756.tar.gz
ingen-25177612b20f7d3ebd4138fed9cd9acffec7e756.tar.bz2
ingen-25177612b20f7d3ebd4138fed9cd9acffec7e756.zip
Fix inconsistent parameter names
Diffstat (limited to 'ingen')
-rw-r--r--ingen/LV2Features.hpp2
-rw-r--r--ingen/Resource.hpp6
-rw-r--r--ingen/Serialiser.hpp2
-rw-r--r--ingen/Store.hpp2
-rw-r--r--ingen/URIMap.hpp6
-rw-r--r--ingen/World.hpp2
-rw-r--r--ingen/client/BlockModel.hpp2
-rw-r--r--ingen/client/ClientStore.hpp2
-rw-r--r--ingen/client/GraphModel.hpp2
-rw-r--r--ingen/client/ObjectModel.hpp2
-rw-r--r--ingen/client/PluginModel.hpp2
11 files changed, 15 insertions, 15 deletions
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<FeatureArray> lv2_features(World* world,
- Node* block) const;
+ Node* node) const;
private:
typedef std::vector< SPtr<Feature> > 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<const Node> 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<EngineBase> e);
- virtual void set_interface(SPtr<Interface> e);
+ virtual void set_interface(SPtr<Interface> i);
virtual void set_store(SPtr<Store> s);
virtual SPtr<EngineBase> 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<ObjectModel> c);
bool remove_child(SPtr<ObjectModel> c);
void add_port(SPtr<PortModel> pm);
- void remove_port(SPtr<PortModel> pm);
+ void remove_port(SPtr<PortModel> port);
void remove_port(const Raul::Path& port_path);
void set(SPtr<ObjectModel> 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<ObjectModel> object);
SPtr<ObjectModel> remove_object(const Raul::Path& path);
- void add_plugin(SPtr<PluginModel> plugin);
+ void add_plugin(SPtr<PluginModel> pm);
SPtr<GraphModel> 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<ObjectModel> c);
- bool remove_child(SPtr<ObjectModel> c);
+ bool remove_child(SPtr<ObjectModel> o);
void remove_arcs_on(SPtr<PortModel> p);
void add_arc(SPtr<ArcModel> 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<ObjectModel> c) {}
virtual bool remove_child(SPtr<ObjectModel> c) { return true; }
- virtual void set(SPtr<ObjectModel> model);
+ virtual void set(SPtr<ObjectModel> o);
SPtr<ObjectModel> _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<float, std::string> ScalePoints;
ScalePoints port_scale_points(uint32_t i) const;