From f3b3fa39d13a044338fa1e51726ef15c13473d93 Mon Sep 17 00:00:00 2001 From: Richard Cohen Date: Mon, 12 Jun 2023 19:38:04 +0100 Subject: [PATCH] Refactor: DECLARE_FINAL GncSxInstanceDenseCalAdapter < GObject --- .../gnome-utils/gnc-sx-instance-dense-cal-adapter.c | 5 ----- .../gnome-utils/gnc-sx-instance-dense-cal-adapter.h | 10 +--------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c index a0ee9b5afc..cad69da8ec 100644 --- a/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c +++ b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c @@ -50,11 +50,6 @@ static gchar* gsidca_get_info(GncDenseCalModel *model, guint tag); static gint gsidca_get_instance_count(GncDenseCalModel *model, guint tag); static void gsidca_get_instance(GncDenseCalModel *model, guint tag, gint instance_index, GDate *date); -struct _GncSxInstanceDenseCalAdapterClass -{ - GObjectClass parent; -}; - struct _GncSxInstanceDenseCalAdapter { GObject parent; diff --git a/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h index ac093f807a..4d976b6ebe 100644 --- a/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h +++ b/gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.h @@ -27,17 +27,9 @@ #include #include "gnc-sx-instance-model.h" -typedef struct _GncSxInstanceDenseCalAdapterClass GncSxInstanceDenseCalAdapterClass; -typedef struct _GncSxInstanceDenseCalAdapter GncSxInstanceDenseCalAdapter; - #define GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER (gnc_sx_instance_dense_cal_adapter_get_type ()) -#define GNC_SX_INSTANCE_DENSE_CAL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER, GncSxInstanceDenseCalAdapter)) -#define GNC_SX_INSTANCE_DENSE_CAL_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER, GncSxInstanceDenseCalAdapterClass)) -#define GNC_IS_SX_INSTANCE_DENSE_CAL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER)) -#define GNC_IS_SX_INSTANCE_DENSE_CAL_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER)) -#define GNC_SX_INSTANCE_DENSE_CAL_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_SX_INSTANCE_DENSE_CAL_ADAPTER, GncSxInstanceDenseCalAdapterClass)) +G_DECLARE_FINAL_TYPE (GncSxInstanceDenseCalAdapter, gnc_sx_instance_dense_cal_adapter, GNC, SX_INSTANCE_DENSE_CAL_ADAPTER, GObject) GncSxInstanceDenseCalAdapter* gnc_sx_instance_dense_cal_adapter_new(GncSxInstanceModel *instances); -GType gnc_sx_instance_dense_cal_adapter_get_type(void); #endif // _GNC_SX_INSTANCE_DENSE_CAL_ADAPTER_H