[gnome-commander] src/gnome-cmd-user-actions.cc: Fix gcc warnings about variable shadowing
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] src/gnome-cmd-user-actions.cc: Fix gcc warnings about variable shadowing
- Date: Fri, 28 Apr 2017 21:43:33 +0000 (UTC)
commit 6fa4a96cacdff1b3e0e50bd50bc27aad0fe7b719
Author: Uwe Scholz <uwescholz src gnome org>
Date: Mon Apr 24 21:35:51 2017 +0200
src/gnome-cmd-user-actions.cc: Fix gcc warnings about variable shadowing
src/gnome-cmd-user-actions.cc | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 4bed2be..ac50103 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -497,9 +497,9 @@ void GnomeCmdUserActions::shutdown()
}
-gboolean GnomeCmdUserActions::register_action(guint state, guint keyval, const gchar *name, const char
*user_data)
+gboolean GnomeCmdUserActions::register_action(guint state, guint keyval, const gchar *action_name, const
char *user_data)
{
- GnomeCmdUserActionFunc func = action_func[name];
+ GnomeCmdUserActionFunc func = action_func[action_name];
if (!func)
return FALSE;
@@ -529,7 +529,7 @@ gboolean GnomeCmdUserActions::register_action(guint state, guint keyval, const g
}
-void GnomeCmdUserActions::unregister(const gchar *name)
+void GnomeCmdUserActions::unregister(const gchar *action_name)
{
}
@@ -551,9 +551,9 @@ void GnomeCmdUserActions::unregister(guint state, guint keyval)
}
-gboolean GnomeCmdUserActions::registered(const gchar *name)
+gboolean GnomeCmdUserActions::registered(const gchar *action_name)
{
- GnomeCmdUserActionFunc func = action_func[name];
+ GnomeCmdUserActionFunc func = action_func[action_name];
if (!func)
return FALSE;
@@ -891,8 +891,8 @@ void file_create_symlink (GtkMenuItem *menuitem, gpointer not_used)
}
else
{
- GnomeCmdFile *f = get_fl (ACTIVE)->get_focused_file();
- gnome_cmd_file_selector_create_symlink (inactive_fs, f);
+ GnomeCmdFile *focused_f = get_fl (ACTIVE)->get_focused_file();
+ gnome_cmd_file_selector_create_symlink (inactive_fs, focused_f);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]