From c23f3f05e311d81ce0fbb7bbc6b850e5acd5776d Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 10 Sep 2019 16:33:33 -0700 Subject: [PATCH] Fix deprecated G_TYPE_INSTANCE_GET_PRIVATE and G_INLINE_FUNC with the function/declaration that they substituted. Note that this doesn't use the recommended new GObject creation macros because the class names in libgnucash/engine don't follow the gnome naming convention. --- gnucash/gnome-search/gnc-general-search.c | 2 +- gnucash/gnome-search/search-account.c | 2 +- gnucash/gnome-search/search-boolean.c | 2 +- gnucash/gnome-search/search-core-type.c | 2 +- gnucash/gnome-search/search-date.c | 2 +- gnucash/gnome-search/search-double.c | 2 +- gnucash/gnome-search/search-int64.c | 2 +- gnucash/gnome-search/search-numeric.c | 2 +- gnucash/gnome-search/search-reconciled.c | 2 +- gnucash/gnome-search/search-string.c | 2 +- gnucash/gnome-utils/gnc-combott.c | 3 ++- gnucash/gnome-utils/gnc-currency-edit.c | 2 +- gnucash/gnome-utils/gnc-date-format.c | 2 +- gnucash/gnome-utils/gnc-embedded-window.c | 2 +- gnucash/gnome-utils/gnc-main-window.c | 2 +- gnucash/gnome-utils/gnc-period-select.c | 2 +- gnucash/gnome-utils/gnc-plugin-file-history.c | 2 +- gnucash/gnome-utils/gnc-plugin-manager.c | 2 +- gnucash/gnome-utils/gnc-plugin-menu-additions.c | 2 +- gnucash/gnome-utils/gnc-plugin-page.c | 2 +- gnucash/gnome-utils/gnc-plugin.c | 2 +- gnucash/gnome-utils/gnc-query-view.c | 2 +- gnucash/gnome-utils/gnc-tree-model-account-types.c | 3 +-- gnucash/gnome-utils/gnc-tree-model-account.c | 2 +- gnucash/gnome-utils/gnc-tree-model-commodity.c | 2 +- gnucash/gnome-utils/gnc-tree-model-owner.c | 2 +- gnucash/gnome-utils/gnc-tree-model-price.c | 2 +- gnucash/gnome-utils/gnc-tree-model-selection.c | 2 +- gnucash/gnome-utils/gnc-tree-model-split-reg.c | 2 +- gnucash/gnome-utils/gnc-tree-model.c | 2 +- gnucash/gnome-utils/gnc-tree-view-account.c | 2 +- gnucash/gnome-utils/gnc-tree-view-commodity.c | 2 +- gnucash/gnome-utils/gnc-tree-view-owner.c | 2 +- gnucash/gnome-utils/gnc-tree-view-price.c | 2 +- gnucash/gnome-utils/gnc-tree-view-split-reg.c | 2 +- gnucash/gnome-utils/gnc-tree-view-sx-list.c | 2 +- gnucash/gnome-utils/gnc-tree-view.c | 2 +- gnucash/gnome-utils/search-param.c | 6 +++--- gnucash/gnome/gnc-budget-view.c | 2 +- gnucash/gnome/gnc-plugin-account-tree.c | 2 +- gnucash/gnome/gnc-plugin-basic-commands.c | 2 +- gnucash/gnome/gnc-plugin-budget.c | 2 +- gnucash/gnome/gnc-plugin-business.c | 2 +- gnucash/gnome/gnc-plugin-page-account-tree.c | 2 +- gnucash/gnome/gnc-plugin-page-budget.c | 2 +- gnucash/gnome/gnc-plugin-page-invoice.c | 2 +- gnucash/gnome/gnc-plugin-page-owner-tree.c | 2 +- gnucash/gnome/gnc-plugin-page-register.c | 2 +- gnucash/gnome/gnc-plugin-page-register2.c | 2 +- gnucash/gnome/gnc-plugin-page-sx-list.c | 2 +- gnucash/gnome/gnc-plugin-register.c | 2 +- gnucash/gnome/gnc-plugin-register2.c | 2 +- gnucash/gnome/search-owner.c | 2 +- gnucash/html/gnc-html.c | 4 +++- gnucash/import-export/csv-exp/gnc-plugin-csv-export.c | 2 +- gnucash/import-export/csv-imp/gnc-plugin-csv-import.c | 2 +- gnucash/import-export/log-replay/gnc-plugin-log-replay.c | 2 +- gnucash/import-export/ofx/gnc-plugin-ofx.c | 2 +- gnucash/import-export/qif-imp/gnc-plugin-qif-import.c | 2 +- gnucash/register/register-gnome/gnucash-sheet-private.c | 2 +- gnucash/register/register-gnome/gnucash-sheet.c | 2 +- gnucash/report/report-gnome/gnc-plugin-page-report.c | 2 +- gnucash/report/stylesheets/gnc-plugin-stylesheets.c | 2 +- libgnucash/app-utils/gnc-ui-util.c | 4 +--- libgnucash/engine/Account.cpp | 4 ++-- libgnucash/engine/Transaction.c | 4 ++-- libgnucash/engine/gnc-budget.c | 2 +- libgnucash/engine/gnc-commodity.c | 2 +- libgnucash/engine/gnc-lot.c | 2 +- libgnucash/engine/gncAddress.c | 2 +- libgnucash/engine/gncCustomer.c | 2 +- libgnucash/engine/gncEmployee.c | 2 +- libgnucash/engine/gncEntry.c | 2 +- libgnucash/engine/gncJob.c | 2 +- libgnucash/engine/gncOrder.c | 2 +- libgnucash/engine/gncVendor.c | 2 +- libgnucash/engine/qofinstance.cpp | 2 +- 77 files changed, 84 insertions(+), 84 deletions(-) diff --git a/gnucash/gnome-search/gnc-general-search.c b/gnucash/gnome-search/gnc-general-search.c index 174c00a318..6c96d15472 100644 --- a/gnucash/gnome-search/gnc-general-search.c +++ b/gnucash/gnome-search/gnc-general-search.c @@ -78,7 +78,7 @@ struct _GNCGeneralSearchPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCGeneralSearch, gnc_general_search, GTK_TYPE_BOX) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_GENERAL_SEARCH, GNCGeneralSearchPrivate)) + ((GNCGeneralSearchPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_GENERAL_SEARCH)) static GtkBoxClass *parent_class; static guint general_search_signals[LAST_SIGNAL]; diff --git a/gnucash/gnome-search/search-account.c b/gnucash/gnome-search/search-account.c index 6bce8894e8..de41c7676d 100644 --- a/gnucash/gnome-search/search-account.c +++ b/gnucash/gnome-search/search-account.c @@ -61,7 +61,7 @@ struct _GNCSearchAccountPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchAccount, gnc_search_account, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_ACCOUNT, GNCSearchAccountPrivate)) + ((GNCSearchAccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_ACCOUNT)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-boolean.c b/gnucash/gnome-search/search-boolean.c index 8bc22479ea..ddbb85aa10 100644 --- a/gnucash/gnome-search/search-boolean.c +++ b/gnucash/gnome-search/search-boolean.c @@ -56,7 +56,7 @@ struct _GNCSearchBooleanPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchBoolean, gnc_search_boolean, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_BOOLEAN, GNCSearchBooleanPrivate)) + ((GNCSearchBooleanPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_BOOLEAN)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-core-type.c b/gnucash/gnome-search/search-core-type.c index 523309e0d8..f3bfa5ae71 100644 --- a/gnucash/gnome-search/search-core-type.c +++ b/gnucash/gnome-search/search-core-type.c @@ -58,7 +58,7 @@ struct _GNCSearchCoreTypePrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchCoreType, gnc_search_core_type, G_TYPE_OBJECT) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreTypePrivate)) + ((GNCSearchCoreTypePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_CORE_TYPE)) static GObjectClass *parent_class; diff --git a/gnucash/gnome-search/search-date.c b/gnucash/gnome-search/search-date.c index 10f82e389d..7c55f0f118 100644 --- a/gnucash/gnome-search/search-date.c +++ b/gnucash/gnome-search/search-date.c @@ -60,7 +60,7 @@ struct _GNCSearchDatePrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDate, gnc_search_date, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_DATE, GNCSearchDatePrivate)) + ((GNCSearchDatePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_DATE)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-double.c b/gnucash/gnome-search/search-double.c index 3f906696ea..c815f27d23 100644 --- a/gnucash/gnome-search/search-double.c +++ b/gnucash/gnome-search/search-double.c @@ -60,7 +60,7 @@ struct _GNCSearchDoublePrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDouble, gnc_search_double, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_DOUBLE, GNCSearchDoublePrivate)) + ((GNCSearchDoublePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_DOUBLE)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-int64.c b/gnucash/gnome-search/search-int64.c index ecf6cadc79..f0c98930be 100644 --- a/gnucash/gnome-search/search-int64.c +++ b/gnucash/gnome-search/search-int64.c @@ -61,7 +61,7 @@ struct _GNCSearchInt64Private G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchInt64, gnc_search_int64, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_INT64, GNCSearchInt64Private)) + ((GNCSearchInt64Private*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_INT64)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-numeric.c b/gnucash/gnome-search/search-numeric.c index d5fc64a75d..4e57b6ab75 100644 --- a/gnucash/gnome-search/search-numeric.c +++ b/gnucash/gnome-search/search-numeric.c @@ -61,7 +61,7 @@ struct _GNCSearchNumericPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchNumeric, gnc_search_numeric, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_NUMERIC, GNCSearchNumericPrivate)) + ((GNCSearchNumericPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_NUMERIC)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c index f928153786..280b7f8586 100644 --- a/gnucash/gnome-search/search-reconciled.c +++ b/gnucash/gnome-search/search-reconciled.c @@ -57,7 +57,7 @@ struct _GNCSearchReconciledPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchReconciled, gnc_search_reconciled, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_RECONCILED, GNCSearchReconciledPrivate)) + ((GNCSearchReconciledPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_RECONCILED)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-search/search-string.c b/gnucash/gnome-search/search-string.c index 8f698d11a1..df7cb8bbcb 100644 --- a/gnucash/gnome-search/search-string.c +++ b/gnucash/gnome-search/search-string.c @@ -60,7 +60,7 @@ struct _GNCSearchStringPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchString, gnc_search_string, GNC_TYPE_SEARCH_CORE_TYPE) #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_STRING, GNCSearchStringPrivate)) + ((GNCSearchStringPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_STRING)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/gnome-utils/gnc-combott.c b/gnucash/gnome-utils/gnc-combott.c index 9f2af1ce4f..fd430abca8 100644 --- a/gnucash/gnome-utils/gnc-combott.c +++ b/gnucash/gnome-utils/gnc-combott.c @@ -49,7 +49,8 @@ enum PROP_TIP_COL, }; -#define GNC_COMBOTT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_COMBOTT, GncCombottPrivate)) +#define GNC_COMBOTT_GET_PRIVATE(o) \ + ((GncCombottPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_COMBOTT)) static guint combott_signals[LAST_SIGNAL] = {0,}; diff --git a/gnucash/gnome-utils/gnc-currency-edit.c b/gnucash/gnome-utils/gnc-currency-edit.c index a3ade068d2..33baa11ee6 100644 --- a/gnucash/gnome-utils/gnc-currency-edit.c +++ b/gnucash/gnome-utils/gnc-currency-edit.c @@ -93,7 +93,7 @@ typedef struct _GNCCurrencyEditPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCCurrencyEdit, gnc_currency_edit, GTK_TYPE_COMBO_BOX) #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_CURRENCY_EDIT, GNCCurrencyEditPrivate)) + ((GNCCurrencyEditPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_CURRENCY_EDIT)) /** @name Basic Object Implementation */ /** @{ */ diff --git a/gnucash/gnome-utils/gnc-date-format.c b/gnucash/gnome-utils/gnc-date-format.c index fe5198c11f..b678e5a370 100644 --- a/gnucash/gnome-utils/gnc-date-format.c +++ b/gnucash/gnome-utils/gnc-date-format.c @@ -76,7 +76,7 @@ struct _GNCDateFormatPrivate }; #define GNC_DATE_FORMAT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_DATE_FORMAT, GNCDateFormatPrivate)) + ((GNCDateFormatPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_DATE_FORMAT)) static guint date_format_signals [LAST_SIGNAL] = { 0 }; diff --git a/gnucash/gnome-utils/gnc-embedded-window.c b/gnucash/gnome-utils/gnc-embedded-window.c index 38de73dc20..bb05fcf140 100644 --- a/gnucash/gnome-utils/gnc-embedded-window.c +++ b/gnucash/gnome-utils/gnc-embedded-window.c @@ -91,7 +91,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncEmbeddedWindow, gnc_embedded_window, GTK_TYPE_BOX, gnc_window_embedded_window_init)) #define GNC_EMBEDDED_WINDOW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_EMBEDDED_WINDOW, GncEmbeddedWindowPrivate)) + ((GncEmbeddedWindowPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_EMBEDDED_WINDOW)) /* Display a data plugin page in a window. */ void diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c index bc9a38e366..3d85d7f1af 100644 --- a/gnucash/gnome-utils/gnc-main-window.c +++ b/gnucash/gnome-utils/gnc-main-window.c @@ -235,7 +235,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncMainWindow, gnc_main_window, GTK_TYPE_WINDOW, gnc_window_main_window_init)) #define GNC_MAIN_WINDOW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_MAIN_WINDOW, GncMainWindowPrivate)) + ((GncMainWindowPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_MAIN_WINDOW)) /** This data structure maintains information about one action groups * that has been installed in this window. */ diff --git a/gnucash/gnome-utils/gnc-period-select.c b/gnucash/gnome-utils/gnc-period-select.c index 31fdb8b4db..14c06bac0e 100644 --- a/gnucash/gnome-utils/gnc-period-select.c +++ b/gnucash/gnome-utils/gnc-period-select.c @@ -112,7 +112,7 @@ struct _GncPeriodSelectPrivate }; #define GNC_PERIOD_SELECT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PERIOD_SELECT, GncPeriodSelectPrivate)) + ((GncPeriodSelectPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PERIOD_SELECT)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c index 44cab3374f..da69b5d88f 100644 --- a/gnucash/gnome-utils/gnc-plugin-file-history.c +++ b/gnucash/gnome-utils/gnc-plugin-file-history.c @@ -106,7 +106,7 @@ typedef struct GncPluginFileHistoryPrivate #define GNC_PLUGIN_FILE_HISTORY_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_FILE_HISTORY, GncPluginFileHistoryPrivate)) + ((GncPluginFileHistoryPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_FILE_HISTORY)) /************************************************************ * Other Functions * diff --git a/gnucash/gnome-utils/gnc-plugin-manager.c b/gnucash/gnome-utils/gnc-plugin-manager.c index 73fb9ebeac..244e269e8f 100644 --- a/gnucash/gnome-utils/gnc-plugin-manager.c +++ b/gnucash/gnome-utils/gnc-plugin-manager.c @@ -45,7 +45,7 @@ typedef struct GncPluginManagerPrivate } GncPluginManagerPrivate; #define GNC_PLUGIN_MANAGER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_MANAGER, GncPluginManagerPrivate)) + ((GncPluginManagerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_MANAGER)) enum { diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c index 2cc4898248..c0e6cc88a5 100644 --- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c +++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c @@ -70,7 +70,7 @@ typedef struct GncPluginMenuAdditionsPrivate } GncPluginMenuAdditionsPrivate; #define GNC_PLUGIN_MENU_ADDITIONS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_MENU_ADDITIONS, GncPluginMenuAdditionsPrivate)) + ((GncPluginMenuAdditionsPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_MENU_ADDITIONS)) /** Per-window private data for this plugin. This plugin is unique in diff --git a/gnucash/gnome-utils/gnc-plugin-page.c b/gnucash/gnome-utils/gnc-plugin-page.c index d238bfe3d2..792c8bd92e 100644 --- a/gnucash/gnome-utils/gnc-plugin-page.c +++ b/gnucash/gnome-utils/gnc-plugin-page.c @@ -108,7 +108,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncPluginPage, gnc_plugin_page, G_TYPE_OBJECT, G_ADD_PRIVATE(GncPluginPage)) #define GNC_PLUGIN_PAGE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE, GncPluginPagePrivate)) + ((GncPluginPagePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE)) /* Create the display widget that corresponds to this plugin. This * function will be called by the main/embedded window manipulation diff --git a/gnucash/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c index d84f359e42..465eb89b47 100644 --- a/gnucash/gnome-utils/gnc-plugin.c +++ b/gnucash/gnome-utils/gnc-plugin.c @@ -65,7 +65,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncPlugin, gnc_plugin, G_TYPE_OBJECT, G_ADD_PRIVATE(GncPlugin)) #define GNC_PLUGIN_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN, GncPluginPrivate)) + ((GncPluginPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN)) /** Initialize the class for the new gnucash plugin object. This will * set up any function pointers that override functions in the parent diff --git a/gnucash/gnome-utils/gnc-query-view.c b/gnucash/gnome-utils/gnc-query-view.c index 594fc866f1..d5dcfa6c91 100644 --- a/gnucash/gnome-utils/gnc-query-view.c +++ b/gnucash/gnome-utils/gnc-query-view.c @@ -53,7 +53,7 @@ struct _GNCQueryViewPrivate }; #define GNC_QUERY_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_QUERY_VIEW, GNCQueryViewPrivate)) + ((GNCQueryViewPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_QUERY_VIEW)) /** Static Globals ****************************************************/ static GtkTreeViewClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-model-account-types.c b/gnucash/gnome-utils/gnc-tree-model-account-types.c index beca1b54a2..6932c8c724 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account-types.c +++ b/gnucash/gnome-utils/gnc-tree-model-account-types.c @@ -56,8 +56,7 @@ typedef struct GncTreeModelAccountTypesPrivate } GncTreeModelAccountTypesPrivate; #define GNC_TREE_MODEL_ACCOUNT_TYPES_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_ACCOUNT_TYPES, \ - GncTreeModelAccountTypesPrivate)) + ((GncTreeModelAccountTypesPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_ACCOUNT_TYPES)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c index 695878414e..21ea030b1f 100644 --- a/gnucash/gnome-utils/gnc-tree-model-account.c +++ b/gnucash/gnome-utils/gnc-tree-model-account.c @@ -100,7 +100,7 @@ typedef struct GncTreeModelAccountPrivate } GncTreeModelAccountPrivate; #define GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_ACCOUNT, GncTreeModelAccountPrivate)) + ((GncTreeModelAccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_ACCOUNT)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-model-commodity.c b/gnucash/gnome-utils/gnc-tree-model-commodity.c index ebd0acd0a1..dbf1c5ccad 100644 --- a/gnucash/gnome-utils/gnc-tree-model-commodity.c +++ b/gnucash/gnome-utils/gnc-tree-model-commodity.c @@ -101,7 +101,7 @@ typedef struct GncTreeModelCommodityPrivate } GncTreeModelCommodityPrivate; #define GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_COMMODITY, GncTreeModelCommodityPrivate)) + ((GncTreeModelCommodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_COMMODITY)) /** A pointer to the parent class of a commodity tree model. */ static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-model-owner.c b/gnucash/gnome-utils/gnc-tree-model-owner.c index 34d7317ca0..27f5f14ea9 100644 --- a/gnucash/gnome-utils/gnc-tree-model-owner.c +++ b/gnucash/gnome-utils/gnc-tree-model-owner.c @@ -99,7 +99,7 @@ typedef struct GncTreeModelOwnerPrivate } GncTreeModelOwnerPrivate; #define GNC_TREE_MODEL_OWNER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_OWNER, GncTreeModelOwnerPrivate)) + ((GncTreeModelOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_OWNER)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-model-price.c b/gnucash/gnome-utils/gnc-tree-model-price.c index 79885f4e10..55311c7edc 100644 --- a/gnucash/gnome-utils/gnc-tree-model-price.c +++ b/gnucash/gnome-utils/gnc-tree-model-price.c @@ -132,7 +132,7 @@ typedef struct GncTreeModelPricePrivate } GncTreeModelPricePrivate; #define GNC_TREE_MODEL_PRICE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_PRICE, GncTreeModelPricePrivate)) + ((GncTreeModelPricePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_PRICE)) /** A pointer to the parent class of a price tree model. */ static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-model-selection.c b/gnucash/gnome-utils/gnc-tree-model-selection.c index b7bd28e76f..d6734d440a 100644 --- a/gnucash/gnome-utils/gnc-tree-model-selection.c +++ b/gnucash/gnome-utils/gnc-tree-model-selection.c @@ -97,7 +97,7 @@ typedef struct GncTreeModelSelectionPrivate } GncTreeModelSelectionPrivate; #define GNC_TREE_MODEL_SELECTION_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_SELECTION, GncTreeModelSelectionPrivate)) + ((GncTreeModelSelectionPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_SELECTION)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-model-split-reg.c b/gnucash/gnome-utils/gnc-tree-model-split-reg.c index de50205756..2d4a68410a 100644 --- a/gnucash/gnome-utils/gnc-tree-model-split-reg.c +++ b/gnucash/gnome-utils/gnc-tree-model-split-reg.c @@ -220,7 +220,7 @@ gtm_sr_make_iter (GncTreeModelSplitReg *model, gint f, GList *tnode, GList *snod #define GNC_TREE_MODEL_SPLIT_REG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_SPLIT_REG, GncTreeModelSplitRegPrivate)) + ((GncTreeModelSplitRegPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL_SPLIT_REG)) /************************************************************/ /* g_object required functions */ diff --git a/gnucash/gnome-utils/gnc-tree-model.c b/gnucash/gnome-utils/gnc-tree-model.c index 432bcdf396..645d1efaa1 100644 --- a/gnucash/gnome-utils/gnc-tree-model.c +++ b/gnucash/gnome-utils/gnc-tree-model.c @@ -51,7 +51,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncTreeModel, gnc_tree_model, G_TYPE_OBJECT, G_ADD_PRIVATE(GncTreeModel)) #define GNC_TREE_MODEL_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL, GncTreeModelPrivate)) + ((GncTreeModelPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_MODEL)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c index f8f9e67ae3..44f9dac18a 100644 --- a/gnucash/gnome-utils/gnc-tree-view-account.c +++ b/gnucash/gnome-utils/gnc-tree-view-account.c @@ -115,7 +115,7 @@ typedef struct GncTreeViewAccountPrivate } GncTreeViewAccountPrivate; #define GNC_TREE_VIEW_ACCOUNT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_ACCOUNT, GncTreeViewAccountPrivate)) + ((GncTreeViewAccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_ACCOUNT)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c index 46dc23fa68..b1fa531be2 100644 --- a/gnucash/gnome-utils/gnc-tree-view-commodity.c +++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c @@ -58,7 +58,7 @@ typedef struct GncTreeViewCommodityPrivate } GncTreeViewCommodityPrivate; #define GNC_TREE_VIEW_COMMODITY_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_COMMODITY, GncTreeViewCommodityPrivate)) + ((GncTreeViewCommodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_COMMODITY)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-view-owner.c b/gnucash/gnome-utils/gnc-tree-view-owner.c index 8c5c6e8bb5..ced2bf90d1 100644 --- a/gnucash/gnome-utils/gnc-tree-view-owner.c +++ b/gnucash/gnome-utils/gnc-tree-view-owner.c @@ -87,7 +87,7 @@ typedef struct GncTreeViewOwnerPrivate } GncTreeViewOwnerPrivate; #define GNC_TREE_VIEW_OWNER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_OWNER, GncTreeViewOwnerPrivate)) + ((GncTreeViewOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_OWNER)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-view-price.c b/gnucash/gnome-utils/gnc-tree-view-price.c index 90e7c51b44..544a33c381 100644 --- a/gnucash/gnome-utils/gnc-tree-view-price.c +++ b/gnucash/gnome-utils/gnc-tree-view-price.c @@ -58,7 +58,7 @@ typedef struct GncTreeViewPricePrivate } GncTreeViewPricePrivate; #define GNC_TREE_VIEW_PRICE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_PRICE, GncTreeViewPricePrivate)) + ((GncTreeViewPricePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_PRICE)) /************************************************************/ diff --git a/gnucash/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c index b28e43c1b6..f5cec1f902 100644 --- a/gnucash/gnome-utils/gnc-tree-view-split-reg.c +++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c @@ -301,7 +301,7 @@ struct GncTreeViewSplitRegPrivate #define SHOW_SYMBOL FALSE #define GNC_TREE_VIEW_SPLIT_REG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_SPLIT_REG, GncTreeViewSplitRegPrivate)) + ((GncTreeViewSplitRegPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_SPLIT_REG)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c index 32dc45ee4f..ff890b18ee 100644 --- a/gnucash/gnome-utils/gnc-tree-view-sx-list.c +++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.c @@ -59,7 +59,7 @@ typedef struct GncTreeViewSxListPrivate } GncTreeViewSxListPrivate; #define GNC_TREE_VIEW_SX_LIST_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_SX_LIST, GncTreeViewSxListPrivate)) + ((GncTreeViewSxListPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW_SX_LIST)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c index 820c0258df..f89f81e96f 100644 --- a/gnucash/gnome-utils/gnc-tree-view.c +++ b/gnucash/gnome-utils/gnc-tree-view.c @@ -131,7 +131,7 @@ GNC_DEFINE_TYPE_WITH_CODE(GncTreeView, gnc_tree_view, GTK_TYPE_TREE_VIEW, G_ADD_PRIVATE(GncTreeView)) #define GNC_TREE_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW, GncTreeViewPrivate)) + ((GncTreeViewPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_TREE_VIEW)) /************************************************************/ diff --git a/gnucash/gnome-utils/search-param.c b/gnucash/gnome-utils/search-param.c index 5b8417f4a3..24e35c0600 100644 --- a/gnucash/gnome-utils/search-param.c +++ b/gnucash/gnome-utils/search-param.c @@ -53,7 +53,7 @@ struct _GNCSearchParamPrivate }; #define GNC_SEARCH_PARAM_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_PARAM, GNCSearchParamPrivate)) + ((GNCSearchParamPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM)) typedef struct _GNCSearchParamSimplePrivate GNCSearchParamSimplePrivate; @@ -67,7 +67,7 @@ struct _GNCSearchParamSimplePrivate }; #define GNC_SEARCH_PARAM_SIMPLE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_PARAM_SIMPLE, GNCSearchParamSimplePrivate)) + ((GNCSearchParamSimplePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM_SIMPLE)) typedef struct _GNCSearchParamCompoundPrivate GNCSearchParamCompoundPrivate; @@ -80,7 +80,7 @@ struct _GNCSearchParamCompoundPrivate }; #define GNC_SEARCH_PARAM_COMPOUND_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_PARAM_COMPOUND, GNCSearchParamCompoundPrivate)) + ((GNCSearchParamCompoundPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_PARAM_COMPOUND)) static GObjectClass *parent_gobject_class; static GNCSearchParamClass *parent_search_param_class; diff --git a/gnucash/gnome/gnc-budget-view.c b/gnucash/gnome/gnc-budget-view.c index 615b91f39c..0b4cf4f1c0 100644 --- a/gnucash/gnome/gnc-budget-view.c +++ b/gnucash/gnome/gnc-budget-view.c @@ -170,7 +170,7 @@ struct GncBudgetViewPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncBudgetView, gnc_budget_view, GTK_TYPE_BOX) #define GNC_BUDGET_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_BUDGET_VIEW, GncBudgetViewPrivate)) + ((GncBudgetViewPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_BUDGET_VIEW)) /** \brief Create new gnc budget view. diff --git a/gnucash/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c index 31b92f1393..abe3e5a657 100644 --- a/gnucash/gnome/gnc-plugin-account-tree.c +++ b/gnucash/gnome/gnc-plugin-account-tree.c @@ -76,7 +76,7 @@ typedef struct GncPluginAccountTreePrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginAccountTree, gnc_plugin_account_tree, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_ACCOUNT_TREE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_ACCOUNT_TREE, GncPluginAccountTreePrivate)) + ((GncPluginAccountTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_ACCOUNT_TREE)) /** A pointer to the parent class of a plugin page. */ static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c index 2e5330c015..51de834422 100644 --- a/gnucash/gnome/gnc-plugin-basic-commands.c +++ b/gnucash/gnome/gnc-plugin-basic-commands.c @@ -270,7 +270,7 @@ typedef struct GncPluginBasicCommandsPrivate } GncPluginBasicCommandsPrivate; #define GNC_PLUGIN_BASIC_COMMANDS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_BASIC_COMMANDS, GncPluginBasicCommandsPrivate)) + ((GncPluginBasicCommandsPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_BASIC_COMMANDS)) /** A pointer to the parent class of a plugin page. */ static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c index 3585673039..0a86b0dfbe 100644 --- a/gnucash/gnome/gnc-plugin-budget.c +++ b/gnucash/gnome/gnc-plugin-budget.c @@ -83,7 +83,7 @@ typedef struct GncPluginBudgetPrivate } GncPluginBudgetPrivate; #define GNC_PLUGIN_BUDGET_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_BUDGET, GncPluginBudgetPrivate)) + ((GncPluginBudgetPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_BUDGET)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c index f97506bf01..ff9180ad68 100644 --- a/gnucash/gnome/gnc-plugin-business.c +++ b/gnucash/gnome/gnc-plugin-business.c @@ -340,7 +340,7 @@ typedef struct GncPluginBusinessPrivate } GncPluginBusinessPrivate; #define GNC_PLUGIN_BUSINESS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_BUSINESS, GncPluginBusinessPrivate)) + ((GncPluginBusinessPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_BUSINESS)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c index 36c7c81d7b..2230168c29 100644 --- a/gnucash/gnome/gnc-plugin-page-account-tree.c +++ b/gnucash/gnome/gnc-plugin-page-account-tree.c @@ -101,7 +101,7 @@ typedef struct GncPluginPageAccountTreePrivate } GncPluginPageAccountTreePrivate; #define GNC_PLUGIN_PAGE_ACCOUNT_TREE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_ACCOUNT_TREE, GncPluginPageAccountTreePrivate)) + ((GncPluginPageAccountTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_ACCOUNT_TREE)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c index 5d785682eb..3dba5d39b0 100644 --- a/gnucash/gnome/gnc-plugin-page-budget.c +++ b/gnucash/gnome/gnc-plugin-page-budget.c @@ -239,7 +239,7 @@ typedef struct GncPluginPageBudgetPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageBudget, gnc_plugin_page_budget, GNC_TYPE_PLUGIN_PAGE) #define GNC_PLUGIN_PAGE_BUDGET_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_BUDGET, GncPluginPageBudgetPrivate)) + ((GncPluginPageBudgetPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_BUDGET)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index ba7bafb4cb..99eb7ec1c8 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -294,7 +294,7 @@ typedef struct GncPluginPageInvoicePrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageInvoice, gnc_plugin_page_invoice, GNC_TYPE_PLUGIN_PAGE) #define GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_INVOICE, GncPluginPageInvoicePrivate)) + ((GncPluginPageInvoicePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_INVOICE)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c index d4d2cbd57f..5022e7907d 100644 --- a/gnucash/gnome/gnc-plugin-page-owner-tree.c +++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c @@ -86,7 +86,7 @@ typedef struct GncPluginPageOwnerTreePrivate } GncPluginPageOwnerTreePrivate; #define GNC_PLUGIN_PAGE_OWNER_TREE_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_OWNER_TREE, GncPluginPageOwnerTreePrivate)) + ((GncPluginPageOwnerTreePrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_OWNER_TREE)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index 452fb12267..59a2f1bcca 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -597,7 +597,7 @@ typedef struct GncPluginPageRegisterPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageRegister, gnc_plugin_page_register, GNC_TYPE_PLUGIN_PAGE) #define GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_REGISTER, GncPluginPageRegisterPrivate)) + ((GncPluginPageRegisterPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_REGISTER)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c index 41f89ca47f..206f04d42f 100644 --- a/gnucash/gnome/gnc-plugin-page-register2.c +++ b/gnucash/gnome/gnc-plugin-page-register2.c @@ -555,7 +555,7 @@ typedef struct GncPluginPageRegister2Private } GncPluginPageRegister2Private; #define GNC_PLUGIN_PAGE_REGISTER2_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_REGISTER2, GncPluginPageRegister2Private)) + ((GncPluginPageRegister2Private*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_REGISTER2)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c index 10f1b9a27b..6cbabc5867 100644 --- a/gnucash/gnome/gnc-plugin-page-sx-list.c +++ b/gnucash/gnome/gnc-plugin-page-sx-list.c @@ -98,7 +98,7 @@ typedef struct GncPluginPageSxListPrivate } GncPluginPageSxListPrivate; #define GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_SX_LIST, GncPluginPageSxListPrivate)) + ((GncPluginPageSxListPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_SX_LIST)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/gnome/gnc-plugin-register.c b/gnucash/gnome/gnc-plugin-register.c index 810c6da1cd..181a7f8838 100644 --- a/gnucash/gnome/gnc-plugin-register.c +++ b/gnucash/gnome/gnc-plugin-register.c @@ -71,7 +71,7 @@ typedef struct GncPluginRegisterPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginRegister, gnc_plugin_register, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_REGISTER_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_REGISTER, GncPluginRegisterPrivate)) + ((GncPluginRegisterPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_REGISTER)) static GObjectClass *parent_class = NULL; static QofLogModule log_module = GNC_MOD_GUI; diff --git a/gnucash/gnome/gnc-plugin-register2.c b/gnucash/gnome/gnc-plugin-register2.c index 9553945745..4207354e6e 100644 --- a/gnucash/gnome/gnc-plugin-register2.c +++ b/gnucash/gnome/gnc-plugin-register2.c @@ -78,7 +78,7 @@ typedef struct GncPluginRegister2Private G_DEFINE_TYPE_WITH_PRIVATE(GncPluginRegister2, gnc_plugin_register2, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_REGISTER2_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_REGISTER2, GncPluginRegister2Private)) + ((GncPluginRegister2Private*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_REGISTER2)) static GObjectClass *parent_class = NULL; static QofLogModule log_module = GNC_MOD_GUI; diff --git a/gnucash/gnome/search-owner.c b/gnucash/gnome/search-owner.c index fc49a9e8a2..1801a742e4 100644 --- a/gnucash/gnome/search-owner.c +++ b/gnucash/gnome/search-owner.c @@ -60,7 +60,7 @@ typedef struct _GNCSearchOwnerPrivate G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchOwner, gnc_search_owner, GNC_TYPE_SEARCH_CORE_TYPE); #define _PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_OWNER, GNCSearchOwnerPrivate)) + ((GNCSearchOwnerPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_SEARCH_OWNER)) static GNCSearchCoreTypeClass *parent_class; diff --git a/gnucash/html/gnc-html.c b/gnucash/html/gnc-html.c index d9f44567fc..a143688387 100644 --- a/gnucash/html/gnc-html.c +++ b/gnucash/html/gnc-html.c @@ -72,7 +72,9 @@ static void gnc_html_class_init( GncHtmlClass* klass ); static void gnc_html_dispose( GObject* obj ); static void gnc_html_finalize( GObject* obj ); -//#define GNC_HTML_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_HTML, GncHtmlPrivate)) +//#define GNC_HTML_GET_PRIVATE(o) \ + ((GncHtmlPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_HTML)) + #define GNC_HTML_GET_PRIVATE(o) (GNC_HTML(o)->priv) #include "gnc-html-p.h" diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c index 3bf5a0ccee..97b1b9f454 100644 --- a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c +++ b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c @@ -77,7 +77,7 @@ typedef struct GncPluginCsvExportPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginCsvExport, gnc_plugin_csv_export, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_CSV_EXPORT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_CSV_EXPORT, GncPluginCsvExportPrivate)) + ((GncPluginCsvExportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_CSV_EXPORT)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c index df144d1153..4257b25947 100644 --- a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c +++ b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c @@ -72,7 +72,7 @@ typedef struct GncPluginCsvImportPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginCsvImport, gnc_plugin_csv_import, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_CSV_IMPORT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_CSV_IMPORT, GncPluginCsvImportPrivate)) + ((GncPluginCsvImportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_CSV_IMPORT)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c index b55bfaa190..1356caf4e4 100644 --- a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c +++ b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c @@ -60,7 +60,7 @@ typedef struct GncPluginLogreplayPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginLogreplay, gnc_plugin_log_replay, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_LOG_REPLAY_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_LOG_REPLAY, GncPluginLogreplayPrivate)) + ((GncPluginLogreplayPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_LOG_REPLAY)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/import-export/ofx/gnc-plugin-ofx.c b/gnucash/import-export/ofx/gnc-plugin-ofx.c index 867583296b..be07e1ecd3 100644 --- a/gnucash/import-export/ofx/gnc-plugin-ofx.c +++ b/gnucash/import-export/ofx/gnc-plugin-ofx.c @@ -58,7 +58,7 @@ typedef struct GncPluginOfxPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginOfx, gnc_plugin_ofx, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_OFX_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_OFX, GncPluginOfxPrivate)) + ((GncPluginOfxPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_OFX)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c index a2c6a6780e..ccf568af9e 100644 --- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c +++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c @@ -59,7 +59,7 @@ typedef struct GncPluginQifImportPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginQifImport, gnc_plugin_qif_import, GNC_TYPE_PLUGIN); #define GNC_PLUGIN_QIF_IMPORT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_QIF_IMPORT, GncPluginQifImportPrivate)) + ((GncPluginQifImportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_QIF_IMPORT)) static GObjectClass *parent_class = NULL; diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c index 92769ce613..b1fbada809 100644 --- a/gnucash/register/register-gnome/gnucash-sheet-private.c +++ b/gnucash/register/register-gnome/gnucash-sheet-private.c @@ -283,7 +283,7 @@ static guint32 dec_intensity_10percent(guint32 argb) /* Actual drawing routines */ -G_INLINE_FUNC void +static inline void draw_cell_line (cairo_t *cr, GdkRGBA *bg_color, double x1, double y1, double x2, double y2, PhysicalCellBorderLineStyle style); diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c index 7de2f0e103..4fe6abc23c 100644 --- a/gnucash/register/register-gnome/gnucash-sheet.c +++ b/gnucash/register/register-gnome/gnucash-sheet.c @@ -103,7 +103,7 @@ gboolean gnucash_sheet_draw_cb (GtkWidget *widget, cairo_t *cr, /** Implementation *****************************************************/ -G_INLINE_FUNC gboolean +static inline gboolean gnucash_sheet_virt_cell_out_of_bounds (GnucashSheet *sheet, VirtualCellLocation vcell_loc); gboolean diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c index 1cfc747b09..163be654b2 100644 --- a/gnucash/report/report-gnome/gnc-plugin-page-report.c +++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c @@ -136,7 +136,7 @@ typedef struct GncPluginPageReportPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginPageReport, gnc_plugin_page_report, GNC_TYPE_PLUGIN_PAGE) #define GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_PAGE_REPORT, GncPluginPageReportPrivate)) + ((GncPluginPageReportPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_PAGE_REPORT)) static void gnc_plugin_page_report_class_init( GncPluginPageReportClass *klass ); static void gnc_plugin_page_report_init( GncPluginPageReport *plugin_page ); diff --git a/gnucash/report/stylesheets/gnc-plugin-stylesheets.c b/gnucash/report/stylesheets/gnc-plugin-stylesheets.c index ab5c4ed620..e1fd42d88d 100644 --- a/gnucash/report/stylesheets/gnc-plugin-stylesheets.c +++ b/gnucash/report/stylesheets/gnc-plugin-stylesheets.c @@ -64,7 +64,7 @@ typedef struct GncPluginStylesheetsPrivate G_DEFINE_TYPE_WITH_PRIVATE(GncPluginStylesheets, gnc_plugin_stylesheets, GNC_TYPE_PLUGIN) #define GNC_PLUGIN_STYLESHEETS_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_STYLESHEETS, GncPluginStylesheetsPrivate)) + ((GncPluginStylesheetsPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_STYLESHEETS)) static GObjectClass *parent_class = NULL; diff --git a/libgnucash/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c index 24547664ad..eb149eb8d5 100644 --- a/libgnucash/app-utils/gnc-ui-util.c +++ b/libgnucash/app-utils/gnc-ui-util.c @@ -2088,9 +2088,7 @@ typedef enum #define done_state(state) (((state) == DONE_ST) || ((state) == NO_NUM_ST)) -G_INLINE_FUNC long long int multiplier (int num_decimals); - -long long int +static inline long long int multiplier (int num_decimals) { switch (num_decimals) diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp index b6eed3b987..6c9f27daeb 100644 --- a/libgnucash/engine/Account.cpp +++ b/libgnucash/engine/Account.cpp @@ -121,7 +121,7 @@ enum }; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_ACCOUNT, AccountPrivate)) + ((AccountPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_ACCOUNT)) /********************************************************************\ * Because I can't use C++ for this project, doesn't mean that I * @@ -241,7 +241,7 @@ GList *gnc_account_list_name_violations (QofBook *book, const gchar *separator) /********************************************************************\ \********************************************************************/ -G_INLINE_FUNC void mark_account (Account *acc); +static inline void mark_account (Account *acc); void mark_account (Account *acc) { diff --git a/libgnucash/engine/Transaction.c b/libgnucash/engine/Transaction.c index 927e64356b..0a22437474 100644 --- a/libgnucash/engine/Transaction.c +++ b/libgnucash/engine/Transaction.c @@ -228,13 +228,13 @@ xaccTransStillHasSplit(const Transaction *trans, const Split *s) } \ } -G_INLINE_FUNC void mark_trans (Transaction *trans); +static inline void mark_trans (Transaction *trans); void mark_trans (Transaction *trans) { FOR_EACH_SPLIT(trans, mark_split(s)); } -G_INLINE_FUNC void gen_event_trans (Transaction *trans); +static inline void gen_event_trans (Transaction *trans); void gen_event_trans (Transaction *trans) { GList *node; diff --git a/libgnucash/engine/gnc-budget.c b/libgnucash/engine/gnc-budget.c index ab49be6c51..7b435dd549 100644 --- a/libgnucash/engine/gnc-budget.c +++ b/libgnucash/engine/gnc-budget.c @@ -74,7 +74,7 @@ typedef struct GncBudgetPrivate } GncBudgetPrivate; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_BUDGET, GncBudgetPrivate)) + ((GncBudgetPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_BUDGET)) struct _GncBudgetClass { diff --git a/libgnucash/engine/gnc-commodity.c b/libgnucash/engine/gnc-commodity.c index 7d775a7ad2..b6ae5a4b3b 100644 --- a/libgnucash/engine/gnc-commodity.c +++ b/libgnucash/engine/gnc-commodity.c @@ -90,7 +90,7 @@ typedef struct gnc_commodityPrivate } gnc_commodityPrivate; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_COMMODITY, gnc_commodityPrivate)) + ((gnc_commodityPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_COMMODITY)) struct _GncCommodityClass { diff --git a/libgnucash/engine/gnc-lot.c b/libgnucash/engine/gnc-lot.c index a0afc04814..7aac38de61 100644 --- a/libgnucash/engine/gnc-lot.c +++ b/libgnucash/engine/gnc-lot.c @@ -95,7 +95,7 @@ typedef struct GNCLotPrivate } GNCLotPrivate; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_LOT, GNCLotPrivate)) + ((GNCLotPrivate*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_LOT)) #define gnc_lot_set_guid(L,G) qof_instance_set_guid(QOF_INSTANCE(L),&(G)) diff --git a/libgnucash/engine/gncAddress.c b/libgnucash/engine/gncAddress.c index d59ce54552..2b4e5222ce 100644 --- a/libgnucash/engine/gncAddress.c +++ b/libgnucash/engine/gncAddress.c @@ -61,7 +61,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; #define _GNC_MOD_NAME GNC_ADDRESS_MODULE_NAME -G_INLINE_FUNC void mark_address (GncAddress *address); +static inline void mark_address (GncAddress *address); void mark_address (GncAddress *address) { address->dirty = TRUE; diff --git a/libgnucash/engine/gncCustomer.c b/libgnucash/engine/gncCustomer.c index 18192d234b..13ec64c820 100644 --- a/libgnucash/engine/gncCustomer.c +++ b/libgnucash/engine/gncCustomer.c @@ -86,7 +86,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; /* ============================================================== */ /* misc inline funcs */ -G_INLINE_FUNC void mark_customer (GncCustomer *customer); +static inline void mark_customer (GncCustomer *customer); void mark_customer (GncCustomer *customer) { qof_instance_set_dirty(&customer->inst); diff --git a/libgnucash/engine/gncEmployee.c b/libgnucash/engine/gncEmployee.c index 8f57494052..7515d12e24 100644 --- a/libgnucash/engine/gncEmployee.c +++ b/libgnucash/engine/gncEmployee.c @@ -71,7 +71,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; #define _GNC_MOD_NAME GNC_ID_EMPLOYEE -G_INLINE_FUNC void mark_employee (GncEmployee *employee); +static inline void mark_employee (GncEmployee *employee); void mark_employee (GncEmployee *employee) { qof_instance_set_dirty(&employee->inst); diff --git a/libgnucash/engine/gncEntry.c b/libgnucash/engine/gncEntry.c index 785255a415..528c7e97ac 100644 --- a/libgnucash/engine/gncEntry.c +++ b/libgnucash/engine/gncEntry.c @@ -200,7 +200,7 @@ gboolean gncEntryPaymentStringToType (const char *str, GncEntryPaymentType *type member = tmp; \ } -G_INLINE_FUNC void mark_entry (GncEntry *entry); +static inline void mark_entry (GncEntry *entry); void mark_entry (GncEntry *entry) { qof_instance_set_dirty(&entry->inst); diff --git a/libgnucash/engine/gncJob.c b/libgnucash/engine/gncJob.c index 2ee97b796e..715363ab8c 100644 --- a/libgnucash/engine/gncJob.c +++ b/libgnucash/engine/gncJob.c @@ -61,7 +61,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; /* ================================================================== */ /* misc inline functions */ -G_INLINE_FUNC void mark_job (GncJob *job); +static inline void mark_job (GncJob *job); void mark_job (GncJob *job) { qof_instance_set_dirty(&job->inst); diff --git a/libgnucash/engine/gncOrder.c b/libgnucash/engine/gncOrder.c index 2130e6d9f7..fbf1b3bd94 100644 --- a/libgnucash/engine/gncOrder.c +++ b/libgnucash/engine/gncOrder.c @@ -74,7 +74,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; member = tmp; \ } -G_INLINE_FUNC void mark_order (GncOrder *order); +static inline void mark_order (GncOrder *order); void mark_order (GncOrder *order) { qof_instance_set_dirty(&order->inst); diff --git a/libgnucash/engine/gncVendor.c b/libgnucash/engine/gncVendor.c index 5f01a03145..7096643144 100644 --- a/libgnucash/engine/gncVendor.c +++ b/libgnucash/engine/gncVendor.c @@ -78,7 +78,7 @@ static QofLogModule log_module = GNC_MOD_BUSINESS; /* ============================================================ */ /* Misc inline funcs */ -G_INLINE_FUNC void mark_vendor (GncVendor *vendor); +static inline void mark_vendor (GncVendor *vendor); void mark_vendor (GncVendor *vendor) { qof_instance_set_dirty(&vendor->inst); diff --git a/libgnucash/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp index 34a6c5bbc8..9f2952f3c4 100644 --- a/libgnucash/engine/qofinstance.cpp +++ b/libgnucash/engine/qofinstance.cpp @@ -112,7 +112,7 @@ typedef struct QofInstancePrivate } QofInstancePrivate; #define GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), QOF_TYPE_INSTANCE, QofInstancePrivate)) + ((QofInstancePrivate*)g_type_instance_get_private((GTypeInstance*)o, QOF_TYPE_INSTANCE)) G_DEFINE_TYPE_WITH_PRIVATE(QofInstance, qof_instance, G_TYPE_OBJECT); QOF_GOBJECT_FINALIZE(qof_instance);