HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some compiler warnings

Browse Source 
* Shadowed function (splitwindow plugin);
 * Invalid escape sequence (classbuilder plugin);
 * Non-static local functions (classbuilder plugin);
 * Missing function argument type (keybindings.c).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5626 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-03-24 22:00:34 +00:00
parent 7698bf60a7
commit dbb260f5bb
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/classbuilder.c
View File

@ -201,7 +201,7 @@ static const gchar templates_php_class_source[] = "<?php\n\
{fileheader}\n\
{namespace_decl}\n\
{base_include}\n\
{abstract_decl}class {class_name}{base_decl}{implements_decl}\n\{\n\
{abstract_decl}class {class_name}{base_decl}{implements_decl}\n{\n\
{singleton_impl}\
{constructor_impl}\
{destructor_impl}\n\
@ -356,7 +356,7 @@ get_template_class_source(ClassInfo *class_info)
}
/* Creates a new option label, indented on the left */
GtkWidget *cc_option_label_new(const gchar *text)
static GtkWidget *cc_option_label_new(const gchar *text)
{
GtkWidget *align;
GtkWidget *label;
@ -373,10 +373,8 @@ GtkWidget *cc_option_label_new(const gchar *text)
/* Attaches a new section label at the specified table row, optionally
* padded at the top, and returns the new label. */
GtkWidget *cc_table_attach_section_label(GtkWidget *table,
const gchar *text,
gint row,
gboolean top_padding)
static GtkWidget *cc_table_attach_section_label(GtkWidget *table, const gchar *text,
gint row, gboolean top_padding)
{
gchar *markup;
GtkWidget *label, *align;
@ -401,9 +399,7 @@ GtkWidget *cc_table_attach_section_label(GtkWidget *table,
/* Attach a new option label at the specified table row and returns
* the label */
GtkWidget *cc_table_attach_option_label(GtkWidget *table,
const gchar *text,
gint row)
static GtkWidget *cc_table_attach_option_label(GtkWidget *table, const gchar *text, gint row)
{
GtkWidget *opt_label = cc_option_label_new(text);
gtk_table_attach(GTK_TABLE(table), opt_label,
@ -416,9 +412,7 @@ GtkWidget *cc_table_attach_option_label(GtkWidget *table,
* The label associated with the widget is set as data on the entry
* with the "label" key, if access to it is needed later. The entry
* widget is returned. */
GtkWidget *cc_table_attach_option_entry(GtkWidget *table,
const gchar *text,
gint row)
static GtkWidget *cc_table_attach_option_entry(GtkWidget *table, const gchar *text, gint row)
{
GtkWidget *label;
GtkWidget *entry;
@ -431,7 +425,7 @@ GtkWidget *cc_table_attach_option_entry(GtkWidget *table,
return entry;
}
void show_dialog_create_class(gint type)
static void show_dialog_create_class(gint type)
{
CreateClassDialog *cc_dlg;
GtkWidget *main_box, *table, *label, *hdr_hbox;

8
plugins/splitwindow.c
View File

@ -174,14 +174,14 @@ static const gchar *ui_get_stock_label(const gchar *stock_id)
static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label, const gchar *tooltip)
{
GtkToolItem *item;
gchar *dup = NULL;
gchar *dupl = NULL;
if (stock_id && !label)
{
label = ui_get_stock_label(stock_id);
}
dup = utils_str_remove_chars(g_strdup(label), "_");
label = dup;
dupl = utils_str_remove_chars(g_strdup(label), "_");
label = dupl;
item = gtk_tool_button_new(NULL, label);
if (stock_id)
@ -192,7 +192,7 @@ static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label,
if (tooltip)
ui_widget_set_tooltip_text(GTK_WIDGET(item), tooltip);
g_free(dup);
g_free(dupl);
return GTK_WIDGET(item);
}

2
src/keybindings.c
View File

@ -1778,7 +1778,7 @@ static GtkWidget *create_switch_dialog(void)
}
static void update_filename_label()
static void update_filename_label(void)
{
if (!switch_dialog)
{