[gimp/wip/nielsdg/g-declare-interface] gimpconfig-iface: Use G_DECLARE_INTERFACE
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/nielsdg/g-declare-interface] gimpconfig-iface: Use G_DECLARE_INTERFACE
- Date: Sun, 10 May 2020 13:34:18 +0000 (UTC)
commit 95a335e09cae30752db8603e1412ecc344f5119d
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun May 10 15:23:55 2020 +0200
gimpconfig-iface: Use G_DECLARE_INTERFACE
app/core/gimpcontainer.c | 10 +++---
app/core/gimptoolpreset.c | 5 ++-
app/widgets/gimpdialogfactory.c | 4 +--
.../libgimpconfig/libgimpconfig3-sections.txt | 2 +-
libgimpconfig/gimpconfig-deserialize.c | 2 +-
libgimpconfig/gimpconfig-iface.c | 40 ++++++++++------------
libgimpconfig/gimpconfig-iface.h | 12 ++-----
libgimpconfig/gimpconfig-serialize.c | 2 +-
8 files changed, 32 insertions(+), 45 deletions(-)
---
diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c
index bbfbe5fb4b..d03721e8d8 100644
--- a/app/core/gimpcontainer.c
+++ b/app/core/gimpcontainer.c
@@ -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);
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
index 1da6cef230..bc8a8fa3f6 100644
--- a/app/core/gimptoolpreset.c
+++ b/app/core/gimptoolpreset.c
@@ -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);
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index 286c644624..0b0d6f880f 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -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);
diff --git a/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
b/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
index e387c6b6d2..2ff106e841 100644
--- a/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
+++ b/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
@@ -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>
diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c
index f7646e6288..2f3115a69a 100644
--- a/libgimpconfig/gimpconfig-deserialize.c
+++ b/libgimpconfig/gimpconfig-deserialize.c
@@ -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);
diff --git a/libgimpconfig/gimpconfig-iface.c b/libgimpconfig/gimpconfig-iface.c
index 4bcb9bec3f..7733b5e392 100644
--- a/libgimpconfig/gimpconfig-iface.c
+++ b/libgimpconfig/gimpconfig-iface.c
@@ -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));
diff --git a/libgimpconfig/gimpconfig-iface.h b/libgimpconfig/gimpconfig-iface.h
index b765db9e57..605e999a1a 100644
--- a/libgimpconfig/gimpconfig-iface.h
+++ b/libgimpconfig/gimpconfig-iface.h
@@ -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,
diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c
index 288723ce5e..cf873c0aff 100644
--- a/libgimpconfig/gimpconfig-serialize.c
+++ b/libgimpconfig/gimpconfig-serialize.c
@@ -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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]