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

Rename the type GUID into GncGUID because on Windows, the system headers have a type GUID which clashes with ours.

Browse Source 
Note that only the type was renamed, but not any enums or function names.
Hence, the scheme wrappers should be unchanged completely (hopefully).

Discussed at http://lists.gnucash.org/pipermail/gnucash-devel/2010-March/027679.html

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18969 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-03-27 21:01:21 +00:00
parent 932eeb766d
commit a322015eb8
193 changed files with 709 additions and 709 deletions
src
app-utils
file-utils.cgnc-component-manager.cgnc-component-manager.hgnc-sx-instance-model.cguile-util.cguile-util.h
backend
sql
gnc-account-sql.cgnc-backend-sql.cgnc-backend-sql.hgnc-book-sql.cgnc-budget-sql.cgnc-commodity-sql.cgnc-lots-sql.cgnc-recurrence-sql.cgnc-recurrence-sql.hgnc-schedxaction-sql.cgnc-slots-sql.cgnc-slots-sql.hgnc-transaction-sql.c
xml
gnc-account-xml-v2.cgnc-backend-xml.cgnc-book-xml-v2.cgnc-budget-xml-v2.cgnc-freqspec-xml-v2.cgnc-lot-xml-v2.cgnc-pricedb-xml-v2.cgnc-schedxaction-xml-v2.cgnc-transaction-xml-v2.cio-gncxml-v1.csixtp-dom-generators.csixtp-dom-generators.hsixtp-dom-parsers.csixtp-dom-parsers.hsixtp-utils.c
test
test-dom-converters1.ctest-file-stuff.ctest-file-stuff.htest-xml-transaction.c
base-typemaps.i
business
business-core
business-core.igncBillTerm.hgncCustomer.hgncEmployee.hgncEntry.hgncEntryP.hgncInvoice.cgncInvoice.hgncJob.hgncOrder.hgncOwner.cgncOwner.hgncTaxTable.hgncVendor.h
sql
gnc-bill-term-sql.cgnc-customer-sql.cgnc-employee-sql.cgnc-entry-sql.cgnc-invoice-sql.cgnc-job-sql.cgnc-order-sql.cgnc-owner-sql.cgnc-tax-table-sql.cgnc-vendor-sql.c
test
test-customer.ctest-employee.ctest-job.ctest-vendor.c
xml
gnc-bill-term-xml-v2.cgnc-bill-term-xml-v2.hgnc-customer-xml-v2.cgnc-employee-xml-v2.cgnc-entry-xml-v2.cgnc-invoice-xml-v2.cgnc-job-xml-v2.cgnc-order-xml-v2.cgnc-owner-xml-v2.cgnc-tax-table-xml-v2.cgnc-vendor-xml-v2.c
business-gnome
business-urls.cdialog-customer.cdialog-employee.cdialog-invoice.cdialog-job.cdialog-order.cdialog-payment.cdialog-vendor.csearch-owner.c
business-ledger
gncEntryLedger.cgncEntryLedgerP.h
engine
Account.cAccount.hAccountP.hGNCId.hPeriod.cPeriod.hQuery.cQuery.hQueryP.hSX-book.cSchedXaction.c
Show More

2
src/app-utils/file-utils.c
View File

@ -327,7 +327,7 @@ gnc_find_state_file (const gchar *url,
file_guid = g_key_file_get_string(key_file,
STATE_FILE_TOP, STATE_FILE_BOOK_GUID,
NULL);
DEBUG("File GUID is %s", file_guid ? file_guid : "<not found>");
DEBUG("File GncGUID is %s", file_guid ? file_guid : "<not found>");
if (safe_strcmp(guid, file_guid) == 0)
{
DEBUG("Matched !!!");

18
src/app-utils/gnc-component-manager.c
View File

@ -140,7 +140,7 @@ destroy_mask_hash (GHashTable *hash)
static gboolean
destroy_event_hash_helper (gpointer key, gpointer value, gpointer user_data)
{
GUID *guid = key;
GncGUID *guid = key;
EventInfo *ei = value;
xaccGUIDFree (guid);
@ -149,7 +149,7 @@ destroy_event_hash_helper (gpointer key, gpointer value, gpointer user_data)
return TRUE;
}
/* clear a hash table of the form GUID --> EventInfo, where
/* clear a hash table of the form GncGUID --> EventInfo, where
* both keys and values are g_malloced */
static void
clear_event_hash (GHashTable *hash)
@ -178,7 +178,7 @@ clear_event_info (ComponentEventInfo *cei)
}
static void
add_event (ComponentEventInfo *cei, const GUID *entity,
add_event (ComponentEventInfo *cei, const GncGUID *entity,
QofEventId event_mask, gboolean or_in)
{
GHashTable *hash;
@ -210,7 +210,7 @@ add_event (ComponentEventInfo *cei, const GUID *entity,
ei = g_hash_table_lookup (hash, entity);
if (ei == NULL)
{
GUID *key;
GncGUID *key;
key = xaccGUIDMalloc ();
*key = *entity;
@ -258,7 +258,7 @@ gnc_cm_event_handler (QofInstance *entity,
gpointer user_data,
gpointer event_data)
{
const GUID *guid = qof_entity_get_guid(entity);
const GncGUID *guid = qof_entity_get_guid(entity);
#if CM_DEBUG
fprintf (stderr, "event_handler: event %d, entity %p, guid %s\n", event_type,
entity, guid_to_string(guid));
@ -448,7 +448,7 @@ gnc_register_gui_component (const char *component_class,
void
gnc_gui_component_watch_entity (gint component_id,
const GUID *entity,
const GncGUID *entity,
QofEventId event_mask)
{
ComponentInfo *ci;
@ -468,7 +468,7 @@ gnc_gui_component_watch_entity (gint component_id,
void
gnc_gui_component_watch_entity_direct (gint component_id,
GUID entity,
GncGUID entity,
QofEventId event_mask)
{
gnc_gui_component_watch_entity (component_id, &entity, event_mask);
@ -492,7 +492,7 @@ gnc_gui_component_watch_entity_type (gint component_id,
}
const EventInfo *
gnc_gui_get_entity_events (GHashTable *changes, const GUID *entity)
gnc_gui_get_entity_events (GHashTable *changes, const GncGUID *entity)
{
if (!changes || !entity)
return QOF_EVENT_NONE;
@ -621,7 +621,7 @@ match_type_helper (gpointer key, gpointer value, gpointer user_data)
static void
match_helper (gpointer key, gpointer value, gpointer user_data)
{
GUID *guid = key;
GncGUID *guid = key;
EventInfo *ei_1 = value;
EventInfo *ei_2;
ComponentEventInfo *cei = user_data;

16
src/app-utils/gnc-component-manager.h
View File

@ -40,7 +40,7 @@ typedef struct
*
* changes: if NULL, the component should perform a refresh.
*
* if non-NULL, changes is a GUID hash that maps
* if non-NULL, changes is a GncGUID hash that maps
* GUIDs to EventInfo structs describing which
* events have been received. Entities not in
* the hash have not generated any events.
@ -63,10 +63,10 @@ typedef struct
* in the changes GHashTable may no longer exist. So how can you
* determine if this has happened? Well, it's a good idea to check
* for the QOF_EVENT_DESTROY bit in the EventInfo structure. Of
* course, that means you need the hash key (GUID) for the destroyed
* entity. How are you going to get the GUID from the entity if the
* course, that means you need the hash key (GncGUID) for the destroyed
* entity. How are you going to get the GncGUID from the entity if the
* entity has already been destroyed? You're not. So, you have to
* save a COPY of the key (GUID) away beforehand.
* save a COPY of the key (GncGUID) away beforehand.
*
* user_data: user_data supplied when component was registered.
*/
@ -170,7 +170,7 @@ void gnc_gui_component_set_session (gint component_id, gpointer session);
* setting the mask to 0 turns off watching for the entity.
*/
void gnc_gui_component_watch_entity (gint component_id,
const GUID *entity,
const GncGUID *entity,
QofEventId event_mask);
/* gnc_gui_component_watch_entity_direct
@ -183,7 +183,7 @@ void gnc_gui_component_watch_entity (gint component_id,
* setting the mask to 0 turns off watching for the entity.
*/
void gnc_gui_component_watch_entity_direct (gint component_id,
GUID entity,
GncGUID entity,
QofEventId event_mask);
/* gnc_gui_component_watch_entity_type
@ -204,13 +204,13 @@ void gnc_gui_component_watch_entity_type (gint component_id,
* the given entity.
*
* changes: a hash of changes as in the refresh handler
* entity: the GUID of the entity to get the event mask for
* entity: the GncGUID of the entity to get the event mask for
*
* Returns: the event info of the entity, or NULL
* if it is not found.
*/
const EventInfo * gnc_gui_get_entity_events (GHashTable *changes,
const GUID *entity);
const GncGUID *entity);
/* gnc_gui_component_clear_watches
* Clear all watches for the component.

6
src/app-utils/gnc-sx-instance-model.c
View File

@ -190,7 +190,7 @@ _get_vars_helper(Transaction *txn, void *var_hash_data)
for ( ; split_list; split_list = split_list->next)
{
gnc_commodity *split_cmdty = NULL;
GUID *acct_guid;
GncGUID *acct_guid;
Account *acct;
s = (Split*)split_list->data;
@ -903,7 +903,7 @@ typedef struct _SxTxnCreationData
static gboolean
_get_template_split_account(GncSxInstance *instance, Split *template_split, Account **split_acct, GList **creation_errors)
{
GUID *acct_guid;
GncGUID *acct_guid;
kvp_frame *split_kvpf;
kvp_value *kvp_val;
@ -931,7 +931,7 @@ _get_template_split_account(GncSxInstance *instance, Split *template_split, Acco
{
char guid_str[GUID_ENCODING_LENGTH+1];
GString *err;
guid_to_string_buff((const GUID*)acct_guid, guid_str);
guid_to_string_buff((const GncGUID*)acct_guid, guid_str);
err = g_string_new("");
g_string_printf(err, "Unknown account for guid [%s], cancelling SX [%s] creation.",
guid_str, xaccSchedXactionGetName(instance->parent->sx));

4
src/app-utils/guile-util.c
View File

@ -805,8 +805,8 @@ gnc_copy_trans_scm_onto_trans(SCM trans_scm, Transaction *trans,
void
gnc_copy_trans_scm_onto_trans_swap_accounts(SCM trans_scm,
Transaction *trans,
const GUID *guid_1,
const GUID *guid_2,
const GncGUID *guid_1,
const GncGUID *guid_2,
gboolean do_commit,
QofBook *book)
{

4
src/app-utils/guile-util.h
View File

@ -72,8 +72,8 @@ void gnc_copy_trans_scm_onto_trans(SCM trans_scm, Transaction *trans,
gboolean do_commit, QofBook *book);
void gnc_copy_trans_scm_onto_trans_swap_accounts(SCM trans_scm,
Transaction *trans,
const GUID *guid_1,
const GUID *guid_2,
const GncGUID *guid_1,
const GncGUID *guid_2,
gboolean do_commit,
QofBook *book);

14
src/backend/sql/gnc-account-sql.c
View File

@ -88,7 +88,7 @@ static GncSqlColumnTableEntry parent_col_table[] =
typedef struct {
/*@ dependent @*/ Account* pAccount;
GUID guid;
GncGUID guid;
} account_parent_guid_struct;
/* ================================================================= */
@ -98,7 +98,7 @@ get_parent( gpointer pObject )
{
const Account* pAccount;
const Account* pParent;
const GUID* parent_guid;
const GncGUID* parent_guid;
g_return_val_if_fail( pObject != NULL, NULL );
g_return_val_if_fail( GNC_IS_ACCOUNT(pObject), NULL );
@ -119,7 +119,7 @@ set_parent( gpointer pObject, /*@ null @*/ gpointer pValue )
{
Account* pAccount;
QofBook* pBook;
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
Account* pParent;
g_return_if_fail( pObject != NULL );
@ -139,7 +139,7 @@ static void
set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
account_parent_guid_struct* s = (account_parent_guid_struct*)pObject;
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( pValue != NULL );
@ -151,7 +151,7 @@ static /*@ dependent @*//*@ null @*/ Account*
load_single_account( GncSqlBackend* be, GncSqlRow* row,
GList** l_accounts_needing_parents )
{
const GUID* guid;
const GncGUID* guid;
Account* pAccount = NULL;
g_return_val_if_fail( be != NULL, NULL );
@ -297,7 +297,7 @@ gboolean
gnc_sql_save_account( GncSqlBackend* be, QofInstance* inst )
{
Account* pAcc = GNC_ACCOUNT(inst);
const GUID* guid;
const GncGUID* guid;
gboolean is_infant;
gboolean is_ok = FALSE;
gnc_commodity* commodity;
@ -357,7 +357,7 @@ load_account_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
Account* account = NULL;
g_return_if_fail( be != NULL );

24
src/backend/sql/gnc-backend-sql.c
View File

@ -1471,8 +1471,8 @@ load_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
const GUID* pGuid;
GncGUID guid;
const GncGUID* pGuid;
g_return_if_fail( be != NULL );
g_return_if_fail( row != NULL );
@ -1517,7 +1517,7 @@ add_gvalue_guid_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GUID* guid = NULL;
const GncGUID* guid = NULL;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
GValue* value;
@ -1557,7 +1557,7 @@ gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be, QofIdTypeCo
const gpointer pObject, const GncSqlColumnTableEntry* table_row, GSList** pList )
{
QofAccessFunc getter;
const GUID* guid = NULL;
const GncGUID* guid = NULL;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
QofInstance* inst = NULL;
GValue* value;
@ -2027,13 +2027,13 @@ register_standard_col_type_handlers( void )
void
_retrieve_guid_( gpointer pObject, /*@ null @*/ gpointer pValue )
{
GUID* pGuid = (GUID*)pObject;
GUID* guid = (GUID*)pValue;
GncGUID* pGuid = (GncGUID*)pObject;
GncGUID* guid = (GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( pValue != NULL );
memcpy( pGuid, guid, sizeof( GUID ) );
memcpy( pGuid, guid, sizeof( GncGUID ) );
}
@ -2046,10 +2046,10 @@ static GncSqlColumnTableEntry guid_table[] =
/*@ +full_init_block @*/
};
/*@ null @*/ const GUID*
/*@ null @*/ const GncGUID*
gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row )
{
static GUID guid;
static GncGUID guid;
g_return_val_if_fail( be != NULL, NULL );
g_return_val_if_fail( row != NULL, NULL );
@ -2068,10 +2068,10 @@ static GncSqlColumnTableEntry tx_guid_table[] =
/*@ +full_init_block @*/
};
/*@ null @*//*@ dependent @*/ const GUID*
/*@ null @*//*@ dependent @*/ const GncGUID*
gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row )
{
static GUID guid;
static GncGUID guid;
g_return_val_if_fail( be != NULL, NULL );
g_return_val_if_fail( row != NULL, NULL );
@ -2608,7 +2608,7 @@ gboolean
gnc_sql_commit_standard_item( GncSqlBackend* be, QofInstance* inst, const gchar* tableName,
QofIdTypeConst obj_name, const GncSqlColumnTableEntry* col_table )
{
const GUID* guid;
const GncGUID* guid;
gboolean is_infant;
gint op;
gboolean is_ok;

12
src/backend/sql/gnc-backend-sql.h
View File

@ -568,10 +568,10 @@ gboolean gnc_sql_create_index( const GncSqlBackend* be, const gchar* index_name,
*
* @param be SQL backend struct
* @param row Database row
* @return GUID
* @return GncGUID
*/
/*@ dependent @*//*@ null @*/
const GUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
const GncGUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
/**
* Loads the transaction guid from a database row. The table must have a column
@ -579,10 +579,10 @@ const GUID* gnc_sql_load_guid( const GncSqlBackend* be, GncSqlRow* row );
*
* @param be SQL backend struct
* @param row Database row
* @return GUID
* @return GncGUID
*/
/*@ dependent @*//*@ null @*/
const GUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
const GncGUID* gnc_sql_load_tx_guid( const GncSqlBackend* be, GncSqlRow* row );
/**
* Creates a basic SELECT statement for a table.
@ -604,7 +604,7 @@ GncSqlStatement* gnc_sql_create_select_statement( GncSqlBackend* be,
void gnc_sql_register_col_type_handler( const gchar* colType, const GncSqlColumnTypeHandler* handler );
/**
* Adds a GValue for an object reference GUID to the end of a GSList.
* Adds a GValue for an object reference GncGUID to the end of a GSList.
*
* @param be SQL backend struct
* @param obj_name QOF object type name
@ -617,7 +617,7 @@ void gnc_sql_add_gvalue_objectref_guid_to_slist( const GncSqlBackend* be,
const GncSqlColumnTableEntry* table_row, GSList** pList );
/**
* Adds a column info structure for an object reference GUID to the end of a
* Adds a column info structure for an object reference GncGUID to the end of a
* GList.
*
* @param be SQL backend struct

6
src/backend/sql/gnc-book-sql.c
View File

@ -86,7 +86,7 @@ set_root_account_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
const Account* root;
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( QOF_IS_BOOK(pObject) );
@ -113,7 +113,7 @@ static void
set_root_template_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
QofBook* book = QOF_BOOK(pObject);
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
Account* root;
g_return_if_fail( pObject != NULL );
@ -135,7 +135,7 @@ set_root_template_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
static void
load_single_book( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
QofBook* pBook;
g_return_if_fail( be != NULL );

6
src/backend/sql/gnc-budget-sql.c
View File

@ -283,7 +283,7 @@ save_budget_amounts( GncSqlBackend* be, GncBudget* budget )
static /*@ dependent @*//*@ null @*/ GncBudget*
load_single_budget( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncBudget* pBudget = NULL;
Recurrence* r;
@ -369,7 +369,7 @@ static gboolean
save_budget( GncSqlBackend* be, QofInstance* inst )
{
GncBudget* pBudget = GNC_BUDGET(inst);
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
gboolean is_ok;
@ -445,7 +445,7 @@ load_budget_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GncBudget* budget = NULL;
g_return_if_fail( be != NULL );

6
src/backend/sql/gnc-commodity-sql.c
View File

@ -142,7 +142,7 @@ load_all_commodities( GncSqlBackend* be )
pCommodity = load_single_commodity( be, row );
if( pCommodity != NULL ) {
GUID guid;
GncGUID guid;
guid = *qof_instance_get_guid( QOF_INSTANCE(pCommodity) );
pCommodity = gnc_commodity_table_insert( pTable, pCommodity );
@ -176,7 +176,7 @@ create_commodities_tables( GncSqlBackend* be )
static gboolean
do_commit_commodity( GncSqlBackend* be, QofInstance* inst, gboolean force_insert )
{
const GUID* guid;
const GncGUID* guid;
gboolean is_infant;
gint op;
gboolean is_ok;
@ -247,7 +247,7 @@ load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
gnc_commodity* commodity = NULL;
g_return_if_fail( be != NULL );

2
src/backend/sql/gnc-lots-sql.c
View File

@ -207,7 +207,7 @@ load_lot_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GNCLot* lot;
g_return_if_fail( be != NULL );

16
src/backend/sql/gnc-recurrence-sql.c
View File

@ -51,7 +51,7 @@
typedef struct {
/*@ dependent @*/ GncSqlBackend* be;
/*@ dependent @*/ const GUID* guid;
/*@ dependent @*/ const GncGUID* guid;
/*@ dependent @*/ Recurrence* pRecurrence;
} recurrence_info_t;
@ -106,7 +106,7 @@ get_obj_guid( gpointer pObject )
static void
set_obj_guid( void )
{
// Nowhere to put the GUID
// Nowhere to put the GncGUID
}
static gint
@ -184,7 +184,7 @@ set_recurrence_period_start( gpointer pObject, gpointer pValue )
/* ================================================================= */
gboolean
gnc_sql_recurrence_save( GncSqlBackend* be, const GUID* guid, const Recurrence* r )
gnc_sql_recurrence_save( GncSqlBackend* be, const GncGUID* guid, const Recurrence* r )
{
recurrence_info_t recurrence_info;
@ -202,7 +202,7 @@ gnc_sql_recurrence_save( GncSqlBackend* be, const GUID* guid, const Recurrence*
}
void
gnc_sql_recurrence_save_list( GncSqlBackend* be, const GUID* guid, GList* schedule )
gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule )
{
recurrence_info_t recurrence_info;
GList* l;
@ -222,7 +222,7 @@ gnc_sql_recurrence_save_list( GncSqlBackend* be, const GUID* guid, GList* schedu
}
gboolean
gnc_sql_recurrence_delete( GncSqlBackend* be, const GUID* guid )
gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid )
{
recurrence_info_t recurrence_info;
@ -251,7 +251,7 @@ load_recurrence( GncSqlBackend* be, GncSqlRow* row, /*@ out @*/ Recurrence* r )
}
static /*@ null @*/ GncSqlResult*
gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GUID* guid )
gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GncGUID* guid )
{
gchar* buf;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
@ -271,7 +271,7 @@ gnc_sql_set_recurrences_from_db( GncSqlBackend* be, const GUID* guid )
}
/*@ null @*/ Recurrence*
gnc_sql_recurrence_load( GncSqlBackend* be, const GUID* guid )
gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid )
{
GncSqlResult* result;
Recurrence* r = NULL;
@ -300,7 +300,7 @@ gnc_sql_recurrence_load( GncSqlBackend* be, const GUID* guid )
}
/*@ null @*/ GList*
gnc_sql_recurrence_load_list( GncSqlBackend* be, const GUID* guid )
gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid )
{
GncSqlResult* result;
GList* list = NULL;

10
src/backend/sql/gnc-recurrence-sql.h
View File

@ -32,13 +32,13 @@
#include "qof.h"
#include <gmodule.h>
gboolean gnc_sql_recurrence_save( GncSqlBackend* be, const GUID* guid, const Recurrence* pRecurrence );
void gnc_sql_recurrence_save_list( GncSqlBackend* be, const GUID* guid, GList* schedule );
gboolean gnc_sql_recurrence_delete( GncSqlBackend* be, const GUID* guid );
gboolean gnc_sql_recurrence_save( GncSqlBackend* be, const GncGUID* guid, const Recurrence* pRecurrence );
void gnc_sql_recurrence_save_list( GncSqlBackend* be, const GncGUID* guid, GList* schedule );
gboolean gnc_sql_recurrence_delete( GncSqlBackend* be, const GncGUID* guid );
/*@ null @*/
Recurrence* gnc_sql_recurrence_load( GncSqlBackend* be, const GUID* guid );
Recurrence* gnc_sql_recurrence_load( GncSqlBackend* be, const GncGUID* guid );
/*@ null @*/
GList* gnc_sql_recurrence_load_list( GncSqlBackend* be, const GUID* guid );
GList* gnc_sql_recurrence_load_list( GncSqlBackend* be, const GncGUID* guid );
void gnc_sql_init_recurrence_handler( void );

4
src/backend/sql/gnc-schedxaction-sql.c
View File

@ -80,7 +80,7 @@ static const GncSqlColumnTableEntry col_table[] =
static /*@ null @*/ SchedXaction*
load_single_sx( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
SchedXaction* pSx;
GList* schedule;
GDate start_date;
@ -161,7 +161,7 @@ gboolean
gnc_sql_save_schedxaction( GncSqlBackend* be, QofInstance* inst )
{
SchedXaction* pSx;
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
gboolean is_ok;

20
src/backend/sql/gnc-slots-sql.c
View File

@ -48,7 +48,7 @@
typedef struct {
/*@ dependent @*/ GncSqlBackend* be;
/*@ dependent @*/ const GUID* guid;
/*@ dependent @*/ const GncGUID* guid;
gboolean is_ok;
/*@ dependent @*/ KvpFrame* pKvpFrame;
KvpValueType value_type;
@ -129,7 +129,7 @@ get_obj_guid( gpointer pObject )
static void
set_obj_guid( void )
{
// Nowhere to put the GUID
// Nowhere to put the GncGUID
}
static /*@ null @*/ gpointer
@ -302,7 +302,7 @@ set_guid_val( gpointer pObject, /*@ null @*/ gpointer pValue )
g_return_if_fail( pObject != NULL );
if( pInfo->value_type == KVP_TYPE_GUID && pValue != NULL ) {
kvp_frame_set_guid( pInfo->pKvpFrame, pInfo->path->str, (GUID*)pValue );
kvp_frame_set_guid( pInfo->pKvpFrame, pInfo->path->str, (GncGUID*)pValue );
}
}
@ -368,7 +368,7 @@ save_slot( const gchar* key, KvpValue* value, gpointer data )
}
gboolean
gnc_sql_slots_save( GncSqlBackend* be, const GUID* guid, gboolean is_infant, KvpFrame* pFrame )
gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid, gboolean is_infant, KvpFrame* pFrame )
{
slot_info_t slot_info;
@ -392,7 +392,7 @@ gnc_sql_slots_save( GncSqlBackend* be, const GUID* guid, gboolean is_infant, Kvp
}
gboolean
gnc_sql_slots_delete( GncSqlBackend* be, const GUID* guid )
gnc_sql_slots_delete( GncSqlBackend* be, const GncGUID* guid )
{
slot_info_t slot_info;
@ -435,7 +435,7 @@ gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst )
GncSqlResult* result;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
GncSqlStatement* stmt;
const GUID* guid;
const GncGUID* guid;
KvpFrame* pFrame;
g_return_if_fail( be != NULL );
@ -463,10 +463,10 @@ gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst )
}
}
static /*@ dependent @*//*@ null @*/ const GUID*
static /*@ dependent @*//*@ null @*/ const GncGUID*
load_obj_guid( const GncSqlBackend* be, GncSqlRow* row )
{
static GUID guid;
static GncGUID guid;
g_return_val_if_fail( be != NULL, NULL );
g_return_val_if_fail( row != NULL, NULL );
@ -480,7 +480,7 @@ static void
load_slot_for_list_item( GncSqlBackend* be, GncSqlRow* row, QofCollection* coll )
{
slot_info_t slot_info;
const GUID* guid;
const GncGUID* guid;
QofInstance* inst;
g_return_if_fail( be != NULL );
@ -558,7 +558,7 @@ static void
load_slot_for_book_object( GncSqlBackend* be, GncSqlRow* row, BookLookupFn lookup_fn )
{
slot_info_t slot_info;
const GUID* guid;
const GncGUID* guid;
QofInstance* inst;
g_return_if_fail( be != NULL );

6
src/backend/sql/gnc-slots-sql.h
View File

@ -41,7 +41,7 @@
* @param pFrame Top-level KVP frame
* @return TRUE if successful, FALSE if error
*/
gboolean gnc_sql_slots_save( GncSqlBackend* be, const GUID* guid,
gboolean gnc_sql_slots_save( GncSqlBackend* be, const GncGUID* guid,
gboolean is_infant, KvpFrame* pFrame );
/**
@ -51,7 +51,7 @@ gboolean gnc_sql_slots_save( GncSqlBackend* be, const GUID* guid,
* @param guid Object guid
* @return TRUE if successful, FALSE if error
*/
gboolean gnc_sql_slots_delete( GncSqlBackend* be, const GUID* guid );
gboolean gnc_sql_slots_delete( GncSqlBackend* be, const GncGUID* guid );
/** Loads slots for an object from the db.
*
@ -70,7 +70,7 @@ void gnc_sql_slots_load( GncSqlBackend* be, QofInstance* inst );
void gnc_sql_slots_load_for_list( GncSqlBackend* be, GList* list );
typedef QofInstance* (*BookLookupFn)( const GUID* guid, const QofBook* book );
typedef QofInstance* (*BookLookupFn)( const GncGUID* guid, const QofBook* book );
/**
* gnc_sql_slots_load_for_sql_subquery - Loads slots for all objects whose guid is

26
src/backend/sql/gnc-transaction-sql.c
View File

@ -65,7 +65,7 @@
typedef struct {
/*@ dependent @*/ GncSqlBackend* be;
/*@ dependent @*/ const GUID* guid;
/*@ dependent @*/ const GncGUID* guid;
gboolean is_ok;
} split_info_t;
@ -193,8 +193,8 @@ set_split_lot( gpointer pObject, /*@ null @*/ gpointer pLot )
static /*@ null @*/ Split*
load_single_split( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
GUID split_guid;
const GncGUID* guid;
GncGUID split_guid;
Split* pSplit;
g_return_val_if_fail( be != NULL, NULL );
@ -263,8 +263,8 @@ load_splits_for_tx_list( GncSqlBackend* be, GList* list )
static /*@ null @*/ Transaction*
load_single_tx( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
GUID tx_guid;
const GncGUID* guid;
GncGUID tx_guid;
Transaction* pTx;
g_return_val_if_fail( be != NULL, NULL );
@ -626,7 +626,7 @@ save_split_cb( gpointer data, gpointer user_data )
}
static gboolean
save_splits( GncSqlBackend* be, const GUID* tx_guid, SplitList* pSplitList )
save_splits( GncSqlBackend* be, const GncGUID* tx_guid, SplitList* pSplitList )
{
split_info_t split_info;
@ -645,7 +645,7 @@ save_splits( GncSqlBackend* be, const GUID* tx_guid, SplitList* pSplitList )
static gboolean
save_transaction( GncSqlBackend* be, Transaction* pTx, gboolean do_save_splits )
{
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
QofInstance* inst;
@ -713,7 +713,7 @@ commit_transaction( GncSqlBackend* be, QofInstance* inst )
}
/* ================================================================= */
static /*@ dependent @*//*@ null @*/ const GUID*
static /*@ dependent @*//*@ null @*/ const GncGUID*
get_guid_from_query( QofQuery* pQuery )
{
GList* pOrTerms;
@ -749,7 +749,7 @@ get_guid_from_query( QofQuery* pQuery )
*/
void gnc_sql_transaction_load_tx_for_account( GncSqlBackend* be, Account* account )
{
const GUID* guid;
const GncGUID* guid;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
gchar* query_sql;
GncSqlStatement* stmt;
@ -853,7 +853,7 @@ convert_query_term_to_sql( const GncSqlBackend* be, const gchar* fieldName, QofQ
break;
default:
PERR( "Unexpected GUID match type: %d\n", guid_data->options );
PERR( "Unexpected GncGUID match type: %d\n", guid_data->options );
}
for( guid_entry = guid_data->guids; guid_entry != NULL; guid_entry = guid_entry->next ) {
@ -976,7 +976,7 @@ typedef struct {
static /*@ null @*/ gpointer
compile_split_query( GncSqlBackend* be, QofQuery* query )
{
const GUID* acct_guid;
const GncGUID* acct_guid;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
split_query_info_t* query_info = NULL;
gchar* query_sql;
@ -1141,7 +1141,7 @@ static void
set_acct_bal_account_from_guid( gpointer pObject, gpointer pValue )
{
single_acct_balance_t* bal = (single_acct_balance_t*)pObject;
const GUID* guid = (const GUID*)pValue;
const GncGUID* guid = (const GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( pValue != NULL );
@ -1283,7 +1283,7 @@ load_tx_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
Transaction* tx;
const gchar* guid_str;

4
src/backend/xml/gnc-account-xml-v2.c
View File

@ -204,7 +204,7 @@ static gboolean
account_id_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
GUID *guid;
GncGUID *guid;
guid = dom_tree_to_guid(node);
g_return_val_if_fail(guid, FALSE);
@ -363,7 +363,7 @@ account_parent_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
Account *parent;
GUID *gid;
GncGUID *gid;
gid = dom_tree_to_guid(node);
g_return_val_if_fail(gid, FALSE);

2
src/backend/xml/gnc-backend-xml.c
View File

@ -935,7 +935,7 @@ xml_begin_edit (QofBackend *be, QofInstance *inst)
"at least once before closing the books!\n");
}
/* XXX To be anal about it, we should really be checking to see
* if there already is a file with this book GUID, and disallowing
* if there already is a file with this book GncGUID, and disallowing
* further progress. This is because we are not allowed to
* modify books that are closed (They should be treated as
* 'read-only').

2
src/backend/xml/gnc-book-xml-v2.c
View File

@ -186,7 +186,7 @@ static gboolean
book_id_handler(xmlNodePtr node, gpointer book_pdata)
{
QofBook *book = book_pdata;
GUID *guid;
GncGUID *guid;
guid = dom_tree_to_guid(node);
qof_instance_set_guid(QOF_INSTANCE(book), guid);

4
src/backend/xml/gnc-budget-xml-v2.c
View File

@ -64,7 +64,7 @@ gnc_budget_dom_tree_create(GncBudget *bgt)
ret = xmlNewNode(NULL, BAD_CAST gnc_budget_string);
xmlSetProp(ret, BAD_CAST "version", BAD_CAST budget_version_string);
/* field: GUID */
/* field: GncGUID */
xmlAddChild(ret, guid_to_dom_tree(bgt_id_string,
gnc_budget_get_guid(bgt)));
/* field: char* name */
@ -108,7 +108,7 @@ set_string(xmlNodePtr node, GncBudget* bgt,
static gboolean
budget_id_handler (xmlNodePtr node, gpointer bgt)
{
GUID *guid;
GncGUID *guid;
guid = dom_tree_to_guid(node);
g_return_val_if_fail(guid, FALSE);

2
src/backend/xml/gnc-freqspec-xml-v2.c
View File

@ -410,7 +410,7 @@ gboolean
fs_guid_handler( xmlNodePtr node, gpointer data)
{
fsParseData *fspd = data;
GUID *guid;
GncGUID *guid;
guid = dom_tree_to_guid( node );
return TRUE;
}

2
src/backend/xml/gnc-lot-xml-v2.c
View File

@ -92,7 +92,7 @@ static gboolean
lot_id_handler (xmlNodePtr node, gpointer p)
{
struct lot_pdata *pdata = p;
GUID *guid;
GncGUID *guid;
ENTER("(lot=%p)", pdata->lot);
guid = dom_tree_to_guid(node);

2
src/backend/xml/gnc-pricedb-xml-v2.c
View File

@ -92,7 +92,7 @@ price_parse_xml_sub_node(GNCPrice *p, xmlNodePtr sub_node, QofBook *book)
gnc_price_begin_edit (p);
if (safe_strcmp("price:id", (char*)sub_node->name) == 0)
{
GUID *c = dom_tree_to_guid(sub_node);
GncGUID *c = dom_tree_to_guid(sub_node);
if (!c) return FALSE;
gnc_price_set_guid(p, c);
g_free(c);

12
src/backend/xml/gnc-schedxaction-xml-v2.c
View File

@ -85,7 +85,7 @@ gnc_schedXaction_dom_tree_create(SchedXaction *sx)
xmlNodePtr ret;
GDate *date;
gint instCount;
const GUID *templ_acc_guid;
const GncGUID *templ_acc_guid;
gboolean allow_2_2_incompat = TRUE;
templ_acc_guid = xaccAccountGetGUID(sx->template_acct);
@ -149,7 +149,7 @@ gnc_schedXaction_dom_tree_create(SchedXaction *sx)
xaccSchedXactionGetEndDate(sx) ) );
}
/* output template account GUID */
/* output template account GncGUID */
xmlAddChild( ret,
guid_to_dom_tree(SX_TEMPL_ACCT,
templ_acc_guid));
@ -218,7 +218,7 @@ sx_id_handler( xmlNodePtr node, gpointer sx_pdata )
{
struct sx_pdata *pdata = sx_pdata;
SchedXaction *sx = pdata->sx;
GUID *tmp = dom_tree_to_guid( node );
GncGUID *tmp = dom_tree_to_guid( node );
g_return_val_if_fail( tmp, FALSE );
xaccSchedXactionSetGUID(sx, tmp);
@ -588,7 +588,7 @@ sx_templ_acct_handler( xmlNodePtr node, gpointer sx_pdata)
{
struct sx_pdata *pdata = sx_pdata;
SchedXaction *sx = pdata->sx;
GUID *templ_acct_guid = dom_tree_to_guid(node);
GncGUID *templ_acct_guid = dom_tree_to_guid(node);
Account *account;
if (!templ_acct_guid)
@ -749,7 +749,7 @@ gnc_schedXaction_end_handler(gpointer data_for_children,
/* We're dealing with a pre-200107<near-end-of-month> rgmerk
change re: storing template accounts. */
/* Fix: get account with name of our GUID from the template
/* Fix: get account with name of our GncGUID from the template
accounts. Make that our template_acct pointer. */
/* THREAD-UNSAFE */
id = guid_to_string( xaccSchedXactionGetGUID( sx ) );
@ -767,7 +767,7 @@ gnc_schedXaction_end_handler(gpointer data_for_children,
xmlFreeNode( tree );
return FALSE;
}
g_debug("template account name [%s] for SX with GUID [%s]",
g_debug("template account name [%s] for SX with GncGUID [%s]",
xaccAccountGetName( acct ), id );
/* FIXME: free existing template account.

8
src/backend/xml/gnc-transaction-xml-v2.c
View File

@ -233,7 +233,7 @@ static gboolean
spl_id_handler(xmlNodePtr node, gpointer data)
{
struct split_pdata *pdata = data;
GUID *tmp = dom_tree_to_guid(node);
GncGUID *tmp = dom_tree_to_guid(node);
g_return_val_if_fail(tmp, FALSE);
xaccSplitSetGUID(pdata->split, tmp);
@ -304,7 +304,7 @@ static gboolean
spl_account_handler(xmlNodePtr node, gpointer data)
{
struct split_pdata *pdata = data;
GUID *id = dom_tree_to_guid(node);
GncGUID *id = dom_tree_to_guid(node);
Account *account;
g_return_val_if_fail(id, FALSE);
@ -330,7 +330,7 @@ static gboolean
spl_lot_handler(xmlNodePtr node, gpointer data)
{
struct split_pdata *pdata = data;
GUID *id = dom_tree_to_guid(node);
GncGUID *id = dom_tree_to_guid(node);
GNCLot *lot;
g_return_val_if_fail(id, FALSE);
@ -449,7 +449,7 @@ trn_id_handler(xmlNodePtr node, gpointer trans_pdata)
{
struct trans_pdata *pdata = trans_pdata;
Transaction *trn = pdata->trans;
GUID *tmp = dom_tree_to_guid(node);
GncGUID *tmp = dom_tree_to_guid(node);
g_return_val_if_fail(tmp, FALSE);

28
src/backend/xml/io-gncxml-v1.c
View File

@ -613,7 +613,7 @@ guid_kvp_value_end_handler(gpointer data_for_children,
const gchar *tag)
{
gchar *txt = NULL;
GUID val;
GncGUID val;
kvp_value *kvpv;
gboolean ok;
@ -1503,7 +1503,7 @@ acc_restore_name_end_handler(gpointer data_for_children,
start: NA
characters: return string copy for accumulation in end handler.
end: concatenate all chars and set as account GUID if not duplicate.
end: concatenate all chars and set as account GncGUID if not duplicate.
cleanup-result: NA
cleanup-chars: g_free the result string.
@ -1522,7 +1522,7 @@ acc_restore_guid_end_handler(gpointer data_for_children,
GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
Account *acc = (Account *) parent_data;
gchar *txt = NULL;
GUID gid;
GncGUID gid;
gboolean ok;
g_return_val_if_fail(acc, FALSE);
@ -1735,7 +1735,7 @@ acc_restore_parent_end_handler(gpointer data_for_children,
Account *acc = (Account *) parent_data;
Account *parent;
sixtp_child_result *child_result;
GUID gid;
GncGUID gid;
g_return_val_if_fail(acc, FALSE);
@ -1748,7 +1748,7 @@ acc_restore_parent_end_handler(gpointer data_for_children,
return(FALSE);
/* otherwise this must be a good result - use it */
gid = *((GUID *) child_result->data);
gid = *((GncGUID *) child_result->data);
parent = xaccAccountLookup(&gid, pstatus->book);
@ -2839,7 +2839,7 @@ txn_restore_end_handler(gpointer data_for_children,
if (!xaccTransGetGUID(trans))
{
/* must at least have a GUID for a restore */
/* must at least have a GncGUID for a restore */
xaccTransDestroy(trans);
xaccTransCommitEdit(trans);
return(FALSE);
@ -2904,7 +2904,7 @@ txn_restore_fail_handler(gpointer data_for_children,
-----------
start: NA
characters: return string copy for accumulation in end handler.
end: concatenate all chars and set as transaction GUID if not duplicate.
end: concatenate all chars and set as transaction GncGUID if not duplicate.
cleanup-result: NA
cleanup-chars: g_free the result string.
@ -2923,7 +2923,7 @@ txn_restore_guid_end_handler(gpointer data_for_children,
GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
Transaction *t = (Transaction *) parent_data;
gchar *txt = NULL;
GUID gid;
GncGUID gid;
gboolean ok;
g_return_val_if_fail(t, FALSE);
@ -3146,7 +3146,7 @@ txn_restore_split_end_handler(gpointer data_for_children,
if (!xaccSplitGetGUID(s))
{
/* must at least have a GUID for a restore */
/* must at least have a GncGUID for a restore */
xaccSplitDestroy(s);
return(FALSE);
}
@ -3221,7 +3221,7 @@ txn_restore_split_fail_handler(gpointer data_for_children,
-----------
start: NA
characters: return string copy for accumulation in end handler.
end: concatenate all chars and set as split GUID if not duplicate.
end: concatenate all chars and set as split GncGUID if not duplicate.
cleanup-result: NA
cleanup-chars: g_free the result string.
@ -3240,7 +3240,7 @@ txn_restore_split_guid_end_handler(gpointer data_for_children,
GNCParseStatus *pstatus = (GNCParseStatus *) global_data;
Split *s = (Split *) parent_data;
gchar *txt = NULL;
GUID gid;
GncGUID gid;
gboolean ok;
g_return_val_if_fail(s, FALSE);
@ -3431,7 +3431,7 @@ txn_restore_split_reconcile_date_end_handler(gpointer data_for_children,
-----------
start: NA
characters: return string copy for accumulation in end handler.
end: concatenate all chars and set as split account if GUID OK.
end: concatenate all chars and set as split account if GncGUID OK.
cleanup-result: NA
cleanup-chars: g_free the result string.
@ -3451,7 +3451,7 @@ txn_restore_split_account_end_handler(gpointer data_for_children,
Split *s = (Split *) parent_data;
Account *acct;
gchar *txt = NULL;
GUID gid;
GncGUID gid;
gboolean ok;
g_return_val_if_fail(s, FALSE);
@ -3633,7 +3633,7 @@ price_parse_xml_sub_node(GNCPrice *p, xmlNodePtr sub_node, QofBook *book)
if (safe_strcmp("price:id", (char*)sub_node->name) == 0)
{
GUID *c = dom_tree_to_guid(sub_node);
GncGUID *c = dom_tree_to_guid(sub_node);
if (!c) return FALSE;
gnc_price_set_guid(p, c);
g_free(c);

2
src/backend/xml/sixtp-dom-generators.c
View File

@ -80,7 +80,7 @@ guint_to_dom_tree(const char *tag, guint an_int)
xmlNodePtr
guid_to_dom_tree(const char *tag, const GUID* gid)
guid_to_dom_tree(const char *tag, const GncGUID* gid)
{
char guid_str[GUID_ENCODING_LENGTH + 1];
xmlNodePtr ret;

2
src/backend/xml/sixtp-dom-generators.h
View File

@ -36,7 +36,7 @@
xmlNodePtr text_to_dom_tree(const char *tag, const char *str);
xmlNodePtr int_to_dom_tree(const char *tag, gint64 val);
xmlNodePtr boolean_to_dom_tree(const char* tag, gboolean val);
xmlNodePtr guid_to_dom_tree(const char *tag, const GUID* gid);
xmlNodePtr guid_to_dom_tree(const char *tag, const GncGUID* gid);
xmlNodePtr commodity_ref_to_dom_tree(const char *tag, const gnc_commodity *c);
xmlNodePtr timespec_to_dom_tree(const char *tag, const Timespec *spec);
gchar * timespec_nsec_to_string(const Timespec *ts);

6
src/backend/xml/sixtp-dom-parsers.c
View File

@ -33,7 +33,7 @@
static QofLogModule log_module = GNC_MOD_IO;
GUID*
GncGUID*
dom_tree_to_guid(xmlNodePtr node)
{
if (!node->properties)
@ -57,7 +57,7 @@ dom_tree_to_guid(xmlNodePtr node)
/* handle new and guid the same for the moment */
if ((safe_strcmp("guid", type) == 0) || (safe_strcmp("new", type) == 0))
{
GUID *gid = g_new(GUID, 1);
GncGUID *gid = g_new(GncGUID, 1);
char *guid_str;
guid_str = (char*)xmlNodeGetContent (node->xmlChildrenNode);
@ -218,7 +218,7 @@ dom_tree_to_string_kvp_value(xmlNodePtr node)
kvp_value*
dom_tree_to_guid_kvp_value(xmlNodePtr node)
{
GUID *daguid;
GncGUID *daguid;
kvp_value *ret = NULL;
daguid = dom_tree_to_guid(node);

2
src/backend/xml/sixtp-dom-parsers.h
View File

@ -32,7 +32,7 @@
#include "qof.h"
#include "gnc-budget.h"
GUID* dom_tree_to_guid(xmlNodePtr node);
GncGUID* dom_tree_to_guid(xmlNodePtr node);
gnc_commodity* dom_tree_to_commodity_ref(xmlNodePtr node, QofBook *book);
gnc_commodity *dom_tree_to_commodity_ref_no_engine(xmlNodePtr node, QofBook *);

14
src/backend/xml/sixtp-utils.c
View File

@ -748,16 +748,16 @@ generic_timespec_parser_new(sixtp_end_handler end_handler)
and return it.
input: NA
returns: GUID*
returns: GncGUID*
start: NA
characters: return string copy for accumulation in end handler.
end: concatenate all chars and create and return GUID*, if possible.
end: concatenate all chars and create and return GncGUID*, if possible.
cleanup-result: g_free the GUID*
cleanup-result: g_free the GncGUID*
cleanup-chars: g_free the result string.
fail: NA
result-fail: g_free the GUID*
result-fail: g_free the GncGUID*
chars-fail: g_free the result string.
*/
@ -769,13 +769,13 @@ generic_guid_end_handler(gpointer data_for_children,
gpointer *result, const gchar *tag)
{
gchar *txt = NULL;
GUID *gid;
GncGUID *gid;
gboolean ok;
txt = concatenate_child_result_chars(data_from_children);
g_return_val_if_fail(txt, FALSE);
gid = g_new(GUID, 1);
gid = g_new(GncGUID, 1);
if (!gid)
{
g_free(txt);
@ -787,7 +787,7 @@ generic_guid_end_handler(gpointer data_for_children,
if (!ok)
{
PERR ("couldn't parse GUID");
PERR ("couldn't parse GncGUID");
g_free(gid);
return(FALSE);
}

4
src/backend/xml/test/test-dom-converters1.c
View File

@ -242,8 +242,8 @@ test_dom_tree_to_guid(void)
int i;
for (i = 0; i < 20; i++)
{
GUID *test_guid1;
GUID *test_guid2;
GncGUID *test_guid1;
GncGUID *test_guid2;
xmlNodePtr test_node;
test_guid1 = get_random_guid();

4
src/backend/xml/test/test-file-stuff.c
View File

@ -187,9 +187,9 @@ equals_node_val_vs_boolean(xmlNodePtr node, gboolean val)
}
gboolean
equals_node_val_vs_guid(xmlNodePtr node, const GUID *id)
equals_node_val_vs_guid(xmlNodePtr node, const GncGUID *id)
{
GUID *cmpid;
GncGUID *cmpid;
g_return_val_if_fail(node, FALSE);
g_return_val_if_fail(id, FALSE);

2
src/backend/xml/test/test-file-stuff.h
View File

@ -27,7 +27,7 @@ gboolean print_dom_tree(gpointer data_for_children, GSList* data_from_children,
/**/
gboolean check_dom_tree_version(xmlNodePtr node, gchar *verstr);
gboolean equals_node_val_vs_string(xmlNodePtr node, const gchar* str);
gboolean equals_node_val_vs_guid(xmlNodePtr node, const GUID *id);
gboolean equals_node_val_vs_guid(xmlNodePtr node, const GncGUID *id);
gboolean equals_node_val_vs_commodity(xmlNodePtr node,
const gnc_commodity *com, QofBook *);
gboolean equals_node_val_vs_kvp_frame(xmlNodePtr node, const kvp_frame *frm);

6
src/backend/xml/test/test-xml-transaction.c
View File

@ -81,7 +81,7 @@ find_appropriate_node(xmlNodePtr node, Split *spl)
}
else if (safe_strcmp((char*)mark2->name, "split:account") == 0)
{
GUID *accid = dom_tree_to_guid(mark2);
GncGUID *accid = dom_tree_to_guid(mark2);
Account *account = xaccSplitGetAccount (spl);
if (guid_equal(accid, xaccAccountGetGUID(account)))
@ -110,7 +110,7 @@ equals_node_val_vs_split_internal(xmlNodePtr node, Split* spl)
{
if (safe_strcmp((char*)mark->name, "split:id") == 0)
{
GUID *id = dom_tree_to_guid(mark);
GncGUID *id = dom_tree_to_guid(mark);
if (!guid_equal(id, xaccSplitGetGUID(spl)))
{
@ -184,7 +184,7 @@ equals_node_val_vs_split_internal(xmlNodePtr node, Split* spl)
}
else if (safe_strcmp((char*)mark->name, "split:account") == 0)
{
GUID *id = dom_tree_to_guid(mark);
GncGUID *id = dom_tree_to_guid(mark);
Account *account = xaccSplitGetAccount (spl);
if (!guid_equal(id, xaccAccountGetGUID(account)))

8
src/base-typemaps.i
View File

@ -27,10 +27,10 @@ typedef char gchar;
%typemap(in) Timespec "$1 = gnc_timepair2timespec($input);"
%typemap(out) Timespec "$result = gnc_timespec2timepair($1);"
%typemap(in) GUID "$1 = gnc_scm2guid($input);"
%typemap(out) GUID "$result = gnc_guid2scm($1);"
%typemap(in) GUID * (GUID g) " g = gnc_scm2guid($input); $1 = &g; "
%typemap(out) GUID * " $result = ($1) ? gnc_guid2scm(*($1)): SCM_BOOL_F; "
%typemap(in) GncGUID "$1 = gnc_scm2guid($input);"
%typemap(out) GncGUID "$result = gnc_guid2scm($1);"
%typemap(in) GncGUID * (GncGUID g) " g = gnc_scm2guid($input); $1 = &g; "
%typemap(out) GncGUID * " $result = ($1) ? gnc_guid2scm(*($1)): SCM_BOOL_F; "
%typemap(in) gnc_numeric "$1 = gnc_scm_to_numeric($input);"
%typemap(out) gnc_numeric "$result = gnc_numeric_to_scm($1);"

24
src/business/business-core/business-core.i
View File

@ -38,40 +38,40 @@ SCM scm_init_sw_business_core_module (void);
%rename(gncOwnerReturnGUID) gncOwnerRetGUID;
%inline %{
static GUID gncTaxTableReturnGUID(GncTaxTable *x)
static GncGUID gncTaxTableReturnGUID(GncTaxTable *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GUID gncInvoiceReturnGUID(GncInvoice *x)
static GncGUID gncInvoiceReturnGUID(GncInvoice *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GUID gncJobReturnGUID(GncJob *x)
static GncGUID gncJobReturnGUID(GncJob *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GUID gncVendorReturnGUID(GncVendor *x)
static GncGUID gncVendorReturnGUID(GncVendor *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GUID gncCustomerReturnGUID(GncCustomer *x)
static GncGUID gncCustomerReturnGUID(GncCustomer *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GUID gncEmployeeReturnGUID(GncEmployee *x)
static GncGUID gncEmployeeReturnGUID(GncEmployee *x)
{ return (x ? *(qof_instance_get_guid(QOF_INSTANCE(x))) : *(guid_null())); }
static GncTaxTable * gncTaxTableLookupFlip(GUID g, QofBook *b)
static GncTaxTable * gncTaxTableLookupFlip(GncGUID g, QofBook *b)
{ return gncTaxTableLookup(b, &g); }
static GncInvoice * gncInvoiceLookupFlip(GUID g, QofBook *b)
static GncInvoice * gncInvoiceLookupFlip(GncGUID g, QofBook *b)
{ return gncInvoiceLookup(b, &g); }
static GncJob * gncJobLookupFlip(GUID g, QofBook *b)
static GncJob * gncJobLookupFlip(GncGUID g, QofBook *b)
{ return gncJobLookup(b, &g); }
static GncVendor * gncVendorLookupFlip(GUID g, QofBook *b)
static GncVendor * gncVendorLookupFlip(GncGUID g, QofBook *b)
{ return gncVendorLookup(b, &g); }
static GncCustomer * gncCustomerLookupFlip(GUID g, QofBook *b)
static GncCustomer * gncCustomerLookupFlip(GncGUID g, QofBook *b)
{ return gncCustomerLookup(b, &g); }
static GncEmployee * gncEmployeeLookupFlip(GUID g, QofBook *b)
static GncEmployee * gncEmployeeLookupFlip(GncGUID g, QofBook *b)
{ return gncEmployeeLookup(b, &g); }
%}

4
src/business/business-core/gncBillTerm.h
View File

@ -117,9 +117,9 @@ void gncBillTermSetCutoff (GncBillTerm *term, gint cutoff);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncBillTerm * gncBillTermLookup (QofBook *book, const GUID *guid);
* GncBillTerm * gncBillTermLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncBillTerm * gncBillTermLookup (const QofBook *book, const GUID *guid)
static inline GncBillTerm * gncBillTermLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid,GNC_ID_BILLTERM, GncBillTerm);
}

4
src/business/business-core/gncCustomer.h
View File

@ -113,9 +113,9 @@ void gncCustomerRemoveJob (GncCustomer *customer, GncJob *job);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncCustomer * gncCustomerLookup (QofBook *book, const GUID *guid);
* GncCustomer * gncCustomerLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncCustomer * gncCustomerLookup (const QofBook *book, const GUID *guid)
static inline GncCustomer * gncCustomerLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_CUSTOMER, GncCustomer);
}

4
src/business/business-core/gncEmployee.h
View File

@ -97,9 +97,9 @@ Account * gncEmployeeGetCCard (const GncEmployee *employee);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncEmployee * gncEmployeeLookup (QofBook *book, const GUID *guid);
* GncEmployee * gncEmployeeLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncEmployee * gncEmployeeLookup (const QofBook *book, const GUID *guid)
static inline GncEmployee * gncEmployeeLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_EMPLOYEE, GncEmployee);
}

4
src/business/business-core/gncEntry.h
View File

@ -220,9 +220,9 @@ GncInvoice * gncEntryGetBill (const GncEntry *entry);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncEntry * gncEntryLookup (QofBook *book, const GUID *guid);
* GncEntry * gncEntryLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncEntry * gncEntryLookup (const QofBook *book, const GUID *guid)
static inline GncEntry * gncEntryLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_ENTRY, GncEntry);
}

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

@ -32,7 +32,7 @@
#include "gncEntry.h"
gboolean gncEntryRegister (void);
void gncEntrySetGUID (GncEntry *entry, const GUID *guid);
void gncEntrySetGUID (GncEntry *entry, const GncGUID *guid);
void gncEntrySetOrder (GncEntry *entry, GncOrder *order);
void gncEntrySetInvoice (GncEntry *entry, GncInvoice *invoice);
void gncEntrySetBill (GncEntry *entry, GncInvoice *bill);

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

@ -1040,7 +1040,7 @@ GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot)
{
KvpFrame *kvp;
KvpValue *value;
GUID *guid;
GncGUID *guid;
QofBook *book;
if (!lot) return NULL;
@ -1080,7 +1080,7 @@ gncInvoiceGetInvoiceFromTxn (const Transaction *txn)
{
KvpFrame *kvp;
KvpValue *value;
GUID *guid;
GncGUID *guid;
QofBook *book;
if (!txn) return NULL;

4
src/business/business-core/gncInvoice.h
View File

@ -183,9 +183,9 @@ GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncInvoice * gncInvoiceLookup (QofBook *book, const GUID *guid);
* GncInvoice * gncInvoiceLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncInvoice * gncInvoiceLookup (const QofBook *book, const GUID *guid)
static inline GncInvoice * gncInvoiceLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_INVOICE, GncInvoice);
}

4
src/business/business-core/gncJob.h
View File

@ -88,9 +88,9 @@ gboolean gncJobGetActive (const GncJob *job);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncJob * gncJobLookup (QofBook *book, const GUID *guid);
* GncJob * gncJobLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncJob * gncJobLookup (const QofBook *book, const GUID *guid)
static inline GncJob * gncJobLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_JOB, GncJob);
}

4
src/business/business-core/gncOrder.h
View File

@ -99,9 +99,9 @@ gboolean gncOrderIsClosed (const GncOrder *order);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncOrder * gncOrderLookup (QofBook *book, const GUID *guid);
* GncOrder * gncOrderLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncOrder * gncOrderLookup (const QofBook *book, const GUID *guid)
static inline GncOrder * gncOrderLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_ORDER, GncOrder);
}

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

@ -336,7 +336,7 @@ const char * gncOwnerGetName (const GncOwner *owner)
}
}
const GUID * gncOwnerGetGUID (const GncOwner *owner)
const GncGUID * gncOwnerGetGUID (const GncOwner *owner)
{
if (!owner) return NULL;
@ -357,9 +357,9 @@ const GUID * gncOwnerGetGUID (const GncOwner *owner)
}
}
GUID gncOwnerRetGUID (GncOwner *owner)
GncGUID gncOwnerRetGUID (GncOwner *owner)
{
const GUID *guid = gncOwnerGetGUID (owner);
const GncGUID *guid = gncOwnerGetGUID (owner);
if (guid)
return *guid;
return *guid_null ();
@ -409,7 +409,7 @@ int gncOwnerCompare (const GncOwner *a, const GncOwner *b)
}
}
const GUID * gncOwnerGetEndGUID (GncOwner *owner)
const GncGUID * gncOwnerGetEndGUID (GncOwner *owner)
{
if (!owner) return NULL;
owner = gncOwnerGetEndOwner (owner);
@ -440,7 +440,7 @@ gboolean gncOwnerGetOwnerFromLot (GNCLot *lot, GncOwner *owner)
{
KvpFrame *kvp;
KvpValue *value;
GUID *guid;
GncGUID *guid;
QofBook *book;
GncOwnerType type;
@ -532,7 +532,7 @@ reg_lot (void)
qof_class_register (GNC_ID_LOT, NULL, params);
}
gboolean gncOwnerGetOwnerFromTypeGuid (QofBook *book, GncOwner *owner, QofIdType type, GUID *guid)
gboolean gncOwnerGetOwnerFromTypeGuid (QofBook *book, GncOwner *owner, QofIdType type, GncGUID *guid)
{
if (!book || !owner || !type || !guid) return FALSE;

12
src/business/business-core/gncOwner.h
View File

@ -118,18 +118,18 @@ int gncOwnerCompare (const GncOwner *a, const GncOwner *b);
const char * gncOwnerGetName (const GncOwner *owner);
gnc_commodity * gncOwnerGetCurrency (const GncOwner *owner);
/** Get the GUID of the immediate owner */
const GUID * gncOwnerGetGUID (const GncOwner *owner);
GUID gncOwnerRetGUID (GncOwner *owner);
/** Get the GncGUID of the immediate owner */
const GncGUID * gncOwnerGetGUID (const GncOwner *owner);
GncGUID gncOwnerRetGUID (GncOwner *owner);
gboolean gncOwnerIsValid (const GncOwner *owner);
/**
* Get the "parent" Owner or GUID thereof. The "parent" owner
* Get the "parent" Owner or GncGUID thereof. The "parent" owner
* is the Customer or Vendor, or the Owner of a Job
*/
GncOwner * gncOwnerGetEndOwner (GncOwner *owner);
const GUID * gncOwnerGetEndGUID (GncOwner *owner);
const GncGUID * gncOwnerGetEndGUID (GncOwner *owner);
/** attach an owner to a lot */
void gncOwnerAttachToLot (const GncOwner *owner, GNCLot *lot);
@ -139,7 +139,7 @@ void gncOwnerAttachToLot (const GncOwner *owner, GNCLot *lot);
*/
gboolean gncOwnerGetOwnerFromLot (GNCLot *lot, GncOwner *owner);
gboolean gncOwnerGetOwnerFromTypeGuid (QofBook *book, GncOwner *owner, QofIdType type, GUID *guid);
gboolean gncOwnerGetOwnerFromTypeGuid (QofBook *book, GncOwner *owner, QofIdType type, GncGUID *guid);
/** Get the kvp-frame from the underlying owner object */
KvpFrame* gncOwnerGetSlots(GncOwner* owner);

4
src/business/business-core/gncTaxTable.h
View File

@ -142,9 +142,9 @@ void gncTaxTableCommitEdit (GncTaxTable *table);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncTaxTable * gncTaxTableLookup (QofBook *book, const GUID *guid);
* GncTaxTable * gncTaxTableLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncTaxTable *gncTaxTableLookup (const QofBook* book, const GUID *guid)
static inline GncTaxTable *gncTaxTableLookup (const QofBook* book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_TAXTABLE, GncTaxTable);
}

4
src/business/business-core/gncVendor.h
View File

@ -110,9 +110,9 @@ int gncVendorCompare (const GncVendor *a, const GncVendor *b);
* by the guid, and is residing in the book. Returns NULL if the
* instance can't be found.
* Equivalent function prototype is
* GncVendor * gncVendorLookup (QofBook *book, const GUID *guid);
* GncVendor * gncVendorLookup (QofBook *book, const GncGUID *guid);
*/
static inline GncVendor * gncVendorLookup (const QofBook *book, const GUID *guid)
static inline GncVendor * gncVendorLookup (const QofBook *book, const GncGUID *guid)
{
QOF_BOOK_RETURN_ENTITY(book, guid, GNC_ID_VENDOR, GncVendor);
}

14
src/business/business-core/sql/gnc-bill-term-sql.c
View File

@ -97,7 +97,7 @@ static GncSqlColumnTableEntry billterm_parent_col_table[] =
typedef struct {
/*@ dependent @*/ GncBillTerm* billterm;
GUID guid;
GncGUID guid;
gboolean have_guid;
} billterm_parent_guid_struct;
@ -119,7 +119,7 @@ bt_get_parent( gpointer pObject )
{
const GncBillTerm* billterm;
const GncBillTerm* pParent;
const GUID* parent_guid;
const GncGUID* parent_guid;
g_return_val_if_fail( pObject != NULL, NULL );
g_return_val_if_fail( GNC_IS_BILLTERM(pObject), NULL );
@ -141,7 +141,7 @@ bt_set_parent( gpointer data, gpointer value )
GncBillTerm* billterm;
GncBillTerm* parent;
QofBook* pBook;
GUID* guid = (GUID*)value;
GncGUID* guid = (GncGUID*)value;
g_return_if_fail( data != NULL );
g_return_if_fail( GNC_IS_BILLTERM(data) );
@ -162,7 +162,7 @@ static void
bt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
billterm_parent_guid_struct* s = (billterm_parent_guid_struct*)pObject;
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( pValue != NULL );
@ -175,7 +175,7 @@ static GncBillTerm*
load_single_billterm( GncSqlBackend* be, GncSqlRow* row,
GList** l_billterms_needing_parents )
{
const GUID* guid;
const GncGUID* guid;
GncBillTerm* pBillTerm;
g_return_val_if_fail( be != NULL, NULL );
@ -191,7 +191,7 @@ load_single_billterm( GncSqlBackend* be, GncSqlRow* row,
/* If the billterm doesn't have a parent, it might be because it hasn't been loaded yet.
If so, add this billterm to the list of billterms with no parent, along with the parent
GUID so that after they are all loaded, the parents can be fixed up. */
GncGUID so that after they are all loaded, the parents can be fixed up. */
if ( gncBillTermGetParent( pBillTerm ) == NULL )
{
billterm_parent_guid_struct* s = g_malloc( (gsize)sizeof(billterm_parent_guid_struct) );
@ -346,7 +346,7 @@ load_billterm_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GncBillTerm* term = NULL;
g_return_if_fail( be != NULL );

2
src/business/business-core/sql/gnc-customer-sql.c
View File

@ -87,7 +87,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncCustomer*
load_single_customer( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncCustomer* pCustomer;
g_return_val_if_fail( be != NULL, NULL );

4
src/business/business-core/sql/gnc-employee-sql.c
View File

@ -78,7 +78,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncEmployee*
load_single_employee( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncEmployee* pEmployee;
g_return_val_if_fail( be != NULL, NULL );
@ -162,7 +162,7 @@ static gboolean
save_employee( GncSqlBackend* be, QofInstance* inst )
{
GncEmployee* emp;
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
gboolean is_ok = TRUE;

2
src/business/business-core/sql/gnc-entry-sql.c
View File

@ -152,7 +152,7 @@ entry_set_bill( gpointer pObject, gpointer val )
static GncEntry*
load_single_entry( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncEntry* pEntry;
g_return_val_if_fail( be != NULL, NULL );

6
src/business/business-core/sql/gnc-invoice-sql.c
View File

@ -95,7 +95,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncInvoice*
load_single_invoice( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncInvoice* pInvoice;
g_return_val_if_fail( be != NULL, NULL );
@ -179,7 +179,7 @@ create_invoice_tables( GncSqlBackend* be )
static gboolean
save_invoice( GncSqlBackend* be, QofInstance* inst )
{
const GUID* guid;
const GncGUID* guid;
GncInvoice* invoice;
gint op;
gboolean is_infant;
@ -286,7 +286,7 @@ load_invoice_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GncInvoice* invoice = NULL;
g_return_if_fail( be != NULL );

2
src/business/business-core/sql/gnc-job-sql.c
View File

@ -72,7 +72,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncJob*
load_single_job( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncJob* pJob;
g_return_val_if_fail( be != NULL, NULL );

4
src/business/business-core/sql/gnc-order-sql.c
View File

@ -69,7 +69,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncOrder*
load_single_order( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncOrder* pOrder;
g_return_val_if_fail( be != NULL, NULL );
@ -205,7 +205,7 @@ load_order_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GncOrder* order = NULL;
g_return_if_fail( be != NULL );

6
src/business/business-core/sql/gnc-owner-sql.c
View File

@ -55,10 +55,10 @@ load_owner( const GncSqlBackend* be, GncSqlRow* row,
const GValue* val;
gchar* buf;
GncOwnerType type;
GUID guid;
GncGUID guid;
QofBook* book;
GncOwner owner;
GUID* pGuid = NULL;
GncGUID* pGuid = NULL;
g_return_if_fail( be != NULL );
g_return_if_fail( row != NULL );
@ -215,7 +215,7 @@ add_gvalue_owner_to_slist( const GncSqlBackend* be, QofIdTypeConst obj_name,
GValue* subfield_value;
GncOwner* owner;
gchar* buf;
const GUID* guid;
const GncGUID* guid;
gchar guid_buf[GUID_ENCODING_LENGTH+1];
GncOwnerType type;
QofInstance* inst = NULL;

24
src/business/business-core/sql/gnc-tax-table-sql.c
View File

@ -51,7 +51,7 @@ static void set_invisible( gpointer data, gboolean value );
typedef struct
{
GncSqlBackend* be;
const GUID* guid;
const GncGUID* guid;
} guid_info_t;
static gpointer get_obj_guid( gpointer pObject, const QofParam* param );
@ -123,7 +123,7 @@ static GncSqlColumnTableEntry guid_col_table[] =
typedef struct {
/*@ dependent @*/ GncTaxTable* tt;
GUID guid;
GncGUID guid;
gboolean have_guid;
} taxtable_parent_guid_struct;
@ -140,7 +140,7 @@ get_obj_guid( gpointer pObject, const QofParam* param )
static void
set_obj_guid( gpointer pObject, gpointer pValue )
{
// Nowhere to put the GUID
// Nowhere to put the GncGUID
}
static void
@ -173,7 +173,7 @@ bt_get_parent( gpointer pObject )
{
const GncTaxTable* tt;
const GncTaxTable* pParent;
const GUID* parent_guid;
const GncGUID* parent_guid;
g_return_val_if_fail( pObject != NULL, NULL );
g_return_val_if_fail( GNC_IS_TAXTABLE(pObject), NULL );
@ -195,7 +195,7 @@ tt_set_parent( gpointer data, gpointer value )
GncTaxTable* tt;
GncTaxTable* parent;
QofBook* pBook;
GUID* guid = (GUID*)value;
GncGUID* guid = (GncGUID*)value;
g_return_if_fail( data != NULL );
g_return_if_fail( GNC_IS_TAXTABLE(data) );
@ -216,7 +216,7 @@ static void
tt_set_parent_guid( gpointer pObject, /*@ null @*/ gpointer pValue )
{
taxtable_parent_guid_struct* s = (taxtable_parent_guid_struct*)pObject;
GUID* guid = (GUID*)pValue;
GncGUID* guid = (GncGUID*)pValue;
g_return_if_fail( pObject != NULL );
g_return_if_fail( pValue != NULL );
@ -278,7 +278,7 @@ static void
load_single_taxtable( GncSqlBackend* be, GncSqlRow* row,
GList** l_tt_needing_parents )
{
const GUID* guid;
const GncGUID* guid;
GncTaxTable* tt;
g_return_if_fail( be != NULL );
@ -296,7 +296,7 @@ load_single_taxtable( GncSqlBackend* be, GncSqlRow* row,
/* If the tax table doesn't have a parent, it might be because it hasn't been loaded yet.
If so, add this tax table to the list of tax tables with no parent, along with the parent
GUID so that after they are all loaded, the parents can be fixed up. */
GncGUID so that after they are all loaded, the parents can be fixed up. */
if( gncTaxTableGetParent( tt ) == NULL ) {
taxtable_parent_guid_struct* s = g_malloc( (gsize)sizeof(taxtable_parent_guid_struct) );
g_assert( s != NULL );
@ -398,7 +398,7 @@ create_taxtable_tables( GncSqlBackend* be )
/* ================================================================= */
static gboolean
delete_all_tt_entries( GncSqlBackend* be, const GUID* guid )
delete_all_tt_entries( GncSqlBackend* be, const GncGUID* guid )
{
guid_info_t guid_info;
@ -412,7 +412,7 @@ delete_all_tt_entries( GncSqlBackend* be, const GUID* guid )
}
static gboolean
save_tt_entries( GncSqlBackend* be, const GUID* guid, GList* entries )
save_tt_entries( GncSqlBackend* be, const GncGUID* guid, GList* entries )
{
GList* entry;
gboolean is_ok;
@ -440,7 +440,7 @@ static gboolean
save_taxtable( GncSqlBackend* be, QofInstance* inst )
{
GncTaxTable* tt;
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
gboolean is_ok;
@ -524,7 +524,7 @@ load_taxtable_guid( const GncSqlBackend* be, GncSqlRow* row,
const GncSqlColumnTableEntry* table_row )
{
const GValue* val;
GUID guid;
GncGUID guid;
GncTaxTable* taxtable = NULL;
g_return_if_fail( be != NULL );

4
src/business/business-core/sql/gnc-vendor-sql.c
View File

@ -86,7 +86,7 @@ static GncSqlColumnTableEntry col_table[] =
static GncVendor*
load_single_vendor( GncSqlBackend* be, GncSqlRow* row )
{
const GUID* guid;
const GncGUID* guid;
GncVendor* pVendor;
g_return_val_if_fail( be != NULL, NULL );
@ -162,7 +162,7 @@ static gboolean
save_vendor( GncSqlBackend* be, QofInstance* inst )
{
GncVendor* v;
const GUID* guid;
const GncGUID* guid;
gint op;
gboolean is_infant;
gboolean is_ok = TRUE;

4
src/business/business-core/test/test-customer.c
View File

@ -83,7 +83,7 @@ test_customer (void)
/* Test setting/getting routines; does the active flag get set right? */
{
GUID guid;
GncGUID guid;
test_string_fcn (book, "Id", gncCustomerSetID, gncCustomerGetID);
test_string_fcn (book, "Name", gncCustomerSetName, gncCustomerGetName);
@ -137,7 +137,7 @@ test_customer (void)
/* Test the Entity Table */
{
const GUID *guid;
const GncGUID *guid;
guid = gncCustomerGetGUID (customer);
do_test (gncCustomerLookup (book, guid) == customer, "Entity Table");

2
src/business/business-core/test/test-employee.c
View File

@ -88,7 +88,7 @@ test_employee (void)
/* Test setting/getting routines; does the active flag get set right? */
{
GUID guid;
GncGUID guid;
test_string_fcn (book, "Id", gncEmployeeSetID, gncEmployeeGetID);
test_string_fcn (book, "Username", gncEmployeeSetUsername, gncEmployeeGetUsername);

2
src/business/business-core/test/test-job.c
View File

@ -92,7 +92,7 @@ test_job (void)
/* Test setting/getting routines; does the active flag get set right? */
{
GUID guid;
GncGUID guid;
test_string_fcn (book, "Id", gncJobSetID, gncJobGetID);
test_string_fcn (book, "Name", gncJobSetName, gncJobGetName);

2
src/business/business-core/test/test-vendor.c
View File

@ -91,7 +91,7 @@ test_vendor (void)
/* Test setting/getting routines; does the active flag get set right? */
{
GUID guid;
GncGUID guid;
test_string_fcn (book, "Id", gncVendorSetID, gncVendorGetID);
test_string_fcn (book, "Name", gncVendorSetName, gncVendorGetName);

6
src/business/business-core/xml/gnc-bill-term-xml-v2.c
View File

@ -265,7 +265,7 @@ static gboolean
set_parent_child (xmlNodePtr node, struct billterm_pdata *pdata,
void (*func)(GncBillTerm *, GncBillTerm *))
{
GUID *guid;
GncGUID *guid;
GncBillTerm *term;
guid = dom_tree_to_guid(node);
@ -300,7 +300,7 @@ static gboolean
billterm_guid_handler (xmlNodePtr node, gpointer billterm_pdata)
{
struct billterm_pdata *pdata = billterm_pdata;
GUID *guid;
GncGUID *guid;
GncBillTerm *term;
guid = dom_tree_to_guid(node);
@ -769,7 +769,7 @@ gnc_billterm_xml_initialize (void)
}
GncBillTerm *
gnc_billterm_xml_find_or_create(QofBook *book, GUID *guid)
gnc_billterm_xml_find_or_create(QofBook *book, GncGUID *guid)
{
GncBillTerm *term;

2
src/business/business-core/xml/gnc-bill-term-xml-v2.h
View File

@ -26,6 +26,6 @@
#include "gncBillTerm.h"
void gnc_billterm_xml_initialize (void);
GncBillTerm *gnc_billterm_xml_find_or_create(QofBook *book, GUID *guid);
GncBillTerm *gnc_billterm_xml_find_or_create(QofBook *book, GncGUID *guid);
#endif /* GNC_BILLTERM_XML_V2_H */

6
src/business/business-core/xml/gnc-customer-xml-v2.c
View File

@ -187,7 +187,7 @@ static gboolean
customer_guid_handler (xmlNodePtr node, gpointer cust_pdata)
{
struct customer_pdata *pdata = cust_pdata;
GUID *guid;
GncGUID *guid;
GncCustomer *cust;
guid = dom_tree_to_guid(node);
@ -229,7 +229,7 @@ static gboolean
customer_terms_handler (xmlNodePtr node, gpointer cust_pdata)
{
struct customer_pdata *pdata = cust_pdata;
GUID *guid;
GncGUID *guid;
GncBillTerm *term;
guid = dom_tree_to_guid(node);
@ -335,7 +335,7 @@ static gboolean
customer_taxtable_handler (xmlNodePtr node, gpointer cust_pdata)
{
struct customer_pdata *pdata = cust_pdata;
GUID *guid;
GncGUID *guid;
GncTaxTable *taxtable;
guid = dom_tree_to_guid (node);

4
src/business/business-core/xml/gnc-employee-xml-v2.c
View File

@ -159,7 +159,7 @@ static gboolean
employee_guid_handler (xmlNodePtr node, gpointer employee_pdata)
{
struct employee_pdata *pdata = employee_pdata;
GUID *guid;
GncGUID *guid;
GncEmployee *employee;
guid = dom_tree_to_guid(node);
@ -275,7 +275,7 @@ static gboolean
employee_ccard_handler (xmlNodePtr node, gpointer employee_pdata)
{
struct employee_pdata *pdata = employee_pdata;
GUID *guid;
GncGUID *guid;
Account *ccard_acc;
guid = dom_tree_to_guid(node);

12
src/business/business-core/xml/gnc-entry-xml-v2.c
View File

@ -274,7 +274,7 @@ static inline gboolean
set_account(xmlNodePtr node, struct entry_pdata *pdata,
void (*func)(GncEntry *entry, Account *acc))
{
GUID *guid;
GncGUID *guid;
Account * acc;
guid = dom_tree_to_guid (node);
@ -294,7 +294,7 @@ static inline gboolean
set_taxtable (xmlNodePtr node, struct entry_pdata *pdata,
void (*func)(GncEntry *entry, GncTaxTable *taxtable))
{
GUID *guid;
GncGUID *guid;
GncTaxTable *taxtable;
guid = dom_tree_to_guid (node);
@ -319,7 +319,7 @@ static gboolean
entry_guid_handler (xmlNodePtr node, gpointer entry_pdata)
{
struct entry_pdata *pdata = entry_pdata;
GUID *guid;
GncGUID *guid;
GncEntry *entry;
guid = dom_tree_to_guid(node);
@ -561,7 +561,7 @@ static gboolean
entry_order_handler (xmlNodePtr node, gpointer entry_pdata)
{
struct entry_pdata *pdata = entry_pdata;
GUID *guid;
GncGUID *guid;
GncOrder *order;
guid = dom_tree_to_guid (node);
@ -586,7 +586,7 @@ static gboolean
entry_invoice_handler (xmlNodePtr node, gpointer entry_pdata)
{
struct entry_pdata *pdata = entry_pdata;
GUID *guid;
GncGUID *guid;
GncInvoice *invoice;
guid = dom_tree_to_guid (node);
@ -611,7 +611,7 @@ static gboolean
entry_bill_handler (xmlNodePtr node, gpointer entry_pdata)
{
struct entry_pdata *pdata = entry_pdata;
GUID *guid;
GncGUID *guid;
GncInvoice *invoice;
guid = dom_tree_to_guid (node);

10
src/business/business-core/xml/gnc-invoice-xml-v2.c
View File

@ -195,7 +195,7 @@ static gboolean
invoice_guid_handler (xmlNodePtr node, gpointer invoice_pdata)
{
struct invoice_pdata *pdata = invoice_pdata;
GUID *guid;
GncGUID *guid;
GncInvoice *invoice;
guid = dom_tree_to_guid(node);
@ -289,7 +289,7 @@ static gboolean
invoice_terms_handler (xmlNodePtr node, gpointer invoice_pdata)
{
struct invoice_pdata *pdata = invoice_pdata;
GUID *guid;
GncGUID *guid;
GncBillTerm *term;
guid = dom_tree_to_guid(node);
@ -306,7 +306,7 @@ static gboolean
invoice_posttxn_handler (xmlNodePtr node, gpointer invoice_pdata)
{
struct invoice_pdata *pdata = invoice_pdata;
GUID *guid;
GncGUID *guid;
Transaction *txn;
guid = dom_tree_to_guid(node);
@ -323,7 +323,7 @@ static gboolean
invoice_postlot_handler (xmlNodePtr node, gpointer invoice_pdata)
{
struct invoice_pdata *pdata = invoice_pdata;
GUID *guid;
GncGUID *guid;
GNCLot *lot;
guid = dom_tree_to_guid(node);
@ -340,7 +340,7 @@ static gboolean
invoice_postacc_handler (xmlNodePtr node, gpointer invoice_pdata)
{
struct invoice_pdata *pdata = invoice_pdata;
GUID *guid;
GncGUID *guid;
Account *acc;
guid = dom_tree_to_guid(node);

2
src/business/business-core/xml/gnc-job-xml-v2.c
View File

@ -124,7 +124,7 @@ static gboolean
job_guid_handler (xmlNodePtr node, gpointer job_pdata)
{
struct job_pdata *pdata = job_pdata;
GUID *guid;
GncGUID *guid;
GncJob *job;
guid = dom_tree_to_guid(node);

2
src/business/business-core/xml/gnc-order-xml-v2.c
View File

@ -141,7 +141,7 @@ static gboolean
order_guid_handler (xmlNodePtr node, gpointer order_pdata)
{
struct order_pdata *pdata = order_pdata;
GUID *guid;
GncGUID *guid;
GncOrder *order;
guid = dom_tree_to_guid(node);

2
src/business/business-core/xml/gnc-owner-xml-v2.c
View File

@ -128,7 +128,7 @@ static gboolean
owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
{
struct owner_pdata *pdata = owner_pdata;
GUID *guid;
GncGUID *guid;
guid = dom_tree_to_guid(node);
g_return_val_if_fail (guid, FALSE);

6
src/business/business-core/xml/gnc-tax-table-xml-v2.c
View File

@ -145,7 +145,7 @@ static gboolean
ttentry_acct_handler (xmlNodePtr node, gpointer ttentry_pdata)
{
struct ttentry_pdata *pdata = ttentry_pdata;
GUID *guid;
GncGUID *guid;
Account * acc;
guid = dom_tree_to_guid (node);
@ -232,7 +232,7 @@ static gboolean
set_parent_child (xmlNodePtr node, struct taxtable_pdata *pdata,
void (*func)(GncTaxTable *, GncTaxTable *))
{
GUID *guid;
GncGUID *guid;
GncTaxTable *table;
guid = dom_tree_to_guid(node);
@ -264,7 +264,7 @@ static gboolean
taxtable_guid_handler (xmlNodePtr node, gpointer taxtable_pdata)
{
struct taxtable_pdata *pdata = taxtable_pdata;
GUID *guid;
GncGUID *guid;
GncTaxTable *table;
guid = dom_tree_to_guid(node);

6
src/business/business-core/xml/gnc-vendor-xml-v2.c
View File

@ -173,7 +173,7 @@ static gboolean
vendor_guid_handler (xmlNodePtr node, gpointer vendor_pdata)
{
struct vendor_pdata *pdata = vendor_pdata;
GUID *guid;
GncGUID *guid;
GncVendor *vendor;
guid = dom_tree_to_guid(node);
@ -215,7 +215,7 @@ static gboolean
vendor_terms_handler (xmlNodePtr node, gpointer vendor_pdata)
{
struct vendor_pdata *pdata = vendor_pdata;
GUID *guid;
GncGUID *guid;
GncBillTerm *term;
guid = dom_tree_to_guid(node);
@ -281,7 +281,7 @@ static gboolean
vendor_taxtable_handler (xmlNodePtr node, gpointer vendor_pdata)
{
struct vendor_pdata *pdata = vendor_pdata;
GUID *guid;
GncGUID *guid;
GncTaxTable *taxtable;
guid = dom_tree_to_guid (node);

4
src/business/business-gnome/business-urls.c
View File

@ -55,7 +55,7 @@
#define HANDLE_TYPE(URL_TYPE_STR,OBJ_TYPE) { \
QofBook *book; \
GUID guid; \
GncGUID guid; \
QofCollection *coll; \
\
g_return_val_if_fail (location != NULL, FALSE); \
@ -177,7 +177,7 @@ ownerreportCB (const char *location, const char *label,
{
const char *ownerptr;
const char *acctptr;
GUID guid;
GncGUID guid;
GncOwner owner;
GncOwnerType type;
char *etype = NULL;

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

@ -115,7 +115,7 @@ struct _customer_window
GncTaxIncluded taxincluded;
GncBillTerm * terms;
CustomerDialogType dialog_type;
GUID customer_guid;
GncGUID customer_guid;
gint component_id;
QofBook * book;
GncCustomer * created_customer;
@ -428,7 +428,7 @@ gnc_customer_window_refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *customer_guid = find_data;
const GncGUID *customer_guid = find_data;
CustomerWindow *cw = user_data;
return(cw && guid_equal(&cw->customer_guid, customer_guid));
@ -449,7 +449,7 @@ gnc_customer_new_window (QofBook *bookp, GncCustomer *cust)
*/
if (cust)
{
GUID customer_guid;
GncGUID customer_guid;
customer_guid = *gncCustomerGetGUID(cust);
cw = gnc_find_first_gui_component (DIALOG_EDIT_CUSTOMER_CM_CLASS,

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

@ -100,7 +100,7 @@ struct _employee_window
/* ACL? */
EmployeeDialogType dialog_type;
GUID employee_guid;
GncGUID employee_guid;
gint component_id;
QofBook * book;
GncEmployee * created_employee;
@ -382,7 +382,7 @@ gnc_employee_window_refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *employee_guid = find_data;
const GncGUID *employee_guid = find_data;
EmployeeWindow *ew = user_data;
return(ew && guid_equal(&ew->employee_guid, employee_guid));
@ -406,7 +406,7 @@ gnc_employee_new_window (QofBook *bookp,
*/
if (employee)
{
GUID employee_guid;
GncGUID employee_guid;
employee_guid = *gncEmployeeGetGUID (employee);
ew = gnc_find_first_gui_component (DIALOG_EDIT_EMPLOYEE_CM_CLASS,

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

@ -172,7 +172,7 @@ struct _invoice_window
invoice_sort_type_t last_sort;
InvoiceDialogType dialog_type;
GUID invoice_guid;
GncGUID invoice_guid;
gint component_id;
QofBook * book;
GncInvoice * created_invoice;
@ -1786,7 +1786,7 @@ gnc_invoice_id_changed_cb (GtkWidget *unused, gpointer data)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *invoice_guid = find_data;
const GncGUID *invoice_guid = find_data;
InvoiceWindow *iw = user_data;
return(iw && guid_equal(&iw->invoice_guid, invoice_guid));
@ -1810,7 +1810,7 @@ gnc_invoice_new_page (QofBook *bookp, InvoiceDialogType type,
*/
if (invoice)
{
GUID invoice_guid;
GncGUID invoice_guid;
invoice_guid = *gncInvoiceGetGUID (invoice);
iw = gnc_find_first_gui_component (DIALOG_VIEW_INVOICE_CM_CLASS,
@ -1869,7 +1869,7 @@ gnc_invoice_recreate_page (GncMainWindow *window,
char *tmp_string = NULL, *owner_type = NULL;
InvoiceDialogType type;
GncInvoice *invoice;
GUID guid;
GncGUID guid;
QofBook *book;
GncOwner owner = { 0 };
@ -1885,7 +1885,7 @@ gnc_invoice_recreate_page (GncMainWindow *window,
type = InvoiceDialogTypefromString(tmp_string);
g_free(tmp_string);
/* Get Invoice GUID */
/* Get Invoice GncGUID */
tmp_string = g_key_file_get_string(key_file, group_name,
KEY_INVOICE_GUID, &error);
if (error)
@ -1918,7 +1918,7 @@ gnc_invoice_recreate_page (GncMainWindow *window,
goto give_up;
}
/* Get Owner GUID */
/* Get Owner GncGUID */
tmp_string = g_key_file_get_string(key_file, group_name,
KEY_OWNER_GUID, &error);
if (error)
@ -2173,7 +2173,7 @@ gnc_invoice_window_new_invoice (QofBook *bookp, GncOwner *owner,
* Try to find an existing window for this invoice. If found,
* bring it to the front.
*/
GUID invoice_guid;
GncGUID invoice_guid;
invoice_guid = *gncInvoiceGetGUID (invoice);
iw = gnc_find_first_gui_component (DIALOG_NEW_INVOICE_CM_CLASS,
@ -2537,7 +2537,7 @@ gnc_invoice_search (GncInvoice *start, GncOwner *owner, QofBook *book)
* owner. If a Job is supplied, search for all invoices for that
* job, but if a Customer is supplied, search for all invoices owned
* by that Customer or any of that Customer's Jobs. In other words,
* match on <supplied-owner's guid> == Invoice->Owner->GUID or
* match on <supplied-owner's guid> == Invoice->Owner->GncGUID or
* Invoice->owner->parentGUID.
*/
if (owner)

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

@ -78,7 +78,7 @@ struct _job_window
GtkWidget * active_check;
JobDialogType dialog_type;
GUID job_guid;
GncGUID job_guid;
gint component_id;
QofBook * book;
GncJob * created_job;
@ -289,7 +289,7 @@ gnc_job_window_refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *job_guid = find_data;
const GncGUID *job_guid = find_data;
JobWindow *jw = user_data;
return(jw && guid_equal(&jw->job_guid, job_guid));
@ -308,7 +308,7 @@ gnc_job_new_window (QofBook *bookp, GncOwner *owner, GncJob *job)
*/
if (job)
{
GUID job_guid;
GncGUID job_guid;
job_guid = *gncJobGetGUID (job);
jw = gnc_find_first_gui_component (DIALOG_EDIT_JOB_CM_CLASS,

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

@ -95,7 +95,7 @@ struct _order_window
GncEntryLedger * ledger;
OrderDialogType dialog_type;
GUID order_guid;
GncGUID order_guid;
gint component_id;
QofBook * book;
GncOrder * created_order;
@ -539,7 +539,7 @@ gnc_order_update_window (OrderWindow *ow)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *order_guid = find_data;
const GncGUID *order_guid = find_data;
OrderWindow *ow = user_data;
return(ow && guid_equal(&ow->order_guid, order_guid));
@ -572,7 +572,7 @@ gnc_order_new_window (QofBook *bookp, OrderDialogType type,
*/
if (order)
{
GUID order_guid;
GncGUID order_guid;
order_guid = *gncOrderGetGUID(order);
ow = gnc_find_first_gui_component (class_name, find_handler,

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

@ -120,7 +120,7 @@ static void
gnc_payment_dialog_owner_changed(PaymentWindow *pw)
{
Account *last_acct = NULL;
GUID *guid = NULL;
GncGUID *guid = NULL;
KvpValue* value;
KvpFrame* slots;

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

@ -99,7 +99,7 @@ struct _vendor_window
GncTaxIncluded taxincluded;
GncBillTerm * terms;
VendorDialogType dialog_type;
GUID vendor_guid;
GncGUID vendor_guid;
gint component_id;
QofBook * book;
GncVendor * created_vendor;
@ -347,7 +347,7 @@ gnc_vendor_window_refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
find_handler (gpointer find_data, gpointer user_data)
{
const GUID *vendor_guid = find_data;
const GncGUID *vendor_guid = find_data;
VendorWindow *vw = user_data;
return(vw && guid_equal(&vw->vendor_guid, vendor_guid));
@ -367,7 +367,7 @@ gnc_vendor_new_window (QofBook *bookp, GncVendor *vendor)
*/
if (vendor)
{
GUID vendor_guid;
GncGUID vendor_guid;
vendor_guid = *gncVendorGetGUID (vendor);
vw = gnc_find_first_gui_component (DIALOG_EDIT_VENDOR_CM_CLASS,

2
src/business/business-gnome/search-owner.c
View File

@ -306,7 +306,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe)
{
GNCSearchOwner *fi = (GNCSearchOwner *)fe;
GNCSearchOwnerPrivate *priv;
const GUID *guid;
const GncGUID *guid;
GList *l = NULL;
g_return_val_if_fail (fi, NULL);

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

@ -209,7 +209,7 @@ gboolean gnc_entry_ledger_get_numeric (GncEntryLedger *ledger,
GncEntry * gnc_entry_ledger_get_entry (GncEntryLedger *ledger,
VirtualCellLocation vcell_loc)
{
GUID *guid;
GncGUID *guid;
if (!ledger) return NULL;
@ -467,7 +467,7 @@ static void create_invoice_query (GncEntryLedger *ledger)
gncOwnerGetEndGUID (gncInvoiceGetOwner (ledger->invoice)) != NULL)
{
const GUID *invoice_parent =
const GncGUID *invoice_parent =
gncOwnerGetGUID (gncInvoiceGetOwner (ledger->invoice));
QueryNew *q2 = gncQueryCreateFor (GNC_ENTRY_MODULE_NAME);

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

@ -30,7 +30,7 @@
struct GncEntryLedger_s
{
GUID blank_entry_guid;
GncGUID blank_entry_guid;
gboolean blank_entry_edited;
gboolean traverse_to_new;

4
src/engine/Account.c
View File

@ -1629,7 +1629,7 @@ xaccAccountBringUpToDate(Account *acc)
\********************************************************************/
void
xaccAccountSetGUID (Account *acc, const GUID *guid)
xaccAccountSetGUID (Account *acc, const GncGUID *guid)
{
g_return_if_fail(GNC_IS_ACCOUNT(acc));
g_return_if_fail(guid);
@ -1646,7 +1646,7 @@ xaccAccountSetGUID (Account *acc, const GUID *guid)
\********************************************************************/
Account *
xaccAccountLookup (const GUID *guid, QofBook *book)
xaccAccountLookup (const GncGUID *guid, QofBook *book)
{
QofCollection *col;
if (!guid || !book) return NULL;

6
src/engine/Account.h
View File

@ -174,7 +174,7 @@ Account * xaccMallocAccount (QofBook *book);
Account * gnc_account_create_root (QofBook *book);
/** The xaccCloneAccount() does the same as xaccCloneAccountSimple(),
* except that it also also places a pair of GUID-pointers
* except that it also also places a pair of GncGUID-pointers
* of each account to the other, in the other's kvp slot.
* The guid pointers are stored under the under the kvp
* path "gemini".
@ -224,7 +224,7 @@ int xaccAccountOrder (const Account *account_1, const Account *account_2);
/* ------------------ */
/** @name Account lookup and GUID routines
/** @name Account lookup and GncGUID routines
@{ */
/** Returns the account separation character chosen by the user.
@ -246,7 +246,7 @@ void gnc_book_set_root_account(QofBook *book, Account *root);
/** The xaccAccountLookup() subroutine will return the
* account associated with the given id, or NULL
* if there is no such account. */
/*@ dependent @*/ Account * xaccAccountLookup (const GUID *guid, QofBook *book);
/*@ dependent @*/ Account * xaccAccountLookup (const GncGUID *guid, QofBook *book);
#define xaccAccountLookupDirect(g,b) xaccAccountLookup(&(g),b)
/** @} */

4
src/engine/AccountP.h
View File

@ -55,10 +55,10 @@ struct account_s
QofInstance inst;
};
/* Set the account's GUID. This should only be done when reading
/* Set the account's GncGUID. This should only be done when reading
* an account from a datafile, or some other external source. Never
* call this on an existing account! */
void xaccAccountSetGUID (Account *account, const GUID *guid);
void xaccAccountSetGUID (Account *account, const GncGUID *guid);
/* Register Accounts with the engine */
gboolean xaccAccountRegister (void);

2
src/engine/GNCId.h
View File

@ -2,7 +2,7 @@
#include "qof.h"
/* Equivalent function prototype:
* void xaccGUIDNew (GUID *guid, QofBook *book)
* void xaccGUIDNew (GncGUID *guid, QofBook *book)
*/
#define xaccGUIDNew(guid,book) \
qof_instance_guid_new (qof_book_get_entity_table (book), (guid))

4
src/engine/Period.c
View File

@ -122,7 +122,7 @@ gnc_book_insert_trans_clobber (QofBook *book, Transaction *trans)
/* ================================================================ */
/* Reparent transaction to new book. This routine does this by
* moving GUID's to the new book's entity tables.
* moving GncGUID's to the new book's entity tables.
*/
void
@ -202,7 +202,7 @@ gnc_book_insert_lot_clobber (QofBook *book, GNCLot *lot)
/* ================================================================ */
/* Reparent lot to new book. This routine does this by
* moving GUID's to the new book's entity tables.
* moving GncGUID's to the new book's entity tables.
*/
void

30
src/engine/Period.h
View File

@ -43,7 +43,7 @@
* closed book. The guid's of the old transactions will not
* be changed in the move. Note, however, that the closed
* book will have a copy of every account in the open book,
* and that these copies will have new GUID's issued to them.
* and that these copies will have new GncGUID's issued to them.
* Thus, every account has a 'twin' in the other book.
*
* This routine will also create 'equity transactions' in
@ -79,24 +79,24 @@
* Implemented in the closed book:
* /book/close-date Latest date in this book. Must not change.
* /book/log-date Date on which user called this routine.
* /book/next-book GUID of next book (the still-open book).
* /book/next-book GncGUID of next book (the still-open book).
*
* Implemented in still-open book:
* /book/open-date Earliest date in this book.
* /book/prev-book GUID of previous book (the closed book).
* /book/prev-book GncGUID of previous book (the closed book).
*
* Implemented in the balancing transaction:
* /book/closed-acct GUID of account whose balance was brought forward
* /book/closed-book GUID of book whose balance was brought forward
* /book/closed-acct GncGUID of account whose balance was brought forward
* /book/closed-book GncGUID of book whose balance was brought forward
*
* Implemented in the closed account:
* /book/balancing-trans GUID of equity-balancing transaction.
* /book/next-book GUID of equity-balancing book.
* /book/next-acct GUID of twin of this account in the open book.
* /book/balancing-trans GncGUID of equity-balancing transaction.
* /book/next-book GncGUID of equity-balancing book.
* /book/next-acct GncGUID of twin of this account in the open book.
*
* Implemented in the still-open account:
* /book/prev-acct GUID of twin of this account in the closed book.
* /book/prev-book GUID of previous book (the closed book)
* /book/prev-acct GncGUID of twin of this account in the closed book.
* /book/prev-book GncGUID of previous book (the closed book)
*
*/
QofBook * gnc_book_close_period (QofBook *, Timespec,
@ -127,10 +127,10 @@ QofBook * gnc_book_close_period (QofBook *, Timespec,
* a 'general purpose' function. The way to fix this would be to
* weed out open lots by constructing the query correctly.
*
* When an account is copied, the copy is issued a new GUID.
* The GUID of its sibling is placed in the 'gemini' KVP value
* When an account is copied, the copy is issued a new GncGUID.
* The GncGUID of its sibling is placed in the 'gemini' KVP value
* (See kvp_doc.txt for more detail). Transactions and splits
* are moved without reassigning them a new GUID. Note they
* are moved without reassigning them a new GncGUID. Note they
* are removed from one book's entity table and placed into the
* other book: Once moved, they won't be findable in the entity
* table of the old book.
@ -155,7 +155,7 @@ void gnc_book_partition_pricedb (QofBook *dest, QofBook *src, QofQuery *);
* another book. It moves all of the splits as well. In the
* course of the move, the transaction is literally deleted
* from the first book as its placed into the second. The
* transaction and split GUID's are not changed in the move.
* transaction and split GncGUID's are not changed in the move.
* This routine assumes that twin accounts already exist in
* both books (and can be located with the standard twining
* proceedure).
@ -168,7 +168,7 @@ void gnc_book_partition_pricedb (QofBook *dest, QofBook *src, QofQuery *);
*
* The gnc_book_insert_trans() routine does the same as the above,
* except that it doesn't actually clobber the transaction: it
* merely moves the transaction and split GUID's to the new
* merely moves the transaction and split GncGUID's to the new
* books' entity tables, and not much else.
*
* The gnc_book_insert_lot() routine, as above, but for lots ...

8
src/engine/Query.c
View File

@ -243,7 +243,7 @@ xaccQueryAddAccountMatch(Query *q, AccountList *acct_list,
for (; acct_list; acct_list = acct_list->next)
{
Account *acc = acct_list->data;
const GUID *guid;
const GncGUID *guid;
if (!acc)
{
@ -254,7 +254,7 @@ xaccQueryAddAccountMatch(Query *q, AccountList *acct_list,
guid = qof_entity_get_guid (QOF_INSTANCE(acc));
if (!guid)
{
PWARN ("acct returns NULL GUID");
PWARN ("acct returns NULL GncGUID");
continue;
}
@ -298,7 +298,7 @@ void
xaccQueryAddSingleAccountMatch(Query *q, Account *acc, QofQueryOp op)
{
GList *list;
const GUID *guid;
const GncGUID *guid;
if (!q || !acc)
return;
@ -536,7 +536,7 @@ xaccQueryAddClearedMatch(Query * q, cleared_match_t how, QofQueryOp op)
}
void
xaccQueryAddGUIDMatch(Query * q, const GUID *guid,
xaccQueryAddGUIDMatch(Query * q, const GncGUID *guid,
QofIdType id_type, QofQueryOp op)
{
GSList *param_list = NULL;

2
src/engine/Query.h
View File

@ -196,7 +196,7 @@ typedef enum
} cleared_match_t;
void xaccQueryAddClearedMatch(Query * q, cleared_match_t how, QofQueryOp op);
void xaccQueryAddGUIDMatch(Query * q, const GUID *guid,
void xaccQueryAddGUIDMatch(Query * q, const GncGUID *guid,
QofIdType id_type, QofQueryOp op);
/** given kvp value is on right side of comparison */

2
src/engine/QueryP.h
View File

@ -86,7 +86,7 @@ typedef struct
pd_type_t type;
pr_type_t term_type;
int sense;
GUID guid;
GncGUID guid;
QofIdType id_type;
} GUIDPredicateData;

4
src/engine/SX-book.c
View File

@ -361,7 +361,7 @@ GList*
gnc_sx_get_sxes_referencing_account(QofBook *book, Account *acct)
{
GList *rtn = NULL;
const GUID *acct_guid = qof_entity_get_guid(QOF_INSTANCE(acct));
const GncGUID *acct_guid = qof_entity_get_guid(QOF_INSTANCE(acct));
GList *sx_list = gnc_book_get_schedxactions(book)->sx_list;
for (; sx_list != NULL; sx_list = sx_list->next)
{
@ -371,7 +371,7 @@ gnc_sx_get_sxes_referencing_account(QofBook *book, Account *acct)
{
Split *s = (Split*)splits->data;
KvpFrame *frame = kvp_frame_get_frame(xaccSplitGetSlots(s), GNC_SX_ID);
GUID *sx_split_acct_guid = kvp_frame_get_guid(frame, GNC_SX_ACCOUNT);
GncGUID *sx_split_acct_guid = kvp_frame_get_guid(frame, GNC_SX_ACCOUNT);
if (guid_equal(acct_guid, sx_split_acct_guid))
{
rtn = g_list_append(rtn, sx);

4
src/engine/SchedXaction.c
View File

@ -367,7 +367,7 @@ static void
xaccSchedXactionInit(SchedXaction *sx, QofBook *book)
{
Account *ra;
const GUID *guid;
const GncGUID *guid;
qof_instance_init_data (&sx->inst, GNC_ID_SCHEDXACTION, book);
@ -962,7 +962,7 @@ pack_split_info (TTSplitInfo *s_info, Account *parent_acct,
Split *split;
KvpFrame *split_frame;
KvpValue *tmp_value;
const GUID *acc_guid;
const GncGUID *acc_guid;
split = xaccMallocSplit(book);

Some files were not shown because too many files have changed in this diff Show More