r19476 - gnucash/trunk/src - Refactoring: replace all GNC_RND_* and GNC_DENOM_* occurences with their GNC_HOW_RND_* and GNC_HOW_DENOM_* equivalents
Geert Janssens
gjanssens at code.gnucash.org
Thu Aug 26 13:22:07 EDT 2010
Author: gjanssens
Date: 2010-08-26 13:22:06 -0400 (Thu, 26 Aug 2010)
New Revision: 19476
Trac: http://svn.gnucash.org/trac/changeset/19476
Modified:
gnucash/trunk/src/app-utils/gnc-euro.c
gnucash/trunk/src/app-utils/gnc-exp-parser.c
gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/app-utils/test/test-print-parse-amount.c
gnucash/trunk/src/business/business-gnome/dialog-billterms.c
gnucash/trunk/src/business/business-gnome/dialog-invoice.c
gnucash/trunk/src/engine/Scrub.c
gnucash/trunk/src/engine/Split.c
gnucash/trunk/src/engine/Transaction.c
gnucash/trunk/src/engine/gncBusGuile.c
gnucash/trunk/src/engine/gncEntry.c
gnucash/trunk/src/engine/gncInvoice.c
gnucash/trunk/src/engine/gncTaxTable.c
gnucash/trunk/src/engine/test/test-transaction-reversal.c
gnucash/trunk/src/gnome-utils/dialog-transfer.c
gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
gnucash/trunk/src/gnome-utils/window-main-summarybar.c
gnucash/trunk/src/gnome/dialog-fincalc.c
gnucash/trunk/src/gnome/dialog-sx-editor.c
gnucash/trunk/src/gnome/dialog-sx-from-trans.c
gnucash/trunk/src/gnome/druid-hierarchy.c
gnucash/trunk/src/gnome/druid-loan.c
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/lot-viewer.c
gnucash/trunk/src/gnome/window-autoclear.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c
gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c
gnucash/trunk/src/import-export/csv/gnc-csv-model.c
gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c
gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
gnucash/trunk/src/import-export/qif/qif-objects.c
gnucash/trunk/src/libqof/qof/gnc-numeric.c
gnucash/trunk/src/libqof/qof/gnc-numeric.h
gnucash/trunk/src/register/ledger-core/split-register-control.c
gnucash/trunk/src/register/ledger-core/split-register-model-save.c
gnucash/trunk/src/register/ledger-core/split-register-model.c
gnucash/trunk/src/register/ledger-core/split-register.c
gnucash/trunk/src/register/register-core/pricecell.c
Log:
Refactoring: replace all GNC_RND_* and GNC_DENOM_* occurences with their GNC_HOW_RND_* and GNC_HOW_DENOM_* equivalents
And then remove the deprecated definitions.
Modified: gnucash/trunk/src/app-utils/gnc-euro.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-euro.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/app-utils/gnc-euro.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -164,12 +164,12 @@
{
gnc_numeric rate;
- rate = double_to_gnc_numeric (result->rate, 100000, GNC_RND_ROUND);
+ rate = double_to_gnc_numeric (result->rate, 100000, GNC_HOW_RND_ROUND);
/* Which rounding should be used here? H. Thoma said
- GNC_RND_FLOOR, but I (cstim) think he's wrong -- the official
- rules say you *have* to use GNC_RND_ROUND! */
- return gnc_numeric_div (value, rate, 100, GNC_RND_ROUND);
+ GNC_HOW_RND_FLOOR, but I (cstim) think he's wrong -- the official
+ rules say you *have* to use GNC_HOW_RND_ROUND! */
+ return gnc_numeric_div (value, rate, 100, GNC_HOW_RND_ROUND);
}
}
@@ -198,10 +198,10 @@
{
gnc_numeric rate;
- rate = double_to_gnc_numeric (result->rate, 100000, GNC_RND_ROUND);
+ rate = double_to_gnc_numeric (result->rate, 100000, GNC_HOW_RND_ROUND);
return gnc_numeric_mul (value, rate, gnc_commodity_get_fraction (currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
}
@@ -228,7 +228,7 @@
return gnc_numeric_zero ();
return double_to_gnc_numeric (result->rate, GNC_DENOM_AUTO,
- GNC_DENOM_SIGFIGS(6) | GNC_RND_ROUND);
+ GNC_HOW_DENOM_SIGFIGS(6) | GNC_HOW_RND_ROUND);
}
/* ------------------------------------------------------ */
Modified: gnucash/trunk/src/app-utils/gnc-exp-parser.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-exp-parser.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/app-utils/gnc-exp-parser.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -393,7 +393,7 @@
result = g_new0( gnc_numeric, 1 );
*result = double_to_gnc_numeric( scm_num2dbl(scmTmp, G_STRFUNC),
GNC_DENOM_AUTO,
- GNC_DENOM_SIGFIGS(6) | GNC_RND_ROUND );
+ GNC_HOW_DENOM_SIGFIGS(6) | GNC_HOW_RND_ROUND );
/* FIXME: cleanup scmArgs = scm_list, cons'ed cells? */
return (void*)result;
}
@@ -437,19 +437,19 @@
{
case ADD_OP:
result->value = gnc_numeric_add (left->value, right->value,
- GNC_DENOM_AUTO, GNC_DENOM_EXACT);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
break;
case SUB_OP:
result->value = gnc_numeric_sub (left->value, right->value,
- GNC_DENOM_AUTO, GNC_DENOM_EXACT);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
break;
case DIV_OP:
result->value = gnc_numeric_div (left->value, right->value,
- GNC_DENOM_AUTO, GNC_DENOM_EXACT);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
break;
case MUL_OP:
result->value = gnc_numeric_mul (left->value, right->value,
- GNC_DENOM_AUTO, GNC_DENOM_EXACT);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
break;
case ASN_OP:
result->value = right->value;
Modified: gnucash/trunk/src/app-utils/gnc-sx-instance-model.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -280,7 +280,7 @@
{
var->value = double_to_gnc_numeric(rand() + 2, 1,
GNC_NUMERIC_RND_MASK
- | GNC_RND_FLOOR);
+ | GNC_HOW_RND_FLOOR);
}
void
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1407,7 +1407,7 @@
{
rounding.num = 5; /* Limit the denom to 10^13 ~= 2^44, leaving max at ~524288 */
rounding.denom = pow(10, max_dp + 1);
- val = gnc_numeric_add(val, rounding, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ val = gnc_numeric_add(val, rounding, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
/* Yes, rounding up can cause overflow. Check for it. */
if (gnc_numeric_check(val))
{
Modified: gnucash/trunk/src/app-utils/test/test-print-parse-amount.c
===================================================================
--- gnucash/trunk/src/app-utils/test/test-print-parse-amount.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/app-utils/test/test-print-parse-amount.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -55,7 +55,7 @@
print_info.force_fit = 0;
print_info.round = 0;
- n1 = gnc_numeric_convert (n, fraction, GNC_RND_ROUND);
+ n1 = gnc_numeric_convert (n, fraction, GNC_HOW_RND_ROUND);
if (gnc_numeric_check(n1))
{
do_test_args((gnc_numeric_check(n1) == GNC_ERROR_OVERFLOW),
@@ -108,11 +108,11 @@
IS_VALID_NUM(n, n);
test_num (n);
- n1 = gnc_numeric_mul (n, n, n.denom, GNC_RND_ROUND);
+ n1 = gnc_numeric_mul (n, n, n.denom, GNC_HOW_RND_ROUND);
IS_VALID_NUM(n1, n);
test_num (n);
- n1 = gnc_numeric_mul (n, n, n.denom, GNC_RND_ROUND);
+ n1 = gnc_numeric_mul (n, n, n.denom, GNC_HOW_RND_ROUND);
IS_VALID_NUM(n1, n);
test_num (n);
}
Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -160,7 +160,7 @@
gdouble fl = 0.0;
fl = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
- val = double_to_gnc_numeric (fl, 100000, GNC_RND_ROUND);
+ val = double_to_gnc_numeric (fl, 100000, GNC_HOW_RND_ROUND);
func (term, val);
}
Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1344,7 +1344,7 @@
{
char string[256];
- amt = gnc_numeric_convert (amt, gnc_commodity_get_fraction(com), GNC_RND_ROUND);
+ amt = gnc_numeric_convert (amt, gnc_commodity_get_fraction(com), GNC_HOW_RND_ROUND);
xaccSPrintAmount (string, amt, gnc_default_print_info (TRUE));
gtk_label_set_text (label, string);
}
@@ -1399,7 +1399,7 @@
{
amount = gncInvoiceGetTotalOf (invoice, GNC_PAYMENT_CASH);
amount = gnc_numeric_sub (amount, to_charge_amt,
- gnc_commodity_get_fraction (currency), GNC_RND_ROUND);
+ gnc_commodity_get_fraction (currency), GNC_HOW_RND_ROUND);
gnc_invoice_reset_total_label (GTK_LABEL (iw->total_cash_label), amount, currency);
}
@@ -1407,7 +1407,7 @@
{
amount = gncInvoiceGetTotalOf (invoice, GNC_PAYMENT_CARD);
amount = gnc_numeric_add (amount, to_charge_amt,
- gnc_commodity_get_fraction (currency), GNC_RND_ROUND);
+ gnc_commodity_get_fraction (currency), GNC_HOW_RND_ROUND);
gnc_invoice_reset_total_label (GTK_LABEL (iw->total_charge_label), amount, currency);
}
}
Modified: gnucash/trunk/src/engine/Scrub.c
===================================================================
--- gnucash/trunk/src/engine/Scrub.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/Scrub.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -663,13 +663,13 @@
if (balance_split && balance_split != split)
{
gnc_numeric convrate = gnc_numeric_div (amount, value,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
gnc_numeric old_value, new_value;
old_value = xaccSplitGetValue(balance_split);
new_value = gnc_numeric_div (xaccSplitGetAmount(balance_split),
convrate,
gnc_commodity_get_fraction(currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
if (! gnc_numeric_equal (old_value, new_value))
{
xaccTransBeginEdit (trans);
Modified: gnucash/trunk/src/engine/Split.c
===================================================================
--- gnucash/trunk/src/engine/Split.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/Split.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1329,7 +1329,7 @@
convrate = xaccTransGetAccountConvRate(txn, account);
return gnc_numeric_mul (value, convrate,
gnc_commodity_get_fraction (to_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
/********************************************************************\
Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/Transaction.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -975,7 +975,7 @@
if (!trans || !acc) return total;
total = gnc_numeric_convert (total, xaccAccountGetCommoditySCU (acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
FOR_EACH_SPLIT(trans, if (acc == xaccSplitGetAccount(s))
total = gnc_numeric_add_fixed(
total, xaccSplitGetAmount(s)));
@@ -1025,7 +1025,7 @@
if (gnc_numeric_zero_p (value))
PWARN("How can amount be nonzero and value be zero?");
- convrate = gnc_numeric_div(amount, value, GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ convrate = gnc_numeric_div(amount, value, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
return convrate;
}
Modified: gnucash/trunk/src/engine/gncBusGuile.c
===================================================================
--- gnucash/trunk/src/engine/gncBusGuile.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/gncBusGuile.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -85,7 +85,7 @@
com = xaccAccountGetCommodity (av->account);
val = gnc_numeric_convert (av->value, gnc_commodity_get_fraction (com),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
return scm_cons (SWIG_NewPointerObj(av->account, account_type, 0),
gnc_numeric_to_scm (val));
Modified: gnucash/trunk/src/engine/gncEntry.c
===================================================================
--- gnucash/trunk/src/engine/gncEntry.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/gncEntry.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1050,7 +1050,7 @@
/* Step 1: compute the aggregate price */
- aggregate = gnc_numeric_mul (qty, price, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ aggregate = gnc_numeric_mul (qty, price, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
/* Step 2: compute the pre-tax aggregate */
@@ -1064,11 +1064,11 @@
{
case GNC_AMT_TYPE_VALUE:
tvalue = gnc_numeric_add (tvalue, amount, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
break;
case GNC_AMT_TYPE_PERCENT:
tpercent = gnc_numeric_add (tpercent, amount, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
break;
default:
g_warning ("Unknown tax type: %d", gncTaxTableEntryGetType (entry));
@@ -1076,7 +1076,7 @@
}
/* now we need to convert from 5% -> .05 */
tpercent = gnc_numeric_div (tpercent, percent, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
/* Next, actually compute the pre-tax aggregate value based on the
* taxincluded flag.
@@ -1088,12 +1088,12 @@
* pretax = (aggregate-tvalue)/(1+tpercent)
*/
pretax = gnc_numeric_sub (aggregate, tvalue, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
pretax = gnc_numeric_div (pretax,
gnc_numeric_add (tpercent,
gnc_numeric_create (1, 1),
- GNC_DENOM_AUTO, GNC_DENOM_LCD),
- GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD),
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
else
{
@@ -1128,12 +1128,12 @@
if (discount_type == GNC_AMT_TYPE_PERCENT)
{
discount = gnc_numeric_div (discount, percent, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
discount = gnc_numeric_mul (pretax, discount, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
}
- result = gnc_numeric_sub (pretax, discount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ result = gnc_numeric_sub (pretax, discount, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
/* Figure out when to apply the tax, pretax or pretax-discount */
if (discount_how == GNC_DISC_PRETAX)
@@ -1147,17 +1147,17 @@
{
gnc_numeric after_tax;
- tax = gnc_numeric_mul (pretax, tpercent, GNC_DENOM_AUTO, GNC_DENOM_LCD);
- after_tax = gnc_numeric_add (pretax, tax, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ tax = gnc_numeric_mul (pretax, tpercent, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ after_tax = gnc_numeric_add (pretax, tax, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
after_tax = gnc_numeric_add (after_tax, tvalue, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
discount = gnc_numeric_div (discount, percent, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
discount = gnc_numeric_mul (after_tax, discount, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
}
- result = gnc_numeric_sub (pretax, discount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ result = gnc_numeric_sub (pretax, discount, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
break;
default:
@@ -1173,13 +1173,13 @@
if (discount_value != NULL)
{
- if (SCU) discount = gnc_numeric_convert(discount, SCU, GNC_RND_ROUND);
+ if (SCU) discount = gnc_numeric_convert(discount, SCU, GNC_HOW_RND_ROUND);
*discount_value = discount;
}
if (value != NULL)
{
- if (SCU) result = gnc_numeric_convert(result, SCU, GNC_RND_ROUND);
+ if (SCU) result = gnc_numeric_convert(result, SCU, GNC_HOW_RND_ROUND);
*value = result;
}
@@ -1200,14 +1200,14 @@
switch (gncTaxTableEntryGetType (entry))
{
case GNC_AMT_TYPE_VALUE:
- if (SCU) amount = gnc_numeric_convert(amount, SCU, GNC_RND_ROUND);
+ if (SCU) amount = gnc_numeric_convert(amount, SCU, GNC_HOW_RND_ROUND);
taxes = gncAccountValueAdd (taxes, acc, amount);
break;
case GNC_AMT_TYPE_PERCENT:
amount = gnc_numeric_div (amount, percent, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
- tax = gnc_numeric_mul (pretax, amount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
- if (SCU) tax = gnc_numeric_convert(tax, SCU, GNC_RND_ROUND);
+ GNC_HOW_DENOM_LCD);
+ tax = gnc_numeric_mul (pretax, amount, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
+ if (SCU) tax = gnc_numeric_convert(tax, SCU, GNC_HOW_RND_ROUND);
taxes = gncAccountValueAdd (taxes, acc, tax);
break;
default:
@@ -1303,18 +1303,18 @@
&(entry->b_value), NULL, &(entry->b_tax_values));
entry->i_value_rounded = gnc_numeric_convert (entry->i_value, denom,
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
entry->i_disc_value_rounded = gnc_numeric_convert (entry->i_disc_value, denom,
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
entry->i_tax_value = gncAccountValueTotal (entry->i_tax_values);
entry->i_tax_value_rounded = gnc_numeric_convert (entry->i_tax_value, denom,
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
entry->b_value_rounded = gnc_numeric_convert (entry->b_value, denom,
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
entry->b_tax_value = gncAccountValueTotal (entry->b_tax_values);
entry->b_tax_value_rounded = gnc_numeric_convert (entry->b_tax_value, denom,
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
entry->values_dirty = FALSE;
}
Modified: gnucash/trunk/src/engine/gncInvoice.c
===================================================================
--- gnucash/trunk/src/engine/gncInvoice.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/gncInvoice.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -805,7 +805,7 @@
if (gnc_numeric_check (value) == GNC_ERROR_OK)
{
if (use_value)
- total = gnc_numeric_add (total, value, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ total = gnc_numeric_add (total, value, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
else
g_warning ("bad value in our entry");
@@ -813,7 +813,7 @@
if (gnc_numeric_check (tax) == GNC_ERROR_OK)
{
if (use_tax)
- total = gnc_numeric_add (total, tax, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ total = gnc_numeric_add (total, tax, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
else
g_warning ("bad tax-value in our entry");
@@ -1330,7 +1330,7 @@
}
else
- total = gnc_numeric_add (total, value, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ total = gnc_numeric_add (total, value, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
else
@@ -1342,7 +1342,7 @@
/* ... and add the tax total */
if (gnc_numeric_check (tax) == GNC_ERROR_OK)
- total = gnc_numeric_add (total, tax, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ total = gnc_numeric_add (total, tax, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
else
g_warning ("bad tax in our entry");
@@ -1416,7 +1416,7 @@
invoice->currency);
total = gnc_numeric_sub (total, invoice->to_charge_amount,
- GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
/* Now create the Posted split (which is negative -- it's a credit) */
@@ -1784,7 +1784,7 @@
}
/* reduce the payment_value by split_amt */
- payment_value = gnc_numeric_sub (payment_value, split_amt, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ payment_value = gnc_numeric_sub (payment_value, split_amt, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
/* Create the split for this lot in the post account */
split = xaccMallocSplit (book);
Modified: gnucash/trunk/src/engine/gncTaxTable.c
===================================================================
--- gnucash/trunk/src/engine/gncTaxTable.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/gncTaxTable.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -966,7 +966,7 @@
if (res->account == acc)
{
res->value = gnc_numeric_add (res->value, value, GNC_DENOM_AUTO,
- GNC_DENOM_LCD);
+ GNC_HOW_DENOM_LCD);
return list;
}
}
@@ -1000,7 +1000,7 @@
for ( ; list ; list = list->next)
{
GncAccountValue *val = list->data;
- total = gnc_numeric_add (total, val->value, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ total = gnc_numeric_add (total, val->value, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
return total;
}
Modified: gnucash/trunk/src/engine/test/test-transaction-reversal.c
===================================================================
--- gnucash/trunk/src/engine/test/test-transaction-reversal.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/engine/test/test-transaction-reversal.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -93,7 +93,7 @@
{
old = xaccSplitGetAmount(xaccTransGetSplit(transaction, i));
new = xaccSplitGetAmount(xaccTransGetSplit(new_trans, i));
- result = gnc_numeric_add(old, new, GNC_DENOM_AUTO, GNC_DENOM_FIXED);
+ result = gnc_numeric_add(old, new, GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
if (gnc_numeric_eq(old, gnc_numeric_neg(new)))
{
msg = g_strdup_printf("Amount of split %d wrong after reversal\n", i);
@@ -102,7 +102,7 @@
old = xaccSplitGetValue(xaccTransGetSplit(transaction, i));
new = xaccSplitGetValue(xaccTransGetSplit(new_trans, i));
- result = gnc_numeric_add(old, new, GNC_DENOM_AUTO, GNC_DENOM_FIXED);
+ result = gnc_numeric_add(old, new, GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
if (gnc_numeric_eq(old, gnc_numeric_neg(new)))
{
msg = g_strdup_printf("Value of split %d wrong after reversal\n", i);
Modified: gnucash/trunk/src/gnome/dialog-fincalc.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-fincalc.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/dialog-fincalc.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -151,12 +151,12 @@
gnc_amount_edit_set_damount (GNC_AMOUNT_EDIT(fcd->amounts[FUTURE_VALUE]),
-fcd->financial_info.fv);
- pmt = double_to_gnc_numeric (fcd->financial_info.pmt, 100000, GNC_RND_ROUND);
+ pmt = double_to_gnc_numeric (fcd->financial_info.pmt, 100000, GNC_HOW_RND_ROUND);
commodity = gnc_default_currency ();
total = gnc_numeric_mul (npp, pmt, gnc_commodity_get_fraction (commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSPrintAmount (string, total, gnc_default_print_info (FALSE));
gtk_label_set_text (GTK_LABEL(fcd->payment_total_label), string);
Modified: gnucash/trunk/src/gnome/dialog-sx-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/dialog-sx-editor.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -669,7 +669,7 @@
}
tcds->creditSum =
gnc_numeric_add( tcds->creditSum, tmp, 100,
- (GNC_DENOM_AUTO | GNC_DENOM_LCD) );
+ (GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD) );
tmp = gnc_numeric_zero();
}
v = kvp_frame_get_slot_path( f,
@@ -696,7 +696,7 @@
return FALSE;
}
tcds->debitSum = gnc_numeric_add( tcds->debitSum, tmp, 100,
- (GNC_DENOM_AUTO | GNC_DENOM_LCD) );
+ (GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD) );
tmp = gnc_numeric_zero();
}
}
Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -248,7 +248,7 @@
gnc_ttsplitinfo_set_memo(ttsi, xaccSplitGetMemo(sp));
runningBalance = gnc_numeric_add( runningBalance, split_value,
- 100, (GNC_DENOM_AUTO | GNC_DENOM_LCD) );
+ 100, (GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD) );
if (gnc_numeric_positive_p(split_value))
{
Modified: gnucash/trunk/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/druid-hierarchy.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -779,7 +779,7 @@
*/
{
int account_cmdty_fraction = xaccAccountGetCommoditySCU(account);
- amount = gnc_numeric_convert(amount, account_cmdty_fraction, GNC_RND_ROUND);
+ amount = gnc_numeric_convert(amount, account_cmdty_fraction, GNC_HOW_RND_ROUND);
}
set_final_balance (data->balance_hash, account, amount);
qof_event_gen (QOF_INSTANCE(account), QOF_EVENT_MODIFY, NULL);
Modified: gnucash/trunk/src/gnome/druid-loan.c
===================================================================
--- gnucash/trunk/src/gnome/druid-loan.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/druid-loan.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -2152,7 +2152,7 @@
GNCPrintAmountInfo pricePAI = gnc_default_price_print_info();
#define AMTBUF_LEN 64
gchar amtBuf[AMTBUF_LEN];
- gint GNCN_HOW = (GNC_DENOM_SIGFIGS(2) | GNC_RND_ROUND);
+ gint GNCN_HOW = (GNC_HOW_DENOM_SIGFIGS(2) | GNC_HOW_RND_ROUND);
/* We're going to use this a lot, below, so just create it once. */
xaccSPrintAmount( amtBuf,
@@ -2803,7 +2803,7 @@
PERR( "pmt Parsing error at %s", eloc );
continue;
}
- val = gnc_numeric_convert( val, 100, GNC_RND_ROUND );
+ val = gnc_numeric_convert( val, 100, GNC_HOW_RND_ROUND );
rowNumData[0] = val;
if ( ! gnc_exp_parser_parse_separate_vars(
@@ -2812,7 +2812,7 @@
PERR( "ppmt Parsing error at %s", eloc );
continue;
}
- val = gnc_numeric_convert( val, 100, GNC_RND_ROUND );
+ val = gnc_numeric_convert( val, 100, GNC_HOW_RND_ROUND );
rowNumData[1] = val;
if ( ! gnc_exp_parser_parse_separate_vars(
@@ -2821,7 +2821,7 @@
PERR( "ipmt Parsing error at %s", eloc );
continue;
}
- val = gnc_numeric_convert( val, 100, GNC_RND_ROUND );
+ val = gnc_numeric_convert( val, 100, GNC_HOW_RND_ROUND );
rowNumData[2] = val;
}
@@ -2860,8 +2860,8 @@
schedule, &curDate, &nextDate ) )
{
gint gncn_how =
- GNC_DENOM_SIGFIGS(2)
- | GNC_RND_ROUND;
+ GNC_HOW_DENOM_SIGFIGS(2)
+ | GNC_HOW_RND_ROUND;
gnc_numeric val;
rowNumData = (gnc_numeric*)g_hash_table_lookup( repayment_schedule,
&curDate );
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -670,7 +670,7 @@
amount = gnc_numeric_mul (amount, gnc_price_get_value (price),
gnc_commodity_get_fraction (currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSPrintAmount (string, amount, print_info);
Modified: gnucash/trunk/src/gnome/lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/lot-viewer.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/lot-viewer.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -390,7 +390,7 @@
trans = xaccSplitGetParent (s);
if (FALSE == gnc_commodity_equal (xaccTransGetCurrency(trans), currency)) continue;
- gains = gnc_numeric_add (gains, xaccSplitGetValue (s), GNC_DENOM_AUTO, GNC_DENOM_FIXED);
+ gains = gnc_numeric_add (gains, xaccSplitGetValue (s), GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
}
return gains;
}
Modified: gnucash/trunk/src/gnome/window-autoclear.c
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome/window-autoclear.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -134,7 +134,7 @@
/* Value we have to reach */
toclear_value = gnc_amount_edit_get_amount(data->end_value);
- toclear_value = gnc_numeric_convert(toclear_value, xaccAccountGetCommoditySCU(data->account), GNC_RND_NEVER);
+ toclear_value = gnc_numeric_convert(toclear_value, xaccAccountGetCommoditySCU(data->account), GNC_HOW_RND_NEVER);
/* Extract which splits are not cleared and compute the amount we have to clear */
for (node = xaccAccountGetSplitList(data->account); node; node = node->next)
Modified: gnucash/trunk/src/gnome-utils/dialog-transfer.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-transfer.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome-utils/dialog-transfer.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -170,7 +170,7 @@
from_amt = gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(xferData->amount_edit));
to_amt = gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(xferData->to_amount_edit));
- return(gnc_numeric_div(to_amt, from_amt, GNC_DENOM_AUTO, GNC_DENOM_REDUCE));
+ return(gnc_numeric_div(to_amt, from_amt, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE));
}
/* (maybe) update the price from the pricedb. */
@@ -215,7 +215,7 @@
PINFO("Found reverse price: 1 %s = %f %s", gnc_commodity_get_mnemonic(to),
gnc_numeric_to_double(price), gnc_commodity_get_mnemonic(from));
price = gnc_numeric_div (gnc_numeric_create (1, 1), price,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
}
/* and set the price entry */
@@ -288,7 +288,7 @@
if (gnc_numeric_zero_p (from_rate) || gnc_numeric_zero_p (to_rate))
gnc_xfer_dialog_update_price (xferData);
- price = gnc_numeric_div (to_rate, from_rate, GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ price = gnc_numeric_div (to_rate, from_rate, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(xferData->price_edit), price);
@@ -848,7 +848,7 @@
g_free(string);
rate = gnc_numeric_div(gnc_numeric_create (1, 1), rate,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
string = g_strdup_printf("1 %s = %f %s", to_mnemonic,
gnc_numeric_to_double(rate), from_mnemonic);
gtk_label_set_text(GTK_LABEL(xferData->conv_reverse), string);
@@ -901,7 +901,7 @@
to_amount = gnc_numeric_zero();
else
to_amount = gnc_numeric_mul(gnc_amount_edit_get_amount(amount_edit),
- price, scu, GNC_RND_ROUND);
+ price, scu, GNC_HOW_RND_ROUND);
/* Update the dialog. */
gnc_amount_edit_set_amount(to_amount_edit, to_amount);
@@ -950,7 +950,7 @@
gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (xferData->to_amount_edit));
price = gnc_xfer_dialog_compute_price(xferData);
- price = gnc_numeric_convert (price, PRECISION, GNC_RND_ROUND);
+ price = gnc_numeric_convert (price, PRECISION, GNC_HOW_RND_ROUND);
gnc_amount_edit_set_amount(GNC_AMOUNT_EDIT(xferData->price_edit), price);
gnc_xfer_dialog_update_conv_info(xferData);
@@ -1521,7 +1521,7 @@
from = to;
to = tmp;
value = gnc_numeric_div (gnc_numeric_create(1, 1), value,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
}
else if ((to != gnc_default_currency()) &&
(strcmp (gnc_commodity_get_mnemonic(from),
@@ -1531,7 +1531,7 @@
from = to;
to = tmp;
value = gnc_numeric_div (gnc_numeric_create(1, 1), value,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
}
price = gnc_price_create (xferData->book);
@@ -2260,7 +2260,7 @@
/* XXX: should we tell the user we've done the conversion? */
amount = gnc_numeric_div(
amount, rate,
- gnc_commodity_get_fraction(txn_cur), GNC_DENOM_REDUCE);
+ gnc_commodity_get_fraction(txn_cur), GNC_HOW_DENOM_REDUCE);
}
/* enter the accounts */
@@ -2270,7 +2270,7 @@
gnc_xfer_dialog_select_from_currency(xfer, xfer_com);
if (!gnc_numeric_zero_p(*exch_rate))
*exch_rate = gnc_numeric_div(gnc_numeric_create(1, 1), *exch_rate,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
amount = gnc_numeric_neg(amount);
}
else
@@ -2300,6 +2300,6 @@
*/
if (swap_amounts)
*exch_rate = gnc_numeric_div(gnc_numeric_create(1, 1), *exch_rate,
- GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
return FALSE;
}
Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -251,7 +251,7 @@
gnc_numeric old_amount = gae->amount;
if (gae->fraction > 0)
- amount = gnc_numeric_convert (amount, gae->fraction, GNC_RND_ROUND);
+ amount = gnc_numeric_convert (amount, gae->fraction, GNC_HOW_RND_ROUND);
gnc_amount_edit_set_amount (gae, amount);
@@ -354,7 +354,7 @@
else
fraction = 100000;
- amount = double_to_gnc_numeric (damount, fraction, GNC_RND_ROUND);
+ amount = double_to_gnc_numeric (damount, fraction, GNC_HOW_RND_ROUND);
gnc_amount_edit_set_amount (gae, amount);
}
Modified: gnucash/trunk/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/gnome-utils/window-main-summarybar.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -206,7 +206,7 @@
currency_accum->assets =
gnc_numeric_add (currency_accum->assets, end_amount,
gnc_commodity_get_fraction (account_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (non_currency)
@@ -214,7 +214,7 @@
non_curr_accum->assets =
gnc_numeric_add (non_curr_accum->assets, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (options.grand_total)
@@ -222,7 +222,7 @@
grand_total_accum->assets =
gnc_numeric_add (grand_total_accum->assets, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (options.euro && (currency_accum != euro_accum))
@@ -231,7 +231,7 @@
gnc_numeric_add (euro_accum->assets,
gnc_convert_to_euro(account_currency, end_amount),
gnc_commodity_get_fraction (euro_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
gnc_ui_accounts_recurse(account, currency_list, options);
@@ -256,11 +256,11 @@
currency_accum->profits =
gnc_numeric_add (currency_accum->profits, start_amount,
gnc_commodity_get_fraction (account_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
currency_accum->profits =
gnc_numeric_sub (currency_accum->profits, end_amount,
gnc_commodity_get_fraction (account_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (non_currency)
@@ -268,11 +268,11 @@
non_curr_accum->profits =
gnc_numeric_add (non_curr_accum->profits, start_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
non_curr_accum->profits =
gnc_numeric_sub (non_curr_accum->profits, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (options.grand_total)
@@ -281,12 +281,12 @@
gnc_numeric_add (grand_total_accum->profits,
start_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
grand_total_accum->profits =
gnc_numeric_sub (grand_total_accum->profits,
end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
if (options.euro && (currency_accum != euro_accum))
@@ -295,12 +295,12 @@
gnc_numeric_add (euro_accum->profits,
gnc_convert_to_euro(account_currency, start_amount),
gnc_commodity_get_fraction (euro_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
euro_accum->profits =
gnc_numeric_sub (euro_accum->profits,
gnc_convert_to_euro(account_currency, end_amount),
gnc_commodity_get_fraction (euro_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
gnc_ui_accounts_recurse(account, currency_list, options);
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-transfer.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -223,7 +223,7 @@
amount = double_to_gnc_numeric(
AB_Value_GetValueAsDouble(AB_Transaction_GetValue(ab_trans)),
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
gnc_xfer_dialog_set_amount(xfer_dialog, amount);
description = gnc_ab_description_to_gnc(ab_trans);
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -520,7 +520,7 @@
gnc_amount = double_to_gnc_numeric(
d_value,
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
if (!ab_value)
g_warning("transaction_cb: Oops, value was NULL. Using 0");
xaccSplitSetBaseValue(split, gnc_amount, xaccAccountGetCommodity(gnc_acc));
@@ -815,7 +815,7 @@
value = double_to_gnc_numeric(booked_value,
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
if (noted_value == 0.0 && booked_value == 0.0)
{
dialog = gtk_message_dialog_new(
Modified: gnucash/trunk/src/import-export/csv/gnc-csv-model.c
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-model.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-model.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -690,7 +690,7 @@
prop->value = g_new(gnc_numeric, 1);
*((gnc_numeric*)(prop->value)) =
double_to_gnc_numeric(value, xaccAccountGetCommoditySCU(prop->list->account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
return TRUE;
}
@@ -859,7 +859,7 @@
QofBook* book = gnc_account_get_book(list->account);
gnc_commodity* currency = xaccAccountGetCommodity(list->account);
gnc_numeric amount = double_to_gnc_numeric(0.0, xaccAccountGetCommoditySCU(list->account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
/* This flag is set to TRUE if we can use the "Deposit" or "Withdrawal" column. */
gboolean amount_set = FALSE;
@@ -909,7 +909,7 @@
amount = gnc_numeric_add(*((gnc_numeric*)(prop->value)),
amount,
xaccAccountGetCommoditySCU(list->account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
amount_set = TRUE;
/* We will use the "Deposit" and "Withdrawal" columns in preference to "Balance". */
trans_line->balance_set = FALSE;
@@ -922,7 +922,7 @@
amount = gnc_numeric_add(gnc_numeric_neg(*((gnc_numeric*)(prop->value))),
amount,
xaccAccountGetCommoditySCU(list->account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
amount_set = TRUE;
/* We will use the "Deposit" and "Withdrawal" columns in preference to "Balance". */
trans_line->balance_set = FALSE;
@@ -1154,7 +1154,7 @@
* any given transaction. */
gnc_numeric balance_offset = double_to_gnc_numeric(0.0,
xaccAccountGetCommoditySCU(account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
while (transactions != NULL)
{
GncCsvTransLine* trans_line = (GncCsvTransLine*)transactions->data;
@@ -1165,13 +1165,13 @@
gnc_numeric existing_balance = gnc_numeric_add(balance_offset,
xaccAccountGetBalanceAsOfDate(account, date),
xaccAccountGetCommoditySCU(account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
/* The amount of the transaction is the difference between the new and existing balance. */
gnc_numeric amount = gnc_numeric_sub(trans_line->balance,
existing_balance,
xaccAccountGetCommoditySCU(account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
SplitList* splits = xaccTransGetSplitList(trans_line->trans);
while (splits)
@@ -1187,7 +1187,7 @@
balance_offset = gnc_numeric_add(balance_offset,
amount,
xaccAccountGetCommoditySCU(account),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
transactions = g_list_next(transactions);
}
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-getbalance.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -265,7 +265,7 @@
value = double_to_gnc_numeric (booked_value,
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
if ((noted_value == 0.0) && (booked_value == 0.0))
{
dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -342,7 +342,7 @@
gnc_amount = double_to_gnc_numeric
(d_value,
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
if (!h_value)
g_warning("trans_list_cb: Oops, value was NULL. Using 0.\n");
xaccSplitSetBaseValue(split, gnc_amount, xaccAccountGetCommodity(gnc_acc));
Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-transfer.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -271,7 +271,7 @@
amount = double_to_gnc_numeric
(AB_Value_GetValue (AB_Transaction_GetValue (h_trans)),
xaccAccountGetCommoditySCU(gnc_acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
/*switch (trans_type) {
case SINGLE_DEBITNOTE:
gnc_xfer_dialog_set_amount (transdialog, gnc_numeric_neg (amount));
Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -385,7 +385,7 @@
gnc_amount = double_to_gnc_numeric (data.amount,
gnc_commodity_get_fraction(xaccTransGetCurrency(transaction)),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetBaseValue(split, gnc_amount, xaccTransGetCurrency(transaction));
/* Also put the ofx transaction's memo in the split's memo field */
@@ -440,10 +440,10 @@
gnc_amount = double_to_gnc_numeric (ofx_get_investment_amount(data),
gnc_commodity_get_fraction(investment_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
gnc_units = double_to_gnc_numeric (data.units,
gnc_commodity_get_fraction(investment_commodity),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetAmount(split, gnc_units);
xaccSplitSetValue(split, gnc_amount);
@@ -523,7 +523,7 @@
gnc_amount = double_to_gnc_numeric (data.amount,
gnc_commodity_get_fraction(xaccTransGetCurrency(transaction)),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetBaseValue(split, gnc_amount, xaccTransGetCurrency(transaction));
/* Also put the ofx transaction name in the splits memo field, or ofx memo if name is unavailable */
@@ -546,7 +546,7 @@
gnc_amount = double_to_gnc_numeric (-data.amount,/*OFX_INCOME amounts come in as positive numbers*/
gnc_commodity_get_fraction(xaccTransGetCurrency(transaction)),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetBaseValue(split, gnc_amount, xaccTransGetCurrency(transaction));
/* Also put the ofx transaction name in the splits memo field, or ofx memo if name is unavailable */
@@ -570,7 +570,7 @@
gnc_amount = double_to_gnc_numeric (-ofx_get_investment_amount(data),
gnc_commodity_get_fraction(xaccTransGetCurrency(transaction)),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetBaseValue(split, gnc_amount, xaccTransGetCurrency(transaction));
/* Also put the ofx transaction name in the splits memo field, or ofx memo if name is unavailable */
Modified: gnucash/trunk/src/import-export/qif/qif-objects.c
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-objects.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/import-export/qif/qif-objects.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -712,7 +712,7 @@
for (node = txn->splits; node; node = node->next)
{
split = node->data;
- sum = gnc_numeric_add(sum, split->amount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ sum = gnc_numeric_add(sum, split->amount, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
}
/* if the sum is not zero then reverse all the amounts in the split list */
@@ -851,7 +851,7 @@
{
split = node->data;
split->value = split->amount;
- total = gnc_numeric_add(total, split->amount, 0, GNC_DENOM_LCD);
+ total = gnc_numeric_add(total, split->amount, 0, GNC_HOW_DENOM_LCD);
}
/* And re-set the default-split amount */
@@ -1079,7 +1079,7 @@
itxn = txn->invst_info;
/* Compute the share value, because we'll probably need it */
- split_value = gnc_numeric_mul(itxn->shares, itxn->price, 0, GNC_DENOM_REDUCE);
+ split_value = gnc_numeric_mul(itxn->shares, itxn->price, 0, GNC_HOW_DENOM_REDUCE);
/* Make sure that "amount" is a valid "transaction amount" */
if (!itxn->amountstr && itxn->d_amountstr)
Modified: gnucash/trunk/src/libqof/qof/gnc-numeric.c
===================================================================
--- gnucash/trunk/src/libqof/qof/gnc-numeric.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/libqof/qof/gnc-numeric.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1080,7 +1080,7 @@
converted_val = *a;
if (converted_val.denom <= 0)
{
- converted_val = gnc_numeric_convert(converted_val, 1, GNC_DENOM_EXACT);
+ converted_val = gnc_numeric_convert(converted_val, 1, GNC_HOW_DENOM_EXACT);
if (gnc_numeric_check(converted_val) != GNC_ERROR_OK)
return FALSE;
*a = converted_val;
Modified: gnucash/trunk/src/libqof/qof/gnc-numeric.h
===================================================================
--- gnucash/trunk/src/libqof/qof/gnc-numeric.h 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/libqof/qof/gnc-numeric.h 2010-08-26 17:22:06 UTC (rev 19476)
@@ -484,27 +484,5 @@
#define GNC_TYPE_NUMERIC (gnc_numeric_get_type ())
/** @} */
-
-/** @name Deprecated, backwards-compatible definitions
- @{
-*/
-#define GNC_RND_FLOOR GNC_HOW_RND_FLOOR
-#define GNC_RND_CEIL GNC_HOW_RND_CEIL
-#define GNC_RND_TRUNC GNC_HOW_RND_TRUNC
-#define GNC_RND_PROMOTE GNC_HOW_RND_PROMOTE
-#define GNC_RND_ROUND_HALF_DOWN GNC_HOW_RND_ROUND_HALF_DOWN
-#define GNC_RND_ROUND_HALF_UP GNC_HOW_RND_ROUND_HALF_UP
-#define GNC_RND_ROUND GNC_HOW_RND_ROUND
-#define GNC_RND_NEVER GNC_HOW_RND_NEVER
-
-#define GNC_DENOM_EXACT GNC_HOW_DENOM_EXACT
-#define GNC_DENOM_REDUCE GNC_HOW_DENOM_REDUCE
-#define GNC_DENOM_LCD GNC_HOW_DENOM_LCD
-#define GNC_DENOM_FIXED GNC_HOW_DENOM_FIXED
-#define GNC_DENOM_SIGFIG GNC_HOW_DENOM_SIGFIG
-
-#define GNC_DENOM_SIGFIGS(X) GNC_HOW_DENOM_SIGFIGS(X)
-#define GNC_NUMERIC_GET_SIGFIGS(X) GNC_HOW_GET_SIGFIGS(X)
/** @} */
-/** @} */
#endif
Modified: gnucash/trunk/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-control.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/register/ledger-core/split-register-control.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -303,7 +303,7 @@
gnc_numeric amt = xaccSplitGetAmount(split);
gnc_numeric val = xaccSplitGetValue(split);
gnc_numeric orig_rate = gnc_numeric_div(amt, val, GNC_DENOM_AUTO,
- GNC_DENOM_REDUCE);
+ GNC_HOW_DENOM_REDUCE);
if (!gnc_numeric_check(orig_rate))
{
@@ -1426,7 +1426,7 @@
{
gnc_numeric amt = xaccSplitGetAmount (osplit);
gnc_numeric val = xaccSplitGetValue (osplit);
- exch_rate = gnc_numeric_div (amt, val, GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ exch_rate = gnc_numeric_div (amt, val, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
}
/* Ok, we need to grab the exchange rate */
Modified: gnucash/trunk/src/register/ledger-core/split-register-model-save.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-model-save.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/register/ledger-core/split-register-model-save.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -439,7 +439,7 @@
{
value = gnc_numeric_div(new_amount, amtconv,
gnc_commodity_get_fraction(curr),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetValue(sd->split, value);
}
else
@@ -470,7 +470,7 @@
/* convert the amount to the Value ... */
value = gnc_numeric_div (new_amount, amtconv,
gnc_commodity_get_fraction (curr),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetValue (sd->split, value);
}
else
@@ -487,7 +487,7 @@
acc = xaccSplitGetAccount (sd->split);
new_amount = gnc_numeric_mul (value, convrate,
xaccAccountGetCommoditySCU (acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetAmount (sd->split, new_amount);
}
}
@@ -560,7 +560,7 @@
{
gnc_numeric amount = xaccSplitGetAmount (sd->split);
value = gnc_numeric_div(
- amount, rate, gnc_commodity_get_fraction(txn_cur), GNC_RND_ROUND);
+ amount, rate, gnc_commodity_get_fraction(txn_cur), GNC_HOW_RND_ROUND);
xaccSplitSetValue (sd->split, value);
/* XXX: do we need to set the amount on the other split? */
@@ -583,7 +583,7 @@
acc);
amount = gnc_numeric_mul (value, rate, xaccAccountGetCommoditySCU (acc),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetAmount (other_split, amount);
}
@@ -611,7 +611,7 @@
amount = xaccSplitGetAmount (sd->split);
value = gnc_numeric_div (amount, rate, gnc_commodity_get_fraction (txn_cur),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
xaccSplitSetValue (sd->split, value);
#endif
}
Modified: gnucash/trunk/src/register/ledger-core/split-register-model.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-model.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/register/ledger-core/split-register-model.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1082,7 +1082,7 @@
if (gnc_numeric_zero_p (value))
return "0";
- convrate = gnc_numeric_div (amount, value, GNC_DENOM_AUTO, GNC_DENOM_REDUCE);
+ convrate = gnc_numeric_div (amount, value, GNC_DENOM_AUTO, GNC_HOW_DENOM_REDUCE);
return xaccPrintAmount (convrate, gnc_default_price_print_info ());
}
@@ -1625,13 +1625,13 @@
imbalance = gnc_numeric_mul (imbalance,
xaccTransGetAccountConvRate(trans, acc),
gnc_commodity_get_fraction (currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
else
{
imbalance = gnc_numeric_convert (imbalance,
gnc_commodity_get_fraction (currency),
- GNC_RND_ROUND);
+ GNC_HOW_RND_ROUND);
}
return xaccPrintAmount (imbalance, gnc_account_print_info (acc, FALSE));
Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/register/ledger-core/split-register.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -1907,7 +1907,7 @@
recalc_value = TRUE;
}
- calc_value = gnc_numeric_mul (price, amount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ calc_value = gnc_numeric_mul (price, amount, GNC_DENOM_AUTO, GNC_HOW_DENOM_LCD);
denom = gnc_split_get_value_denom (split);
@@ -1918,7 +1918,7 @@
if (!recalc_shares &&
!recalc_price &&
!recalc_value &&
- !gnc_numeric_same (value, calc_value, denom, GNC_RND_ROUND))
+ !gnc_numeric_same (value, calc_value, denom, GNC_HOW_RND_ROUND))
{
int choice;
int default_value;
@@ -1989,7 +1989,7 @@
denom = gnc_split_get_amount_denom (split);
- amount = gnc_numeric_div (value, price, denom, GNC_RND_ROUND);
+ amount = gnc_numeric_div (value, price, denom, GNC_HOW_RND_ROUND);
cell = gnc_table_layout_get_cell (reg->table->layout, SHRS_CELL);
gnc_price_cell_set_value ((PriceCell *) cell, amount);
@@ -2009,7 +2009,7 @@
price = gnc_numeric_div (value, amount,
GNC_DENOM_AUTO,
- GNC_DENOM_EXACT);
+ GNC_HOW_DENOM_EXACT);
if (gnc_numeric_negative_p (price))
{
@@ -2047,7 +2047,7 @@
denom = gnc_split_get_value_denom (split);
- value = gnc_numeric_mul (price, amount, denom, GNC_RND_ROUND);
+ value = gnc_numeric_mul (price, amount, denom, GNC_HOW_RND_ROUND);
gnc_price_cell_set_debt_credit_value ((PriceCell *) debit_cell,
(PriceCell *) credit_cell, value);
Modified: gnucash/trunk/src/register/register-core/pricecell.c
===================================================================
--- gnucash/trunk/src/register/register-core/pricecell.c 2010-08-26 16:35:12 UTC (rev 19475)
+++ gnucash/trunk/src/register/register-core/pricecell.c 2010-08-26 17:22:06 UTC (rev 19476)
@@ -144,7 +144,7 @@
else if (gnc_exp_parser_parse (cell->cell.value, &amount, &err_location))
{
if (cell->fraction > 0)
- amount = gnc_numeric_convert (amount, cell->fraction, GNC_RND_ROUND);
+ amount = gnc_numeric_convert (amount, cell->fraction, GNC_HOW_RND_ROUND);
cell->amount = amount;
}
@@ -243,7 +243,7 @@
return FALSE;
if (cell->fraction > 0)
- amount = gnc_numeric_convert (amount, cell->fraction, GNC_RND_ROUND);
+ amount = gnc_numeric_convert (amount, cell->fraction, GNC_HOW_RND_ROUND);
cell->amount = amount;
buff = gnc_price_cell_print_value (cell);
More information about the gnucash-changes
mailing list