Skip to content

Commit

Permalink
Merge Richard Cohen's 'remove-duplicate-define-type-code' into stable.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jralls
jralls committed May 24, 2023
2 parents ad7bae8 + 2db5004 commit 8a5b372
Show file tree
Hide file tree
Showing 67 changed files with 77 additions and 464 deletions.
7 changes: 1 addition & 6 deletions gnucash/gnome-search/gnc-general-search.c
View file
Expand Up @@ -58,8 +58,6 @@ enum
GSL_N_COLUMNS
};

static void gnc_general_search_init (GNCGeneralSearch *gsl);
static void gnc_general_search_class_init (GNCGeneralSearchClass *klass);
static void gnc_general_search_destroy (GtkWidget *widget);

typedef struct _GNCGeneralSearchPrivate GNCGeneralSearchPrivate;
Expand All @@ -80,15 +78,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCGeneralSearch, gnc_general_search, GTK_TYPE_BOX)
#define _PRIVATE(o) \
((GNCGeneralSearchPrivate*)gnc_general_search_get_instance_private((GNCGeneralSearch*)o))

static GtkBoxClass *parent_class;
static guint general_search_signals[LAST_SIGNAL];

static void
gnc_general_search_class_init (GNCGeneralSearchClass *klass)
{
GtkWidgetClass *object_class = (GtkWidgetClass *) klass;

parent_class = g_type_class_peek_parent (klass);

general_search_signals[SELECTION_CHANGED] =
g_signal_new("changed",
Expand Down Expand Up @@ -141,8 +137,7 @@ gnc_general_search_destroy (GtkWidget *widget)
priv->component_id = 0;
}

if (GTK_WIDGET_CLASS (parent_class)->destroy)
GTK_WIDGET_CLASS (parent_class)->destroy (widget);
GTK_WIDGET_CLASS (gnc_general_search_parent_class)->destroy (widget);
}

/* The "selection" contents have changed. Change the text. */
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-account.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_account_class_init (GNCSearchAccountClass *klass);
static void gnc_search_account_init (GNCSearchAccount *gspaper);
static void gnc_search_account_finalize (GObject *obj);

typedef struct _GNCSearchAccountPrivate GNCSearchAccountPrivate;
Expand All @@ -63,16 +61,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchAccount, gnc_search_account, GNC_TYPE_SEARCH
#define _PRIVATE(o) \
((GNCSearchAccountPrivate*)gnc_search_account_get_instance_private((GNCSearchAccount*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_account_class_init (GNCSearchAccountClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_account_finalize;

Expand All @@ -96,7 +91,7 @@ gnc_search_account_finalize (GObject *obj)
GNCSearchAccount *o = (GNCSearchAccount *)obj;
g_assert (IS_GNCSEARCH_ACCOUNT (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_account_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-boolean.c
View file
Expand Up @@ -41,8 +41,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_boolean_class_init (GNCSearchBooleanClass *klass);
static void gnc_search_boolean_init (GNCSearchBoolean *gspaper);
static void gnc_search_boolean_finalize (GObject *obj);

typedef struct _GNCSearchBooleanPrivate GNCSearchBooleanPrivate;
Expand All @@ -58,16 +56,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchBoolean, gnc_search_boolean, GNC_TYPE_SEARCH
#define _PRIVATE(o) \
((GNCSearchBooleanPrivate*)gnc_search_boolean_get_instance_private((GNCSearchBoolean*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_boolean_class_init (GNCSearchBooleanClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_boolean_finalize;

Expand All @@ -91,7 +86,7 @@ gnc_search_boolean_finalize (GObject *obj)
GNCSearchBoolean *o = (GNCSearchBoolean *)obj;
g_assert (IS_GNCSEARCH_BOOLEAN (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_boolean_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-core-type.c
View file
Expand Up @@ -44,8 +44,6 @@ static void grab_focus (GNCSearchCoreType *fe);
static void editable_enters (GNCSearchCoreType *fe);
static gboolean validate (GNCSearchCoreType *fe);

static void gnc_search_core_type_class_init (GNCSearchCoreTypeClass *klass);
static void gnc_search_core_type_init (GNCSearchCoreType *gspaper);
static void gnc_search_core_type_finalize (GObject *obj);

typedef struct _GNCSearchCoreTypePrivate GNCSearchCoreTypePrivate;
Expand All @@ -60,8 +58,6 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchCoreType, gnc_search_core_type, G_TYPE_OBJEC
#define _PRIVATE(o) \
((GNCSearchCoreTypePrivate*)gnc_search_core_type_get_instance_private((GNCSearchCoreType*)o))

static GObjectClass *parent_class;

static GHashTable *typeTable = NULL;

static void
Expand All @@ -70,7 +66,6 @@ gnc_search_core_type_class_init (GNCSearchCoreTypeClass *klass)
GObjectClass *object_class;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_core_type_finalize;

Expand All @@ -91,7 +86,7 @@ gnc_search_core_type_finalize (GObject *obj)
GNCSearchCoreType *o = (GNCSearchCoreType *)obj;
g_assert (GNC_IS_SEARCH_CORE_TYPE (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_core_type_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-date.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget (GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_date_class_init (GNCSearchDateClass *klass);
static void gnc_search_date_init (GNCSearchDate *gspaper);
static void gnc_search_date_finalize (GObject *obj);

typedef struct _GNCSearchDatePrivate GNCSearchDatePrivate;
Expand All @@ -62,16 +60,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDate, gnc_search_date, GNC_TYPE_SEARCH_CORE_
#define _PRIVATE(o) \
((GNCSearchDatePrivate*)gnc_search_date_get_instance_private((GNCSearchDate*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_date_class_init (GNCSearchDateClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_date_finalize;

Expand Down Expand Up @@ -105,7 +100,7 @@ gnc_search_date_finalize (GObject *obj)
if (priv->entry)
gtk_widget_destroy (priv->entry);

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_date_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-double.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_double_class_init (GNCSearchDoubleClass *klass);
static void gnc_search_double_init (GNCSearchDouble *gspaper);
static void gnc_search_double_finalize (GObject *obj);

typedef struct _GNCSearchDoublePrivate GNCSearchDoublePrivate;
Expand All @@ -63,16 +61,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchDouble, gnc_search_double, GNC_TYPE_SEARCH_C
#define _PRIVATE(o) \
((GNCSearchDoublePrivate*)gnc_search_double_get_instance_private((GNCSearchDouble*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_double_class_init (GNCSearchDoubleClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_double_finalize;

Expand All @@ -98,7 +93,7 @@ gnc_search_double_finalize (GObject *obj)
GNCSearchDouble *o = (GNCSearchDouble *)obj;
g_assert (IS_GNCSEARCH_DOUBLE (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_double_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-int64.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_int64_class_init (GNCSearchInt64Class *klass);
static void gnc_search_int64_init (GNCSearchInt64 *gspaper);
static void gnc_search_int64_finalize (GObject *obj);


Expand All @@ -64,16 +62,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchInt64, gnc_search_int64, GNC_TYPE_SEARCH_COR
#define _PRIVATE(o) \
((GNCSearchInt64Private*)gnc_search_int64_get_instance_private((GNCSearchInt64*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_int64_class_init (GNCSearchInt64Class *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_int64_finalize;

Expand All @@ -99,7 +94,7 @@ gnc_search_int64_finalize (GObject *obj)
GNCSearchInt64 *o = (GNCSearchInt64 *)obj;
g_assert (IS_GNCSEARCH_INT64 (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_int64_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-numeric.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_numeric_class_init (GNCSearchNumericClass *klass);
static void gnc_search_numeric_init (GNCSearchNumeric *gspaper);
static void gnc_search_numeric_finalize (GObject *obj);

typedef struct _GNCSearchNumericPrivate GNCSearchNumericPrivate;
Expand All @@ -64,16 +62,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchNumeric, gnc_search_numeric, GNC_TYPE_SEARCH
#define _PRIVATE(o) \
((GNCSearchNumericPrivate*)gnc_search_numeric_get_instance_private((GNCSearchNumeric*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_numeric_class_init (GNCSearchNumericClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_numeric_finalize;

Expand Down Expand Up @@ -101,7 +96,7 @@ gnc_search_numeric_finalize (GObject *obj)
GNCSearchNumeric *o = (GNCSearchNumeric *)obj;
g_assert (IS_GNCSEARCH_NUMERIC (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_numeric_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-reconciled.c
View file
Expand Up @@ -43,8 +43,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_reconciled_class_init (GNCSearchReconciledClass *klass);
static void gnc_search_reconciled_init (GNCSearchReconciled *gspaper);
static void gnc_search_reconciled_finalize (GObject *obj);

typedef struct _GNCSearchReconciledPrivate GNCSearchReconciledPrivate;
Expand All @@ -60,16 +58,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchReconciled, gnc_search_reconciled, GNC_TYPE_
#define _PRIVATE(o) \
((GNCSearchReconciledPrivate*)gnc_search_reconciled_get_instance_private((GNCSearchReconciled*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_reconciled_class_init (GNCSearchReconciledClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_reconciled_finalize;

Expand All @@ -94,7 +89,7 @@ gnc_search_reconciled_finalize (GObject *obj)
GNCSearchReconciled *o = (GNCSearchReconciled *)obj;
g_assert (IS_GNCSEARCH_RECONCILED (o));

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_reconciled_parent_class)->finalize(obj);
}

/**
Expand Down
7 changes: 1 addition & 6 deletions gnucash/gnome-search/search-string.c
View file
Expand Up @@ -45,8 +45,6 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);

static void gnc_search_string_class_init (GNCSearchStringClass *klass);
static void gnc_search_string_init (GNCSearchString *gspaper);
static void gnc_search_string_finalize (GObject *obj);

typedef struct _GNCSearchStringPrivate GNCSearchStringPrivate;
Expand All @@ -62,16 +60,13 @@ G_DEFINE_TYPE_WITH_PRIVATE(GNCSearchString, gnc_search_string, GNC_TYPE_SEARCH_C
#define _PRIVATE(o) \
((GNCSearchStringPrivate*)gnc_search_string_get_instance_private((GNCSearchString*)o))

static GNCSearchCoreTypeClass *parent_class;

static void
gnc_search_string_class_init (GNCSearchStringClass *klass)
{
GObjectClass *object_class;
GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;

object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_search_string_finalize;

Expand Down Expand Up @@ -101,7 +96,7 @@ gnc_search_string_finalize (GObject *obj)

g_free (o->value);

G_OBJECT_CLASS (parent_class)->finalize(obj);
G_OBJECT_CLASS (gnc_search_string_parent_class)->finalize(obj);
}

/**
Expand Down
10 changes: 2 additions & 8 deletions gnucash/gnome-utils/gnc-account-sel.c
View file
Expand Up @@ -89,8 +89,6 @@ enum

static guint account_sel_signals [LAST_SIGNAL] = { 0 };

static void gnc_account_sel_init (GNCAccountSel *gas);
static void gnc_account_sel_class_init (GNCAccountSelClass *klass);
static void gnc_account_sel_finalize (GObject *object);
static void gnc_account_sel_dispose (GObject *object);

Expand All @@ -106,8 +104,6 @@ static void gas_get_property (GObject *object,

static void gas_new_account_click (GtkButton *b, gpointer ud);

static GtkBox *parent_class;

#define GNC_ACCOUNT_SEL_PATH "gnc-account-sel-path"

G_DEFINE_TYPE (GNCAccountSel, gnc_account_sel, GTK_TYPE_BOX)
Expand Down Expand Up @@ -204,8 +200,6 @@ gnc_account_sel_class_init (GNCAccountSelClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);

parent_class = g_type_class_peek_parent (klass);

object_class->finalize = gnc_account_sel_finalize;
object_class->dispose = gnc_account_sel_dispose;

Expand Down Expand Up @@ -938,7 +932,7 @@ gnc_account_sel_finalize (GObject *object)
if (gas->acctExcludeList)
g_list_free (gas->acctExcludeList);

G_OBJECT_CLASS (parent_class)->finalize (object);
G_OBJECT_CLASS (gnc_account_sel_parent_class)->finalize (object);
}

static void
Expand All @@ -963,7 +957,7 @@ gnc_account_sel_dispose (GObject *object)
gtk_tree_row_reference_free (gas->saved_account_ref);
gas->saved_account_ref = NULL;

G_OBJECT_CLASS (parent_class)->dispose (object);
G_OBJECT_CLASS (gnc_account_sel_parent_class)->dispose (object);
}

void
Expand Down

0 comments on commit 8a5b372

Please sign in to comment.