Skip to content

Commit 25d0718

Browse files
zisoftzisoft
committed
rename static functions with leading '_'
1 parent 1cdb48b commit 25d0718

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

‎src/libs/lib.c‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ gchar *dt_lib_get_active_preset_name(dt_lib_module_info_t *minfo)
103103
return name;
104104
}
105105

106-
// get dt_lib_module_info_t for a module. Must be freed by free_module_info()
106+
// get dt_lib_module_info_t for a module. Must be freed by _free_module_info()
107107
static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module)
108108
{
109109
dt_lib_module_info_t *mi = calloc(1, sizeof(dt_lib_module_info_t));
@@ -122,16 +122,17 @@ static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module
122122
return mi;
123123
}
124124

125-
static void _set_module_preset_label(dt_lib_module_t *module, const gchar *preset_name)
125+
static void _set_module_preset_label(dt_lib_module_t *module,
126+
const gchar *preset_name)
126127
{
127128
gchar *preset_label_text = (*preset_name == '\0')? g_strdup("")
128129
: g_strdup_printf("• %s", preset_name);
129130
gtk_label_set_text(GTK_LABEL(module->preset_label), preset_label_text);
130131
g_free(preset_label_text);
131132
}
132133

133-
static void edit_preset(const char *name_in,
134-
dt_lib_module_info_t *minfo)
134+
static void _edit_preset(const char *name_in,
135+
dt_lib_module_info_t *minfo)
135136
{
136137
// get the original name of the preset
137138
gchar *name = NULL;
@@ -171,8 +172,8 @@ static void edit_preset(const char *name_in,
171172
GTK_WINDOW(window));
172173
}
173174

174-
static void menuitem_update_preset(GtkMenuItem *menuitem,
175-
dt_lib_module_info_t *minfo)
175+
static void _menuitem_update_preset(GtkMenuItem *menuitem,
176+
dt_lib_module_info_t *minfo)
176177
{
177178
char *name = g_object_get_data(G_OBJECT(menuitem), "dt-preset-name");
178179

@@ -204,8 +205,8 @@ static void menuitem_update_preset(GtkMenuItem *menuitem,
204205
}
205206
}
206207

207-
static void menuitem_new_preset(GtkMenuItem *menuitem,
208-
dt_lib_module_info_t *minfo)
208+
static void _menuitem_new_preset(GtkMenuItem *menuitem,
209+
dt_lib_module_info_t *minfo)
209210
{
210211
dt_lib_presets_remove(_("new preset"), minfo->plugin_name, minfo->version);
211212

@@ -235,23 +236,23 @@ static void menuitem_new_preset(GtkMenuItem *menuitem,
235236
dt_action_define_preset(&minfo->module->actions, _("new preset"));
236237

237238
// then show edit dialog
238-
edit_preset(_("new preset"), minfo);
239+
_edit_preset(_("new preset"), minfo);
239240
}
240241

241-
static void menuitem_edit_preset(GtkMenuItem *menuitem,
242-
dt_lib_module_info_t *minfo)
242+
static void _menuitem_edit_preset(GtkMenuItem *menuitem,
243+
dt_lib_module_info_t *minfo)
243244
{
244-
edit_preset(NULL, minfo);
245+
_edit_preset(NULL, minfo);
245246
}
246247

247-
static void menuitem_manage_presets(GtkMenuItem *menuitem,
248-
dt_lib_module_info_t *minfo)
248+
static void _menuitem_manage_presets(GtkMenuItem *menuitem,
249+
dt_lib_module_info_t *minfo)
249250
{
250251
if(minfo->module->manage_presets) minfo->module->manage_presets(minfo->module);
251252
}
252253

253-
static void menuitem_delete_preset(GtkMenuItem *menuitem,
254-
dt_lib_module_info_t *minfo)
254+
static void _menuitem_delete_preset(GtkMenuItem *menuitem,
255+
dt_lib_module_info_t *minfo)
255256
{
256257
gchar *name = dt_lib_get_active_preset_name(minfo);
257258
if(name == NULL) return;
@@ -448,24 +449,24 @@ static gboolean _menuitem_button_preset(GtkMenuItem *menuitem,
448449
return TRUE;
449450
}
450451

451-
static void free_module_info(GtkWidget *widget,
452-
gpointer user_data)
452+
static void _free_module_info(GtkWidget *widget,
453+
gpointer user_data)
453454
{
454455
dt_lib_module_info_t *minfo = (dt_lib_module_info_t *)user_data;
455456
g_free(minfo->plugin_name);
456457
free(minfo->params);
457458
free(minfo);
458459
}
459460

460-
static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
461-
GtkWidget *w)
461+
static void _dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
462+
GtkWidget *w)
462463
{
463464
GtkMenu *menu = GTK_MENU(gtk_menu_new());
464465

465466
const gboolean hide_default = dt_conf_get_bool("plugins/lighttable/hide_default_presets");
466467
const gboolean default_first = dt_conf_get_bool("modules/default_presets_first");
467468

468-
g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(free_module_info), minfo);
469+
g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(_free_module_info), minfo);
469470

470471
GtkWidget *mi;
471472
int active_preset = -1, cnt = 0;
@@ -559,7 +560,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
559560
if(minfo->module->manage_presets)
560561
{
561562
mi = gtk_menu_item_new_with_label(_("manage presets..."));
562-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_manage_presets), minfo);
563+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_manage_presets), minfo);
563564
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
564565
cnt++;
565566
}
@@ -568,11 +569,11 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
568569
if(!selected_writeprotect)
569570
{
570571
mi = gtk_menu_item_new_with_label(_("edit this preset.."));
571-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_edit_preset), minfo);
572+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_edit_preset), minfo);
572573
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
573574

574575
mi = gtk_menu_item_new_with_label(_("delete this preset"));
575-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_delete_preset), minfo);
576+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_delete_preset), minfo);
576577
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
577578
cnt++;
578579
}
@@ -586,7 +587,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
586587
gtk_widget_set_tooltip_text(mi, _("nothing to save"));
587588
}
588589
else
589-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_new_preset), minfo);
590+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_new_preset), minfo);
590591
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
591592

592593
if(darktable.gui->last_preset && found)
@@ -600,7 +601,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
600601
g_object_set_data_full(G_OBJECT(mi), "dt-preset-name",
601602
g_strdup(darktable.gui->last_preset), g_free);
602603
g_signal_connect(G_OBJECT(mi), "activate",
603-
G_CALLBACK(menuitem_update_preset), minfo);
604+
G_CALLBACK(_menuitem_update_preset), minfo);
604605
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
605606
g_free(markup);
606607
}
@@ -890,7 +891,7 @@ void dt_lib_gui_update(dt_lib_module_t *module)
890891

891892
dt_lib_module_info_t *mi = _get_module_info_for_module(module);
892893
gchar *active_preset_name = dt_lib_get_active_preset_name(mi);
893-
free_module_info(NULL, mi);
894+
_free_module_info(NULL, mi);
894895
_set_module_preset_label(module, active_preset_name? active_preset_name : "");
895896
g_free(active_preset_name);
896897
}
@@ -937,7 +938,7 @@ static gboolean _presets_popup_callback(GtkButton *button,
937938
dt_lib_module_t *module)
938939
{
939940
dt_lib_module_info_t *mi = _get_module_info_for_module(module);
940-
dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button));
941+
_dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button));
941942

942943
if(button)
943944
dtgtk_button_set_active(DTGTK_BUTTON(button), FALSE);
@@ -1357,7 +1358,7 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module)
13571358
_set_module_preset_label(mi->module, preset_name);
13581359
g_free(preset_name);
13591360
}
1360-
free_module_info(NULL, mi);
1361+
_free_module_info(NULL, mi);
13611362

13621363
return module->expander;
13631364
}

0 commit comments

Comments
 (0)