Skip to content

Commit f03df1a

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

File tree

2 files changed

+31
-38
lines changed

2 files changed

+31
-38
lines changed

‎src/libs/lib.c

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
#include "gui/drag_and_drop.h"
2828
#include "gui/gtk.h"
2929
#include "gui/presets.h"
30-
#include <glib-2.0/glib.h>
31-
#include <string.h>
32-
#ifdef GDK_WINDOWING_QUARTZ
33-
#endif
3430
#include <stdbool.h>
3531
#include <stdlib.h>
3632

@@ -103,7 +99,7 @@ gchar *dt_lib_get_active_preset_name(dt_lib_module_info_t *minfo)
10399
return name;
104100
}
105101

106-
// get dt_lib_module_info_t for a module. Must be freed by free_module_info()
102+
// get dt_lib_module_info_t for a module. Must be freed by _free_module_info()
107103
static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module)
108104
{
109105
dt_lib_module_info_t *mi = calloc(1, sizeof(dt_lib_module_info_t));
@@ -122,16 +118,17 @@ static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module
122118
return mi;
123119
}
124120

125-
static void _set_module_preset_label(dt_lib_module_t *module, const gchar *preset_name)
121+
static void _set_module_preset_label(dt_lib_module_t *module,
122+
const gchar *preset_name)
126123
{
127124
gchar *preset_label_text = (*preset_name == '\0')? g_strdup("")
128125
: g_strdup_printf("• %s", preset_name);
129126
gtk_label_set_text(GTK_LABEL(module->preset_label), preset_label_text);
130127
g_free(preset_label_text);
131128
}
132129

133-
static void edit_preset(const char *name_in,
134-
dt_lib_module_info_t *minfo)
130+
static void _edit_preset(const char *name_in,
131+
dt_lib_module_info_t *minfo)
135132
{
136133
// get the original name of the preset
137134
gchar *name = NULL;
@@ -171,8 +168,8 @@ static void edit_preset(const char *name_in,
171168
GTK_WINDOW(window));
172169
}
173170

174-
static void menuitem_update_preset(GtkMenuItem *menuitem,
175-
dt_lib_module_info_t *minfo)
171+
static void _menuitem_update_preset(GtkMenuItem *menuitem,
172+
dt_lib_module_info_t *minfo)
176173
{
177174
char *name = g_object_get_data(G_OBJECT(menuitem), "dt-preset-name");
178175

@@ -204,8 +201,8 @@ static void menuitem_update_preset(GtkMenuItem *menuitem,
204201
}
205202
}
206203

207-
static void menuitem_new_preset(GtkMenuItem *menuitem,
208-
dt_lib_module_info_t *minfo)
204+
static void _menuitem_new_preset(GtkMenuItem *menuitem,
205+
dt_lib_module_info_t *minfo)
209206
{
210207
dt_lib_presets_remove(_("new preset"), minfo->plugin_name, minfo->version);
211208

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

237234
// then show edit dialog
238-
edit_preset(_("new preset"), minfo);
235+
_edit_preset(_("new preset"), minfo);
239236
}
240237

241-
static void menuitem_edit_preset(GtkMenuItem *menuitem,
242-
dt_lib_module_info_t *minfo)
238+
static void _menuitem_edit_preset(GtkMenuItem *menuitem,
239+
dt_lib_module_info_t *minfo)
243240
{
244-
edit_preset(NULL, minfo);
241+
_edit_preset(NULL, minfo);
245242
}
246243

247-
static void menuitem_manage_presets(GtkMenuItem *menuitem,
248-
dt_lib_module_info_t *minfo)
244+
static void _menuitem_manage_presets(GtkMenuItem *menuitem,
245+
dt_lib_module_info_t *minfo)
249246
{
250247
if(minfo->module->manage_presets) minfo->module->manage_presets(minfo->module);
251248
}
252249

253-
static void menuitem_delete_preset(GtkMenuItem *menuitem,
254-
dt_lib_module_info_t *minfo)
250+
static void _menuitem_delete_preset(GtkMenuItem *menuitem,
251+
dt_lib_module_info_t *minfo)
255252
{
256253
gchar *name = dt_lib_get_active_preset_name(minfo);
257254
if(name == NULL) return;
@@ -448,24 +445,24 @@ static gboolean _menuitem_button_preset(GtkMenuItem *menuitem,
448445
return TRUE;
449446
}
450447

451-
static void free_module_info(GtkWidget *widget,
452-
gpointer user_data)
448+
static void _free_module_info(GtkWidget *widget,
449+
gpointer user_data)
453450
{
454451
dt_lib_module_info_t *minfo = (dt_lib_module_info_t *)user_data;
455452
g_free(minfo->plugin_name);
456453
free(minfo->params);
457454
free(minfo);
458455
}
459456

460-
static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
461-
GtkWidget *w)
457+
static void _dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
458+
GtkWidget *w)
462459
{
463460
GtkMenu *menu = GTK_MENU(gtk_menu_new());
464461

465462
const gboolean hide_default = dt_conf_get_bool("plugins/lighttable/hide_default_presets");
466463
const gboolean default_first = dt_conf_get_bool("modules/default_presets_first");
467464

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

470467
GtkWidget *mi;
471468
int active_preset = -1, cnt = 0;
@@ -559,7 +556,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
559556
if(minfo->module->manage_presets)
560557
{
561558
mi = gtk_menu_item_new_with_label(_("manage presets..."));
562-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_manage_presets), minfo);
559+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_manage_presets), minfo);
563560
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
564561
cnt++;
565562
}
@@ -568,11 +565,11 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
568565
if(!selected_writeprotect)
569566
{
570567
mi = gtk_menu_item_new_with_label(_("edit this preset.."));
571-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_edit_preset), minfo);
568+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_edit_preset), minfo);
572569
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
573570

574571
mi = gtk_menu_item_new_with_label(_("delete this preset"));
575-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_delete_preset), minfo);
572+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_delete_preset), minfo);
576573
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
577574
cnt++;
578575
}
@@ -586,7 +583,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
586583
gtk_widget_set_tooltip_text(mi, _("nothing to save"));
587584
}
588585
else
589-
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_new_preset), minfo);
586+
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_new_preset), minfo);
590587
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
591588

592589
if(darktable.gui->last_preset && found)
@@ -600,7 +597,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo,
600597
g_object_set_data_full(G_OBJECT(mi), "dt-preset-name",
601598
g_strdup(darktable.gui->last_preset), g_free);
602599
g_signal_connect(G_OBJECT(mi), "activate",
603-
G_CALLBACK(menuitem_update_preset), minfo);
600+
G_CALLBACK(_menuitem_update_preset), minfo);
604601
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
605602
g_free(markup);
606603
}
@@ -890,7 +887,7 @@ void dt_lib_gui_update(dt_lib_module_t *module)
890887

891888
dt_lib_module_info_t *mi = _get_module_info_for_module(module);
892889
gchar *active_preset_name = dt_lib_get_active_preset_name(mi);
893-
free_module_info(NULL, mi);
890+
_free_module_info(NULL, mi);
894891
_set_module_preset_label(module, active_preset_name? active_preset_name : "");
895892
g_free(active_preset_name);
896893
}
@@ -937,7 +934,7 @@ static gboolean _presets_popup_callback(GtkButton *button,
937934
dt_lib_module_t *module)
938935
{
939936
dt_lib_module_info_t *mi = _get_module_info_for_module(module);
940-
dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button));
937+
_dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button));
941938

942939
if(button)
943940
dtgtk_button_set_active(DTGTK_BUTTON(button), FALSE);
@@ -1357,7 +1354,7 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module)
13571354
_set_module_preset_label(mi->module, preset_name);
13581355
g_free(preset_name);
13591356
}
1360-
free_module_info(NULL, mi);
1357+
_free_module_info(NULL, mi);
13611358

13621359
return module->expander;
13631360
}

‎src/libs/lib.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of darktable,
3-
Copyright (C) 2009-2023 darktable developers.
3+
Copyright (C) 2009-2025 darktable developers.
44
55
darktable is free software: you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -28,11 +28,7 @@
2828
#include "gui/presets.h"
2929

3030
#ifdef USE_LUA
31-
#include "lua/call.h"
32-
#include "lua/events.h"
3331
#include "lua/lib.h"
34-
#include "lua/modules.h"
35-
#include "lua/types.h"
3632
#endif
3733

3834
struct dt_lib_module_t;

0 commit comments

Comments
 (0)