From 1084071be68c022fffddabbcf4340c7daad3893c Mon Sep 17 00:00:00 2001 From: Richard Cohen Date: Tue, 13 Jun 2023 13:04:37 +0100 Subject: [PATCH] Refactor: hide implementation of GncTreeModel* (move from .h -> .c) --- gnucash/gnome-utils/gnc-tree-model-account-types.c | 6 ++++++ gnucash/gnome-utils/gnc-tree-model-account-types.h | 7 ------- gnucash/gnome-utils/gnc-tree-model-account.c | 8 ++++++++ gnucash/gnome-utils/gnc-tree-model-account.h | 10 ---------- gnucash/gnome-utils/gnc-tree-model-commodity.c | 8 ++++++++ gnucash/gnome-utils/gnc-tree-model-commodity.h | 11 ----------- gnucash/gnome-utils/gnc-tree-model-owner.c | 8 ++++++++ gnucash/gnome-utils/gnc-tree-model-owner.h | 10 ---------- gnucash/gnome-utils/gnc-tree-model-price.c | 8 ++++++++ gnucash/gnome-utils/gnc-tree-model-price.h | 10 ---------- 10 files changed, 38 insertions(+), 48 deletions(-) diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.c b/gnucash/gnome-utils/gnc-tree-model-account-types.c index 489953e64d..7fb1bb9933 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account-types.c +++ b/gnucash/gnome-utils/gnc-tree-model-account-types.c @@ -46,6 +46,12 @@ gnc_tree_model_account_types_finalize (GObject * object); static void gnc_tree_model_account_types_tree_model_init (GtkTreeModelIface * iface); +struct _GncTreeModelAccountTypes +{ + GObject gobject; + int stamp; +}; + typedef struct GncTreeModelAccountTypesPrivate { guint32 selected; diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.h b/gnucash/gnome-utils/gnc-tree-model-account-types.h index 29019be2d6..902c65377f 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account-types.h +++ b/gnucash/gnome-utils/gnc-tree-model-account-types.h @@ -54,13 +54,6 @@ typedef enum GNC_TREE_MODEL_ACCOUNT_TYPES_NUM_COLUMNS } GncTreeModelAccountTypesColumn; -/* typedefs & structures */ -struct _GncTreeModelAccountTypes -{ - GObject gobject; - int stamp; -}; - /* function prototypes */ /* Choose one of two methods to use the GncTreeModelAccountTypes diff --git a/gnucash/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c index 0fb6f2f100..bd3ad98625 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account.c +++ b/gnucash/gnome-utils/gnc-tree-model-account.c @@ -90,6 +90,14 @@ static void gnc_tree_model_account_event_handler (QofInstance *entity, GncTreeModelAccount *model, GncEventData *ed); +/** The instance data structure for an account tree model. */ +struct _GncTreeModelAccount +{ + GncTreeModel gnc_tree_model; /**< The parent object data. */ + int stamp; /**< The state of the model. Any state + * change increments this number. */ +}; + /** The instance private data for an account tree model. */ typedef struct GncTreeModelAccountPrivate { diff --git a/gnucash/gnome-utils/gnc-tree-model-account.h b/gnucash/gnome-utils/gnc-tree-model-account.h index 802e4efd01..4b2baefd1b 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account.h +++ b/gnucash/gnome-utils/gnc-tree-model-account.h @@ -96,16 +96,6 @@ typedef enum GNC_TREE_MODEL_ACCOUNT_NUM_COLUMNS } GncTreeModelAccountColumn; -/* typedefs & structures */ - -/** The instance data structure for an account tree model. */ -struct _GncTreeModelAccount -{ - GncTreeModel gnc_tree_model; /**< The parent object data. */ - int stamp; /**< The state of the model. Any state - * change increments this number. */ -}; - /** Clear the tree model account cached values. * * @param model A pointer to the account tree model. diff --git a/gnucash/gnome-utils/gnc-tree-model-commodity.c b/gnucash/gnome-utils/gnc-tree-model-commodity.c index d1b9113cad..387df0ae8e 100644 --- a/gnucash/gnome-utils/gnc-tree-model-commodity.c +++ b/gnucash/gnome-utils/gnc-tree-model-commodity.c @@ -91,6 +91,14 @@ static void gnc_tree_model_commodity_event_handler (QofInstance *entity, gpointer user_data, gpointer event_data); +/** The instance data structure for a commodity tree model. */ +struct _GncTreeModelCommodity +{ + GncTreeModel gnc_tree_model; /**< The parent object data. */ + int stamp; /**< The state of the model. Any state + * change increments this number. */ +}; + /** The instance private data for a commodity database tree model. */ typedef struct GncTreeModelCommodityPrivate { diff --git a/gnucash/gnome-utils/gnc-tree-model-commodity.h b/gnucash/gnome-utils/gnc-tree-model-commodity.h index e8ef562cb9..0bbad9f9bf 100644 --- a/gnucash/gnome-utils/gnc-tree-model-commodity.h +++ b/gnucash/gnome-utils/gnc-tree-model-commodity.h @@ -72,17 +72,6 @@ typedef enum GNC_TREE_MODEL_COMMODITY_NUM_COLUMNS } GncTreeModelCommodityColumn; -/* typedefs & structures */ - -/** The instance data structure for a commodity tree model. */ -struct _GncTreeModelCommodity -{ - GncTreeModel gnc_tree_model; /**< The parent object data. */ - int stamp; /**< The state of the model. Any state - * change increments this number. */ -}; - - /** @name Account Tree Model Constructors @{ */ diff --git a/gnucash/gnome-utils/gnc-tree-model-owner.c b/gnucash/gnome-utils/gnc-tree-model-owner.c index 0f9eb8183d..7ab068e473 100644 --- a/gnucash/gnome-utils/gnc-tree-model-owner.c +++ b/gnucash/gnome-utils/gnc-tree-model-owner.c @@ -86,6 +86,14 @@ static void gnc_tree_model_owner_event_handler (QofInstance *entity, GncTreeModelOwner *model, GncEventData *ed); +/** The instance data structure for an owner tree model. */ +struct _GncTreeModelOwner +{ + GncTreeModel gnc_tree_model; /**< The parent object data. */ + int stamp; /**< The state of the model. Any state + * change increments this number. */ +}; + /** The instance private data for an owner tree model. */ typedef struct GncTreeModelOwnerPrivate { diff --git a/gnucash/gnome-utils/gnc-tree-model-owner.h b/gnucash/gnome-utils/gnc-tree-model-owner.h index 8907333276..2f292cb7f0 100644 --- a/gnucash/gnome-utils/gnc-tree-model-owner.h +++ b/gnucash/gnome-utils/gnc-tree-model-owner.h @@ -75,16 +75,6 @@ typedef enum GNC_TREE_MODEL_OWNER_NUM_COLUMNS } GncTreeModelOwnerColumn; -/* typedefs & structures */ - -/** The instance data structure for an owner tree model. */ -struct _GncTreeModelOwner -{ - GncTreeModel gnc_tree_model; /**< The parent object data. */ - int stamp; /**< The state of the model. Any state - * change increments this number. */ -}; - /** @name Owner Tree Model Constructors @{ */ diff --git a/gnucash/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c index c5e642c48c..6c7e6ac0b8 100644 --- a/gnucash/gnome-utils/gnc-tree-model-price.c +++ b/gnucash/gnome-utils/gnc-tree-model-price.c @@ -120,6 +120,14 @@ static void gnc_tree_model_price_event_handler (QofInstance *entity, gpointer user_data, gpointer event_data); +/** The instance data structure for a price tree model. */ +struct _GncTreeModelPrice +{ + GncTreeModel gnc_tree_model; /**< The parent object data. */ + int stamp; /**< The state of the model. Any state + * change increments this number. */ +}; + /** The instance private data for a price database tree model. */ typedef struct GncTreeModelPricePrivate { diff --git a/gnucash/gnome-utils/gnc-tree-model-price.h b/gnucash/gnome-utils/gnc-tree-model-price.h index 2c89c43917..4783c29662 100644 --- a/gnucash/gnome-utils/gnc-tree-model-price.h +++ b/gnucash/gnome-utils/gnc-tree-model-price.h @@ -66,16 +66,6 @@ typedef enum GNC_TREE_MODEL_PRICE_NUM_COLUMNS } GncTreeModelPriceColumn; -/* typedefs & structures */ - -/** The instance data structure for a price tree model. */ -struct _GncTreeModelPrice -{ - GncTreeModel gnc_tree_model; /**< The parent object data. */ - int stamp; /**< The state of the model. Any state - * change increments this number. */ -}; - /** @name Account Tree Model Constructors @{ */