Fix inconsistent parameter names

13 files changed, 31 insertions, 31 deletions

diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index e226751b..22451846 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -74,7 +74,7 @@ class INGEN_API App
 public:
 	~App();
 
-	void error_message(const std::string& msg);
+	void error_message(const std::string& str);
 
 	void attach(SPtr<Client::SigClientInterface> client);
 
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 560bd82b..b3b7473e 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -58,7 +58,7 @@ public:
 private:
 	enum class Mode { CONNECT_REMOTE, LAUNCH_REMOTE, INTERNAL };
 
-	void message(const Message& message);
+	void message(const Message& msg);
 
 	void error(const std::string& msg);
 
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index 20e0a764..ee054e17 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -86,7 +86,7 @@ public:
 	SPtr<const Client::GraphModel> graph() const { return _graph; }
 	SPtr<GraphView>                view()  const { return _view; }
 
-	void show_port_status(const Client::PortModel* model,
+	void show_port_status(const Client::PortModel* port,
 	                      const Atom&              value);
 
 	void set_graph_from_path(const Raul::Path& path, SPtr<GraphView> view);
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index c2212426..f283354e 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -58,18 +58,18 @@ public:
 	App& app() { return _app; }
 
 	void build();
-	void show_human_names(bool show);
-	void show_port_names(bool show);
+	void show_human_names(bool b);
+	void show_port_names(bool b);
 	bool show_port_names() const { return _show_port_names; }
 
-	void add_plugin(SPtr<Client::PluginModel> pm);
+	void add_plugin(SPtr<Client::PluginModel> p);
 	void remove_plugin(const Raul::URI& uri);
 	void add_block(SPtr<const Client::BlockModel> bm);
 	void remove_block(SPtr<const Client::BlockModel> bm);
 	void add_port(SPtr<const Client::PortModel> pm);
 	void remove_port(SPtr<const Client::PortModel> pm);
-	void connection(SPtr<const Client::ArcModel> am);
-	void disconnection(SPtr<const Client::ArcModel> am);
+	void connection(SPtr<const Client::ArcModel> arc);
+	void disconnection(SPtr<const Client::ArcModel> arc);
 
 	void get_new_module_location(double& x, double& y);
 
@@ -85,7 +85,7 @@ public:
 private:
 	enum class ControlType { NUMBER, BUTTON };
 	void generate_port_name(
-		const std::string& sym_base,  std::string& sym,
+		const std::string& sym_base,  std::string& symbol,
 		const std::string& name_base, std::string& name);
 
 	void menu_add_port(const std::string& sym_base,
@@ -97,7 +97,7 @@ private:
 	void menu_new_graph();
 	void menu_load_graph();
 	void menu_properties();
-	void load_plugin(WPtr<Client::PluginModel> plugin);
+	void load_plugin(WPtr<Client::PluginModel> weak_plugin);
 
 	void build_menus();
 
@@ -109,11 +109,11 @@ private:
 
 	Ganv::Port* get_port_view(SPtr<Client::PortModel> port);
 
-	void connect(Ganv::Node* src,
-	             Ganv::Node* dst);
+	void connect(Ganv::Node* tail,
+	             Ganv::Node* head);
 
-	void disconnect(Ganv::Node* src,
-	                Ganv::Node* dst);
+	void disconnect(Ganv::Node* tail,
+	                Ganv::Node* head);
 
 	App&                           _app;
 	SPtr<const Client::GraphModel> _graph;
diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp
index 9722e330..79229be6 100644
--- a/src/gui/GraphPortModule.hpp
+++ b/src/gui/GraphPortModule.hpp
@@ -52,7 +52,7 @@ public:
 
 	App& app() const;
 
-	virtual void store_location(double x, double y);
+	virtual void store_location(double ax, double ay);
 	void show_human_names(bool b);
 
 	void set_name(const std::string& n);
@@ -68,7 +68,7 @@ protected:
 
 	void set_port(Port* port) { _port = port; }
 
-	void property_changed(const Raul::URI& predicate, const Atom& value);
+	void property_changed(const Raul::URI& key, const Atom& value);
 
 	SPtr<const Client::PortModel> _model;
 	Port*                         _port;
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index b48c7970..af767a2a 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -51,12 +51,12 @@ public:
 
 	void graph_property_changed(const Raul::URI&         key,
 	                            const Atom&              value,
-	                            SPtr<Client::GraphModel> gm);
+	                            SPtr<Client::GraphModel> graph);
 
 	void graph_moved(SPtr<Client::GraphModel> graph);
 
-	void add_graph(SPtr<Client::GraphModel> gm);
-	void remove_graph(SPtr<Client::GraphModel> gm);
+	void add_graph(SPtr<Client::GraphModel> pm);
+	void remove_graph(SPtr<Client::GraphModel> pm);
 	void show_graph_menu(GdkEventButton* ev);
 
 protected:
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index e38760a6..71ac76e2 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -114,7 +114,7 @@ private:
 	void set_row(Gtk::TreeModel::Row&            row,
 	             SPtr<const Client::PluginModel> plugin);
 
-	void new_plugin(SPtr<const Client::PluginModel> plugin);
+	void new_plugin(SPtr<const Client::PluginModel> pm);
 
 	void plugin_property_changed(const Raul::URI& plugin,
 	                             const Raul::URI& predicate,
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index 193ef18d..fa9eae1d 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -49,7 +49,7 @@ public:
 	int log(LV2_URID type, const char* fmt, va_list args);
 	void flush();
 
-	void post_error(const std::string& str);
+	void post_error(const std::string& msg);
 
 private:
 	void clear_clicked();
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 86103a03..f2381999 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -49,7 +49,7 @@ public:
 	static NodeModule* create(
 		GraphCanvas&                   canvas,
 		SPtr<const Client::BlockModel> block,
-		bool                           human_names);
+		bool                           human);
 
 	virtual ~NodeModule();
 
@@ -57,9 +57,9 @@ public:
 
 	Port* port(SPtr<const Client::PortModel> model);
 
-	void delete_port_view(SPtr<const Client::PortModel> port);
+	void delete_port_view(SPtr<const Client::PortModel> model);
 
-	virtual void store_location(double x, double y);
+	virtual void store_location(double ax, double ay);
 	void show_human_names(bool b);
 
 	SPtr<const Client::BlockModel> block() const { return _block; }
@@ -79,7 +79,7 @@ protected:
 	bool on_selected(gboolean selected);
 
 	void rename();
-	void property_changed(const Raul::URI& predicate, const Atom& value);
+	void property_changed(const Raul::URI& key, const Atom& value);
 
 	void new_port_view(SPtr<const Client::PortModel> port);
 
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 6819503a..c9a2c9f4 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -84,7 +84,7 @@ private:
 	bool datatype_supported(const std::set<Raul::URI>& types,
 	                        Raul::URI*                 widget_type);
 
-	bool class_supported(const std::set<Raul::URI>& type);
+	bool class_supported(const std::set<Raul::URI>& types);
 
 	Gtk::Widget* create_value_widget(const Raul::URI& key,
 	                                 const char*      type_uri,
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index a64a8759..1b8df2fa 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -41,13 +41,13 @@ class SubgraphModule : public NodeModule
 {
 public:
 	SubgraphModule(GraphCanvas&                        canvas,
-	               SPtr<const Client::GraphModel> controller);
+	               SPtr<const Client::GraphModel> graph);
 
 	virtual ~SubgraphModule() {}
 
-	bool on_double_click(GdkEventButton* ev);
+	bool on_double_click(GdkEventButton* event);
 
-	void store_location(double x, double y);
+	void store_location(double ax, double ay);
 
 	void browse_to_graph();
 	void menu_remove();
diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp
index d8f830d0..f49f5b0d 100644
--- a/src/gui/URIEntry.hpp
+++ b/src/gui/URIEntry.hpp
@@ -48,7 +48,7 @@ private:
 	Gtk::Menu* build_subclass_menu(const LilvNode* klass);
 
 	void add_leaf_menu_item(Gtk::Menu*         menu,
-	                        const LilvNode*    klass,
+	                        const LilvNode*    node,
 	                        const std::string& label);
 
 	void add_class_menu_item(Gtk::Menu*         menu,
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 6754dce4..ea8b909b 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -60,7 +60,7 @@ public:
 	GraphWindow* parent_graph_window(SPtr<const Client::BlockModel> block);
 
 	void present_graph(
-		SPtr<const Client::GraphModel> model,
+		SPtr<const Client::GraphModel> graph,
 		GraphWindow*                   preferred = NULL,
 		SPtr<GraphView>                view      = SPtr<GraphView>());