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

Change enum names to avoid name collision of IGNORE identifier, especially with win32 headers.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15211 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-12-12 11:41:59 +00:00
parent 12f43b1bec
commit f643a37cc8
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/gnome/dialog-sxsincelast.c
View File

@ -151,21 +151,21 @@ typedef enum {
/** /**
* The states a to-be-created SX can be in... * The states a to-be-created SX can be in...
* TO_CREATE : The SX is ready to be created, depending on variable-binding * SX_TO_CREATE : The SX is ready to be created, depending on variable-binding
* requirements. * requirements.
* IGNORE : Drop the SX on the floor forever. * SX_IGNORE : Drop the SX on the floor forever.
* POSTPONE : Bring this SX up in the future, but we're not going to * SX_POSTPONE : Bring this SX up in the future, but we're not going to
* create it right now. * create it right now.
* [MAX_STATE] : The maximum real value. * SX_[MAX_STATE] : The maximum real value.
* UNDEF : Only used for prevState, to indicate that we haven't * SX_UNDEF : Only used for prevState, to indicate that we haven't
* processed this instance, yet. * processed this instance, yet.
**/ **/
typedef enum { typedef enum {
TO_CREATE, SX_TO_CREATE,
IGNORE, SX_IGNORE,
POSTPONE, SX_POSTPONE,
MAX_STATE, SX_MAX_STATE,
UNDEF SX_UNDEF
} ToCreateState; } ToCreateState;
typedef struct toCreateTuple_ { typedef struct toCreateTuple_ {
@ -1141,17 +1141,17 @@ sxsld_process_to_create_instance(sxSinceLastData *sxsld,
/* Undo the previous work. */ /* Undo the previous work. */
switch ( tci->prevState ) { switch ( tci->prevState ) {
case IGNORE: case SX_IGNORE:
switch ( tci->state ) { switch ( tci->state ) {
case IGNORE: case SX_IGNORE:
/* Keep ignoring. */ /* Keep ignoring. */
break; break;
case POSTPONE: case SX_POSTPONE:
/* remove from postponed list. */ /* remove from postponed list. */
gnc_sx_remove_defer_instance( tci->parentTCT->sx, gnc_sx_remove_defer_instance( tci->parentTCT->sx,
tci->sxStateData ); tci->sxStateData );
break; break;
case TO_CREATE: case SX_TO_CREATE:
/* del prev txns. */ /* del prev txns. */
sxsld_revert_to_create_txns( sxsld, tci ); sxsld_revert_to_create_txns( sxsld, tci );
break; break;
@ -1159,20 +1159,20 @@ sxsld_process_to_create_instance(sxSinceLastData *sxsld,
g_assert( FALSE ); g_assert( FALSE );
} }
break; break;
case POSTPONE: case SX_POSTPONE:
if ( tci->state != POSTPONE ) { if ( tci->state != SX_POSTPONE ) {
/* remove from postponed list. */ /* remove from postponed list. */
gnc_sx_remove_defer_instance( tci->parentTCT->sx, gnc_sx_remove_defer_instance( tci->parentTCT->sx,
tci->sxStateData ); tci->sxStateData );
} }
break; break;
case TO_CREATE: case SX_TO_CREATE:
if ( tci->state != TO_CREATE ) { if ( tci->state != SX_TO_CREATE ) {
/* del prev txns. */ /* del prev txns. */
sxsld_revert_to_create_txns( sxsld, tci ); sxsld_revert_to_create_txns( sxsld, tci );
} }
break; break;
case UNDEF: case SX_UNDEF:
/* Fine; do nothing. */ /* Fine; do nothing. */
break; break;
default: default:
@ -1182,11 +1182,11 @@ sxsld_process_to_create_instance(sxSinceLastData *sxsld,
/* Now, process the currently-requested state. */ /* Now, process the currently-requested state. */
switch ( tci->state ) { switch ( tci->state ) {
case IGNORE: case SX_IGNORE:
/* Fine ... just ignore it. */ /* Fine ... just ignore it. */
break; break;
case POSTPONE: case SX_POSTPONE:
if ( tci->prevState == POSTPONE ) { if ( tci->prevState == SX_POSTPONE ) {
break; break;
} }
/* add to the postponed list. */ /* add to the postponed list. */
@ -1199,7 +1199,7 @@ sxsld_process_to_create_instance(sxSinceLastData *sxsld,
} }
gnc_sx_add_defer_instance( tci->parentTCT->sx, tci->sxStateData ); gnc_sx_add_defer_instance( tci->parentTCT->sx, tci->sxStateData );
break; break;
case TO_CREATE: case SX_TO_CREATE:
/* Go ahead and create... */ /* Go ahead and create... */
toRet = sxsld_create_to_create_txns(sxsld, tci, creation_errors); toRet = sxsld_create_to_create_txns(sxsld, tci, creation_errors);
break; break;
@ -1238,7 +1238,7 @@ sxsld_process_to_create_instance(sxSinceLastData *sxsld,
* ignoring the first instance. We only want to incrment the * ignoring the first instance. We only want to incrment the
* counters for newly-discovered-as-to-be-created SXes. * counters for newly-discovered-as-to-be-created SXes.
*/ */
if ( tci->origState == UNDEF ) { if ( tci->origState == SX_UNDEF ) {
tmp = gnc_sx_get_instance_count( sx, NULL ); tmp = gnc_sx_get_instance_count( sx, NULL );
gnc_sx_set_instance_count( sx, tmp+1 ); gnc_sx_set_instance_count( sx, tmp+1 );
if ( xaccSchedXactionHasOccurDef( sx ) ) { if ( xaccSchedXactionHasOccurDef( sx ) ) {
@ -1278,8 +1278,8 @@ sxsld_process_to_create_page( sxSinceLastData *sxsld )
tcInstList = tcInstList->next ) { tcInstList = tcInstList->next ) {
tci = (toCreateInstance*)tcInstList->data; tci = (toCreateInstance*)tcInstList->data;
if ( tci->state == IGNORE if ( tci->state == SX_IGNORE
|| tci->state == POSTPONE ) { || tci->state == SX_POSTPONE ) {
continue; continue;
} }
@ -1506,10 +1506,10 @@ cancel_check( GnomeDruidPage *druid_page,
tciList; tciList;
tciList = tciList->next ) { tciList = tciList->next ) {
tci = (toCreateInstance*)tciList->data; tci = (toCreateInstance*)tciList->data;
if ( tci->prevState == POSTPONE if ( tci->prevState == SX_POSTPONE
&& tci->origState != POSTPONE ) { && tci->origState != SX_POSTPONE ) {
/* Any valid [non-null] 'prevState != /* Any valid [non-null] 'prevState !=
* POSTPONE' sx temporal state * SX_POSTPONE' sx temporal state
* pointers will be destroyed at the * pointers will be destroyed at the
* destruction of the dialog [the * destruction of the dialog [the
* non-cancel case], so if we need to * non-cancel case], so if we need to
@ -1720,9 +1720,9 @@ generate_instances(SchedXaction *sx,
tci->dirty = FALSE; tci->dirty = FALSE;
tci->date = g_date_new(); tci->date = g_date_new();
*tci->date = gd; *tci->date = gd;
tci->origState = UNDEF; tci->origState = SX_UNDEF;
tci->state = TO_CREATE; tci->state = SX_TO_CREATE;
tci->prevState = UNDEF; tci->prevState = SX_UNDEF;
tci->sxStateData = tci->sxStateData =
gnc_sx_clone_temporal_state( seqStateData ); gnc_sx_clone_temporal_state( seqStateData );
*instanceList = g_list_append( *instanceList, tci ); *instanceList = g_list_append( *instanceList, tci );
@ -1854,7 +1854,7 @@ add_to_create_list_to_gui( GList *toCreateList, sxSinceLastData *sxsld )
switch ( tci->state ) { switch ( tci->state ) {
case TO_CREATE: case SX_TO_CREATE:
allVarsBound = TRUE; allVarsBound = TRUE;
g_hash_table_foreach( tci->varBindings, g_hash_table_foreach( tci->varBindings,
andequal_numerics_set, andequal_numerics_set,
@ -1864,10 +1864,10 @@ add_to_create_list_to_gui( GList *toCreateList, sxSinceLastData *sxsld )
: _( "Needs values for variables" ) /* NEEDS_BINDINGS_TEXT */ : _( "Needs values for variables" ) /* NEEDS_BINDINGS_TEXT */
); );
break; break;
case IGNORE: case SX_IGNORE:
rowText[1] = _( "Ignored" ) /* IGNORE_TEXT */ ; rowText[1] = _( "Ignored" ) /* IGNORE_TEXT */ ;
break; break;
case POSTPONE: case SX_POSTPONE:
rowText[1] = _( "Postponed" ) /* POSTPONE_TEXT */ ; rowText[1] = _( "Postponed" ) /* POSTPONE_TEXT */ ;
break; break;
default: default:
@ -2062,9 +2062,9 @@ processSelectedReminderList( GList *goodList, sxSinceLastData *sxsld )
tci->parentTCT = tct; tci->parentTCT = tct;
tci->date = g_date_new(); tci->date = g_date_new();
*tci->date = *rit->occurDate; *tci->date = *rit->occurDate;
tci->state = TO_CREATE; tci->state = SX_TO_CREATE;
tci->prevState = UNDEF; tci->prevState = SX_UNDEF;
tci->origState = UNDEF; tci->origState = SX_UNDEF;
tci->varBindings = NULL; tci->varBindings = NULL;
tci->node = NULL; tci->node = NULL;
tci->sxStateData = rit->sxStateData; tci->sxStateData = rit->sxStateData;
@ -2162,9 +2162,9 @@ sxsincelast_populate( sxSinceLastData *sxsld )
xaccSchedXactionGetNextInstance( xaccSchedXactionGetNextInstance(
sx, tci->sxStateData ); sx, tci->sxStateData );
tci->dirty = FALSE; tci->dirty = FALSE;
tci->state = POSTPONE; tci->state = SX_POSTPONE;
tci->prevState = POSTPONE; tci->prevState = SX_POSTPONE;
tci->origState = POSTPONE; tci->origState = SX_POSTPONE;
instanceList = g_list_append( instanceList, tci ); instanceList = g_list_append( instanceList, tci );
tci = NULL; tci = NULL;
@ -3449,7 +3449,7 @@ sxsld_get_future_created_txn_count( sxSinceLastData *sxsld )
} }
switch ( tci->state ) { switch ( tci->state ) {
case TO_CREATE: case SX_TO_CREATE:
/* We were postpone or ignore, before ... so /* We were postpone or ignore, before ... so
* add the new txns in. */ * add the new txns in. */
@ -3466,18 +3466,18 @@ sxsld_get_future_created_txn_count( sxSinceLastData *sxsld )
g_list_free( txnSet ); g_list_free( txnSet );
txnSet = NULL; txnSet = NULL;
break; break;
case IGNORE: case SX_IGNORE:
case POSTPONE: case SX_POSTPONE:
/* We were {postpone,ignore} or to-create, /* We were {postpone,ignore} or to-create,
* before, so either continue to ignore or * before, so either continue to ignore or
* subtract out the txns. */ * subtract out the txns. */
if ( tci->prevState != TO_CREATE ) { if ( tci->prevState != SX_TO_CREATE ) {
continue; continue;
} }
toRet -= g_list_length( tci->createdTxnGUIDs ); toRet -= g_list_length( tci->createdTxnGUIDs );
break; break;
case UNDEF: case SX_UNDEF:
case MAX_STATE: case SX_MAX_STATE:
g_assert( "We shouldn't see any of these." ); g_assert( "We shouldn't see any of these." );
break; break;
} }
@ -3511,7 +3511,7 @@ sxsld_disposition_changed( GtkMenuShell *b, gpointer d )
newCtreeText = "FIXME"; newCtreeText = "FIXME";
switch ( newState ) { switch ( newState ) {
case TO_CREATE: case SX_TO_CREATE:
newSensitivity = TRUE; newSensitivity = TRUE;
{ {
gboolean allVarsBound = TRUE; gboolean allVarsBound = TRUE;
@ -3525,11 +3525,11 @@ sxsld_disposition_changed( GtkMenuShell *b, gpointer d )
: _( NEEDS_BINDINGS_TEXT ) ); : _( NEEDS_BINDINGS_TEXT ) );
} }
break; break;
case IGNORE: case SX_IGNORE:
newSensitivity = FALSE; newSensitivity = FALSE;
newCtreeText = _( IGNORE_TEXT ); newCtreeText = _( IGNORE_TEXT );
break; break;
case POSTPONE: case SX_POSTPONE:
newSensitivity = FALSE; newSensitivity = FALSE;
newCtreeText = _( POSTPONE_TEXT ); newCtreeText = _( POSTPONE_TEXT );
break; break;
@ -3929,8 +3929,8 @@ gnc_sxsld_free_tci( toCreateInstance *tci )
* cancel-specific case handle that destruction [thus the * cancel-specific case handle that destruction [thus the
* valid-pointer check]. * valid-pointer check].
*/ */
if ( tci->prevState != POSTPONE if ( tci->prevState != SX_POSTPONE
&& tci->origState != POSTPONE && tci->origState != SX_POSTPONE
&& tci->sxStateData != NULL ) { && tci->sxStateData != NULL ) {
gnc_sx_destroy_temporal_state( tci->sxStateData ); gnc_sx_destroy_temporal_state( tci->sxStateData );
tci->sxStateData = NULL; tci->sxStateData = NULL;