From 439e305550eb9042086a02b8acc36bcdeca0f856 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Sat, 28 Jun 2003 21:24:07 +0000 Subject: [PATCH] qof translation screwed up a couple of things git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8800 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/engine/engine-helpers.c | 10 +++++----- src/engine/qofquery-p.h | 20 ++++++++++---------- src/engine/qofquery.c | 20 ++++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/engine/engine-helpers.c b/src/engine/engine-helpers.c index e7bf7ade7c..ca9f1d7acd 100644 --- a/src/engine/engine-helpers.c +++ b/src/engine/engine-helpers.c @@ -863,7 +863,7 @@ gnc_scm2KvpFrame (SCM frame_scm) } static SCM -gnc_queryterm2scm (QofQueryTerm_t qt) +gnc_queryterm2scm (QofQueryTerm *qt) { SCM qt_scm = SCM_EOL; QofQueryPredData *pd = NULL; @@ -1526,7 +1526,7 @@ gnc_query_terms2scm (GList *terms) for (and_node = or_node->data; and_node; and_node = and_node->next) { - QofQueryTerm_t qt = and_node->data; + QofQueryTerm *qt = and_node->data; SCM qt_scm; qt_scm = gnc_queryterm2scm (qt); @@ -1625,7 +1625,7 @@ gnc_scm2query_or_terms (SCM or_terms, query_version_t vers) } static SCM -gnc_query_sort2scm (QofSortFunc_t qs) +gnc_query_sort2scm (QofQuerySort *qs) { SCM sort_scm = SCM_EOL; GSList *path; @@ -1698,11 +1698,11 @@ gnc_query_scm2sort (SCM sort_scm, GSList **path, gint *options, gboolean *inc) } SCM -gnc_query2scm (Query *q) +gnc_query2scm (QofQuery *q) { SCM query_scm = SCM_EOL; SCM pair; - QofSortFunc_t s1, s2, s3; + QofQuerySort *s1, *s2, *s3; if (!q) return SCM_BOOL_F; diff --git a/src/engine/qofquery-p.h b/src/engine/qofquery-p.h index b7814bca25..f8dc1c4512 100644 --- a/src/engine/qofquery-p.h +++ b/src/engine/qofquery-p.h @@ -26,8 +26,8 @@ #include "qofquery.h" -typedef struct _QofQueryTerm *QofQueryTerm_t; -typedef struct _QofSortFunc *QofSortFunc_t; +typedef struct _QofQueryTerm QofQueryTerm; +typedef struct _QofQuerySort QofQuerySort; /* Initialize/Shutdown */ void qof_query_init (void); @@ -49,9 +49,9 @@ int qof_query_get_max_results (QofQuery *q); */ GList * qof_query_get_terms (QofQuery *q); -GSList * qof_query_term_get_param_path (QofQueryTerm_t queryterm); -QofQueryPredData *qof_query_term_get_pred_data (QofQueryTerm_t queryterm); -gboolean qof_query_term_is_inverted (QofQueryTerm_t queryterm); +GSList * qof_query_term_get_param_path (QofQueryTerm *queryterm); +QofQueryPredData *qof_query_term_get_pred_data (QofQueryTerm *queryterm); +gboolean qof_query_term_is_inverted (QofQueryTerm *queryterm); /* Functions to get and look at QuerySorts */ @@ -59,11 +59,11 @@ gboolean qof_query_term_is_inverted (QofQueryTerm_t queryterm); /* This function returns the primary, secondary, and tertiary sorts. * These are part of the query and should NOT be changed! */ -void qof_query_get_sorts (QofQuery *q, QofSortFunc_t *primary, - QofSortFunc_t *secondary, QofSortFunc_t *tertiary); +void qof_query_get_sorts (QofQuery *q, QofQuerySort **primary, + QofQuerySort **secondary, QofQuerySort **tertiary); -GSList * qof_query_sort_get_param_path (QofSortFunc_t querysort); -gint qof_query_sort_get_sort_options (QofSortFunc_t querysort); -gboolean qof_query_sort_get_increasing (QofSortFunc_t querysort); +GSList * qof_query_sort_get_param_path (QofQuerySort *querysort); +gint qof_query_sort_get_sort_options (QofQuerySort *querysort); +gboolean qof_query_sort_get_increasing (QofQuerySort *querysort); #endif /* QOF_QUERY_P_H */ diff --git a/src/engine/qofquery.c b/src/engine/qofquery.c index a7164fb56a..268f53e855 100644 --- a/src/engine/qofquery.c +++ b/src/engine/qofquery.c @@ -44,7 +44,7 @@ static short module = MOD_QUERY; -typedef struct _QofQueryTerm +struct _QofQueryTerm { GSList * param_list; QofQueryPredData *pdata; @@ -57,9 +57,9 @@ typedef struct _QofQueryTerm */ GSList * param_fcns; QofQueryPredicateFunc pred_fcn; -} QofQueryTerm; +}; -typedef struct _QofSortFunc +struct _QofQuerySort { GSList * param_list; gint options; @@ -74,7 +74,7 @@ typedef struct _QofSortFunc GSList * param_fcns; QofSortFunc obj_cmp; /* In case you are comparing objects */ QofCompareFunc comp_fcn; /* When you are comparing core types */ -} QofQuerySort; +}; /* The QUERY structure */ struct _QofQuery @@ -1205,21 +1205,21 @@ GList * qof_query_get_terms (QofQuery *q) return q->terms; } -GSList * qof_query_term_get_param_path (QofQueryTerm_t qt) +GSList * qof_query_term_get_param_path (QofQueryTerm *qt) { if (!qt) return NULL; return qt->param_list; } -QofQueryPredData *qof_query_term_get_pred_data (QofQueryTerm_t qt) +QofQueryPredData *qof_query_term_get_pred_data (QofQueryTerm *qt) { if (!qt) return NULL; return qt->pdata; } -gboolean qof_query_term_is_inverted (QofQueryTerm_t qt) +gboolean qof_query_term_is_inverted (QofQueryTerm *qt) { if (!qt) return FALSE; @@ -1261,7 +1261,7 @@ gboolean qof_query_sort_get_increasing (QofQuerySort *qs) } static gboolean -qof_query_term_equal (QofQueryTerm_t qt1, QofQueryTerm_t qt2) +qof_query_term_equal (QofQueryTerm *qt1, QofQueryTerm *qt2) { if (qt1 == qt2) return TRUE; if (!qt1 || !qt2) return FALSE; @@ -1493,7 +1493,7 @@ static GList * qof_query_printAndTerms (GList * terms, GList * output) { const char *prefix = " AND Terms:"; - QofQueryTerm_t qt; + QofQueryTerm *qt; QofQueryPredData *pd; GSList *path; GList *lst; @@ -1502,7 +1502,7 @@ qof_query_printAndTerms (GList * terms, GList * output) output = g_list_append (output, g_string_new (prefix)); for (lst = terms; lst; lst = lst->next) { - qt = (QofQueryTerm_t) lst->data; + qt = (QofQueryTerm *) lst->data; pd = qof_query_term_get_pred_data (qt); path = qof_query_term_get_param_path (qt); invert = qof_query_term_is_inverted (qt);