mirror of https://github.com/GNOME/gimp.git
gimpconfig-iface: Use G_DECLARE_INTERFACE
This commit is contained in:
parent
65b12c108d
commit
7a8a300adc
|
@ -352,7 +352,7 @@ gimp_container_serialize_foreach (GObject *object,
|
|||
GimpConfigInterface *config_iface;
|
||||
const gchar *name;
|
||||
|
||||
config_iface = GIMP_CONFIG_GET_INTERFACE (object);
|
||||
config_iface = GIMP_CONFIG_GET_IFACE (object);
|
||||
|
||||
if (! config_iface)
|
||||
serialize_data->success = FALSE;
|
||||
|
@ -478,10 +478,10 @@ gimp_container_deserialize (GimpConfig *config,
|
|||
*/
|
||||
gimp_object_take_name (child, name);
|
||||
|
||||
if (! GIMP_CONFIG_GET_INTERFACE (child)->deserialize (GIMP_CONFIG (child),
|
||||
scanner,
|
||||
nest_level + 1,
|
||||
NULL))
|
||||
if (! GIMP_CONFIG_GET_IFACE (child)->deserialize (GIMP_CONFIG (child),
|
||||
scanner,
|
||||
nest_level + 1,
|
||||
NULL))
|
||||
{
|
||||
if (add_child)
|
||||
g_object_unref (child);
|
||||
|
|
|
@ -449,9 +449,8 @@ gimp_tool_preset_deserialize_property (GimpConfig *config,
|
|||
GIMP_CONTEXT_PROP_MASK_PALETTE |
|
||||
GIMP_CONTEXT_PROP_MASK_FONT);
|
||||
|
||||
if (! GIMP_CONFIG_GET_INTERFACE (options)->deserialize (GIMP_CONFIG (options),
|
||||
scanner, 1,
|
||||
NULL))
|
||||
if (! GIMP_CONFIG_GET_IFACE (options)->deserialize (GIMP_CONFIG (options),
|
||||
scanner, 1, NULL))
|
||||
{
|
||||
*expected = G_TOKEN_NONE;
|
||||
g_object_unref (options);
|
||||
|
|
|
@ -1491,9 +1491,7 @@ gimp_dialog_factory_save (GimpDialogFactory *factory,
|
|||
gimp_config_writer_string (writer,
|
||||
gimp_object_get_name (factory));
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (info)->serialize (GIMP_CONFIG (info),
|
||||
writer,
|
||||
NULL);
|
||||
GIMP_CONFIG_GET_IFACE (info)->serialize (GIMP_CONFIG (info), writer, NULL);
|
||||
|
||||
gimp_config_writer_close (writer);
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ gimp_config_copy
|
|||
GIMP_CONFIG
|
||||
GIMP_IS_CONFIG
|
||||
GIMP_TYPE_CONFIG
|
||||
GIMP_CONFIG_GET_INTERFACE
|
||||
GIMP_CONFIG_GET_IFACE
|
||||
gimp_config_get_type
|
||||
</SECTION>
|
||||
|
||||
|
|
|
@ -764,7 +764,7 @@ gimp_config_deserialize_object (GValue *value,
|
|||
}
|
||||
}
|
||||
|
||||
config_iface = GIMP_CONFIG_GET_INTERFACE (prop_object);
|
||||
config_iface = GIMP_CONFIG_GET_IFACE (prop_object);
|
||||
|
||||
if (! config_iface)
|
||||
return gimp_config_deserialize_any (value, prop_spec, scanner);
|
||||
|
|
|
@ -313,7 +313,7 @@ gimp_config_serialize_to_file (GimpConfig *config,
|
|||
if (!writer)
|
||||
return FALSE;
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (config)->serialize (config, writer, data);
|
||||
GIMP_CONFIG_GET_IFACE (config)->serialize (config, writer, data);
|
||||
|
||||
return gimp_config_writer_finish (writer, footer, error);
|
||||
}
|
||||
|
@ -352,7 +352,7 @@ gimp_config_serialize_to_stream (GimpConfig *config,
|
|||
if (!writer)
|
||||
return FALSE;
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (config)->serialize (config, writer, data);
|
||||
GIMP_CONFIG_GET_IFACE (config)->serialize (config, writer, data);
|
||||
|
||||
return gimp_config_writer_finish (writer, footer, error);
|
||||
}
|
||||
|
@ -384,7 +384,7 @@ gimp_config_serialize_to_fd (GimpConfig *config,
|
|||
if (!writer)
|
||||
return FALSE;
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (config)->serialize (config, writer, data);
|
||||
GIMP_CONFIG_GET_IFACE (config)->serialize (config, writer, data);
|
||||
|
||||
return gimp_config_writer_finish (writer, NULL, NULL);
|
||||
}
|
||||
|
@ -412,7 +412,7 @@ gimp_config_serialize_to_string (GimpConfig *config,
|
|||
str = g_string_new (NULL);
|
||||
writer = gimp_config_writer_new_from_string (str);
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (config)->serialize (config, writer, data);
|
||||
GIMP_CONFIG_GET_IFACE (config)->serialize (config, writer, data);
|
||||
|
||||
gimp_config_writer_finish (writer, NULL, NULL);
|
||||
|
||||
|
@ -494,8 +494,8 @@ gimp_config_deserialize_file (GimpConfig *config,
|
|||
|
||||
g_object_freeze_notify (G_OBJECT (config));
|
||||
|
||||
success = GIMP_CONFIG_GET_INTERFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
success = GIMP_CONFIG_GET_IFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
|
||||
g_object_thaw_notify (G_OBJECT (config));
|
||||
|
||||
|
@ -542,8 +542,8 @@ gimp_config_deserialize_stream (GimpConfig *config,
|
|||
|
||||
g_object_freeze_notify (G_OBJECT (config));
|
||||
|
||||
success = GIMP_CONFIG_GET_INTERFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
success = GIMP_CONFIG_GET_IFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
|
||||
g_object_thaw_notify (G_OBJECT (config));
|
||||
|
||||
|
@ -589,8 +589,8 @@ gimp_config_deserialize_string (GimpConfig *config,
|
|||
|
||||
g_object_freeze_notify (G_OBJECT (config));
|
||||
|
||||
success = GIMP_CONFIG_GET_INTERFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
success = GIMP_CONFIG_GET_IFACE (config)->deserialize (config,
|
||||
scanner, 0, data);
|
||||
|
||||
g_object_thaw_notify (G_OBJECT (config));
|
||||
|
||||
|
@ -703,9 +703,7 @@ gimp_config_serialize (GimpConfig *config,
|
|||
{
|
||||
g_return_val_if_fail (GIMP_IS_CONFIG (config), FALSE);
|
||||
|
||||
return GIMP_CONFIG_GET_INTERFACE (config)->serialize (config,
|
||||
writer,
|
||||
data);
|
||||
return GIMP_CONFIG_GET_IFACE (config)->serialize (config, writer, data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -729,10 +727,10 @@ gimp_config_deserialize (GimpConfig *config,
|
|||
{
|
||||
g_return_val_if_fail (GIMP_IS_CONFIG (config), FALSE);
|
||||
|
||||
return GIMP_CONFIG_GET_INTERFACE (config)->deserialize (config,
|
||||
scanner,
|
||||
nest_level,
|
||||
data);
|
||||
return GIMP_CONFIG_GET_IFACE (config)->deserialize (config,
|
||||
scanner,
|
||||
nest_level,
|
||||
data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -753,7 +751,7 @@ gimp_config_duplicate (GimpConfig *config)
|
|||
{
|
||||
g_return_val_if_fail (GIMP_IS_CONFIG (config), NULL);
|
||||
|
||||
return GIMP_CONFIG_GET_INTERFACE (config)->duplicate (config);
|
||||
return GIMP_CONFIG_GET_IFACE (config)->duplicate (config);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -779,7 +777,7 @@ gimp_config_is_equal_to (GimpConfig *a,
|
|||
g_return_val_if_fail (G_TYPE_FROM_INSTANCE (a) == G_TYPE_FROM_INSTANCE (b),
|
||||
FALSE);
|
||||
|
||||
return GIMP_CONFIG_GET_INTERFACE (a)->equal (a, b);
|
||||
return GIMP_CONFIG_GET_IFACE (a)->equal (a, b);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -799,7 +797,7 @@ gimp_config_reset (GimpConfig *config)
|
|||
|
||||
g_object_freeze_notify (G_OBJECT (config));
|
||||
|
||||
GIMP_CONFIG_GET_INTERFACE (config)->reset (config);
|
||||
GIMP_CONFIG_GET_IFACE (config)->reset (config);
|
||||
|
||||
g_object_thaw_notify (G_OBJECT (config));
|
||||
}
|
||||
|
@ -834,7 +832,7 @@ gimp_config_copy (GimpConfig *src,
|
|||
|
||||
g_object_freeze_notify (G_OBJECT (dest));
|
||||
|
||||
changed = GIMP_CONFIG_GET_INTERFACE (src)->copy (src, dest, flags);
|
||||
changed = GIMP_CONFIG_GET_IFACE (src)->copy (src, dest, flags);
|
||||
|
||||
g_object_thaw_notify (G_OBJECT (dest));
|
||||
|
||||
|
|
|
@ -30,14 +30,8 @@ G_BEGIN_DECLS
|
|||
|
||||
/* For information look into the C source or the html documentation */
|
||||
|
||||
|
||||
#define GIMP_TYPE_CONFIG (gimp_config_get_type ())
|
||||
#define GIMP_IS_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONFIG))
|
||||
#define GIMP_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONFIG, GimpConfig))
|
||||
#define GIMP_CONFIG_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG, GimpConfigInterface))
|
||||
|
||||
|
||||
typedef struct _GimpConfigInterface GimpConfigInterface;
|
||||
#define GIMP_TYPE_CONFIG (gimp_config_get_type ())
|
||||
G_DECLARE_INTERFACE (GimpConfig, gimp_config, GIMP, CONFIG, GObject)
|
||||
|
||||
struct _GimpConfigInterface
|
||||
{
|
||||
|
@ -71,8 +65,6 @@ struct _GimpConfigInterface
|
|||
};
|
||||
|
||||
|
||||
GType gimp_config_get_type (void) G_GNUC_CONST;
|
||||
|
||||
gboolean gimp_config_serialize_to_file (GimpConfig *config,
|
||||
GFile *file,
|
||||
const gchar *header,
|
||||
|
|
|
@ -246,7 +246,7 @@ gimp_config_serialize_property (GimpConfig *config,
|
|||
prop_object = g_value_get_object (&value);
|
||||
|
||||
if (prop_object)
|
||||
config_iface = GIMP_CONFIG_GET_INTERFACE (prop_object);
|
||||
config_iface = GIMP_CONFIG_GET_IFACE (prop_object);
|
||||
else
|
||||
success = TRUE;
|
||||
|
||||
|
|
Loading…
Reference in New Issue