IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace GNCBook by QofBook. Currently, GNCBook is #define'd to be QofBook. An upcoming change will create GncBook as a subclass

Browse Source 
of QofBook, so this needs to be cleaned up.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18200 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Phil Longstaff 2009-07-13 16:41:02 +00:00
parent e0f11ece71
commit 4b9fe8e22e
21 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/business/business-gnome/business-gnome-utils.c
View File

@ -57,7 +57,7 @@ typedef enum {
} GNCSearchType; } GNCSearchType;
static GtkWidget * gnc_owner_new (GtkWidget *label, GtkWidget *hbox, static GtkWidget * gnc_owner_new (GtkWidget *label, GtkWidget *hbox,
GNCBook *book, GncOwner *owner, QofBook *book, GncOwner *owner,
GNCSearchType type) GNCSearchType type)
{ {
GtkWidget *edit; GtkWidget *edit;
@ -129,7 +129,7 @@ static GtkWidget * gnc_owner_new (GtkWidget *label, GtkWidget *hbox,
} }
GtkWidget * gnc_owner_select_create (GtkWidget *label, GtkWidget *hbox, GtkWidget * gnc_owner_select_create (GtkWidget *label, GtkWidget *hbox,
GNCBook *book, GncOwner *owner) QofBook *book, GncOwner *owner)
{ {
g_return_val_if_fail (hbox != NULL, NULL); g_return_val_if_fail (hbox != NULL, NULL);
g_return_val_if_fail (book != NULL, NULL); g_return_val_if_fail (book != NULL, NULL);
@ -139,7 +139,7 @@ GtkWidget * gnc_owner_select_create (GtkWidget *label, GtkWidget *hbox,
} }
GtkWidget * gnc_owner_edit_create (GtkWidget *label, GtkWidget *hbox, GtkWidget * gnc_owner_edit_create (GtkWidget *label, GtkWidget *hbox,
GNCBook *book, GncOwner *owner) QofBook *book, GncOwner *owner)
{ {
g_return_val_if_fail (hbox != NULL, NULL); g_return_val_if_fail (hbox != NULL, NULL);
g_return_val_if_fail (book != NULL, NULL); g_return_val_if_fail (book != NULL, NULL);
@ -175,7 +175,7 @@ void gnc_owner_set_owner (GtkWidget *widget, GncOwner *owner)
typedef struct _invoice_select_info { typedef struct _invoice_select_info {
GtkWidget *label; GtkWidget *label;
GNCBook *book; QofBook *book;
GncOwner owner; GncOwner owner;
gboolean have_owner; gboolean have_owner;
} GncISI; } GncISI;
@ -225,7 +225,7 @@ gnc_invoice_select_search_set_label(GncISI* isi)
gtk_label_set_text(GTK_LABEL(isi->label), label); gtk_label_set_text(GTK_LABEL(isi->label), label);
} }
GtkWidget * gnc_invoice_select_create (GtkWidget *hbox, GNCBook *book, GtkWidget * gnc_invoice_select_create (GtkWidget *hbox, QofBook *book,
const GncOwner *owner, const GncOwner *owner,
GncInvoice *invoice, GncInvoice *invoice,
GtkWidget *label) GtkWidget *label)
@ -304,7 +304,7 @@ void gnc_invoice_set_owner (GtkWidget *widget, GncOwner *owner)
} }
void void
gnc_fill_account_select_combo (GtkWidget *combo, GNCBook *book, gnc_fill_account_select_combo (GtkWidget *combo, QofBook *book,
GList *acct_types, GList *acct_commodities) GList *acct_types, GList *acct_commodities)
{ {
GtkListStore *store; GtkListStore *store;
@ -396,10 +396,10 @@ typedef const char * (*GenericLookup_t)(gpointer);
typedef struct { typedef struct {
gint component_id; gint component_id;
GtkWidget * omenu; GtkWidget * omenu;
GNCBook * book; QofBook * book;
gboolean none_ok; gboolean none_ok;
const char * (*get_name)(gpointer); const char * (*get_name)(gpointer);
GList * (*get_list)(GNCBook*); GList * (*get_list)(QofBook*);
gboolean building_menu; gboolean building_menu;
gpointer result; gpointer result;
@ -493,9 +493,9 @@ generic_omenu_refresh_handler (GHashTable *changes, gpointer user_data)
} }
static OpMenuData * static OpMenuData *
make_generic_optionmenu (GtkWidget *omenu, GNCBook *book, make_generic_optionmenu (GtkWidget *omenu, QofBook *book,
gboolean none_ok, GNCIdType type_name, gboolean none_ok, GNCIdType type_name,
GList * (*get_list)(GNCBook*), GList * (*get_list)(QofBook*),
GenericLookup_t get_name, GenericLookup_t get_name,
gpointer *result) gpointer *result)
{ {
@ -610,7 +610,7 @@ gnc_ui_optionmenu_set_value (GtkWidget *omenu, gpointer data)
* created. * created.
*/ */
void void
gnc_ui_billterms_optionmenu (GtkWidget *omenu, GNCBook *book, gnc_ui_billterms_optionmenu (GtkWidget *omenu, QofBook *book,
gboolean none_ok, GncBillTerm **choice) gboolean none_ok, GncBillTerm **choice)
{ {
if (!omenu || !book) return; if (!omenu || !book) return;
@ -622,7 +622,7 @@ gnc_ui_billterms_optionmenu (GtkWidget *omenu, GNCBook *book,
} }
void void
gnc_ui_taxtables_optionmenu (GtkWidget *omenu, GNCBook *book, gnc_ui_taxtables_optionmenu (GtkWidget *omenu, QofBook *book,
gboolean none_ok, GncTaxTable **choice) gboolean none_ok, GncTaxTable **choice)
{ {
if (!omenu || !book) return; if (!omenu || !book) return;

12
src/business/business-gnome/business-gnome-utils.h
View File

@ -38,10 +38,10 @@
#define GCONF_SECTION_EMPLOYEE "dialogs/business/employee" #define GCONF_SECTION_EMPLOYEE "dialogs/business/employee"
GtkWidget * gnc_owner_select_create (GtkWidget *label, GtkWidget *hbox, GtkWidget * gnc_owner_select_create (GtkWidget *label, GtkWidget *hbox,
GNCBook *book, GncOwner *owner); QofBook *book, GncOwner *owner);
GtkWidget * gnc_owner_edit_create (GtkWidget *label, GtkWidget *hbox, GtkWidget * gnc_owner_edit_create (GtkWidget *label, GtkWidget *hbox,
GNCBook *book, GncOwner *owner); QofBook *book, GncOwner *owner);
void gnc_owner_get_owner (GtkWidget *widget, GncOwner *owner); void gnc_owner_get_owner (GtkWidget *widget, GncOwner *owner);
void gnc_owner_set_owner (GtkWidget *widget, GncOwner *owner); void gnc_owner_set_owner (GtkWidget *widget, GncOwner *owner);
@ -50,7 +50,7 @@ void gnc_owner_set_owner (GtkWidget *widget, GncOwner *owner);
/* An invoice select widget.. /* An invoice select widget..
* the owner, invoice, and label parameters are optional * the owner, invoice, and label parameters are optional
*/ */
GtkWidget * gnc_invoice_select_create (GtkWidget *hbox, GNCBook *book, GtkWidget * gnc_invoice_select_create (GtkWidget *hbox, QofBook *book,
const GncOwner *owner, const GncOwner *owner,
GncInvoice *invoice, GncInvoice *invoice,
GtkWidget *label); GtkWidget *label);
@ -66,7 +66,7 @@ GList * gnc_business_account_types (GncOwner *owner);
GList * gnc_business_commodities (GncOwner *owner); GList * gnc_business_commodities (GncOwner *owner);
/* Fill in a combo box with the appropriate list of accounts */ /* Fill in a combo box with the appropriate list of accounts */
void gnc_fill_account_select_combo (GtkWidget *combo, GNCBook *book, void gnc_fill_account_select_combo (GtkWidget *combo, QofBook *book,
GList *acct_types, GList *acct_types,
GList *acct_commodities); GList *acct_commodities);
@ -78,12 +78,12 @@ void gnc_fill_account_select_combo (GtkWidget *combo, GNCBook *book,
* then that will be the default option setting when the menu is * then that will be the default option setting when the menu is
* created. * created.
*/ */
void gnc_ui_billterms_optionmenu (GtkWidget *omenu, GNCBook *book, void gnc_ui_billterms_optionmenu (GtkWidget *omenu, QofBook *book,
gboolean none_ok, GncBillTerm **choice); gboolean none_ok, GncBillTerm **choice);
/* Same thing except for the tax tables */ /* Same thing except for the tax tables */
void void
gnc_ui_taxtables_optionmenu (GtkWidget *omenu, GNCBook *book, gnc_ui_taxtables_optionmenu (GtkWidget *omenu, QofBook *book,
gboolean none_ok, GncTaxTable **choice); gboolean none_ok, GncTaxTable **choice);
/* Build an option menu for choosing a GncTaxIncluded */ /* Build an option menu for choosing a GncTaxIncluded */

8
src/business/business-gnome/dialog-billterms.c
View File

@ -81,7 +81,7 @@ struct _billterms_window {
BillTermNB notebook; BillTermNB notebook;
GncBillTerm * current_term; GncBillTerm * current_term;
GNCBook * book; QofBook * book;
gint component_id; gint component_id;
}; };
@ -657,14 +657,14 @@ static gboolean
find_handler (gpointer find_data, gpointer user_data) find_handler (gpointer find_data, gpointer user_data)
{ {
BillTermsWindow *btw = user_data; BillTermsWindow *btw = user_data;
GNCBook *book = find_data; QofBook *book = find_data;
return (btw != NULL && btw->book == book); return (btw != NULL && btw->book == book);
} }
/* Create a billterms window */ /* Create a billterms window */
BillTermsWindow * BillTermsWindow *
gnc_ui_billterms_window_new (GNCBook *book) gnc_ui_billterms_window_new (QofBook *book)
{ {
BillTermsWindow *btw; BillTermsWindow *btw;
GladeXML *xml; GladeXML *xml;
@ -760,7 +760,7 @@ gnc_ui_billterms_window_destroy (BillTermsWindow *btw)
#if 0 #if 0
/* Create a new billterms by name */ /* Create a new billterms by name */
GncBillTerm * GncBillTerm *
gnc_ui_billterms_new_from_name (GNCBook *book, const char *name) gnc_ui_billterms_new_from_name (QofBook *book, const char *name)
{ {
BillTermsWindow *btw; BillTermsWindow *btw;

2
src/business/business-gnome/dialog-billterms.h
View File

@ -29,7 +29,7 @@ typedef struct _billterms_window BillTermsWindow;
#include "gnc-book.h" #include "gnc-book.h"
/* Create a billterms window */ /* Create a billterms window */
BillTermsWindow * gnc_ui_billterms_window_new (GNCBook *book); BillTermsWindow * gnc_ui_billterms_window_new (QofBook *book);
/* Destroy a billterms window */ /* Destroy a billterms window */
void gnc_ui_billterms_window_destroy (BillTermsWindow *ttw); void gnc_ui_billterms_window_destroy (BillTermsWindow *ttw);

10
src/business/business-gnome/dialog-customer.c
View File

@ -70,7 +70,7 @@ typedef enum
} CustomerDialogType; } CustomerDialogType;
struct _customer_select_window { struct _customer_select_window {
GNCBook * book; QofBook * book;
QueryNew * q; QueryNew * q;
}; };
@ -115,7 +115,7 @@ struct _customer_window {
CustomerDialogType dialog_type; CustomerDialogType dialog_type;
GUID customer_guid; GUID customer_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncCustomer * created_customer; GncCustomer * created_customer;
GncTaxTable * taxtable; GncTaxTable * taxtable;
@ -422,7 +422,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static CustomerWindow * static CustomerWindow *
gnc_customer_new_window (GNCBook *bookp, GncCustomer *cust) gnc_customer_new_window (QofBook *bookp, GncCustomer *cust)
{ {
CustomerWindow *cw; CustomerWindow *cw;
GladeXML *xml; GladeXML *xml;
@ -640,7 +640,7 @@ gnc_ui_customer_edit (GncCustomer *cust)
} }
CustomerWindow * CustomerWindow *
gnc_ui_customer_new (GNCBook *bookp) gnc_ui_customer_new (QofBook *bookp)
{ {
CustomerWindow *cw; CustomerWindow *cw;
@ -770,7 +770,7 @@ free_userdata_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_customer_search (GncCustomer *start, GNCBook *book) gnc_customer_search (GncCustomer *start, QofBook *book)
{ {
QueryNew *q, *q2 = NULL; QueryNew *q, *q2 = NULL;
GNCIdType type = GNC_CUSTOMER_MODULE_NAME; GNCIdType type = GNC_CUSTOMER_MODULE_NAME;

6
src/business/business-gnome/dialog-date-close.c
View File

@ -48,7 +48,7 @@ typedef struct _dialog_date_close_window {
Timespec *ts, *ts2; Timespec *ts, *ts2;
GList * acct_types; GList * acct_types;
GList * acct_commodities; GList * acct_commodities;
GNCBook *book; QofBook *book;
Account *acct; Account *acct;
char **memo; char **memo;
gboolean retval; gboolean retval;
@ -230,7 +230,7 @@ gnc_dialog_dates_acct_question_parented (GtkWidget *parent, const char *message,
gboolean ok_is_default, gboolean ok_is_default,
gboolean set_default_acct, gboolean set_default_acct,
GList * acct_types, GList * acct_commodities, GList * acct_types, GList * acct_commodities,
GNCBook *book, GncBillTerm *terms, QofBook *book, GncBillTerm *terms,
/* Returned Data... */ /* Returned Data... */
Timespec *ddue, Timespec *post, Timespec *ddue, Timespec *post,
char **memo, Account **acct, gboolean *answer) char **memo, Account **acct, gboolean *answer)
@ -345,7 +345,7 @@ gnc_dialog_date_acct_parented (GtkWidget *parent, const char *message,
const char *date_label_message, const char *date_label_message,
const char *acct_label_message, const char *acct_label_message,
gboolean ok_is_default, gboolean ok_is_default,
GList * acct_types, GNCBook *book, GList * acct_types, QofBook *book,
/* Returned Data... */ /* Returned Data... */
Timespec *date, Account **acct) Timespec *date, Account **acct)
{ {

4
src/business/business-gnome/dialog-date-close.h
View File

@ -54,7 +54,7 @@ gnc_dialog_dates_acct_question_parented (GtkWidget *parent, const char *message,
gboolean ok_is_default, gboolean ok_is_default,
gboolean set_default_acct, gboolean set_default_acct,
GList * acct_types, GList * acct_commodities, GList * acct_types, GList * acct_commodities,
GNCBook *book, GncBillTerm *terms, QofBook *book, GncBillTerm *terms,
/* Returned Data... */ /* Returned Data... */
Timespec *ddue, Timespec *post, Timespec *ddue, Timespec *post,
char **memo, Account **acct, gboolean *answer); char **memo, Account **acct, gboolean *answer);
@ -87,7 +87,7 @@ gnc_dialog_date_acct_parented (GtkWidget *parent, const char *message,
const char *date_label_message, const char *date_label_message,
const char *acct_label_message, const char *acct_label_message,
gboolean ok_is_default, gboolean ok_is_default,
GList * acct_types, GNCBook *book, GList * acct_types, QofBook *book,
/* Returned Data... */ /* Returned Data... */
Timespec *date, Account **acct); Timespec *date, Account **acct);

10
src/business/business-gnome/dialog-employee.c
View File

@ -66,7 +66,7 @@ typedef enum
} EmployeeDialogType; } EmployeeDialogType;
struct _employee_select_window { struct _employee_select_window {
GNCBook * book; QofBook * book;
QueryNew * q; QueryNew * q;
}; };
@ -100,7 +100,7 @@ struct _employee_window {
EmployeeDialogType dialog_type; EmployeeDialogType dialog_type;
GUID employee_guid; GUID employee_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncEmployee * created_employee; GncEmployee * created_employee;
}; };
@ -373,7 +373,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static EmployeeWindow * static EmployeeWindow *
gnc_employee_new_window (GNCBook *bookp, gnc_employee_new_window (QofBook *bookp,
GncEmployee *employee) GncEmployee *employee)
{ {
EmployeeWindow *ew; EmployeeWindow *ew;
@ -567,7 +567,7 @@ gnc_employee_new_window (GNCBook *bookp,
} }
EmployeeWindow * EmployeeWindow *
gnc_ui_employee_new (GNCBook *bookp) gnc_ui_employee_new (QofBook *bookp)
{ {
EmployeeWindow *ew; EmployeeWindow *ew;
@ -671,7 +671,7 @@ free_employee_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_employee_search (GncEmployee *start, GNCBook *book) gnc_employee_search (GncEmployee *start, QofBook *book)
{ {
GNCIdType type = GNC_EMPLOYEE_MODULE_NAME; GNCIdType type = GNC_EMPLOYEE_MODULE_NAME;
struct _employee_select_window *sw; struct _employee_select_window *sw;

16
src/business/business-gnome/dialog-invoice.c
View File

@ -108,7 +108,7 @@ FROM_STRING_FUNC(InvoiceDialogType, ENUM_INVOICE_TYPE)
AS_STRING_FUNC(InvoiceDialogType, ENUM_INVOICE_TYPE) AS_STRING_FUNC(InvoiceDialogType, ENUM_INVOICE_TYPE)
struct _invoice_select_window { struct _invoice_select_window {
GNCBook * book; QofBook * book;
GncOwner * owner; GncOwner * owner;
QueryNew * q; QueryNew * q;
GncOwner owner_def; GncOwner owner_def;
@ -172,7 +172,7 @@ struct _invoice_window {
InvoiceDialogType dialog_type; InvoiceDialogType dialog_type;
GUID invoice_guid; GUID invoice_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncInvoice * created_invoice; GncInvoice * created_invoice;
GncOwner owner; GncOwner owner;
GncOwner job; GncOwner job;
@ -1730,7 +1730,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static InvoiceWindow * static InvoiceWindow *
gnc_invoice_new_page (GNCBook *bookp, InvoiceDialogType type, gnc_invoice_new_page (QofBook *bookp, InvoiceDialogType type,
GncInvoice *invoice, GncOwner *owner, GncInvoice *invoice, GncOwner *owner,
GncMainWindow *window) GncMainWindow *window)
{ {
@ -2083,7 +2083,7 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
} }
static InvoiceWindow * static InvoiceWindow *
gnc_invoice_window_new_invoice (GNCBook *bookp, GncOwner *owner, gnc_invoice_window_new_invoice (QofBook *bookp, GncOwner *owner,
GncInvoice *invoice) GncInvoice *invoice)
{ {
InvoiceWindow *iw; InvoiceWindow *iw;
@ -2217,7 +2217,7 @@ gnc_ui_invoice_modify (GncInvoice *invoice)
} }
InvoiceWindow * InvoiceWindow *
gnc_ui_invoice_new (GncOwner *ownerp, GNCBook *bookp) gnc_ui_invoice_new (GncOwner *ownerp, QofBook *bookp)
{ {
InvoiceWindow *iw; InvoiceWindow *iw;
GncOwner owner; GncOwner owner;
@ -2296,7 +2296,7 @@ free_invoice_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_invoice_search (GncInvoice *start, GncOwner *owner, GNCBook *book) gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
{ {
GNCIdType type = GNC_INVOICE_MODULE_NAME; GNCIdType type = GNC_INVOICE_MODULE_NAME;
struct _invoice_select_window *sw; struct _invoice_select_window *sw;
@ -2554,7 +2554,7 @@ gnc_invoice_search_edit (gpointer start, gpointer book)
} }
DialogQueryList * DialogQueryList *
gnc_invoice_show_bills_due (GNCBook *book, double days_in_advance) gnc_invoice_show_bills_due (QofBook *book, double days_in_advance)
{ {
GNCIdType type = GNC_INVOICE_MODULE_NAME; GNCIdType type = GNC_INVOICE_MODULE_NAME;
Query *q; Query *q;
@ -2629,7 +2629,7 @@ gnc_invoice_show_bills_due (GNCBook *book, double days_in_advance)
void void
gnc_invoice_remind_bills_due (void) gnc_invoice_remind_bills_due (void)
{ {
GNCBook *book; QofBook *book;
gint days; gint days;
if (!gnc_current_session_exist()) return; if (!gnc_current_session_exist()) return;

12
src/business/business-gnome/dialog-job.c
View File

@ -61,7 +61,7 @@ typedef enum
} JobDialogType; } JobDialogType;
struct _job_select_window { struct _job_select_window {
GNCBook * book; QofBook * book;
GncOwner * owner; GncOwner * owner;
QueryNew * q; QueryNew * q;
GncOwner owner_def; GncOwner owner_def;
@ -78,7 +78,7 @@ struct _job_window {
JobDialogType dialog_type; JobDialogType dialog_type;
GUID job_guid; GUID job_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncJob * created_job; GncJob * created_job;
GncOwner owner; GncOwner owner;
@ -286,7 +286,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static JobWindow * static JobWindow *
gnc_job_new_window (GNCBook *bookp, GncOwner *owner, GncJob *job) gnc_job_new_window (QofBook *bookp, GncOwner *owner, GncJob *job)
{ {
JobWindow *jw; JobWindow *jw;
GladeXML *xml; GladeXML *xml;
@ -386,7 +386,7 @@ gnc_job_new_window (GNCBook *bookp, GncOwner *owner, GncJob *job)
} }
GncJob * GncJob *
gnc_ui_job_new_return_handle (GncOwner *owner, GNCBook *book) gnc_ui_job_new_return_handle (GncOwner *owner, QofBook *book)
{ {
JobWindow *jw; JobWindow *jw;
if (!book) return NULL; if (!book) return NULL;
@ -395,7 +395,7 @@ gnc_ui_job_new_return_handle (GncOwner *owner, GNCBook *book)
} }
JobWindow * JobWindow *
gnc_ui_job_new (GncOwner *ownerp, GNCBook *bookp) gnc_ui_job_new (GncOwner *ownerp, QofBook *bookp)
{ {
JobWindow *jw; JobWindow *jw;
GncOwner owner; GncOwner owner;
@ -503,7 +503,7 @@ free_userdata_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_job_search (GncJob *start, GncOwner *owner, GNCBook *book) gnc_job_search (GncJob *start, GncOwner *owner, QofBook *book)
{ {
QueryNew *q, *q2 = NULL; QueryNew *q, *q2 = NULL;
GNCIdType type = GNC_JOB_MODULE_NAME; GNCIdType type = GNC_JOB_MODULE_NAME;

12
src/business/business-gnome/dialog-order.c
View File

@ -67,7 +67,7 @@ typedef enum
} OrderDialogType; } OrderDialogType;
struct _order_select_window { struct _order_select_window {
GNCBook * book; QofBook * book;
GncOwner * owner; GncOwner * owner;
QueryNew * q; QueryNew * q;
GncOwner owner_def; GncOwner owner_def;
@ -95,7 +95,7 @@ struct _order_window {
OrderDialogType dialog_type; OrderDialogType dialog_type;
GUID order_guid; GUID order_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncOrder * created_order; GncOrder * created_order;
GncOwner owner; GncOwner owner;
@ -522,7 +522,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static OrderWindow * static OrderWindow *
gnc_order_new_window (GNCBook *bookp, OrderDialogType type, gnc_order_new_window (QofBook *bookp, OrderDialogType type,
GncOrder *order, GncOwner *owner) GncOrder *order, GncOwner *owner)
{ {
OrderWindow *ow; OrderWindow *ow;
@ -641,7 +641,7 @@ gnc_order_new_window (GNCBook *bookp, OrderDialogType type,
} }
static OrderWindow * static OrderWindow *
gnc_order_window_new_order (GNCBook *bookp, GncOwner *owner) gnc_order_window_new_order (QofBook *bookp, GncOwner *owner)
{ {
OrderWindow *ow; OrderWindow *ow;
GladeXML *xml; GladeXML *xml;
@ -720,7 +720,7 @@ gnc_ui_order_edit (GncOrder *order)
} }
OrderWindow * OrderWindow *
gnc_ui_order_new (GncOwner *ownerp, GNCBook *bookp) gnc_ui_order_new (GncOwner *ownerp, QofBook *bookp)
{ {
OrderWindow *ow; OrderWindow *ow;
GncOwner owner; GncOwner owner;
@ -789,7 +789,7 @@ free_order_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_order_search (GncOrder *start, GncOwner *owner, GNCBook *book) gnc_order_search (GncOrder *start, GncOwner *owner, QofBook *book)
{ {
GNCIdType type = GNC_ORDER_MODULE_NAME; GNCIdType type = GNC_ORDER_MODULE_NAME;
struct _order_select_window *sw; struct _order_select_window *sw;

4
src/business/business-gnome/dialog-order.h
View File

@ -33,11 +33,11 @@ typedef struct _order_window OrderWindow;
/* Create and edit an order */ /* Create and edit an order */
OrderWindow * gnc_ui_order_edit (GncOrder *order); OrderWindow * gnc_ui_order_edit (GncOrder *order);
OrderWindow * gnc_ui_order_new (GncOwner *owner, GNCBook *book); OrderWindow * gnc_ui_order_new (GncOwner *owner, QofBook *book);
/* Search for orders */ /* Search for orders */
GNCSearchWindow * gnc_order_search (GncOrder *start, GncOwner *owner, GNCSearchWindow * gnc_order_search (GncOrder *start, GncOwner *owner,
GNCBook *book); QofBook *book);
/* /*
* These callbacks are for use with the gnc_general_search widget * These callbacks are for use with the gnc_general_search widget

8
src/business/business-gnome/dialog-payment.c
View File

@ -63,7 +63,7 @@ struct _payment_window {
GtkWidget * acct_tree; GtkWidget * acct_tree;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncOwner owner; GncOwner owner;
GncInvoice * invoice; GncInvoice * invoice;
GList * acct_types; GList * acct_types;
@ -395,7 +395,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static PaymentWindow * static PaymentWindow *
new_payment_window (GncOwner *owner, GNCBook *book, GncInvoice *invoice) new_payment_window (GncOwner *owner, QofBook *book, GncInvoice *invoice)
{ {
PaymentWindow *pw; PaymentWindow *pw;
GladeXML *xml; GladeXML *xml;
@ -533,7 +533,7 @@ gnc_ui_payment_window_destroy (PaymentWindow *pw)
} }
PaymentWindow * PaymentWindow *
gnc_ui_payment_new_with_invoice (GncOwner *owner, GNCBook *book, gnc_ui_payment_new_with_invoice (GncOwner *owner, QofBook *book,
GncInvoice *invoice) GncInvoice *invoice)
{ {
GncOwner owner_def; GncOwner owner_def;
@ -551,7 +551,7 @@ gnc_ui_payment_new_with_invoice (GncOwner *owner, GNCBook *book,
} }
PaymentWindow * PaymentWindow *
gnc_ui_payment_new (GncOwner *owner, GNCBook *book) gnc_ui_payment_new (GncOwner *owner, QofBook *book)
{ {
return gnc_ui_payment_new_with_invoice (owner, book, NULL); return gnc_ui_payment_new_with_invoice (owner, book, NULL);
} }

4
src/business/business-gnome/dialog-payment.h
View File

@ -31,9 +31,9 @@ typedef struct _payment_window PaymentWindow;
#include "gncInvoice.h" #include "gncInvoice.h"
/* Create a payment window */ /* Create a payment window */
PaymentWindow * gnc_ui_payment_new (GncOwner *owner, GNCBook *book); PaymentWindow * gnc_ui_payment_new (GncOwner *owner, QofBook *book);
PaymentWindow * gnc_ui_payment_new_with_invoice (GncOwner *owner, PaymentWindow * gnc_ui_payment_new_with_invoice (GncOwner *owner,
GNCBook *book, QofBook *book,
GncInvoice *invoice); GncInvoice *invoice);
/* Destroy a payment window */ /* Destroy a payment window */

10
src/business/business-gnome/dialog-vendor.c
View File

@ -66,7 +66,7 @@ typedef enum
} VendorDialogType; } VendorDialogType;
struct _vendor_select_window { struct _vendor_select_window {
GNCBook * book; QofBook * book;
QueryNew * q; QueryNew * q;
}; };
@ -99,7 +99,7 @@ struct _vendor_window {
VendorDialogType dialog_type; VendorDialogType dialog_type;
GUID vendor_guid; GUID vendor_guid;
gint component_id; gint component_id;
GNCBook * book; QofBook * book;
GncVendor * created_vendor; GncVendor * created_vendor;
GncTaxTable * taxtable; GncTaxTable * taxtable;
@ -344,7 +344,7 @@ find_handler (gpointer find_data, gpointer user_data)
} }
static VendorWindow * static VendorWindow *
gnc_vendor_new_window (GNCBook *bookp, GncVendor *vendor) gnc_vendor_new_window (QofBook *bookp, GncVendor *vendor)
{ {
VendorWindow *vw; VendorWindow *vw;
GladeXML *xml; GladeXML *xml;
@ -495,7 +495,7 @@ gnc_vendor_new_window (GNCBook *bookp, GncVendor *vendor)
} }
VendorWindow * VendorWindow *
gnc_ui_vendor_new (GNCBook *bookp) gnc_ui_vendor_new (QofBook *bookp)
{ {
VendorWindow *vw; VendorWindow *vw;
@ -635,7 +635,7 @@ free_vendor_cb (gpointer user_data)
} }
GNCSearchWindow * GNCSearchWindow *
gnc_vendor_search (GncVendor *start, GNCBook *book) gnc_vendor_search (GncVendor *start, QofBook *book)
{ {
GNCIdType type = GNC_VENDOR_MODULE_NAME; GNCIdType type = GNC_VENDOR_MODULE_NAME;
struct _vendor_select_window *sw; struct _vendor_select_window *sw;

2
src/business/business-ledger/gncEntryLedger.c
View File

@ -264,7 +264,7 @@ gnc_entry_ledger_config_cells (GncEntryLedger *ledger)
} }
/* Create and return a new GncEntry Ledger */ /* Create and return a new GncEntry Ledger */
GncEntryLedger * gnc_entry_ledger_new (GNCBook *book, GncEntryLedgerType type) GncEntryLedger * gnc_entry_ledger_new (QofBook *book, GncEntryLedgerType type)
{ {
GncEntryLedger *ledger; GncEntryLedger *ledger;

2
src/business/business-ledger/gncEntryLedger.h
View File

@ -79,7 +79,7 @@ typedef struct GncEntryLedger_s GncEntryLedger;
/** Prototypes ***************************************************/ /** Prototypes ***************************************************/
/* Create and return a new GncEntry Ledger */ /* Create and return a new GncEntry Ledger */
GncEntryLedger * gnc_entry_ledger_new (GNCBook *book, GncEntryLedgerType type); GncEntryLedger * gnc_entry_ledger_new (QofBook *book, GncEntryLedgerType type);
/* Set the default order for this ledger */ /* Set the default order for this ledger */
void gnc_entry_ledger_set_default_order (GncEntryLedger *ledger, void gnc_entry_ledger_set_default_order (GncEntryLedger *ledger,

2
src/business/business-ledger/gncEntryLedgerP.h
View File

@ -43,7 +43,7 @@ struct GncEntryLedger_s {
GncEntry * hint_entry; /* A Hint for where to display */ GncEntry * hint_entry; /* A Hint for where to display */
gncUIWidget parent; gncUIWidget parent;
GNCBook * book; QofBook * book;
Table * table; Table * table;
GncOrder * order; GncOrder * order;
GncInvoice * invoice; GncInvoice * invoice;

8
src/business/dialog-tax-table/dialog-tax-table.c
View File

@ -73,7 +73,7 @@ struct _taxtable_window {
GncTaxTable * current_table; GncTaxTable * current_table;
GncTaxTableEntry * current_entry; GncTaxTableEntry * current_entry;
GNCBook * book; QofBook * book;
gint component_id; gint component_id;
}; };
@ -640,14 +640,14 @@ static gboolean
find_handler (gpointer find_data, gpointer user_data) find_handler (gpointer find_data, gpointer user_data)
{ {
TaxTableWindow *ttw = user_data; TaxTableWindow *ttw = user_data;
GNCBook *book = find_data; QofBook *book = find_data;
return (ttw != NULL && ttw->book == book); return (ttw != NULL && ttw->book == book);
} }
/* Create a tax-table window */ /* Create a tax-table window */
TaxTableWindow * TaxTableWindow *
gnc_ui_tax_table_window_new (GNCBook *book) gnc_ui_tax_table_window_new (QofBook *book)
{ {
TaxTableWindow *ttw; TaxTableWindow *ttw;
GladeXML *xml; GladeXML *xml;
@ -749,7 +749,7 @@ gnc_ui_tax_table_window_destroy (TaxTableWindow *ttw)
/* Create a new tax-table by name */ /* Create a new tax-table by name */
GncTaxTable * GncTaxTable *
gnc_ui_tax_table_new_from_name (GNCBook *book, const char *name) gnc_ui_tax_table_new_from_name (QofBook *book, const char *name)
{ {
TaxTableWindow *ttw; TaxTableWindow *ttw;

4
src/business/dialog-tax-table/dialog-tax-table.h
View File

@ -30,10 +30,10 @@ typedef struct _taxtable_window TaxTableWindow;
#include "gncTaxTable.h" #include "gncTaxTable.h"
/* Create a new tax-table by name */ /* Create a new tax-table by name */
GncTaxTable * gnc_ui_tax_table_new_from_name (GNCBook *book, const char *name); GncTaxTable * gnc_ui_tax_table_new_from_name (QofBook *book, const char *name);
/* Create a tax-table window */ /* Create a tax-table window */
TaxTableWindow * gnc_ui_tax_table_window_new (GNCBook *book); TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);
/* Destroy a tax-table window */ /* Destroy a tax-table window */
void gnc_ui_tax_table_window_destroy (TaxTableWindow *ttw); void gnc_ui_tax_table_window_destroy (TaxTableWindow *ttw);

2
src/business/dialog-tax-table/dialog-tax-table.i
View File

@ -9,4 +9,4 @@ SCM scm_init_sw_dialog_tax_table_module (void);
%import "base-typemaps.i" %import "base-typemaps.i"
TaxTableWindow * gnc_ui_tax_table_window_new (GNCBook *book); TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);