dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

colorselector: Rename signal emitters 

The GIR parser is giving warnings because both e.g. a signal, a
corresponding vfunc and a method emitting it are named
"channel_changed", which can and will give issues in some bindings.

The easiest option is to follow the general convention of starting the
signal emitters with `emit_`, which also makes clear the intention of
the method.
This commit is contained in:
Niels De Graef 2020-05-03 23:17:57 +02:00 committed by Niels De Graef
parent f6c7bb997d
commit cf41d1fdf8
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpcolorselectorpalette.c
View File

@ -113,7 +113,7 @@ gimp_color_selector_palette_entry_clicked (GimpPaletteView *view,
selector->rgb = entry->color;
gimp_rgb_to_hsv (&selector->rgb, &selector->hsv);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
static void

6
devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
View File

@ -1296,9 +1296,9 @@ gimp_color_selector_set_channel
gimp_color_selector_get_channel
gimp_color_selector_set_model_visible
gimp_color_selector_get_model_visible
gimp_color_selector_color_changed
gimp_color_selector_channel_changed
gimp_color_selector_model_visible_changed
gimp_color_selector_emit_channel_changed
gimp_color_selector_emit_color_changed
gimp_color_selector_emit_model_visible_changed
gimp_color_selector_set_config
<SUBSECTION Standard>
GimpColorSelectorClass

2
libgimpwidgets/gimpcolornotebook.c
View File

@ -400,7 +400,7 @@ gimp_color_notebook_color_changed (GimpColorSelector *page,
selector->rgb = *rgb;
selector->hsv = *hsv;
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
static void

2
libgimpwidgets/gimpcolorscales.c
View File

@ -855,7 +855,7 @@ gimp_color_scales_scale_changed (GtkAdjustment *adjustment,
gimp_color_scales_update_scales (scales, i);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
static void

2
libgimpwidgets/gimpcolorselect.c
View File

@ -692,7 +692,7 @@ gimp_color_select_update (GimpColorSelect *select,
}
if (update & UPDATE_CALLER)
gimp_color_selector_color_changed (GIMP_COLOR_SELECTOR (select));
gimp_color_selector_emit_color_changed (GIMP_COLOR_SELECTOR (select));
}
static void

26
libgimpwidgets/gimpcolorselector.c
View File

@ -371,7 +371,7 @@ gimp_color_selector_set_color (GimpColorSelector *selector,
if (selector_class->set_color)
selector_class->set_color (selector, rgb, hsv);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
/**
@ -457,7 +457,7 @@ gimp_color_selector_set_channel (GimpColorSelector *selector,
if (selector_class->set_channel)
selector_class->set_channel (selector, channel);
gimp_color_selector_channel_changed (selector);
gimp_color_selector_emit_channel_changed (selector);
if (model != -1)
{
@ -537,7 +537,7 @@ gimp_color_selector_set_model_visible (GimpColorSelector *selector,
if (selector_class->set_model_visible)
selector_class->set_model_visible (selector, model, visible);
gimp_color_selector_model_visible_changed (selector, model);
gimp_color_selector_emit_model_visible_changed (selector, model);
}
}
@ -564,13 +564,13 @@ gimp_color_selector_get_model_visible (GimpColorSelector *selector,
}
/**
* gimp_color_selector_color_changed:
* gimp_color_selector_emit_color_changed:
* @selector: A #GimpColorSelector widget.
*
* Emits the "color-changed" signal.
**/
*/
void
gimp_color_selector_color_changed (GimpColorSelector *selector)
gimp_color_selector_emit_color_changed (GimpColorSelector *selector)
{
g_return_if_fail (GIMP_IS_COLOR_SELECTOR (selector));
@ -579,13 +579,13 @@ gimp_color_selector_color_changed (GimpColorSelector *selector)
}
/**
* gimp_color_selector_channel_changed:
* gimp_color_selector_emit_channel_changed:
* @selector: A #GimpColorSelector widget.
*
* Emits the "channel-changed" signal.
**/
*/
void
gimp_color_selector_channel_changed (GimpColorSelector *selector)
gimp_color_selector_emit_channel_changed (GimpColorSelector *selector)
{
g_return_if_fail (GIMP_IS_COLOR_SELECTOR (selector));
@ -594,17 +594,17 @@ gimp_color_selector_channel_changed (GimpColorSelector *selector)
}
/**
* gimp_color_selector_model_visible_changed:
* gimp_color_selector_emit_model_visible_changed:
* @selector: A #GimpColorSelector widget.
* @model: The #GimpColorSelectorModel where visibility changed.
*
* Emits the "model-visible-changed" signal.
*
* Since: 2.10
**/
*/
void
gimp_color_selector_model_visible_changed (GimpColorSelector *selector,
GimpColorSelectorModel model)
gimp_color_selector_emit_model_visible_changed (GimpColorSelector *selector,
GimpColorSelectorModel model)
{
GimpColorSelectorPrivate *priv;

8
libgimpwidgets/gimpcolorselector.h
View File

@ -163,10 +163,10 @@ void gimp_color_selector_set_model_visible (GimpColorSelector *selector,
gboolean gimp_color_selector_get_model_visible (GimpColorSelector *selector,
GimpColorSelectorModel model);
void gimp_color_selector_color_changed (GimpColorSelector *selector);
void gimp_color_selector_channel_changed (GimpColorSelector *selector);
void gimp_color_selector_model_visible_changed (GimpColorSelector *selector,
GimpColorSelectorModel model);
void gimp_color_selector_emit_color_changed (GimpColorSelector *selector);
void gimp_color_selector_emit_channel_changed (GimpColorSelector *selector);
void gimp_color_selector_emit_model_visible_changed (GimpColorSelector *selector,
GimpColorSelectorModel model);
void gimp_color_selector_set_config (GimpColorSelector *selector,
GimpColorConfig *config);

6
libgimpwidgets/gimpwidgets.def
View File

@ -122,9 +122,10 @@ EXPORTS
gimp_color_selection_set_config
gimp_color_selection_set_old_color
gimp_color_selection_set_show_alpha
gimp_color_selector_channel_changed
gimp_color_selector_channel_get_type
gimp_color_selector_color_changed
gimp_color_selector_emit_channel_changed
gimp_color_selector_emit_color_changed
gimp_color_selector_emit_model_visible_changed
gimp_color_selector_get_channel
gimp_color_selector_get_color
gimp_color_selector_get_model_visible
@ -133,7 +134,6 @@ EXPORTS
gimp_color_selector_get_toggles_visible
gimp_color_selector_get_type
gimp_color_selector_model_get_type
gimp_color_selector_model_visible_changed
gimp_color_selector_new
gimp_color_selector_set_channel
gimp_color_selector_set_color

2
modules/color-selector-cmyk.c
View File

@ -344,7 +344,7 @@ colorsel_cmyk_adj_update (GtkAdjustment *adj,
gimp_rgb_to_hsv (&selector->rgb, &selector->hsv);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
static void

2
modules/color-selector-water.c
View File

@ -406,7 +406,7 @@ add_pigment (ColorselWater *water,
gimp_rgb_to_hsv (&selector->rgb, &selector->hsv);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}
static void

2
modules/color-selector-wheel.c
View File

@ -160,5 +160,5 @@ colorsel_wheel_changed (GimpColorWheel *hsv,
&selector->hsv.v);
gimp_hsv_to_rgb (&selector->hsv, &selector->rgb);
gimp_color_selector_color_changed (selector);
gimp_color_selector_emit_color_changed (selector);
}

4
plug-ins/pygimp/gimpui.defs
View File

@ -1319,13 +1319,13 @@
(define-method color_changed
(of-object "GimpColorSelector")
(c-name "gimp_color_selector_color_changed")
(c-name "gimp_color_selector_emit_color_changed")
(return-type "none")
)
(define-method channel_changed
(of-object "GimpColorSelector")
(c-name "gimp_color_selector_channel_changed")
(c-name "gimp_color_selector_emit_channel_changed")
(return-type "none")
)