[gimp] app: s/slider_count/n_sliders/ in GimpToolLine and firends
- From: N/A <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: s/slider_count/n_sliders/ in GimpToolLine and firends
- Date: Mon, 3 Jul 2017 22:12:14 +0000 (UTC)
commit 04b407a0199934623d4e815722977af1332d63d7
Author: Ell <ell_se yahoo com>
Date: Mon Jul 3 18:10:30 2017 -0400
app: s/slider_count/n_sliders/ in GimpToolLine and firends
Yep yep yep.
app/display/gimptoolline.c | 12 ++++++------
app/display/gimptoolline.h | 4 ++--
app/propgui/gimppropgui-spiral.c | 10 +++++-----
app/propgui/propgui-types.h | 2 +-
app/tools/gimpfiltertool-widgets.c | 12 ++++++------
5 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/app/display/gimptoolline.c b/app/display/gimptoolline.c
index 65ec27d..50a61f5 100644
--- a/app/display/gimptoolline.c
+++ b/app/display/gimptoolline.c
@@ -926,19 +926,19 @@ gimp_tool_line_new (GimpDisplayShell *shell,
void
gimp_tool_line_set_sliders (GimpToolLine *line,
const GimpControllerSlider *sliders,
- gint slider_count)
+ gint n_sliders)
{
GimpToolLinePrivate *private;
g_return_if_fail (GIMP_IS_TOOL_LINE (line));
- g_return_if_fail (slider_count == 0 || (slider_count > 0 && sliders != NULL));
+ g_return_if_fail (n_sliders == 0 || (n_sliders > 0 && sliders != NULL));
private = line->private;
- g_array_set_size (private->sliders, slider_count);
+ g_array_set_size (private->sliders, n_sliders);
memcpy (private->sliders->data, sliders,
- slider_count * sizeof (GimpControllerSlider));
+ n_sliders * sizeof (GimpControllerSlider));
g_object_set (line,
"sliders", private->sliders,
@@ -947,7 +947,7 @@ gimp_tool_line_set_sliders (GimpToolLine *line,
const GimpControllerSlider *
gimp_tool_line_get_sliders (GimpToolLine *line,
- gint *slider_count)
+ gint *n_sliders)
{
GimpToolLinePrivate *private;
@@ -955,7 +955,7 @@ gimp_tool_line_get_sliders (GimpToolLine *line,
private = line->private;
- if (slider_count) *slider_count = private->sliders->len;
+ if (n_sliders) *n_sliders = private->sliders->len;
return (const GimpControllerSlider *) private->sliders->data;
}
diff --git a/app/display/gimptoolline.h b/app/display/gimptoolline.h
index dfad2af..2398d03 100644
--- a/app/display/gimptoolline.h
+++ b/app/display/gimptoolline.h
@@ -60,9 +60,9 @@ GimpToolWidget * gimp_tool_line_new (GimpDisplayShell
void gimp_tool_line_set_sliders (GimpToolLine *line,
const GimpControllerSlider *sliders,
- gint slider_count);
+ gint n_sliders);
const GimpControllerSlider * gimp_tool_line_get_sliders (GimpToolLine *line,
- gint *slider_count);
+ gint *n_sliders);
#endif /* __GIMP_TOOL_LINE_H__ */
diff --git a/app/propgui/gimppropgui-spiral.c b/app/propgui/gimppropgui-spiral.c
index 450da45..58705e8 100644
--- a/app/propgui/gimppropgui-spiral.c
+++ b/app/propgui/gimppropgui-spiral.c
@@ -52,7 +52,7 @@ slider_line_callback (GObject *config,
gdouble x2,
gdouble y2,
const GimpControllerSlider *sliders,
- gint slider_count)
+ gint n_sliders)
{
GeglSpiralType type;
gdouble x, y;
@@ -128,7 +128,7 @@ config_notify (GObject *config,
gdouble balance;
gdouble x1, y1, x2, y2;
GimpControllerSlider sliders[2];
- gint slider_count = 0;
+ gint n_sliders = 0;
set_func = g_object_get_data (G_OBJECT (config), "set-func");
area = g_object_get_data (G_OBJECT (config), "area");
@@ -151,7 +151,7 @@ config_notify (GObject *config,
switch (type)
{
case GEGL_SPIRAL_TYPE_LINEAR:
- slider_count = 1;
+ n_sliders = 1;
sliders[0].min = 0.5;
sliders[0].max = 1.0;
@@ -160,7 +160,7 @@ config_notify (GObject *config,
break;
case GEGL_SPIRAL_TYPE_LOGARITHMIC:
- slider_count = 2;
+ n_sliders = 2;
sliders[0].min = 0.0;
sliders[0].max = 1.0;
@@ -173,7 +173,7 @@ config_notify (GObject *config,
break;
}
- set_func (set_data, area, x1, y1, x2, y2, sliders, slider_count);
+ set_func (set_data, area, x1, y1, x2, y2, sliders, n_sliders);
}
GtkWidget *
diff --git a/app/propgui/propgui-types.h b/app/propgui/propgui-types.h
index 94cb395..719617d 100644
--- a/app/propgui/propgui-types.h
+++ b/app/propgui/propgui-types.h
@@ -56,7 +56,7 @@ typedef void (* GimpControllerSliderLineCallback) (gpointer d
gdouble x2,
gdouble y2,
const GimpControllerSlider *sliders,
- gint slider_count);
+ gint n_sliders);
typedef GtkWidget * (* GimpCreatePickerFunc) (gpointer creator,
diff --git a/app/tools/gimpfiltertool-widgets.c b/app/tools/gimpfiltertool-widgets.c
index 9b08dbb..99e8e22 100644
--- a/app/tools/gimpfiltertool-widgets.c
+++ b/app/tools/gimpfiltertool-widgets.c
@@ -64,7 +64,7 @@ static void gimp_filter_tool_set_slider_line (Controller *
gdouble x2,
gdouble y2,
const GimpControllerSlider *sliders,
- gint slider_count);
+ gint n_sliders);
static void gimp_filter_tool_slider_line_changed (GimpToolWidget *widget,
Controller *controller);
@@ -209,7 +209,7 @@ gimp_filter_tool_set_slider_line (Controller *controller,
gdouble x2,
gdouble y2,
const GimpControllerSlider *sliders,
- gint slider_count)
+ gint n_sliders)
{
GimpDrawable *drawable = controller->filter_tool->drawable;
@@ -237,7 +237,7 @@ gimp_filter_tool_set_slider_line (Controller *controller,
NULL);
gimp_tool_line_set_sliders (GIMP_TOOL_LINE (controller->widget),
- sliders, slider_count);
+ sliders, n_sliders);
g_signal_handlers_unblock_by_func (controller->widget,
gimp_filter_tool_slider_line_changed,
@@ -252,7 +252,7 @@ gimp_filter_tool_slider_line_changed (GimpToolWidget *widget,
GimpControllerSliderLineCallback slider_line_callback;
gdouble x1, y1, x2, y2;
const GimpControllerSlider *sliders;
- gint slider_count;
+ gint n_sliders;
gint off_x, off_y;
GeglRectangle area;
@@ -267,7 +267,7 @@ gimp_filter_tool_slider_line_changed (GimpToolWidget *widget,
NULL);
sliders = gimp_tool_line_get_sliders (GIMP_TOOL_LINE (controller->widget),
- &slider_count);
+ &n_sliders);
gimp_filter_tool_get_drawable_area (filter_tool, &off_x, &off_y, &area);
@@ -277,5 +277,5 @@ gimp_filter_tool_slider_line_changed (GimpToolWidget *widget,
y2 -= off_y + area.y;
slider_line_callback (controller->creator_data,
- &area, x1, y1, x2, y2, sliders, slider_count);
+ &area, x1, y1, x2, y2, sliders, n_sliders);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]