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

libgimpwidgets: UnitStore: Fix conflicting names 

`gimp_unit_store_get_value()` clashes with the `get_value()` method of
its parent class GtkTreeStore. This means trouble for bindings, as seen
here in some pseudocode:

```vala
var unit_store = new Gimp.UnitStore();
// Which function are we referencing here, the one from GtkTreeStore or
// the one from GimpUnitStore? Worse, they both have different arguments
unit_store.get_value( ... )
```
This commit is contained in:
Niels De Graef 2019-08-20 18:21:45 +02:00 committed by Jehan
parent 25ecef0dc3
commit 65b12c108d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,7 +716,7 @@ gimp_unit_store_set_pixel_value
gimp_unit_store_set_pixel_values
gimp_unit_store_set_resolution
gimp_unit_store_set_resolutions
gimp_unit_store_get_value
gimp_unit_store_get_nth_value
gimp_unit_store_get_values
<SUBSECTION Standard>
GimpUnitStoreClass

8
libgimpwidgets/gimpunitstore.c
View File

@ -851,9 +851,9 @@ gimp_unit_store_set_resolutions (GimpUnitStore *store,
}
gdouble
gimp_unit_store_get_value (GimpUnitStore *store,
GimpUnit unit,
gint index)
gimp_unit_store_get_nth_value (GimpUnitStore *store,
GimpUnit unit,
gint index)
{
GimpUnitStorePrivate *private;
GtkTreeIter iter;
@ -894,7 +894,7 @@ gimp_unit_store_get_values (GimpUnitStore *store,
for (i = 0; i < private->num_values; )
{
if (first_value)
*first_value = gimp_unit_store_get_value (store, unit, i);
*first_value = gimp_unit_store_get_nth_value (store, unit, i);
if (++i < private->num_values)
first_value = va_arg (args, gdouble *);

2
libgimpwidgets/gimpunitstore.h
View File

@ -104,7 +104,7 @@ void gimp_unit_store_set_resolution (GimpUnitStore *store,
void gimp_unit_store_set_resolutions (GimpUnitStore *store,
gdouble first_resolution,
...);
gdouble gimp_unit_store_get_value (GimpUnitStore *store,
gdouble gimp_unit_store_get_nth_value (GimpUnitStore *store,
GimpUnit unit,
gint index);
void gimp_unit_store_get_values (GimpUnitStore *store,

2
libgimpwidgets/gimpwidgets.def
View File

@ -413,8 +413,8 @@ EXPORTS
gimp_unit_combo_box_set_active
gimp_unit_store_get_has_percent
gimp_unit_store_get_has_pixels
gimp_unit_store_get_nth_value
gimp_unit_store_get_type
gimp_unit_store_get_value
gimp_unit_store_get_values
gimp_unit_store_new
gimp_unit_store_set_has_percent