[gimp/wip/nielsdg/fix-gir-warnings] colorselector: Rename signal emitters
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/nielsdg/fix-gir-warnings] colorselector: Rename signal emitters
- Date: Sun, 3 May 2020 21:23:14 +0000 (UTC)
commit 5f90e420b92996e7fa7d8ca2273c85bfe52ca2eb
Author: Niels De Graef <niels degraef barco com>
Date: Sun May 3 23:17:57 2020 +0200
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.
app/widgets/gimpcolorselectorpalette.c | 2 +-
.../libgimpwidgets/libgimpwidgets3-sections.txt | 6 ++---
libgimpwidgets/gimpcolornotebook.c | 2 +-
libgimpwidgets/gimpcolorscales.c | 2 +-
libgimpwidgets/gimpcolorselect.c | 2 +-
libgimpwidgets/gimpcolorselector.c | 26 +++++++++++-----------
libgimpwidgets/gimpcolorselector.h | 8 +++----
libgimpwidgets/gimpwidgets.def | 6 ++---
modules/color-selector-cmyk.c | 2 +-
modules/color-selector-water.c | 2 +-
modules/color-selector-wheel.c | 2 +-
plug-ins/pygimp/gimpui.defs | 4 ++--
12 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/app/widgets/gimpcolorselectorpalette.c b/app/widgets/gimpcolorselectorpalette.c
index 08db0cad88..bfd0fc7a46 100644
--- a/app/widgets/gimpcolorselectorpalette.c
+++ b/app/widgets/gimpcolorselectorpalette.c
@@ -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
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
b/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
index d87454ed9f..6bd2235693 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
@@ -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
diff --git a/libgimpwidgets/gimpcolornotebook.c b/libgimpwidgets/gimpcolornotebook.c
index 7eb6addc57..d567d16098 100644
--- a/libgimpwidgets/gimpcolornotebook.c
+++ b/libgimpwidgets/gimpcolornotebook.c
@@ -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
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index fdaffd777e..8be092c943 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -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
diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c
index b421850e6c..d4b2b1ad03 100644
--- a/libgimpwidgets/gimpcolorselect.c
+++ b/libgimpwidgets/gimpcolorselect.c
@@ -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
diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c
index 55c274fcbd..2215e14616 100644
--- a/libgimpwidgets/gimpcolorselector.c
+++ b/libgimpwidgets/gimpcolorselector.c
@@ -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;
diff --git a/libgimpwidgets/gimpcolorselector.h b/libgimpwidgets/gimpcolorselector.h
index c629806d0a..854f596ebd 100644
--- a/libgimpwidgets/gimpcolorselector.h
+++ b/libgimpwidgets/gimpcolorselector.h
@@ -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);
diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def
index 6fde040c39..15abf75946 100644
--- a/libgimpwidgets/gimpwidgets.def
+++ b/libgimpwidgets/gimpwidgets.def
@@ -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
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 5b568441ab..22eaf77011 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -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
diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c
index dd62cde611..65a207486d 100644
--- a/modules/color-selector-water.c
+++ b/modules/color-selector-water.c
@@ -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
diff --git a/modules/color-selector-wheel.c b/modules/color-selector-wheel.c
index 3dc1581b19..0cef54dc9f 100644
--- a/modules/color-selector-wheel.c
+++ b/modules/color-selector-wheel.c
@@ -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);
}
diff --git a/plug-ins/pygimp/gimpui.defs b/plug-ins/pygimp/gimpui.defs
index 6fa49f817e..34ad12b0e0 100644
--- a/plug-ins/pygimp/gimpui.defs
+++ b/plug-ins/pygimp/gimpui.defs
@@ -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")
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]