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

continuing port to the qof code

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8769 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2003-06-27 03:36:02 +00:00
parent 761724ab32
commit bd03ce3eb1
14 changed files with 222 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/business/business-core/gncAddress.c
View File

@ -9,8 +9,8 @@
#include <glib.h>
#include "gnc-engine-util.h" /* safe_strcmp */
#include "QueryCore.h"
#include "QueryObject.h"
#include "qofquerycore.h"
#include "qofqueryobject.h"
#include "guid.h"
#include "gnc-event-p.h"
@ -234,16 +234,16 @@ int gncAddressCompare (const GncAddress *a, const GncAddress *b)
gboolean gncAddressRegister (void)
{
static QueryObjectDef params[] = {
static QofQueryObject params[] = {
{ ADDRESS_NAME, QUERYCORE_STRING, (QueryAccess)gncAddressGetName },
{ ADDRESS_PHONE, QUERYCORE_STRING, (QueryAccess)gncAddressGetPhone },
{ ADDRESS_FAX, QUERYCORE_STRING, (QueryAccess)gncAddressGetFax },
{ ADDRESS_EMAIL, QUERYCORE_STRING, (QueryAccess)gncAddressGetEmail },
{ ADDRESS_NAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncAddressGetName },
{ ADDRESS_PHONE, QOF_QUERYCORE_STRING, (QofAccessFunc)gncAddressGetPhone },
{ ADDRESS_FAX, QOF_QUERYCORE_STRING, (QofAccessFunc)gncAddressGetFax },
{ ADDRESS_EMAIL, QOF_QUERYCORE_STRING, (QofAccessFunc)gncAddressGetEmail },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncAddressCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncAddressCompare, params);
return TRUE;
}

2
src/business/business-core/gncAddress.h
View File

@ -7,7 +7,7 @@
#ifndef GNC_ADDRESS_H_
#define GNC_ADDRESS_H_
#include "gnc-book.h"
#include "qofbook.h"
#define GNC_ADDRESS_MODULE_NAME "gncAddress"

24
src/business/business-core/gncBillTerm.c
View File

@ -9,17 +9,17 @@
#include <glib.h>
#include "messages.h"
#include "gnc-book.h"
#include "gnc-numeric.h"
#include "gnc-engine.h"
#include "gnc-engine-util.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofquerycore.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofbook.h"
#include "qofid.h"
#include "qofid-p.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gncBusiness.h"
#include "gncBillTermP.h"
@ -308,7 +308,7 @@ void gncBillTermBeginEdit (GncBillTerm *term)
static void gncBillTermOnError (GncBillTerm *term, QofBackendError errcode)
{
PERR("BillTerm Backend Failure: %d", errcode);
PERR("BillTerm QofBackend Failure: %d", errcode);
}
static void gncBillTermOnDone (GncBillTerm *term)
@ -327,7 +327,7 @@ void gncBillTermCommitEdit (GncBillTerm *term)
GncBillTerm * gncBillTermLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -633,7 +633,7 @@ static void _gncBillTermMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncBillTermForeach (QofBook *book, foreachObjectCB cb,
static void _gncBillTermForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -653,13 +653,13 @@ static QofObject gncBillTermDesc = {
gboolean gncBillTermRegister (void)
{
static QueryObjectDef params[] = {
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncBillTermGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncBillTermGetGUID },
static QofQueryObject params[] = {
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncBillTermGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncBillTermGetGUID },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncBillTermCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncBillTermCompare, params);
return qof_object_register (&gncBillTermDesc);
}

24
src/business/business-core/gncBusiness.c
View File

@ -10,11 +10,11 @@
#include "gncBusiness.h"
#include "gnc-book.h"
#include "GNCId.h"
#include "qofid.h"
#include "qofid-p.h"
struct _iterate {
foreachObjectCB cb;
QofEntityForeachCB cb;
gpointer user_data;
};
@ -24,8 +24,8 @@ static void get_list (gpointer key, gpointer item, gpointer arg)
iter->cb (item, iter->user_data);
}
void gncBusinessForeach (QofBook *book, GNCIdType mod_name,
foreachObjectCB cb, gpointer user_data)
void gncBusinessForeach (QofBook *book, QofIdType mod_name,
QofEntityForeachCB cb, gpointer user_data)
{
GncBookInfo *bi;
struct _iterate iter;
@ -40,7 +40,7 @@ void gncBusinessForeach (QofBook *book, GNCIdType mod_name,
g_hash_table_foreach (bi->ht, get_list, &iter);
}
void gncBusinessCreate (QofBook *book, GNCIdType mod_name)
void gncBusinessCreate (QofBook *book, QofIdType mod_name)
{
GncBookInfo *bi;
@ -51,7 +51,7 @@ void gncBusinessCreate (QofBook *book, GNCIdType mod_name)
gnc_book_set_data (book, mod_name, bi);
}
void gncBusinessDestroy (QofBook *book, GNCIdType mod_name)
void gncBusinessDestroy (QofBook *book, QofIdType mod_name)
{
GncBookInfo *bi;
@ -64,7 +64,7 @@ void gncBusinessDestroy (QofBook *book, GNCIdType mod_name)
g_free (bi);
}
gboolean gncBusinessIsDirty (QofBook *book, GNCIdType mod_name)
gboolean gncBusinessIsDirty (QofBook *book, QofIdType mod_name)
{
GncBookInfo *bi;
@ -74,7 +74,7 @@ gboolean gncBusinessIsDirty (QofBook *book, GNCIdType mod_name)
return bi->is_dirty;
}
void gncBusinessSetDirtyFlag (QofBook *book, GNCIdType mod_name,
void gncBusinessSetDirtyFlag (QofBook *book, QofIdType mod_name,
gboolean is_dirty)
{
GncBookInfo *bi;
@ -85,22 +85,22 @@ void gncBusinessSetDirtyFlag (QofBook *book, GNCIdType mod_name,
bi->is_dirty = is_dirty;
}
void gncBusinessAddObject (QofBook *book, GNCIdType mod_name,
void gncBusinessAddObject (QofBook *book, QofIdType mod_name,
gpointer obj, const GUID *guid)
{
GncBookInfo *bi;
xaccStoreEntity (gnc_book_get_entity_table (book), obj, guid, mod_name);
qof_entity_store (gnc_book_get_entity_table (book), obj, guid, mod_name);
bi = gnc_book_get_data (book, mod_name);
g_hash_table_insert (bi->ht, (gpointer)guid, obj);
}
void gncBusinessRemoveObject (QofBook *book, GNCIdType mod_name,
void gncBusinessRemoveObject (QofBook *book, QofIdType mod_name,
const GUID *guid)
{
GncBookInfo *bi;
xaccRemoveEntity (gnc_book_get_entity_table (book), guid);
qof_entity_remove (gnc_book_get_entity_table (book), guid);
bi = gnc_book_get_data (book, mod_name);
g_hash_table_remove (bi->ht, guid);
}

20
src/business/business-core/gncBusiness.h
View File

@ -8,25 +8,25 @@
#define GNC_BUSINESS_H_
#include "gnc-book.h"
#include "gncObject.h"
#include "GNCId.h"
#include "qofobject.h"
#include "qofid.h"
typedef struct _gncBookInfo {
GHashTable * ht;
gboolean is_dirty;
} GncBookInfo;
void gncBusinessForeach (QofBook *book, GNCIdType mod_name,
foreachObjectCB cb, gpointer user_data);
void gncBusinessForeach (QofBook *book, QofIdType mod_name,
QofEntityForeachCB cb, gpointer user_data);
void gncBusinessCreate (QofBook *book, GNCIdType mod_name);
void gncBusinessDestroy (QofBook *book, GNCIdType mod_name);
gboolean gncBusinessIsDirty (QofBook *book, GNCIdType mod_name);
void gncBusinessSetDirtyFlag (QofBook *book, GNCIdType mod_name,
void gncBusinessCreate (QofBook *book, QofIdType mod_name);
void gncBusinessDestroy (QofBook *book, QofIdType mod_name);
gboolean gncBusinessIsDirty (QofBook *book, QofIdType mod_name);
void gncBusinessSetDirtyFlag (QofBook *book, QofIdType mod_name,
gboolean is_dirty);
void gncBusinessAddObject (QofBook *book, GNCIdType mod_name,
void gncBusinessAddObject (QofBook *book, QofIdType mod_name,
gpointer obj, const GUID *guid);
void gncBusinessRemoveObject (QofBook *book, GNCIdType mod_name,
void gncBusinessRemoveObject (QofBook *book, QofIdType mod_name,
const GUID *guid);

39
src/business/business-core/gncCustomer.c
View File

@ -11,17 +11,18 @@
#include "messages.h"
#include "gnc-engine-util.h"
#include "GNCId.h"
#include "gnc-book.h"
#include "gnc-commodity.h"
#include "gnc-numeric.h"
#include "gncObject.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofobject.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofbook.h"
#include "qofid-p.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gncBusiness.h"
#include "gncCustomer.h"
@ -310,7 +311,7 @@ void gncCustomerBeginEdit (GncCustomer *cust)
static void gncCustomerOnError (GncCustomer *cust, QofBackendError errcode)
{
PERR("Customer Backend Failure: %d", errcode);
PERR("Customer QofBackend Failure: %d", errcode);
}
static void gncCustomerOnDone (GncCustomer *cust)
@ -439,7 +440,7 @@ GList * gncCustomerGetJoblist (GncCustomer *cust, gboolean show_all)
GUID gncCustomerRetGUID (GncCustomer *customer)
{
if (!customer)
return *xaccGUIDNULL();
return *guid_null();
return customer->guid;
}
@ -453,7 +454,7 @@ GncCustomer * gncCustomerLookupDirect (GUID guid, QofBook *book)
GncCustomer * gncCustomerLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -508,7 +509,7 @@ static void _gncCustomerMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncCustomerForeach (QofBook *book, foreachObjectCB cb,
static void _gncCustomerForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -538,18 +539,18 @@ static QofObject gncCustomerDesc = {
gboolean gncCustomerRegister (void)
{
static QueryObjectDef params[] = {
{ CUSTOMER_ID, QUERYCORE_STRING, (QueryAccess)gncCustomerGetID },
{ CUSTOMER_NAME, QUERYCORE_STRING, (QueryAccess)gncCustomerGetName },
{ CUSTOMER_ADDR, GNC_ADDRESS_MODULE_NAME, (QueryAccess)gncCustomerGetAddr },
{ CUSTOMER_SHIPADDR, GNC_ADDRESS_MODULE_NAME, (QueryAccess)gncCustomerGetShipAddr },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncCustomerGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncCustomerGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncCustomerGetActive },
static QofQueryObject params[] = {
{ CUSTOMER_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncCustomerGetID },
{ CUSTOMER_NAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncCustomerGetName },
{ CUSTOMER_ADDR, GNC_ADDRESS_MODULE_NAME, (QofAccessFunc)gncCustomerGetAddr },
{ CUSTOMER_SHIPADDR, GNC_ADDRESS_MODULE_NAME, (QofAccessFunc)gncCustomerGetShipAddr },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncCustomerGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncCustomerGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncCustomerGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncCustomerCompare,params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncCustomerCompare,params);
return qof_object_register (&gncCustomerDesc);
}

34
src/business/business-core/gncEmployee.c
View File

@ -14,11 +14,11 @@
#include "gnc-book.h"
#include "gnc-commodity.h"
#include "gnc-engine-util.h"
#include "GNCId.h"
#include "gncObject.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofobject.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -308,14 +308,14 @@ Account * gncEmployeeGetCCard (GncEmployee *employee)
GncEmployee * gncEmployeeLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
GUID gncEmployeeRetGUID (GncEmployee *employee)
{
if (!employee)
return *xaccGUIDNULL();
return *guid_null();
return employee->guid;
}
@ -339,7 +339,7 @@ void gncEmployeeBeginEdit (GncEmployee *employee)
static void gncEmployeeOnError (GncEmployee *employee, QofBackendError errcode)
{
PERR("Employee Backend Failure: %d", errcode);
PERR("Employee QofBackend Failure: %d", errcode);
}
static void gncEmployeeOnDone (GncEmployee *employee)
@ -399,7 +399,7 @@ static void _gncEmployeeMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncEmployeeForeach (QofBook *book, foreachObjectCB cb,
static void _gncEmployeeForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -429,17 +429,17 @@ static QofObject gncEmployeeDesc = {
gboolean gncEmployeeRegister (void)
{
static QueryObjectDef params[] = {
{ EMPLOYEE_ID, QUERYCORE_STRING, (QueryAccess)gncEmployeeGetID },
{ EMPLOYEE_USERNAME, QUERYCORE_STRING, (QueryAccess)gncEmployeeGetUsername },
{ EMPLOYEE_ADDR, GNC_ADDRESS_MODULE_NAME, (QueryAccess)gncEmployeeGetAddr },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncEmployeeGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncEmployeeGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncEmployeeGetActive },
static QofQueryObject params[] = {
{ EMPLOYEE_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncEmployeeGetID },
{ EMPLOYEE_USERNAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncEmployeeGetUsername },
{ EMPLOYEE_ADDR, GNC_ADDRESS_MODULE_NAME, (QofAccessFunc)gncEmployeeGetAddr },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncEmployeeGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncEmployeeGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncEmployeeGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncEmployeeCompare,params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncEmployeeCompare,params);
return qof_object_register (&gncEmployeeDesc);
}

48
src/business/business-core/gncEntry.c
View File

@ -14,10 +14,10 @@
#include "gnc-engine-util.h"
#include "gnc-event-p.h"
#include "gnc-numeric.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -763,7 +763,7 @@ GncOrder * gncEntryGetOrder (GncEntry *entry)
GncEntry * gncEntryLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -1112,7 +1112,7 @@ void gncEntryBeginEdit (GncEntry *entry)
static void gncEntryOnError (GncEntry *entry, QofBackendError errcode)
{
PERR("Entry Backend Failure: %d", errcode);
PERR("Entry QofBackend Failure: %d", errcode);
}
static void gncEntryOnDone (GncEntry *entry)
@ -1182,7 +1182,7 @@ static void _gncEntryMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncEntryForeach (QofBook *book, foreachObjectCB cb,
static void _gncEntryForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -1202,26 +1202,26 @@ static QofObject gncEntryDesc = {
gboolean gncEntryRegister (void)
{
static QueryObjectDef params[] = {
{ ENTRY_DATE, QUERYCORE_DATE, (QueryAccess)gncEntryGetDate },
{ ENTRY_DATE_ENTERED, QUERYCORE_DATE, (QueryAccess)gncEntryGetDateEntered },
{ ENTRY_DESC, QUERYCORE_STRING, (QueryAccess)gncEntryGetDescription },
{ ENTRY_ACTION, QUERYCORE_STRING, (QueryAccess)gncEntryGetAction },
{ ENTRY_NOTES, QUERYCORE_STRING, (QueryAccess)gncEntryGetNotes },
{ ENTRY_QTY, QUERYCORE_NUMERIC, (QueryAccess)gncEntryGetQuantity },
{ ENTRY_IPRICE, QUERYCORE_NUMERIC, (QueryAccess)gncEntryGetInvPrice },
{ ENTRY_BPRICE, QUERYCORE_NUMERIC, (QueryAccess)gncEntryGetBillPrice },
{ ENTRY_INVOICE, GNC_INVOICE_MODULE_NAME, (QueryAccess)gncEntryGetInvoice },
{ ENTRY_BILL, GNC_INVOICE_MODULE_NAME, (QueryAccess)gncEntryGetBill },
{ ENTRY_BILLABLE, QUERYCORE_BOOLEAN, (QueryAccess)gncEntryGetBillable },
{ ENTRY_BILLTO, GNC_OWNER_MODULE_NAME, (QueryAccess)gncEntryGetBillTo },
{ ENTRY_ORDER, GNC_ORDER_MODULE_NAME, (QueryAccess)gncEntryGetOrder },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncEntryGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncEntryGetGUID },
static QofQueryObject params[] = {
{ ENTRY_DATE, QOF_QUERYCORE_DATE, (QofAccessFunc)gncEntryGetDate },
{ ENTRY_DATE_ENTERED, QOF_QUERYCORE_DATE, (QofAccessFunc)gncEntryGetDateEntered },
{ ENTRY_DESC, QOF_QUERYCORE_STRING, (QofAccessFunc)gncEntryGetDescription },
{ ENTRY_ACTION, QOF_QUERYCORE_STRING, (QofAccessFunc)gncEntryGetAction },
{ ENTRY_NOTES, QOF_QUERYCORE_STRING, (QofAccessFunc)gncEntryGetNotes },
{ ENTRY_QTY, QOF_QUERYCORE_NUMERIC, (QofAccessFunc)gncEntryGetQuantity },
{ ENTRY_IPRICE, QOF_QUERYCORE_NUMERIC, (QofAccessFunc)gncEntryGetInvPrice },
{ ENTRY_BPRICE, QOF_QUERYCORE_NUMERIC, (QofAccessFunc)gncEntryGetBillPrice },
{ ENTRY_INVOICE, GNC_INVOICE_MODULE_NAME, (QofAccessFunc)gncEntryGetInvoice },
{ ENTRY_BILL, GNC_INVOICE_MODULE_NAME, (QofAccessFunc)gncEntryGetBill },
{ ENTRY_BILLABLE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncEntryGetBillable },
{ ENTRY_BILLTO, GNC_OWNER_MODULE_NAME, (QofAccessFunc)gncEntryGetBillTo },
{ ENTRY_ORDER, GNC_ORDER_MODULE_NAME, (QofAccessFunc)gncEntryGetOrder },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncEntryGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncEntryGetGUID },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncEntryCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncEntryCompare, params);
return qof_object_register (&gncEntryDesc);
}

72
src/business/business-core/gncInvoice.c
View File

@ -15,10 +15,10 @@
#include "kvp_frame.h"
#include "gnc-engine-util.h"
#include "gnc-book.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-event-p.h"
#include "gnc-lot.h"
#include "gnc-be-utils.h"
@ -618,7 +618,7 @@ GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot)
guid = kvp_value_get_guid (value);
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -659,7 +659,7 @@ GncInvoice * gncInvoiceGetInvoiceFromTxn (Transaction *txn)
guid = kvp_value_get_guid (value);
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -1242,7 +1242,7 @@ gboolean gncInvoiceIsPaid (GncInvoice *invoice)
GUID gncInvoiceRetGUID (GncInvoice *invoice)
{
if (!invoice)
return *xaccGUIDNULL();
return *guid_null();
return invoice->guid;
}
@ -1256,7 +1256,7 @@ GncInvoice * gncInvoiceLookupDirect (GUID guid, QofBook *book)
GncInvoice * gncInvoiceLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -1267,7 +1267,7 @@ void gncInvoiceBeginEdit (GncInvoice *invoice)
static void gncInvoiceOnError (GncInvoice *invoice, QofBackendError errcode)
{
PERR("Invoice Backend Failure: %d", errcode);
PERR("Invoice QofBackend Failure: %d", errcode);
}
static void gncInvoiceOnDone (GncInvoice *invoice)
@ -1334,7 +1334,7 @@ static void _gncInvoiceMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncInvoiceForeach (QofBook *book, foreachObjectCB cb,
static void _gncInvoiceForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -1372,52 +1372,52 @@ static QofObject gncInvoiceDesc = {
static void
reg_lot (void)
{
static QueryObjectDef params[] = {
static QofQueryObject params[] = {
{ INVOICE_FROM_LOT, _GNC_MOD_NAME,
(QueryAccess)gncInvoiceGetInvoiceFromLot },
(QofAccessFunc)gncInvoiceGetInvoiceFromLot },
{ NULL },
};
gncQueryObjectRegister (GNC_ID_LOT, NULL, params);
qof_query_object_register (GNC_ID_LOT, NULL, params);
}
static void
reg_txn (void)
{
static QueryObjectDef params[] = {
static QofQueryObject params[] = {
{ INVOICE_FROM_TXN, _GNC_MOD_NAME,
(QueryAccess)gncInvoiceGetInvoiceFromTxn },
(QofAccessFunc)gncInvoiceGetInvoiceFromTxn },
{ NULL },
};
gncQueryObjectRegister (GNC_ID_TRANS, NULL, params);
qof_query_object_register (GNC_ID_TRANS, NULL, params);
}
gboolean gncInvoiceRegister (void)
{
static QueryObjectDef params[] = {
{ INVOICE_ID, QUERYCORE_STRING, (QueryAccess)gncInvoiceGetID },
{ INVOICE_OWNER, GNC_OWNER_MODULE_NAME, (QueryAccess)gncInvoiceGetOwner },
{ INVOICE_OPENED, QUERYCORE_DATE, (QueryAccess)gncInvoiceGetDateOpened },
{ INVOICE_DUE, QUERYCORE_DATE, (QueryAccess)gncInvoiceGetDateDue },
{ INVOICE_POSTED, QUERYCORE_DATE, (QueryAccess)gncInvoiceGetDatePosted },
{ INVOICE_IS_POSTED, QUERYCORE_BOOLEAN, (QueryAccess)gncInvoiceIsPosted },
{ INVOICE_IS_PAID, QUERYCORE_BOOLEAN, (QueryAccess)gncInvoiceIsPaid },
{ INVOICE_BILLINGID, QUERYCORE_STRING, (QueryAccess)gncInvoiceGetBillingID },
{ INVOICE_NOTES, QUERYCORE_STRING, (QueryAccess)gncInvoiceGetNotes },
{ INVOICE_ACC, GNC_ID_ACCOUNT, (QueryAccess)gncInvoiceGetPostedAcc },
{ INVOICE_POST_TXN, GNC_ID_TRANS, (QueryAccess)gncInvoiceGetPostedTxn },
{ INVOICE_POST_LOT, GNC_ID_LOT, (QueryAccess)gncInvoiceGetPostedLot },
{ INVOICE_TYPE, QUERYCORE_STRING, (QueryAccess)gncInvoiceGetType },
{ INVOICE_TERMS, GNC_BILLTERM_MODULE_NAME, (QueryAccess)gncInvoiceGetTerms },
{ INVOICE_BILLTO, GNC_OWNER_MODULE_NAME, (QueryAccess)gncInvoiceGetBillTo },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncInvoiceGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncInvoiceGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncInvoiceGetActive },
static QofQueryObject params[] = {
{ INVOICE_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncInvoiceGetID },
{ INVOICE_OWNER, GNC_OWNER_MODULE_NAME, (QofAccessFunc)gncInvoiceGetOwner },
{ INVOICE_OPENED, QOF_QUERYCORE_DATE, (QofAccessFunc)gncInvoiceGetDateOpened },
{ INVOICE_DUE, QOF_QUERYCORE_DATE, (QofAccessFunc)gncInvoiceGetDateDue },
{ INVOICE_POSTED, QOF_QUERYCORE_DATE, (QofAccessFunc)gncInvoiceGetDatePosted },
{ INVOICE_IS_POSTED, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncInvoiceIsPosted },
{ INVOICE_IS_PAID, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncInvoiceIsPaid },
{ INVOICE_BILLINGID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncInvoiceGetBillingID },
{ INVOICE_NOTES, QOF_QUERYCORE_STRING, (QofAccessFunc)gncInvoiceGetNotes },
{ INVOICE_ACC, GNC_ID_ACCOUNT, (QofAccessFunc)gncInvoiceGetPostedAcc },
{ INVOICE_POST_TXN, GNC_ID_TRANS, (QofAccessFunc)gncInvoiceGetPostedTxn },
{ INVOICE_POST_LOT, GNC_ID_LOT, (QofAccessFunc)gncInvoiceGetPostedLot },
{ INVOICE_TYPE, QOF_QUERYCORE_STRING, (QofAccessFunc)gncInvoiceGetType },
{ INVOICE_TERMS, GNC_BILLTERM_MODULE_NAME, (QofAccessFunc)gncInvoiceGetTerms },
{ INVOICE_BILLTO, GNC_OWNER_MODULE_NAME, (QofAccessFunc)gncInvoiceGetBillTo },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncInvoiceGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncInvoiceGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncInvoiceGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncInvoiceCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncInvoiceCompare, params);
reg_lot ();
reg_txn ();

36
src/business/business-core/gncJob.c
View File

@ -14,10 +14,10 @@
#include "gnc-engine-util.h"
#include "gnc-numeric.h"
#include "gnc-book.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -223,7 +223,7 @@ void gncJobBeginEdit (GncJob *job)
static void gncJobOnError (GncJob *job, QofBackendError errcode)
{
PERR("Job Backend Failure: %d", errcode);
PERR("Job QofBackend Failure: %d", errcode);
}
static void gncJobOnDone (GncJob *job)
@ -281,7 +281,7 @@ GUID gncJobRetGUID (GncJob *job)
const GUID *guid = gncJobGetGUID (job);
if (guid)
return *guid;
return *xaccGUIDNULL ();
return *guid_null ();
}
gboolean gncJobGetActive (GncJob *job)
@ -293,7 +293,7 @@ gboolean gncJobGetActive (GncJob *job)
GncJob * gncJobLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -352,7 +352,7 @@ static void _gncJobMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncJobForeach (QofBook *book, foreachObjectCB cb,
static void _gncJobForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -382,19 +382,19 @@ static QofObject gncJobDesc = {
gboolean gncJobRegister (void)
{
static QueryObjectDef params[] = {
{ JOB_ID, QUERYCORE_STRING, (QueryAccess)gncJobGetID },
{ JOB_NAME, QUERYCORE_STRING, (QueryAccess)gncJobGetName },
{ JOB_REFERENCE, QUERYCORE_STRING, (QueryAccess)gncJobGetReference },
{ JOB_OWNER, GNC_OWNER_MODULE_NAME, (QueryAccess)gncJobGetOwner },
{ JOB_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncJobGetActive },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncJobGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncJobGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncJobGetActive },
static QofQueryObject params[] = {
{ JOB_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncJobGetID },
{ JOB_NAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncJobGetName },
{ JOB_REFERENCE, QOF_QUERYCORE_STRING, (QofAccessFunc)gncJobGetReference },
{ JOB_OWNER, GNC_OWNER_MODULE_NAME, (QofAccessFunc)gncJobGetOwner },
{ JOB_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncJobGetActive },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncJobGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncJobGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncJobGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncJobCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
return qof_object_register (&gncJobDesc);
}

38
src/business/business-core/gncOrder.c
View File

@ -13,10 +13,10 @@
#include "kvp_frame.h"
#include "gnc-engine-util.h"
#include "gnc-book.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -308,7 +308,7 @@ GList * gncOrderGetEntries (GncOrder *order)
GncOrder * gncOrderLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -332,7 +332,7 @@ void gncOrderBeginEdit (GncOrder *order)
static void gncOrderOnError (GncOrder *order, QofBackendError errcode)
{
PERR("Order Backend Failure: %d", errcode);
PERR("Order QofBackend Failure: %d", errcode);
}
static void gncOrderOnDone (GncOrder *order)
@ -399,7 +399,7 @@ static void _gncOrderMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncOrderForeach (QofBook *book, foreachObjectCB cb,
static void _gncOrderForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -436,21 +436,21 @@ static QofObject gncOrderDesc = {
gboolean gncOrderRegister (void)
{
static QueryObjectDef params[] = {
{ ORDER_ID, QUERYCORE_STRING, (QueryAccess)gncOrderGetID },
{ ORDER_REFERENCE, QUERYCORE_STRING, (QueryAccess)gncOrderGetReference },
{ ORDER_OWNER, GNC_OWNER_MODULE_NAME, (QueryAccess)gncOrderGetOwner },
{ ORDER_OPENED, QUERYCORE_DATE, (QueryAccess)gncOrderGetDateOpened },
{ ORDER_IS_CLOSED, QUERYCORE_BOOLEAN, (QueryAccess)gncOrderIsClosed },
{ ORDER_CLOSED, QUERYCORE_DATE, (QueryAccess)gncOrderGetDateClosed },
{ ORDER_NOTES, QUERYCORE_STRING, (QueryAccess)gncOrderGetNotes },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncOrderGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncOrderGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncOrderGetActive },
static QofQueryObject params[] = {
{ ORDER_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncOrderGetID },
{ ORDER_REFERENCE, QOF_QUERYCORE_STRING, (QofAccessFunc)gncOrderGetReference },
{ ORDER_OWNER, GNC_OWNER_MODULE_NAME, (QofAccessFunc)gncOrderGetOwner },
{ ORDER_OPENED, QOF_QUERYCORE_DATE, (QofAccessFunc)gncOrderGetDateOpened },
{ ORDER_IS_CLOSED, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncOrderIsClosed },
{ ORDER_CLOSED, QOF_QUERYCORE_DATE, (QofAccessFunc)gncOrderGetDateClosed },
{ ORDER_NOTES, QOF_QUERYCORE_STRING, (QofAccessFunc)gncOrderGetNotes },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncOrderGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncOrderGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncOrderGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncOrderCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncOrderCompare, params);
return qof_object_register (&gncOrderDesc);
}

34
src/business/business-core/gncOwner.c
View File

@ -9,9 +9,9 @@
#include <glib.h>
#include <string.h> /* for memcpy() */
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gncOwner.h"
#include "gncOwnerP.h"
@ -329,31 +329,31 @@ owner_from_lot (GNCLot *lot)
static void
reg_lot (void)
{
static QueryObjectDef params[] = {
{ OWNER_FROM_LOT, _GNC_MOD_NAME, (QueryAccess)owner_from_lot },
static QofQueryObject params[] = {
{ OWNER_FROM_LOT, _GNC_MOD_NAME, (QofAccessFunc)owner_from_lot },
{ NULL },
};
gncQueryObjectRegister (GNC_ID_LOT, NULL, params);
qof_query_object_register (GNC_ID_LOT, NULL, params);
}
gboolean gncOwnerRegister (void)
{
static QueryObjectDef params[] = {
{ OWNER_TYPE, QUERYCORE_INT64, (QueryAccess)gncOwnerGetType },
static QofQueryObject params[] = {
{ OWNER_TYPE, QUERYCORE_INT64, (QofAccessFunc)gncOwnerGetType },
{ OWNER_CUSTOMER, GNC_CUSTOMER_MODULE_NAME,
(QueryAccess)gncOwnerGetCustomer },
{ OWNER_JOB, GNC_JOB_MODULE_NAME, (QueryAccess)gncOwnerGetJob },
{ OWNER_VENDOR, GNC_VENDOR_MODULE_NAME, (QueryAccess)gncOwnerGetVendor },
{ OWNER_EMPLOYEE, GNC_EMPLOYEE_MODULE_NAME, (QueryAccess)gncOwnerGetEmployee },
{ OWNER_PARENT, _GNC_MOD_NAME, (QueryAccess)gncOwnerGetEndOwner },
{ OWNER_PARENTG, QUERYCORE_GUID, (QueryAccess)gncOwnerGetEndGUID },
{ OWNER_NAME, QUERYCORE_STRING, (QueryAccess)gncOwnerGetName },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncOwnerGetGUID },
(QofAccessFunc)gncOwnerGetCustomer },
{ OWNER_JOB, GNC_JOB_MODULE_NAME, (QofAccessFunc)gncOwnerGetJob },
{ OWNER_VENDOR, GNC_VENDOR_MODULE_NAME, (QofAccessFunc)gncOwnerGetVendor },
{ OWNER_EMPLOYEE, GNC_EMPLOYEE_MODULE_NAME, (QofAccessFunc)gncOwnerGetEmployee },
{ OWNER_PARENT, _GNC_MOD_NAME, (QofAccessFunc)gncOwnerGetEndOwner },
{ OWNER_PARENTG, QOF_QUERYCORE_GUID, (QofAccessFunc)gncOwnerGetEndGUID },
{ OWNER_NAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncOwnerGetName },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncOwnerGetGUID },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncOwnerCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncOwnerCompare, params);
reg_lot ();
return TRUE;

24
src/business/business-core/gncTaxTable.c
View File

@ -12,10 +12,10 @@
#include "gnc-numeric.h"
#include "gnc-engine-util.h"
#include "gnc-book.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-event-p.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -396,7 +396,7 @@ void gncTaxTableBeginEdit (GncTaxTable *table)
static void gncTaxTableOnError (GncTaxTable *table, QofBackendError errcode)
{
PERR("TaxTable Backend Failure: %d", errcode);
PERR("TaxTable QofBackend Failure: %d", errcode);
}
static void gncTaxTableOnDone (GncTaxTable *table)
@ -416,7 +416,7 @@ void gncTaxTableCommitEdit (GncTaxTable *table)
GncTaxTable * gncTaxTableLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -652,7 +652,7 @@ void gncAccountValueDestroy (GList *list)
GUID gncTaxTableRetGUID (GncTaxTable *table)
{
if (!table)
return *xaccGUIDNULL();
return *guid_null();
return table->guid;
}
@ -735,7 +735,7 @@ static void _gncTaxTableMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncTaxTableForeach (QofBook *book, foreachObjectCB cb,
static void _gncTaxTableForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -755,13 +755,13 @@ static QofObject gncTaxTableDesc = {
gboolean gncTaxTableRegister (void)
{
static QueryObjectDef params[] = {
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncTaxTableGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncTaxTableGetGUID },
static QofQueryObject params[] = {
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncTaxTableGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncTaxTableGetGUID },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncTaxTableCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncTaxTableCompare, params);
return qof_object_register (&gncTaxTableDesc);
}

32
src/business/business-core/gncVendor.c
View File

@ -15,10 +15,10 @@
#include "gnc-commodity.h"
#include "gnc-engine-util.h"
#include "gnc-event-p.h"
#include "GNCId.h"
#include "QueryCore.h"
#include "QueryNew.h"
#include "QueryObject.h"
#include "qofid.h"
#include "qofquerycore.h"
#include "qofquery.h"
#include "qofqueryobject.h"
#include "gnc-be-utils.h"
#include "qofid-p.h"
@ -357,7 +357,7 @@ void gncVendorBeginEdit (GncVendor *vendor)
static void gncVendorOnError (GncVendor *vendor, QofBackendError errcode)
{
PERR("Vendor Backend Failure: %d", errcode);
PERR("Vendor QofBackend Failure: %d", errcode);
}
static void gncVendorOnDone (GncVendor *vendor)
@ -404,7 +404,7 @@ GList * gncVendorGetJoblist (GncVendor *vendor, gboolean show_all)
GUID gncVendorRetGUID (GncVendor *vendor)
{
if (!vendor)
return *xaccGUIDNULL();
return *guid_null();
return vendor->guid;
}
@ -418,7 +418,7 @@ GncVendor * gncVendorLookupDirect (GUID guid, QofBook *book)
GncVendor * gncVendorLookup (QofBook *book, const GUID *guid)
{
if (!book || !guid) return NULL;
return xaccLookupEntity (gnc_book_get_entity_table (book),
return qof_entity_lookup (gnc_book_get_entity_table (book),
guid, _GNC_MOD_NAME);
}
@ -460,7 +460,7 @@ static void _gncVendorMarkClean (QofBook *book)
gncBusinessSetDirtyFlag (book, _GNC_MOD_NAME, FALSE);
}
static void _gncVendorForeach (QofBook *book, foreachObjectCB cb,
static void _gncVendorForeach (QofBook *book, QofEntityForeachCB cb,
gpointer user_data)
{
gncBusinessForeach (book, _GNC_MOD_NAME, cb, user_data);
@ -490,17 +490,17 @@ static QofObject gncVendorDesc = {
gboolean gncVendorRegister (void)
{
static QueryObjectDef params[] = {
{ VENDOR_ID, QUERYCORE_STRING, (QueryAccess)gncVendorGetID },
{ VENDOR_NAME, QUERYCORE_STRING, (QueryAccess)gncVendorGetName },
{ VENDOR_ADDR, GNC_ADDRESS_MODULE_NAME, (QueryAccess)gncVendorGetAddr },
{ QUERY_PARAM_BOOK, GNC_ID_BOOK, (QueryAccess)gncVendorGetBook },
{ QUERY_PARAM_GUID, QUERYCORE_GUID, (QueryAccess)gncVendorGetGUID },
{ QUERY_PARAM_ACTIVE, QUERYCORE_BOOLEAN, (QueryAccess)gncVendorGetActive },
static QofQueryObject params[] = {
{ VENDOR_ID, QOF_QUERYCORE_STRING, (QofAccessFunc)gncVendorGetID },
{ VENDOR_NAME, QOF_QUERYCORE_STRING, (QofAccessFunc)gncVendorGetName },
{ VENDOR_ADDR, GNC_ADDRESS_MODULE_NAME, (QofAccessFunc)gncVendorGetAddr },
{ QOF_QUERY_PARAM_BOOK, GNC_ID_BOOK, (QofAccessFunc)gncVendorGetBook },
{ QOF_QUERY_PARAM_GUID, QOF_QUERYCORE_GUID, (QofAccessFunc)gncVendorGetGUID },
{ QOF_QUERY_PARAM_ACTIVE, QOF_QUERYCORE_BOOLEAN, (QofAccessFunc)gncVendorGetActive },
{ NULL },
};
gncQueryObjectRegister (_GNC_MOD_NAME, (QuerySort)gncVendorCompare, params);
qof_query_object_register (_GNC_MOD_NAME, (QofSortFunc)gncVendorCompare, params);
return qof_object_register (&gncVendorDesc);
}