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

Remove GIMP_TYPE_INT16 and GimpParamSpecInt16 

Use gint and GParamSpecInt with the right value range instead.
This commit is contained in:
Michael Natterer 2019-08-15 14:17:17 +02:00
parent 5a09523214
commit 350abba213
14 changed files with 33 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/pdb/gimp-pdb-compat.c
View File

@ -55,7 +55,6 @@ gimp_pdb_compat_arg_type_from_gtype (GType type)
{ G_TYPE_ENUM, GIMP_PDB_INT32 },
{ G_TYPE_BOOLEAN, GIMP_PDB_INT32 },
{ GIMP_TYPE_INT16, GIMP_PDB_INT16 },
{ G_TYPE_UCHAR, GIMP_PDB_INT8 },
{ G_TYPE_DOUBLE, GIMP_PDB_FLOAT },

40
app/pdb/plug-in-compat-cmds.c
View File

@ -7023,17 +7023,17 @@ register_plug_in_compat_procs (GimpPDB *pdb)
pdb->gimp, FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int16 ("width",
"width",
"Width of the passages",
1, 1024, 1,
GIMP_PARAM_READWRITE));
g_param_spec_int ("width",
"width",
"Width of the passages",
1, 1024, 1,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int16 ("height",
"height",
"Height of the passages",
1, 1024, 1,
GIMP_PARAM_READWRITE));
g_param_spec_int ("height",
"height",
"Height of the passages",
1, 1024, 1,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_uchar ("tileable",
"tileable",
@ -7053,17 +7053,17 @@ register_plug_in_compat_procs (GimpPDB *pdb)
G_MININT32, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int16 ("multiple",
"multiple",
"Multiple (use 57)",
G_MININT16, G_MAXINT16, 0,
GIMP_PARAM_READWRITE));
g_param_spec_int ("multiple",
"multiple",
"Multiple (use 57)",
G_MININT16, G_MAXINT16, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int16 ("offset",
"offset",
"Offset (use 1)",
G_MININT16, G_MAXINT16, 0,
GIMP_PARAM_READWRITE));
g_param_spec_int ("offset",
"offset",
"Offset (use 1)",
G_MININT16, G_MAXINT16, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);

7
app/plug-in/gimpgpparams.c
View File

@ -90,13 +90,6 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
param_def->meta.m_int.default_val,
flags);
if (! strcmp (param_def->type_name, "GimpParamInt16"))
return gimp_param_spec_int16 (name, nick, blurb,
param_def->meta.m_int.min_val,
param_def->meta.m_int.max_val,
param_def->meta.m_int.default_val,
flags);
if (! strcmp (param_def->type_name, "GParamUInt"))
return g_param_spec_uint (name, nick, blurb,
param_def->meta.m_int.min_val,

9
devel-docs/libgimpbase/libgimpbase3-sections.txt
View File

@ -296,7 +296,6 @@ GIMP_PARAM_STATIC_STRINGS
GIMP_PARAM_READABLE
GIMP_PARAM_WRITABLE
GIMP_PARAM_READWRITE
gimp_param_spec_int16
gimp_param_spec_string
gimp_array_new
gimp_array_copy
@ -344,7 +343,6 @@ gimp_value_take_rgb_array
<SUBSECTION Standard>
GIMP_IS_PARAM_SPEC_ARRAY
GIMP_IS_PARAM_SPEC_FLOAT_ARRAY
GIMP_IS_PARAM_SPEC_INT16
GIMP_IS_PARAM_SPEC_INT16_ARRAY
GIMP_IS_PARAM_SPEC_INT32_ARRAY
GIMP_IS_PARAM_SPEC_INT8_ARRAY
@ -353,7 +351,6 @@ GIMP_IS_PARAM_SPEC_STRING
GIMP_IS_PARAM_SPEC_STRING_ARRAY
GIMP_PARAM_SPEC_ARRAY
GIMP_PARAM_SPEC_FLOAT_ARRAY
GIMP_PARAM_SPEC_INT16
GIMP_PARAM_SPEC_INT16_ARRAY
GIMP_PARAM_SPEC_INT32_ARRAY
GIMP_PARAM_SPEC_INT8_ARRAY
@ -362,13 +359,11 @@ GIMP_PARAM_SPEC_STRING
GIMP_PARAM_SPEC_STRING_ARRAY
GIMP_TYPE_ARRAY
GIMP_TYPE_FLOAT_ARRAY
GIMP_TYPE_INT16
GIMP_TYPE_INT16_ARRAY
GIMP_TYPE_INT32_ARRAY
GIMP_TYPE_INT8_ARRAY
GIMP_TYPE_PARAM_ARRAY
GIMP_TYPE_PARAM_FLOAT_ARRAY
GIMP_TYPE_PARAM_INT16
GIMP_TYPE_PARAM_INT16_ARRAY
GIMP_TYPE_PARAM_INT32_ARRAY
GIMP_TYPE_PARAM_INT8_ARRAY
@ -379,7 +374,6 @@ GIMP_TYPE_RGB_ARRAY
GIMP_TYPE_STRING_ARRAY
GIMP_VALUE_HOLDS_ARRAY
GIMP_VALUE_HOLDS_FLOAT_ARRAY
GIMP_VALUE_HOLDS_INT16
GIMP_VALUE_HOLDS_INT16_ARRAY
GIMP_VALUE_HOLDS_INT32_ARRAY
GIMP_VALUE_HOLDS_INT8_ARRAY
@ -389,7 +383,6 @@ GimpArray
GimpStringArray
GimpParamSpecArray
GimpParamSpecFloatArray
GimpParamSpecInt16
GimpParamSpecInt16Array
GimpParamSpecInt32Array
GimpParamSpecInt8Array
@ -399,13 +392,11 @@ GimpParamSpecStringArray
gimp_array_get_type
gimp_float_array_get_type
gimp_int16_array_get_type
gimp_int16_get_type
gimp_int32_array_get_type
gimp_int8_array_get_type
gimp_param_array_get_type
gimp_param_float_array_get_type
gimp_param_int16_array_get_type
gimp_param_int16_get_type
gimp_param_int32_array_get_type
gimp_param_int8_array_get_type
gimp_param_rgb_array_get_type

2
devel-docs/libgimpbase/libgimpbase3.types
View File

@ -1,7 +1,6 @@
gimp_array_get_type
gimp_float_array_get_type
gimp_int16_array_get_type
gimp_int16_get_type
gimp_int32_array_get_type
gimp_int8_array_get_type
gimp_memsize_get_type
@ -9,7 +8,6 @@ gimp_metadata_get_type
gimp_param_array_get_type
gimp_param_float_array_get_type
gimp_param_int16_array_get_type
gimp_param_int16_get_type
gimp_param_int32_array_get_type
gimp_param_int8_array_get_type
gimp_param_rgb_array_get_type

1
libgimp/gimp.c
View File

@ -447,7 +447,6 @@ _gimp_main_internal (GType plug_in_type,
GType init_types[] =
{
G_TYPE_INT, G_TYPE_PARAM_INT,
GIMP_TYPE_INT16, GIMP_TYPE_PARAM_INT16,
G_TYPE_UCHAR, G_TYPE_PARAM_UCHAR,
G_TYPE_STRING, GIMP_TYPE_PARAM_STRING,

9
libgimp/gimpgpcompat.c
View File

@ -52,9 +52,9 @@ _gimp_gp_compat_param_spec (GimpPDBArgType arg_type,
break;
case GIMP_PDB_INT16:
pspec = gimp_param_spec_int16 (name, nick, blurb,
G_MININT16, G_MAXINT16, 0,
G_PARAM_READWRITE);
pspec = g_param_spec_int (name, nick, blurb,
G_MININT16, G_MAXINT16, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT8:
@ -192,7 +192,7 @@ _gimp_pdb_arg_type_to_gtype (GimpPDBArgType type)
return G_TYPE_INT;
case GIMP_PDB_INT16:
return GIMP_TYPE_INT16;
return G_TYPE_INT;
case GIMP_PDB_INT8:
return G_TYPE_UCHAR;
@ -284,7 +284,6 @@ _gimp_pdb_gtype_to_arg_type (GType type)
{ G_TYPE_ENUM, GIMP_PDB_INT32 },
{ G_TYPE_BOOLEAN, GIMP_PDB_INT32 },
{ GIMP_TYPE_INT16, GIMP_PDB_INT16 },
{ G_TYPE_UCHAR, GIMP_PDB_INT8 },
{ G_TYPE_DOUBLE, GIMP_PDB_FLOAT },

9
libgimp/gimpgpparams-body.c
View File

@ -39,8 +39,7 @@ _gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
pspec_type = G_PARAM_SPEC_TYPE (pspec);
if (pspec_type == G_TYPE_PARAM_INT ||
pspec_type == GIMP_TYPE_PARAM_INT16)
if (pspec_type == G_TYPE_PARAM_INT)
{
GParamSpecInt *ispec = G_PARAM_SPEC_INT (pspec);
@ -190,8 +189,7 @@ _gimp_gp_param_to_value (gpointer gimp,
g_value_init (value, type);
if (type == G_TYPE_INT ||
type == GIMP_TYPE_INT16 ||
if (type == G_TYPE_INT ||
type == GIMP_TYPE_UNIT)
{
g_value_set_int (value, param->data.d_int);
@ -434,8 +432,7 @@ _gimp_value_to_gp_param (const GValue *value,
else
param->type_name = (gchar *) g_type_name (type);
if (type == G_TYPE_INT ||
type == GIMP_TYPE_INT16 ||
if (type == G_TYPE_INT ||
type == GIMP_TYPE_UNIT)
{
param->param_type = GP_PARAM_TYPE_INT;

7
libgimp/gimpgpparams.c
View File

@ -81,13 +81,6 @@ _gimp_gp_param_def_to_param_spec (gpointer gimp,
param_def->meta.m_int.default_val,
flags);
if (! strcmp (param_def->type_name, "GimpParamInt16"))
return gimp_param_spec_int16 (name, nick, blurb,
param_def->meta.m_int.min_val,
param_def->meta.m_int.max_val,
param_def->meta.m_int.default_val,
flags);
if (! strcmp (param_def->type_name, "GParamUInt"))
return g_param_spec_uint (name, nick, blurb,
param_def->meta.m_int.min_val,

3
libgimpbase/gimpbase.def
View File

@ -67,7 +67,6 @@ EXPORTS
gimp_installation_directory
gimp_installation_directory_file
gimp_int16_array_get_type
gimp_int16_get_type
gimp_int32_array_get_type
gimp_int8_array_get_type
gimp_int8_get_type
@ -110,7 +109,6 @@ EXPORTS
gimp_param_array_get_type
gimp_param_float_array_get_type
gimp_param_int16_array_get_type
gimp_param_int16_get_type
gimp_param_int32_array_get_type
gimp_param_int8_array_get_type
gimp_param_memsize_get_type
@ -118,7 +116,6 @@ EXPORTS
gimp_param_rgb_array_get_type
gimp_param_spec_array
gimp_param_spec_float_array
gimp_param_spec_int16
gimp_param_spec_int16_array
gimp_param_spec_int32_array
gimp_param_spec_int8_array

109
libgimpbase/gimpparamspecs.c
View File

@ -25,115 +25,6 @@
#include "gimpbase.h"
/*
* GIMP_TYPE_INT16
*/
GType
gimp_int16_get_type (void)
{
static GType type = 0;
if (! type)
{
const GTypeInfo info = { 0, };
type = g_type_register_static (G_TYPE_INT, "GimpInt16", &info, 0);
}
return type;
}
/*
* GIMP_TYPE_PARAM_INT16
*/
static void gimp_param_int16_class_init (GParamSpecClass *klass);
static void gimp_param_int16_init (GParamSpec *pspec);
GType
gimp_param_int16_get_type (void)
{
static GType type = 0;
if (! type)
{
const GTypeInfo info =
{
sizeof (GParamSpecClass),
NULL, NULL,
(GClassInitFunc) gimp_param_int16_class_init,
NULL, NULL,
sizeof (GimpParamSpecInt16),
0,
(GInstanceInitFunc) gimp_param_int16_init
};
type = g_type_register_static (G_TYPE_PARAM_INT,
"GimpParamInt16", &info, 0);
}
return type;
}
static void
gimp_param_int16_class_init (GParamSpecClass *klass)
{
klass->value_type = GIMP_TYPE_INT16;
}
static void
gimp_param_int16_init (GParamSpec *pspec)
{
}
/**
* gimp_param_spec_int16:
* @name: Canonical name of the property specified.
* @nick: Nick name of the property specified.
* @blurb: Description of the property specified.
* @minimum: The minimum accepted value.
* @maximum: The maximum accepted value.
* @default_value: The default value.
* @flags: Flags for the property specified.
*
* Creates a new #GimpParamSpecInt16 specifying a
* #GIMP_TYPE_INT16 property.
*
* See g_param_spec_internal() for details on property names.
*
* Returns: (transfer full): The newly created #GimpParamSpecInt16.
*
* Since: 3.0
**/
GParamSpec *
gimp_param_spec_int16 (const gchar *name,
const gchar *nick,
const gchar *blurb,
gint minimum,
gint maximum,
gint default_value,
GParamFlags flags)
{
GParamSpecInt *ispec;
g_return_val_if_fail (minimum >= G_MININT16, NULL);
g_return_val_if_fail (maximum <= G_MAXINT16, NULL);
g_return_val_if_fail (default_value >= minimum &&
default_value <= maximum, NULL);
ispec = g_param_spec_internal (GIMP_TYPE_PARAM_INT16,
name, nick, blurb, flags);
ispec->minimum = minimum;
ispec->maximum = maximum;
ispec->default_value = default_value;
return G_PARAM_SPEC (ispec);
}
/*
* GIMP_TYPE_PARAM_STRING
*/

37
libgimpbase/gimpparamspecs.h
View File

@ -74,43 +74,6 @@ G_BEGIN_DECLS
GIMP_PARAM_STATIC_STRINGS)
/*
* GIMP_TYPE_INT16
*/
#define GIMP_TYPE_INT16 (gimp_int16_get_type ())
#define GIMP_VALUE_HOLDS_INT16(value) (G_TYPE_CHECK_VALUE_TYPE ((value),\
GIMP_TYPE_INT16))
GType gimp_int16_get_type (void) G_GNUC_CONST;
/*
* GIMP_TYPE_PARAM_INT16
*/
#define GIMP_TYPE_PARAM_INT16 (gimp_param_int16_get_type ())
#define GIMP_PARAM_SPEC_INT16(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_INT16, GimpParamSpecInt16))
#define GIMP_IS_PARAM_SPEC_INT16(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_INT16))
typedef struct _GimpParamSpecInt16 GimpParamSpecInt16;
struct _GimpParamSpecInt16
{
GParamSpecInt parent_instance;
};
GType gimp_param_int16_get_type (void) G_GNUC_CONST;
GParamSpec * gimp_param_spec_int16 (const gchar *name,
const gchar *nick,
const gchar *blurb,
gint minimum,
gint maximum,
gint default_value,
GParamFlags flags);
/*
* GIMP_TYPE_PARAM_STRING
*/

10
pdb/app.pl
View File

@ -385,11 +385,11 @@ CODE
}
$default = exists $arg->{default} ? $arg->{default} : defined $typeinfo[0] ? $typeinfo[0] : 0;
$pspec = <<CODE;
gimp_param_spec_int16 ("$name",
"$nick",
"$blurb",
$min, $max, $default,
$flags)
g_param_spec_int ("$name",
"$nick",
"$blurb",
$min, $max, $default,
$flags)
CODE
}
elsif ($pdbtype eq 'int8') {

2
pdb/pdb.pl
View File

@ -28,7 +28,7 @@ package Gimp::CodeGen::pdb;
take_value_func => 'g_value_set_int ($value, $var)' },
int16 => { name => 'INT16',
gtype => 'GIMP_TYPE_INT16',
gtype => 'G_TYPE_INT',
type => 'gint16 ',
const_type => 'gint16 ',
init_value => '0',