[gimp] app: change some gimp-operation-config.[ch] parameters to GObject
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: change some gimp-operation-config.[ch] parameters to GObject
- Date: Sun, 9 Jul 2017 17:21:53 +0000 (UTC)
commit 4f7fff8cb863b09816e51097e8ecb5201686f308
Author: Michael Natterer <mitch gimp org>
Date: Sun Jul 9 19:20:55 2017 +0200
app: change some gimp-operation-config.[ch] parameters to GObject
They were GimpObject for no reason, also inconsistent with other
places where we deal with config objects.
app/actions/gimpgeglprocedure.c | 8 ++++----
app/operations/gimp-operation-config.c | 18 +++++++++---------
app/operations/gimp-operation-config.h | 6 +++---
app/propgui/gimppropgui.c | 2 +-
app/tools/gimpblendtool.c | 2 +-
app/tools/gimpfiltertool.c | 6 +++---
6 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/app/actions/gimpgeglprocedure.c b/app/actions/gimpgeglprocedure.c
index 6850f8a..d5aa177 100644
--- a/app/actions/gimpgeglprocedure.c
+++ b/app/actions/gimpgeglprocedure.c
@@ -238,18 +238,18 @@ gimp_gegl_procedure_execute (GimpProcedure *procedure,
{
GimpImage *image;
GimpDrawable *drawable;
- GimpObject *settings;
+ GObject *config;
GeglNode *node;
image = gimp_value_get_image (gimp_value_array_index (args, 1), gimp);
drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
- settings = g_value_get_object (gimp_value_array_index (args, 3));
+ config = g_value_get_object (gimp_value_array_index (args, 3));
node = gegl_node_new_child (NULL,
"operation", procedure->original_name,
NULL);
- if (settings)
- gimp_operation_config_sync_node (settings, node);
+ if (config)
+ gimp_operation_config_sync_node (config, node);
gimp_drawable_apply_operation (drawable, progress,
gimp_procedure_get_label (procedure),
diff --git a/app/operations/gimp-operation-config.c b/app/operations/gimp-operation-config.c
index cc5bf4a..9c67172 100644
--- a/app/operations/gimp-operation-config.c
+++ b/app/operations/gimp-operation-config.c
@@ -477,15 +477,15 @@ gimp_operation_config_deserialize (Gimp *gimp,
}
void
-gimp_operation_config_sync_node (GimpObject *config,
- GeglNode *node)
+gimp_operation_config_sync_node (GObject *config,
+ GeglNode *node)
{
GParamSpec **pspecs;
gchar *operation;
guint n_pspecs;
gint i;
- g_return_if_fail (GIMP_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (config));
g_return_if_fail (GEGL_IS_NODE (node));
gegl_node_get (node,
@@ -555,15 +555,15 @@ gimp_operation_config_sync_node (GimpObject *config,
}
void
-gimp_operation_config_connect_node (GimpObject *config,
- GeglNode *node)
+gimp_operation_config_connect_node (GObject *config,
+ GeglNode *node)
{
GParamSpec **pspecs;
gchar *operation;
guint n_pspecs;
gint i;
- g_return_if_fail (GIMP_IS_OBJECT (config));
+ g_return_if_fail (G_IS_OBJECT (config));
g_return_if_fail (GEGL_IS_NODE (node));
gegl_node_get (node,
@@ -619,7 +619,7 @@ gimp_operation_config_connect_node (GimpObject *config,
}
GParamSpec **
-gimp_operation_config_list_properties (GimpObject *config,
+gimp_operation_config_list_properties (GObject *config,
GType owner_type,
GParamFlags flags,
guint *n_pspecs)
@@ -628,7 +628,7 @@ gimp_operation_config_list_properties (GimpObject *config,
guint n_param_specs;
gint i, j;
- g_return_val_if_fail (GIMP_IS_OBJECT (config), NULL);
+ g_return_val_if_fail (G_IS_OBJECT (config), NULL);
param_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (config),
&n_param_specs);
@@ -671,7 +671,7 @@ gimp_operation_config_config_sync (GObject *config,
const GParamSpec *gimp_pspec,
GeglNode *node)
{
- gimp_operation_config_sync_node (GIMP_OBJECT (config), node);
+ gimp_operation_config_sync_node (config, node);
}
static void
diff --git a/app/operations/gimp-operation-config.h b/app/operations/gimp-operation-config.h
index 09d3997..af9ce6e 100644
--- a/app/operations/gimp-operation-config.h
+++ b/app/operations/gimp-operation-config.h
@@ -39,12 +39,12 @@ void gimp_operation_config_deserialize (Gimp *gimp,
GimpContainer *container,
GFile *file);
-void gimp_operation_config_sync_node (GimpObject *config,
+void gimp_operation_config_sync_node (GObject *config,
GeglNode *node);
-void gimp_operation_config_connect_node (GimpObject *config,
+void gimp_operation_config_connect_node (GObject *config,
GeglNode *node);
-GParamSpec ** gimp_operation_config_list_properties (GimpObject *config,
+GParamSpec ** gimp_operation_config_list_properties (GObject *config,
GType owner_type,
GParamFlags flags,
guint *n_pspecs);
diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c
index 1444aca..50bf67a 100644
--- a/app/propgui/gimppropgui.c
+++ b/app/propgui/gimppropgui.c
@@ -494,7 +494,7 @@ gimp_prop_gui_new (GObject *config,
g_return_val_if_fail (G_IS_OBJECT (config), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
- param_specs = gimp_operation_config_list_properties (GIMP_OBJECT (config),
+ param_specs = gimp_operation_config_list_properties (config,
owner_type, flags,
&n_param_specs);
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index a3aa248..2396e8a 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -615,7 +615,7 @@ gimp_blend_tool_start (GimpBlendTool *blend_tool,
gimp_blend_tool_create_filter (blend_tool, drawable);
/* Initially sync all of the properties */
- gimp_operation_config_sync_node (GIMP_OBJECT (options),
+ gimp_operation_config_sync_node (G_OBJECT (options),
blend_tool->render_node);
/* Connect signal handlers for the gradient */
diff --git a/app/tools/gimpfiltertool.c b/app/tools/gimpfiltertool.c
index 71509c5..fa0a8ce 100644
--- a/app/tools/gimpfiltertool.c
+++ b/app/tools/gimpfiltertool.c
@@ -1426,9 +1426,9 @@ gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
GIMP_TYPE_SETTINGS),
NULL);
- gimp_operation_config_sync_node (GIMP_OBJECT (filter_tool->config),
+ gimp_operation_config_sync_node (filter_tool->config,
filter_tool->operation);
- gimp_operation_config_connect_node (GIMP_OBJECT (filter_tool->config),
+ gimp_operation_config_connect_node (filter_tool->config,
filter_tool->operation);
filter_tool->settings =
@@ -1438,7 +1438,7 @@ gimp_filter_tool_get_operation (GimpFilterTool *filter_tool)
g_object_ref (filter_tool->settings);
pspecs =
- gimp_operation_config_list_properties (GIMP_OBJECT (filter_tool->config),
+ gimp_operation_config_list_properties (filter_tool->config,
G_TYPE_FROM_INSTANCE (filter_tool->config),
0, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]