[gimp] app, libgimp: don't duplicate _gimp_gp_param_def_to_param_spec()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app, libgimp: don't duplicate _gimp_gp_param_def_to_param_spec()
- Date: Wed, 4 Sep 2019 08:42:57 +0000 (UTC)
commit b3b3d8160cdb9f9da0b1cd67cea2d7697738d369
Author: Michael Natterer <mitch gimp org>
Date: Wed Sep 4 10:41:19 2019 +0200
app, libgimp: don't duplicate _gimp_gp_param_def_to_param_spec()
they are virtually the same now (except GimpParamEnum, but that one is
still the same because its special feature doesn't go over the wire).
app/plug-in/gimpgpparams.c | 184 +-------------------------------------------
libgimp/gimpgpparams-body.c | 174 +++++++++++++++++++++++++++++++++++++++++
libgimp/gimpgpparams.c | 175 -----------------------------------------
3 files changed, 176 insertions(+), 357 deletions(-)
---
diff --git a/app/plug-in/gimpgpparams.c b/app/plug-in/gimpgpparams.c
index 1e30c37127..cab548e018 100644
--- a/app/plug-in/gimpgpparams.c
+++ b/app/plug-in/gimpgpparams.c
@@ -42,187 +42,7 @@
#include "libgimp/gimpgpparams.h"
-/* public functions */
-
-/* include the implementations of
- *
- * _gimp_param_spec_to_gp_param_def()
- * _gimp_gp_params_to_value_array()
- * _gimp_value_array_to_gp_params()
- *
- * from libgimp, they are identical.
+/* include the implementation, they are shared between app/ and
+ * libgimp/ but need different headers.
*/
#include "../../libgimp/gimpgpparams-body.c"
-
-GParamSpec *
-_gimp_gp_param_def_to_param_spec (gpointer gimp,
- const GPParamDef *param_def)
-{
- const gchar *name = param_def->name;
- const gchar *nick = param_def->nick;
- const gchar *blurb = param_def->blurb;
- GParamFlags flags = param_def->flags;
-
- flags &= ~G_PARAM_STATIC_STRINGS;
-
- switch (param_def->param_def_type)
- {
- case GP_PARAM_DEF_TYPE_DEFAULT:
- if (! strcmp (param_def->type_name, "GimpParamInt32Array"))
- return gimp_param_spec_int32_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamInt16Array"))
- return gimp_param_spec_int16_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamUInt8Array"))
- return gimp_param_spec_uint8_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamFloatArray"))
- return gimp_param_spec_float_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamStringArray"))
- return gimp_param_spec_string_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamRGBArray"))
- return gimp_param_spec_rgb_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamParasite"))
- return gimp_param_spec_parasite (name, nick, blurb, flags);
- break;
-
- case GP_PARAM_DEF_TYPE_INT:
- if (! strcmp (param_def->type_name, "GParamInt"))
- return g_param_spec_int (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,
- param_def->meta.m_int.max_val,
- param_def->meta.m_int.default_val,
- flags);
-
- if (! strcmp (param_def->type_name, "GParamUChar"))
- return g_param_spec_uchar (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);
- break;
-
- case GP_PARAM_DEF_TYPE_UNIT:
- if (! strcmp (param_def->type_name, "GimpParamUnit"))
- return gimp_param_spec_unit (name, nick, blurb,
- param_def->meta.m_unit.allow_pixels,
- param_def->meta.m_unit.allow_percent,
- param_def->meta.m_unit.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_ENUM:
- if (! strcmp (param_def->type_name, "GParamEnum"))
- return g_param_spec_enum (name, nick, blurb,
- g_type_from_name (param_def->meta.m_enum.type_name),
- param_def->meta.m_enum.default_val,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamEnum"))
- return gimp_param_spec_enum (name, nick, blurb,
- g_type_from_name (param_def->meta.m_enum.type_name),
- param_def->meta.m_enum.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_BOOLEAN:
- if (! strcmp (param_def->type_name, "GParamBoolean"))
- return g_param_spec_boolean (name, nick, blurb,
- param_def->meta.m_boolean.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_FLOAT:
- if (! strcmp (param_def->type_name, "GParamDouble"))
- return g_param_spec_double (name, nick, blurb,
- param_def->meta.m_float.min_val,
- param_def->meta.m_float.max_val,
- param_def->meta.m_float.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_STRING:
- if (! strcmp (param_def->type_name, "GParamString"))
- return g_param_spec_string (name, nick, blurb,
- param_def->meta.m_string.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_COLOR:
- if (! strcmp (param_def->type_name, "GimpParamRGB"))
- return gimp_param_spec_rgb (name, nick, blurb,
- param_def->meta.m_color.has_alpha,
- ¶m_def->meta.m_color.default_val,
- flags);
-
- case GP_PARAM_DEF_TYPE_ID:
- if (! strcmp (param_def->type_name, "GimpParamDisplay"))
- return gimp_param_spec_display (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamImage"))
- return gimp_param_spec_image (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamItem"))
- return gimp_param_spec_item (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamDrawable"))
- return gimp_param_spec_drawable (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamLayer"))
- return gimp_param_spec_layer (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamChannel"))
- return gimp_param_spec_channel (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamLayerMask"))
- return gimp_param_spec_layer_mask (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamSelection"))
- return gimp_param_spec_selection (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamVectors"))
- return gimp_param_spec_vectors (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_PARAM_DEF:
- if (! strcmp (param_def->type_name, "GParamParam"))
- return g_param_spec_param (name, nick, blurb,
- g_type_from_name (param_def->meta.m_param_def.type_name),
- flags);
- break;
- }
-
- g_printerr ("%s: GParamSpec type '%s' is not handled\n",
- G_STRFUNC, param_def->type_name);
-
- return NULL;
-}
diff --git a/libgimp/gimpgpparams-body.c b/libgimp/gimpgpparams-body.c
index 7e96b0bbb1..a60bdc1eb9 100644
--- a/libgimp/gimpgpparams-body.c
+++ b/libgimp/gimpgpparams-body.c
@@ -25,6 +25,180 @@
* app/plug-in/gimpgpparams.c
*/
+GParamSpec *
+_gimp_gp_param_def_to_param_spec (gpointer gimp,
+ const GPParamDef *param_def)
+{
+ const gchar *name = param_def->name;
+ const gchar *nick = param_def->nick;
+ const gchar *blurb = param_def->blurb;
+ GParamFlags flags = param_def->flags;
+
+ flags &= ~G_PARAM_STATIC_STRINGS;
+
+ switch (param_def->param_def_type)
+ {
+ case GP_PARAM_DEF_TYPE_DEFAULT:
+ if (! strcmp (param_def->type_name, "GimpParamInt32Array"))
+ return gimp_param_spec_int32_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamInt16Array"))
+ return gimp_param_spec_int16_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamUInt8Array"))
+ return gimp_param_spec_uint8_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamFloatArray"))
+ return gimp_param_spec_float_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamStringArray"))
+ return gimp_param_spec_string_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamRGBArray"))
+ return gimp_param_spec_rgb_array (name, nick, blurb, flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamParasite"))
+ return gimp_param_spec_parasite (name, nick, blurb, flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_INT:
+ if (! strcmp (param_def->type_name, "GParamInt"))
+ return g_param_spec_int (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,
+ param_def->meta.m_int.max_val,
+ param_def->meta.m_int.default_val,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GParamUChar"))
+ return g_param_spec_uchar (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);
+ break;
+
+ case GP_PARAM_DEF_TYPE_UNIT:
+ if (! strcmp (param_def->type_name, "GimpParamUnit"))
+ return gimp_param_spec_unit (name, nick, blurb,
+ param_def->meta.m_unit.allow_pixels,
+ param_def->meta.m_unit.allow_percent,
+ param_def->meta.m_unit.default_val,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_ENUM:
+ if (! strcmp (param_def->type_name, "GParamEnum"))
+ return g_param_spec_enum (name, nick, blurb,
+ g_type_from_name (param_def->meta.m_enum.type_name),
+ param_def->meta.m_enum.default_val,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamEnum"))
+ /* FIXME GimpParamEnum */
+ return g_param_spec_enum (name, nick, blurb,
+ g_type_from_name (param_def->meta.m_enum.type_name),
+ param_def->meta.m_enum.default_val,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_BOOLEAN:
+ if (! strcmp (param_def->type_name, "GParamBoolean"))
+ return g_param_spec_boolean (name, nick, blurb,
+ param_def->meta.m_boolean.default_val,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_FLOAT:
+ if (! strcmp (param_def->type_name, "GParamDouble"))
+ return g_param_spec_double (name, nick, blurb,
+ param_def->meta.m_float.min_val,
+ param_def->meta.m_float.max_val,
+ param_def->meta.m_float.default_val,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_STRING:
+ if (! strcmp (param_def->type_name, "GParamString"))
+ return g_param_spec_string (name, nick, blurb,
+ param_def->meta.m_string.default_val,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_COLOR:
+ if (! strcmp (param_def->type_name, "GimpParamRGB"))
+ return gimp_param_spec_rgb (name, nick, blurb,
+ param_def->meta.m_color.has_alpha,
+ ¶m_def->meta.m_color.default_val,
+ flags);
+
+ case GP_PARAM_DEF_TYPE_ID:
+ if (! strcmp (param_def->type_name, "GimpParamDisplay"))
+ return gimp_param_spec_display (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamImage"))
+ return gimp_param_spec_image (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamItem"))
+ return gimp_param_spec_item (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamDrawable"))
+ return gimp_param_spec_drawable (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamLayer"))
+ return gimp_param_spec_layer (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamChannel"))
+ return gimp_param_spec_channel (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamLayerMask"))
+ return gimp_param_spec_layer_mask (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamSelection"))
+ return gimp_param_spec_selection (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+
+ if (! strcmp (param_def->type_name, "GimpParamVectors"))
+ return gimp_param_spec_vectors (name, nick, blurb,
+ param_def->meta.m_id.none_ok,
+ flags);
+ break;
+
+ case GP_PARAM_DEF_TYPE_PARAM_DEF:
+ if (! strcmp (param_def->type_name, "GParamParam"))
+ return g_param_spec_param (name, nick, blurb,
+ g_type_from_name (param_def->meta.m_param_def.type_name),
+ flags);
+ break;
+ }
+
+ g_printerr ("%s: GParamSpec type '%s' is not handled\n",
+ G_STRFUNC, param_def->type_name);
+
+ return NULL;
+}
+
void
_gimp_param_spec_to_gp_param_def (GParamSpec *pspec,
GPParamDef *param_def)
diff --git a/libgimp/gimpgpparams.c b/libgimp/gimpgpparams.c
index cb39e1f70d..6af9df6931 100644
--- a/libgimp/gimpgpparams.c
+++ b/libgimp/gimpgpparams.c
@@ -22,7 +22,6 @@
#include "config.h"
#include <cairo.h>
-#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
@@ -40,177 +39,3 @@
#define LIBGIMP_COMPILATION
#include "gimpgpparams-body.c"
#undef LIBGIMP_COMPILATION
-
-GParamSpec *
-_gimp_gp_param_def_to_param_spec (gpointer gimp,
- const GPParamDef *param_def)
-{
- const gchar *name = param_def->name;
- const gchar *nick = param_def->nick;
- const gchar *blurb = param_def->blurb;
- GParamFlags flags = param_def->flags;
-
- flags &= ~G_PARAM_STATIC_STRINGS;
-
- switch (param_def->param_def_type)
- {
- case GP_PARAM_DEF_TYPE_DEFAULT:
- if (! strcmp (param_def->type_name, "GimpParamInt32Array"))
- return gimp_param_spec_int32_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamInt16Array"))
- return gimp_param_spec_int16_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamUInt8Array"))
- return gimp_param_spec_uint8_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamFloatArray"))
- return gimp_param_spec_float_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamStringArray"))
- return gimp_param_spec_string_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamRGBArray"))
- return gimp_param_spec_rgb_array (name, nick, blurb, flags);
-
- if (! strcmp (param_def->type_name, "GimpParamParasite"))
- return gimp_param_spec_parasite (name, nick, blurb, flags);
- break;
-
- case GP_PARAM_DEF_TYPE_INT:
- if (! strcmp (param_def->type_name, "GParamInt"))
- return g_param_spec_int (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,
- param_def->meta.m_int.max_val,
- param_def->meta.m_int.default_val,
- flags);
-
- if (! strcmp (param_def->type_name, "GParamUChar"))
- return g_param_spec_uchar (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);
- break;
-
- case GP_PARAM_DEF_TYPE_UNIT:
- if (! strcmp (param_def->type_name, "GimpParamUnit"))
- return gimp_param_spec_unit (name, nick, blurb,
- param_def->meta.m_unit.allow_pixels,
- param_def->meta.m_unit.allow_percent,
- param_def->meta.m_unit.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_ENUM:
- if (! strcmp (param_def->type_name, "GParamEnum"))
- return g_param_spec_enum (name, nick, blurb,
- g_type_from_name (param_def->meta.m_enum.type_name),
- param_def->meta.m_enum.default_val,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamEnum"))
- /* FIXME GimpParamEnum */
- return g_param_spec_enum (name, nick, blurb,
- g_type_from_name (param_def->meta.m_enum.type_name),
- param_def->meta.m_enum.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_BOOLEAN:
- if (! strcmp (param_def->type_name, "GParamBoolean"))
- return g_param_spec_boolean (name, nick, blurb,
- param_def->meta.m_boolean.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_FLOAT:
- if (! strcmp (param_def->type_name, "GParamDouble"))
- return g_param_spec_double (name, nick, blurb,
- param_def->meta.m_float.min_val,
- param_def->meta.m_float.max_val,
- param_def->meta.m_float.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_STRING:
- if (! strcmp (param_def->type_name, "GParamString"))
- return g_param_spec_string (name, nick, blurb,
- param_def->meta.m_string.default_val,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_COLOR:
- if (! strcmp (param_def->type_name, "GimpParamRGB"))
- return gimp_param_spec_rgb (name, nick, blurb,
- param_def->meta.m_color.has_alpha,
- ¶m_def->meta.m_color.default_val,
- flags);
-
- case GP_PARAM_DEF_TYPE_ID:
- if (! strcmp (param_def->type_name, "GimpParamDisplay"))
- return gimp_param_spec_display (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamImage"))
- return gimp_param_spec_image (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamItem"))
- return gimp_param_spec_item (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamDrawable"))
- return gimp_param_spec_drawable (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamLayer"))
- return gimp_param_spec_layer (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamChannel"))
- return gimp_param_spec_channel (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamLayerMask"))
- return gimp_param_spec_layer_mask (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamSelection"))
- return gimp_param_spec_selection (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
-
- if (! strcmp (param_def->type_name, "GimpParamVectors"))
- return gimp_param_spec_vectors (name, nick, blurb,
- param_def->meta.m_id.none_ok,
- flags);
- break;
-
- case GP_PARAM_DEF_TYPE_PARAM_DEF:
- if (! strcmp (param_def->type_name, "GParamParam"))
- return g_param_spec_param (name, nick, blurb,
- g_type_from_name (param_def->meta.m_param_def.type_name),
- flags);
- break;
- }
-
- g_printerr ("%s: GParamSpec type '%s' is not handled\n",
- G_STRFUNC, param_def->type_name);
-
- return NULL;
-}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
