r15206 - gnucash/trunk/src/gnome - Change enum names to avoid name collisions, especially with win32 headers.
Christian Stimming
cstim at cvs.gnucash.org
Tue Dec 12 06:24:16 EST 2006
Author: cstim
Date: 2006-12-12 06:24:14 -0500 (Tue, 12 Dec 2006)
New Revision: 15206
Trac: http://svn.gnucash.org/trac/changeset/15206
Modified:
gnucash/trunk/src/gnome/druid-loan.c
Log:
Change enum names to avoid name collisions, especially with win32 headers.
Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c 2006-12-12 02:51:37 UTC (rev 15205)
+++ gnucash/trunk/src/gnome/druid-loan.c 2006-12-12 11:24:14 UTC (rev 15206)
@@ -122,7 +122,7 @@
* . param account selection should fill in orig/cur principal amounts from
* the books.
* . initialize type freq to monthly.
- * . if LoanType <- !FIXED
+ * . if LoanType <- !GNC_FIXED
* . Frequency <- sensitive
**/
@@ -179,18 +179,18 @@
} RepayOptUIData;
typedef enum {
- FIXED = 0,
- VARIABLE,
- VARIABLE_3_1 = VARIABLE,
- VARIABLE_5_1,
- VARIABLE_7_1,
- VARIABLE_10_1,
+ GNC_FIXED = 0,
+ GNC_VARIABLE,
+ GNC_VARIABLE_3_1 = GNC_VARIABLE,
+ GNC_VARIABLE_5_1,
+ GNC_VARIABLE_7_1,
+ GNC_VARIABLE_10_1,
/* ... FIXME */
} LoanType;
typedef enum {
- MONTHS = 0,
- YEARS
+ GNC_MONTHS = 0,
+ GNC_YEARS
} PeriodSize;
/**
@@ -927,7 +927,7 @@
g_string_append_printf( gstr, "pmt( %.5f / 12 : %0.2f : %0.2f : 0 : 0 )",
(ldd->ld.interestRate / 100),
( ldd->ld.numPer
- * ( ldd->ld.perSize == MONTHS ? 1 : 12 ) ) * 1.,
+ * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
gnc_numeric_to_double(ldd->ld.principal) );
}
@@ -940,7 +940,7 @@
g_string_printf( gstr, "ppmt( %.5f / 12 : i : %0.2f : %0.2f : 0 : 0 )",
(ldd->ld.interestRate / 100),
( ldd->ld.numPer
- * ( ldd->ld.perSize == MONTHS ? 1 : 12 ) ) * 1.,
+ * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
gnc_numeric_to_double(ldd->ld.principal));
}
@@ -953,7 +953,7 @@
g_string_printf( gstr, "ipmt( %.5f / 12 : i : %0.2f : %0.2f : 0 : 0 )",
(ldd->ld.interestRate / 100),
( ldd->ld.numPer
- * ( ldd->ld.perSize == MONTHS ? 1 : 12 ) ) * 1.,
+ * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) ) * 1.,
gnc_numeric_to_double( ldd->ld.principal ) );
}
@@ -1053,7 +1053,7 @@
ldd = (LoanDruidData*)ud;
index = gtk_combo_box_get_active( ldd->prmType );
gtk_widget_set_sensitive( GTK_WIDGET(ldd->prmVarFrame),
- index != FIXED );
+ index != GNC_FIXED );
}
static
@@ -1163,7 +1163,7 @@
ldd->ld.principal = gnc_amount_edit_get_amount( ldd->prmOrigPrincGAE );
ldd->ld.interestRate = gtk_spin_button_get_value( ldd->prmIrateSpin );
ldd->ld.type = gtk_combo_box_get_active( ldd->prmType );
- if ( ldd->ld.type != FIXED ) {
+ if ( ldd->ld.type != GNC_FIXED ) {
gnc_frequency_save_state( ldd->prmVarGncFreq,
ldd->ld.loanFreq,
ldd->ld.varStartDate );
@@ -1186,7 +1186,7 @@
{
ldd->ld.perSize =
(gtk_combo_box_get_active( ldd->prmLengthType )
- == MONTHS) ? MONTHS : YEARS;
+ == GNC_MONTHS) ? GNC_MONTHS : GNC_YEARS;
ldd->ld.numPer =
gtk_spin_button_get_value_as_int( ldd->prmLengthSpin );
ldd->ld.numMonRemain =
@@ -1205,7 +1205,7 @@
gnc_amount_edit_set_amount( ldd->prmOrigPrincGAE, ldd->ld.principal );
gtk_spin_button_set_value( ldd->prmIrateSpin, ldd->ld.interestRate );
gtk_combo_box_set_active( ldd->prmType, ldd->ld.type );
- if ( ldd->ld.type != FIXED ) {
+ if ( ldd->ld.type != GNC_FIXED ) {
gnc_frequency_setup( ldd->prmVarGncFreq,
ldd->ld.loanFreq,
ldd->ld.varStartDate );
@@ -2277,7 +2277,7 @@
/* Figure out the correct current instance-count for the txns in the
* SX. */
paymentSX->instNum =
- (ldd->ld.numPer * ( ldd->ld.perSize == YEARS ? 12 : 1 ))
+ (ldd->ld.numPer * ( ldd->ld.perSize == GNC_YEARS ? 12 : 1 ))
- ldd->ld.numMonRemain + 1;
paymentSX->mainTxn = gnc_ttinfo_malloc();
@@ -2564,7 +2564,7 @@
endDateMath = g_new0( struct tm, 1 );
g_date_to_struct_tm( ldd->ld.startDate, endDateMath );
monthsTotal = ( (ldd->ld.numPer - 1)
- * ( ldd->ld.perSize == MONTHS ? 1 : 12 ) );
+ * ( ldd->ld.perSize == GNC_MONTHS ? 1 : 12 ) );
endDateMath->tm_mon += monthsTotal;
g_date_set_time_t( end, mktime( endDateMath ) );
g_free( endDateMath );
More information about the gnucash-changes
mailing list