[gimp/wip/nielsdg/g-declare-interface: 3/3] app/widgets: 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: 3/3] app/widgets: Use G_DECLARE_INTERFACE()
- Date: Fri, 19 Jul 2019 05:45:58 +0000 (UTC)
commit 169f90c7b920f738e2e5fffee1707541b92251e2
Author: Niels De Graef <nielsdegraef gmail com>
Date: Fri Jul 19 07:29:31 2019 +0200
app/widgets: Use G_DECLARE_INTERFACE()
This cuts aways a little of the GObject boilerplate.
app/widgets/gimpaction.h | 11 ++---------
app/widgets/gimpcontainerview.h | 10 ++--------
app/widgets/gimpdockcontainer.c | 10 +++++-----
app/widgets/gimpdockcontainer.h | 10 ++--------
app/widgets/gimpdocked.c | 20 ++++++++++----------
app/widgets/gimpdocked.h | 10 ++--------
app/widgets/gimpsessionmanaged.c | 4 ++--
app/widgets/gimpsessionmanaged.h | 10 ++--------
app/widgets/gimpwindowstrategy.c | 2 +-
app/widgets/gimpwindowstrategy.h | 10 ++--------
devel-docs/app/app-sections.txt | 10 +++++-----
11 files changed, 35 insertions(+), 72 deletions(-)
---
diff --git a/app/widgets/gimpaction.h b/app/widgets/gimpaction.h
index 58bd798cd1..b27f5b2154 100644
--- a/app/widgets/gimpaction.h
+++ b/app/widgets/gimpaction.h
@@ -22,13 +22,8 @@
#define __GIMP_ACTION_H__
-#define GIMP_TYPE_ACTION (gimp_action_get_type ())
-#define GIMP_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION, GimpAction))
-#define GIMP_IS_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ACTION))
-#define GIMP_ACTION_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), GIMP_TYPE_ACTION,
GimpActionInterface))
-
-
-typedef struct _GimpActionInterface GimpActionInterface;
+#define GIMP_TYPE_ACTION (gimp_action_get_type ())
+G_DECLARE_INTERFACE (GimpAction, gimp_action, GIMP, ACTION, GtkAction)
struct _GimpActionInterface
{
@@ -41,8 +36,6 @@ struct _GimpActionInterface
};
-GType gimp_action_get_type (void) G_GNUC_CONST;
-
void gimp_action_init (GimpAction *action);
void gimp_action_emit_activate (GimpAction *action,
diff --git a/app/widgets/gimpcontainerview.h b/app/widgets/gimpcontainerview.h
index bdf3783fd0..154ca2e9c4 100644
--- a/app/widgets/gimpcontainerview.h
+++ b/app/widgets/gimpcontainerview.h
@@ -35,14 +35,10 @@ typedef enum
} GimpContainerViewProp;
-#define GIMP_TYPE_CONTAINER_VIEW (gimp_container_view_get_type ())
-#define GIMP_CONTAINER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_VIEW,
GimpContainerView))
-#define GIMP_IS_CONTAINER_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_VIEW))
-#define GIMP_CONTAINER_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
GIMP_TYPE_CONTAINER_VIEW, GimpContainerViewInterface))
+#define GIMP_TYPE_CONTAINER_VIEW (gimp_container_view_get_type ())
+G_DECLARE_INTERFACE (GimpContainerView, gimp_container_view, GIMP, CONTAINER_VIEW, GtkWidget)
-typedef struct _GimpContainerViewInterface GimpContainerViewInterface;
-
struct _GimpContainerViewInterface
{
GTypeInterface base_iface;
@@ -98,8 +94,6 @@ struct _GimpContainerViewInterface
};
-GType gimp_container_view_get_type (void) G_GNUC_CONST;
-
GimpContainer * gimp_container_view_get_container (GimpContainerView *view);
void gimp_container_view_set_container (GimpContainerView *view,
GimpContainer *container);
diff --git a/app/widgets/gimpdockcontainer.c b/app/widgets/gimpdockcontainer.c
index f412b622a2..95c829ea2c 100644
--- a/app/widgets/gimpdockcontainer.c
+++ b/app/widgets/gimpdockcontainer.c
@@ -56,7 +56,7 @@ gimp_dock_container_get_docks (GimpDockContainer *container)
g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
- iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+ iface = GIMP_DOCK_CONTAINER_GET_IFACE (container);
if (iface->get_docks)
return iface->get_docks (container);
@@ -77,7 +77,7 @@ gimp_dock_container_get_dialog_factory (GimpDockContainer *container)
g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
- iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+ iface = GIMP_DOCK_CONTAINER_GET_IFACE (container);
if (iface->get_dialog_factory)
return iface->get_dialog_factory (container);
@@ -98,7 +98,7 @@ gimp_dock_container_get_ui_manager (GimpDockContainer *container)
g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), NULL);
- iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+ iface = GIMP_DOCK_CONTAINER_GET_IFACE (container);
if (iface->get_ui_manager)
return iface->get_ui_manager (container);
@@ -123,7 +123,7 @@ gimp_dock_container_add_dock (GimpDockContainer *container,
g_return_if_fail (GIMP_IS_DOCK_CONTAINER (container));
- iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+ iface = GIMP_DOCK_CONTAINER_GET_IFACE (container);
if (iface->add_dock)
iface->add_dock (container,
@@ -148,7 +148,7 @@ gimp_dock_container_get_dock_side (GimpDockContainer *container,
g_return_val_if_fail (GIMP_IS_DOCK_CONTAINER (container), -1);
- iface = GIMP_DOCK_CONTAINER_GET_INTERFACE (container);
+ iface = GIMP_DOCK_CONTAINER_GET_IFACE (container);
if (iface->get_dock_side)
return iface->get_dock_side (container, dock);
diff --git a/app/widgets/gimpdockcontainer.h b/app/widgets/gimpdockcontainer.h
index 0fe9d0d18a..497fd33b48 100644
--- a/app/widgets/gimpdockcontainer.h
+++ b/app/widgets/gimpdockcontainer.h
@@ -22,14 +22,10 @@
#define __GIMP_DOCK_CONTAINER_H__
-#define GIMP_TYPE_DOCK_CONTAINER (gimp_dock_container_get_type ())
-#define GIMP_DOCK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_CONTAINER,
GimpDockContainer))
-#define GIMP_IS_DOCK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCK_CONTAINER))
-#define GIMP_DOCK_CONTAINER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
GIMP_TYPE_DOCK_CONTAINER, GimpDockContainerInterface))
+#define GIMP_TYPE_DOCK_CONTAINER (gimp_dock_container_get_type ())
+G_DECLARE_INTERFACE (GimpDockContainer, gimp_dock_container, GIMP, DOCK_CONTAINER, GtkWidget)
-typedef struct _GimpDockContainerInterface GimpDockContainerInterface;
-
struct _GimpDockContainerInterface
{
GTypeInterface base_iface;
@@ -46,8 +42,6 @@ struct _GimpDockContainerInterface
};
-GType gimp_dock_container_get_type (void) G_GNUC_CONST;
-
GList * gimp_dock_container_get_docks (GimpDockContainer *container);
GimpDialogFactory * gimp_dock_container_get_dialog_factory (GimpDockContainer *container);
GimpUIManager * gimp_dock_container_get_ui_manager (GimpDockContainer *container);
diff --git a/app/widgets/gimpdocked.c b/app/widgets/gimpdocked.c
index cfcd6b276f..31859804e3 100644
--- a/app/widgets/gimpdocked.c
+++ b/app/widgets/gimpdocked.c
@@ -129,7 +129,7 @@ gimp_docked_set_aux_info (GimpDocked *docked,
g_return_if_fail (GIMP_IS_DOCKED (docked));
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->set_aux_info)
docked_iface->set_aux_info (docked, aux_info);
@@ -142,7 +142,7 @@ gimp_docked_get_aux_info (GimpDocked *docked)
g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_aux_info)
return docked_iface->get_aux_info (docked);
@@ -159,7 +159,7 @@ gimp_docked_get_preview (GimpDocked *docked,
g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_preview)
return docked_iface->get_preview (docked, context, size);
@@ -174,7 +174,7 @@ gimp_docked_get_prefer_icon (GimpDocked *docked)
g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_prefer_icon)
return docked_iface->get_prefer_icon (docked);
@@ -193,7 +193,7 @@ gimp_docked_get_menu (GimpDocked *docked,
g_return_val_if_fail (ui_path != NULL, NULL);
g_return_val_if_fail (popup_data != NULL, NULL);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_menu)
return docked_iface->get_menu (docked, ui_path, popup_data);
@@ -208,7 +208,7 @@ gimp_docked_get_title (GimpDocked *docked)
g_return_val_if_fail (GIMP_IS_DOCKED (docked), NULL);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_title)
return docked_iface->get_title (docked);
@@ -225,7 +225,7 @@ gimp_docked_set_context (GimpDocked *docked,
g_return_if_fail (GIMP_IS_DOCKED (docked));
g_return_if_fail (context == NULL || GIMP_IS_CONTEXT (context));
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->set_context)
docked_iface->set_context (docked, context);
@@ -238,7 +238,7 @@ gimp_docked_has_button_bar (GimpDocked *docked)
g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->has_button_bar)
return docked_iface->has_button_bar (docked);
@@ -254,7 +254,7 @@ gimp_docked_set_show_button_bar (GimpDocked *docked,
g_return_if_fail (GIMP_IS_DOCKED (docked));
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->set_show_button_bar)
docked_iface->set_show_button_bar (docked, show ? TRUE : FALSE);
@@ -267,7 +267,7 @@ gimp_docked_get_show_button_bar (GimpDocked *docked)
g_return_val_if_fail (GIMP_IS_DOCKED (docked), FALSE);
- docked_iface = GIMP_DOCKED_GET_INTERFACE (docked);
+ docked_iface = GIMP_DOCKED_GET_IFACE (docked);
if (docked_iface->get_show_button_bar)
return docked_iface->get_show_button_bar (docked);
diff --git a/app/widgets/gimpdocked.h b/app/widgets/gimpdocked.h
index 2a5fa22122..ae6433282f 100644
--- a/app/widgets/gimpdocked.h
+++ b/app/widgets/gimpdocked.h
@@ -22,14 +22,10 @@
#define __GIMP_DOCKED_H__
-#define GIMP_TYPE_DOCKED (gimp_docked_get_type ())
-#define GIMP_IS_DOCKED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DOCKED))
-#define GIMP_DOCKED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKED, GimpDocked))
-#define GIMP_DOCKED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_DOCKED,
GimpDockedInterface))
+#define GIMP_TYPE_DOCKED (gimp_docked_get_type ())
+G_DECLARE_INTERFACE (GimpDocked, gimp_docked, GIMP, DOCKED, GtkWidget)
-typedef struct _GimpDockedInterface GimpDockedInterface;
-
/**
* GimpDockedInterface:
*
@@ -66,8 +62,6 @@ struct _GimpDockedInterface
};
-GType gimp_docked_get_type (void) G_GNUC_CONST;
-
void gimp_docked_title_changed (GimpDocked *docked);
void gimp_docked_set_aux_info (GimpDocked *docked,
diff --git a/app/widgets/gimpsessionmanaged.c b/app/widgets/gimpsessionmanaged.c
index 95e02ae2f3..9c750e970f 100644
--- a/app/widgets/gimpsessionmanaged.c
+++ b/app/widgets/gimpsessionmanaged.c
@@ -56,7 +56,7 @@ gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed)
g_return_val_if_fail (GIMP_IS_SESSION_MANAGED (session_managed), NULL);
- iface = GIMP_SESSION_MANAGED_GET_INTERFACE (session_managed);
+ iface = GIMP_SESSION_MANAGED_GET_IFACE (session_managed);
if (iface->get_aux_info)
return iface->get_aux_info (session_managed);
@@ -80,7 +80,7 @@ gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed,
g_return_if_fail (GIMP_IS_SESSION_MANAGED (session_managed));
- iface = GIMP_SESSION_MANAGED_GET_INTERFACE (session_managed);
+ iface = GIMP_SESSION_MANAGED_GET_IFACE (session_managed);
if (iface->set_aux_info)
iface->set_aux_info (session_managed, aux_info);
diff --git a/app/widgets/gimpsessionmanaged.h b/app/widgets/gimpsessionmanaged.h
index dfe675d9ad..7524be703f 100644
--- a/app/widgets/gimpsessionmanaged.h
+++ b/app/widgets/gimpsessionmanaged.h
@@ -22,14 +22,10 @@
#define __GIMP_SESSION_MANAGED_H__
-#define GIMP_TYPE_SESSION_MANAGED (gimp_session_managed_get_type ())
-#define GIMP_SESSION_MANAGED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_SESSION_MANAGED, GimpSessionManaged))
-#define GIMP_IS_SESSION_MANAGED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_SESSION_MANAGED))
-#define GIMP_SESSION_MANAGED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
GIMP_TYPE_SESSION_MANAGED, GimpSessionManagedInterface))
+#define GIMP_TYPE_SESSION_MANAGED (gimp_session_managed_get_type ())
+G_DECLARE_INTERFACE (GimpManaged, gimp_managed, GIMP, MANAGED, GtkWidget)
-typedef struct _GimpSessionManagedInterface GimpSessionManagedInterface;
-
struct _GimpSessionManagedInterface
{
GTypeInterface base_iface;
@@ -41,8 +37,6 @@ struct _GimpSessionManagedInterface
};
-GType gimp_session_managed_get_type (void) G_GNUC_CONST;
-
GList * gimp_session_managed_get_aux_info (GimpSessionManaged *session_managed);
void gimp_session_managed_set_aux_info (GimpSessionManaged *session_managed,
GList *aux_info);
diff --git a/app/widgets/gimpwindowstrategy.c b/app/widgets/gimpwindowstrategy.c
index 5105133937..f721d7ca68 100644
--- a/app/widgets/gimpwindowstrategy.c
+++ b/app/widgets/gimpwindowstrategy.c
@@ -53,7 +53,7 @@ gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
g_return_val_if_fail (GIMP_IS_WINDOW_STRATEGY (strategy), NULL);
- iface = GIMP_WINDOW_STRATEGY_GET_INTERFACE (strategy);
+ iface = GIMP_WINDOW_STRATEGY_GET_IFACE (strategy);
if (iface->show_dockable_dialog)
return iface->show_dockable_dialog (strategy,
diff --git a/app/widgets/gimpwindowstrategy.h b/app/widgets/gimpwindowstrategy.h
index 0c1b37aa81..f916bb157a 100644
--- a/app/widgets/gimpwindowstrategy.h
+++ b/app/widgets/gimpwindowstrategy.h
@@ -22,14 +22,10 @@
#define __GIMP_WINDOW_STRATEGY_H__
-#define GIMP_TYPE_WINDOW_STRATEGY (gimp_window_strategy_get_type ())
-#define GIMP_WINDOW_STRATEGY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_WINDOW_STRATEGY, GimpWindowStrategy))
-#define GIMP_IS_WINDOW_STRATEGY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GIMP_TYPE_WINDOW_STRATEGY))
-#define GIMP_WINDOW_STRATEGY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
GIMP_TYPE_WINDOW_STRATEGY, GimpWindowStrategyInterface))
+#define GIMP_TYPE_WINDOW_STRATEGY (gimp_window_strategy_get_type ())
+G_DECLARE_INTERFACE (GimpWindowStrategy, gimp_window_strategy, GIMP, WINDOW_STRATEGY, GObject)
-typedef struct _GimpWindowStrategyInterface GimpWindowStrategyInterface;
-
struct _GimpWindowStrategyInterface
{
GTypeInterface base_iface;
@@ -43,8 +39,6 @@ struct _GimpWindowStrategyInterface
};
-GType gimp_window_strategy_get_type (void) G_GNUC_CONST;
-
GtkWidget * gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
Gimp *gimp,
GimpDialogFactory *factory,
diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt
index 4eab07841c..5ccb9a4736 100644
--- a/devel-docs/app/app-sections.txt
+++ b/devel-docs/app/app-sections.txt
@@ -7749,7 +7749,7 @@ GIMP_CONTAINER_VIEW
GIMP_IS_CONTAINER_VIEW
GIMP_TYPE_CONTAINER_VIEW
gimp_container_view_interface_get_type
-GIMP_CONTAINER_VIEW_GET_INTERFACE
+GIMP_CONTAINER_VIEW_GET_IFACE
</SECTION>
<SECTION>
@@ -8139,7 +8139,7 @@ gimp_window_strategy_show_dockable_dialog
GIMP_IS_WINDOW_STRATEGY
GIMP_TYPE_WINDOW_STRATEGY
GIMP_WINDOW_STRATEGY
-GIMP_WINDOW_STRATEGY_GET_INTERFACE
+GIMP_WINDOW_STRATEGY_GET_IFACE
gimp_window_strategy_interface_get_type
</SECTION>
@@ -8262,7 +8262,7 @@ gimp_dock_container_get_docks
gimp_dock_container_get_ui_manager
<SUBSECTION Standard>
GIMP_DOCK_CONTAINER
-GIMP_DOCK_CONTAINER_GET_INTERFACE
+GIMP_DOCK_CONTAINER_GET_IFACE
GIMP_IS_DOCK_CONTAINER
GIMP_TYPE_DOCK_CONTAINER
gimp_dock_container_interface_get_type
@@ -8370,7 +8370,7 @@ GIMP_DOCKED
GIMP_IS_DOCKED
GIMP_TYPE_DOCKED
gimp_docked_interface_get_type
-GIMP_DOCKED_GET_INTERFACE
+GIMP_DOCKED_GET_IFACE
</SECTION>
<SECTION>
@@ -9662,7 +9662,7 @@ gimp_session_managed_set_aux_info
<SUBSECTION Standard>
GIMP_IS_SESSION_MANAGED
GIMP_SESSION_MANAGED
-GIMP_SESSION_MANAGED_GET_INTERFACE
+GIMP_SESSION_MANAGED_GET_IFACE
GIMP_TYPE_SESSION_MANAGED
gimp_session_managed_interface_get_type
</SECTION>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]