[Gnucash-changes] r13414 - gnucash/trunk - Add 'const' qualifiers
to various functions.
David Hampton
hampton at cvs.gnucash.org
Mon Feb 27 18:57:17 EST 2006
Author: hampton
Date: 2006-02-27 18:57:16 -0500 (Mon, 27 Feb 2006)
New Revision: 13414
Trac: http://svn.gnucash.org/trac/changeset/13414
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/app-utils/gnc-ui-util.h
gnucash/trunk/src/engine/Account.c
gnucash/trunk/src/engine/Account.h
gnucash/trunk/src/engine/gnc-pricedb-p.h
gnucash/trunk/src/engine/gnc-pricedb.c
gnucash/trunk/src/engine/gnc-pricedb.h
Log:
Add 'const' qualifiers to various functions.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/ChangeLog 2006-02-27 23:57:16 UTC (rev 13414)
@@ -1,5 +1,11 @@
2006-02-27 David Hampton <hampton at employees.org>
+ * src/engine/gnc-pricedb.[ch]:
+ * src/engine/gnc-pricedb-p.h:
+ * src/engine/Account.[ch]:
+ * src/app-utils/gnc-ui-util.[ch]: Add 'const' qualifiers to
+ various functions.
+
* src/gnome-utils/gnc-main-window.c: Check for the existence of a
page before dereferencing it. Fixes 332680.
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2006-02-27 23:57:16 UTC (rev 13414)
@@ -231,7 +231,7 @@
const Account *account,
gboolean recurse,
gboolean *negative,
- gnc_commodity *commodity)
+ const gnc_commodity *commodity)
{
gnc_numeric balance;
@@ -253,7 +253,7 @@
* including all sub-accounts under the specified account.
*/
gnc_numeric
-gnc_ui_account_get_balance (Account *account, gboolean recurse)
+gnc_ui_account_get_balance (const Account *account, gboolean recurse)
{
return gnc_ui_account_get_balance_full (xaccAccountGetBalanceInCurrency,
account, recurse, NULL, NULL);
@@ -265,7 +265,8 @@
* specified account.
*/
gnc_numeric
-gnc_ui_account_get_balance_in_currency (Account *account, gnc_commodity *currency,
+gnc_ui_account_get_balance_in_currency (const Account *account,
+ const gnc_commodity *currency,
gboolean recurse)
{
return gnc_ui_account_get_balance_full (xaccAccountGetBalanceInCurrency,
@@ -277,7 +278,7 @@
* possibly including all sub-accounts under the specified account.
*/
gnc_numeric
-gnc_ui_account_get_reconciled_balance (Account *account,
+gnc_ui_account_get_reconciled_balance (const Account *account,
gboolean recurse)
{
return gnc_ui_account_get_balance_full (xaccAccountGetReconciledBalanceInCurrency,
@@ -301,7 +302,7 @@
*/
gchar *
gnc_ui_account_get_print_balance (xaccGetBalanceInCurrencyFn fn,
- Account *account,
+ const Account *account,
gboolean recurse,
gboolean *negative)
{
@@ -331,7 +332,7 @@
*/
gchar *
gnc_ui_account_get_print_report_balance (xaccGetBalanceInCurrencyFn fn,
- Account *account,
+ const Account *account,
gboolean recurse,
gboolean *negative)
{
@@ -348,7 +349,8 @@
gnc_numeric
-gnc_ui_account_get_balance_as_of_date (Account *account, time_t date,
+gnc_ui_account_get_balance_as_of_date (Account *account,
+ time_t date,
gboolean include_children)
{
gnc_numeric balance;
@@ -392,7 +394,7 @@
/* Caller is responsible for g_free'ing returned memory */
char *
-gnc_ui_account_get_tax_info_string (Account *account)
+gnc_ui_account_get_tax_info_string (const Account *account)
{
static SCM get_form = SCM_UNDEFINED;
static SCM get_desc = SCM_UNDEFINED;
@@ -700,7 +702,7 @@
}
char *
-gnc_account_get_full_name (Account *account)
+gnc_account_get_full_name (const Account *account)
{
if (!account) return NULL;
@@ -1000,7 +1002,7 @@
}
static GNCPrintAmountInfo
-gnc_account_print_info_helper(Account *account, gboolean use_symbol,
+gnc_account_print_info_helper(const Account *account, gboolean use_symbol,
gnc_commodity * (*efffunc)(const Account *),
int (*scufunc)(const Account*))
{
@@ -1038,7 +1040,7 @@
}
GNCPrintAmountInfo
-gnc_account_print_info (Account *account, gboolean use_symbol)
+gnc_account_print_info (const Account *account, gboolean use_symbol)
{
return gnc_account_print_info_helper(account, use_symbol,
xaccAccountGetCommodity,
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.h 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.h 2006-02-27 23:57:16 UTC (rev 13414)
@@ -105,7 +105,7 @@
const Account *account,
gboolean recurse,
gboolean *negative,
- gnc_commodity *commodity);
+ const gnc_commodity *commodity);
/**
* This routine retrives the total balance in an account, possibly
@@ -114,11 +114,11 @@
* @param account The account to retrieve data about.
* @param include_children Include all sub-accounts of this account.
*/
-gnc_numeric gnc_ui_account_get_balance (Account *account,
+gnc_numeric gnc_ui_account_get_balance (const Account *account,
gboolean include_children);
-gnc_numeric gnc_ui_account_get_balance_in_currency (Account *account,
- gnc_commodity *currency,
+gnc_numeric gnc_ui_account_get_balance_in_currency (const Account *account,
+ const gnc_commodity *currency,
gboolean recurse);
/**
* This routine retrives the reconciled balance in an account,
@@ -127,7 +127,7 @@
* @param account The account to retrieve data about.
* @param include_children Include all sub-accounts of this account.
*/
-gnc_numeric gnc_ui_account_get_reconciled_balance(Account *account,
+gnc_numeric gnc_ui_account_get_reconciled_balance(const Account *account,
gboolean include_children);
/**
@@ -145,7 +145,7 @@
*/
gchar *
gnc_ui_account_get_print_balance (xaccGetBalanceInCurrencyFn fn,
- Account *account,
+ const Account *account,
gboolean recurse,
gboolean *negative);
@@ -165,11 +165,11 @@
*/
gchar *
gnc_ui_account_get_print_report_balance (xaccGetBalanceInCurrencyFn fn,
- Account *account,
+ const Account *account,
gboolean recurse,
gboolean *negative);
-char *gnc_ui_account_get_tax_info_string (Account *account);
+char *gnc_ui_account_get_tax_info_string (const Account *account);
gnc_numeric gnc_ui_account_get_balance_as_of_date (Account *account,
time_t date,
@@ -195,7 +195,7 @@
time_t date,
QofBook *book);
-char * gnc_account_get_full_name (Account *account);
+char * gnc_account_get_full_name (const Account *account);
/* Locale functions *************************************************/
@@ -281,7 +281,7 @@
GNCPrintAmountInfo gnc_commodity_print_info (const gnc_commodity *commodity,
gboolean use_symbol);
-GNCPrintAmountInfo gnc_account_print_info (Account *account,
+GNCPrintAmountInfo gnc_account_print_info (const Account *account,
gboolean use_symbol);
GNCPrintAmountInfo gnc_split_amount_print_info (Split *split,
Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/engine/Account.c 2006-02-27 23:57:16 UTC (rev 13414)
@@ -1666,8 +1666,8 @@
gnc_numeric
xaccAccountConvertBalanceToCurrency(const Account *acc, /* for book */
gnc_numeric balance,
- gnc_commodity *balance_currency,
- gnc_commodity *new_currency)
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency)
{
QofBook *book;
GNCPriceDB *pdb;
@@ -1724,7 +1724,7 @@
static gnc_numeric
xaccAccountGetXxxBalanceInCurrency (const Account *acc,
xaccGetBalanceFn fn,
- gnc_commodity *report_currency)
+ const gnc_commodity *report_currency)
{
gnc_numeric balance;
@@ -1739,7 +1739,7 @@
static gnc_numeric
xaccAccountGetXxxBalanceAsOfDateInCurrency(Account *acc, time_t date,
xaccGetBalanceAsOfDateFn fn,
- gnc_commodity *report_commodity)
+ const gnc_commodity *report_commodity)
{
g_return_val_if_fail(acc && fn && report_commodity, gnc_numeric_zero());
return xaccAccountConvertBalanceToCurrency(
@@ -1751,7 +1751,7 @@
*/
typedef struct
{
- gnc_commodity *currency;
+ const gnc_commodity *currency;
gnc_numeric balance;
xaccGetBalanceFn fn;
xaccGetBalanceAsOfDateFn asOfDateFn;
@@ -1809,7 +1809,7 @@
static gnc_numeric
xaccAccountGetXxxBalanceInCurrencyRecursive (const Account *acc,
xaccGetBalanceFn fn,
- gnc_commodity *report_commodity,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
gnc_numeric balance;
@@ -1862,7 +1862,7 @@
gnc_numeric
xaccAccountGetBalanceInCurrency (const Account *acc,
- gnc_commodity *report_commodity,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
gnc_numeric rc;
@@ -1875,7 +1875,7 @@
gnc_numeric
xaccAccountGetClearedBalanceInCurrency (const Account *acc,
- gnc_commodity *report_commodity,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
return xaccAccountGetXxxBalanceInCurrencyRecursive (
@@ -1886,7 +1886,7 @@
gnc_numeric
xaccAccountGetReconciledBalanceInCurrency (const Account *acc,
- gnc_commodity *report_commodity,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
return xaccAccountGetXxxBalanceInCurrencyRecursive (
@@ -1896,7 +1896,7 @@
gnc_numeric
xaccAccountGetPresentBalanceInCurrency (const Account *acc,
- gnc_commodity *report_commodity,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
return xaccAccountGetXxxBalanceInCurrencyRecursive (
@@ -1906,7 +1906,8 @@
gnc_numeric
xaccAccountGetProjectedMinimumBalanceInCurrency (
- const Account *acc, gnc_commodity *report_commodity,
+ const Account *acc,
+ const gnc_commodity *report_commodity,
gboolean include_children)
{
return xaccAccountGetXxxBalanceInCurrencyRecursive (
Modified: gnucash/trunk/src/engine/Account.h
===================================================================
--- gnucash/trunk/src/engine/Account.h 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/engine/Account.h 2006-02-27 23:57:16 UTC (rev 13414)
@@ -51,7 +51,7 @@
typedef gnc_numeric (*xaccGetBalanceFn)( const Account *account );
typedef gnc_numeric (*xaccGetBalanceInCurrencyFn) (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
typedef gnc_numeric (*xaccGetBalanceAsOfDateFn) (
@@ -366,8 +366,9 @@
*/
gnc_numeric xaccAccountConvertBalanceToCurrency(
const Account *account, /* for book */
- gnc_numeric balance, gnc_commodity *balance_currency,
- gnc_commodity *new_currency);
+ gnc_numeric balance,
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency);
gnc_numeric xaccAccountConvertBalanceToCurrencyAsOfDate(
const Account *account, /* for book */
gnc_numeric balance, gnc_commodity *balance_currency,
@@ -376,19 +377,19 @@
/* These functions get some type of balance in the desired commodity.
'report_commodity' may be NULL to use the account's commodity. */
gnc_numeric xaccAccountGetBalanceInCurrency (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
gnc_numeric xaccAccountGetClearedBalanceInCurrency (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
gnc_numeric xaccAccountGetReconciledBalanceInCurrency (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
gnc_numeric xaccAccountGetPresentBalanceInCurrency (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
gnc_numeric xaccAccountGetProjectedMinimumBalanceInCurrency (
- const Account *account, gnc_commodity *report_commodity,
+ const Account *account, const gnc_commodity *report_commodity,
gboolean include_children);
/* This function gets the balance as of the given date in the desired
Modified: gnucash/trunk/src/engine/gnc-pricedb-p.h
===================================================================
--- gnucash/trunk/src/engine/gnc-pricedb-p.h 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/engine/gnc-pricedb-p.h 2006-02-27 23:57:16 UTC (rev 13414)
@@ -76,8 +76,8 @@
{
PriceLookupType type;
GNCPriceDB *prdb;
- gnc_commodity *commodity;
- gnc_commodity *currency;
+ const gnc_commodity *commodity;
+ const gnc_commodity *currency;
Timespec date;
};
Modified: gnucash/trunk/src/engine/gnc-pricedb.c
===================================================================
--- gnucash/trunk/src/engine/gnc-pricedb.c 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/engine/gnc-pricedb.c 2006-02-27 23:57:16 UTC (rev 13414)
@@ -1092,8 +1092,8 @@
GNCPrice *
gnc_pricedb_lookup_latest(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency)
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency)
{
GList *price_list;
GNCPrice *result;
@@ -1148,7 +1148,7 @@
GList *
gnc_pricedb_lookup_latest_any_currency(GNCPriceDB *db,
- gnc_commodity *commodity)
+ const gnc_commodity *commodity)
{
GList *result;
GHashTable *currency_hash;
@@ -1195,8 +1195,8 @@
gboolean
gnc_pricedb_has_prices(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency)
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency)
{
GList *price_list;
GHashTable *currency_hash;
@@ -1243,8 +1243,8 @@
GList *
gnc_pricedb_get_prices(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency)
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency)
{
GList *price_list;
GList *result;
@@ -1289,8 +1289,8 @@
GList *
gnc_pricedb_lookup_day(GNCPriceDB *db,
- gnc_commodity *c,
- gnc_commodity *currency,
+ const gnc_commodity *c,
+ const gnc_commodity *currency,
Timespec t)
{
GList *price_list;
@@ -1362,7 +1362,7 @@
GList *
gnc_pricedb_lookup_day_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t)
{
GList *result = NULL;
@@ -1407,8 +1407,8 @@
GList *
gnc_pricedb_lookup_at_time(GNCPriceDB *db,
- gnc_commodity *c,
- gnc_commodity *currency,
+ const gnc_commodity *c,
+ const gnc_commodity *currency,
Timespec t)
{
GList *price_list;
@@ -1477,7 +1477,7 @@
GList *
gnc_pricedb_lookup_at_time_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t)
{
GList *result = NULL;
@@ -1520,8 +1520,8 @@
GNCPrice *
gnc_pricedb_lookup_nearest_in_time(GNCPriceDB *db,
- gnc_commodity *c,
- gnc_commodity *currency,
+ const gnc_commodity *c,
+ const gnc_commodity *currency,
Timespec t)
{
GList *price_list;
@@ -1652,7 +1652,7 @@
GList *
gnc_pricedb_lookup_nearest_in_time_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t)
{
GList *result = NULL;
@@ -1699,8 +1699,8 @@
gnc_numeric
gnc_pricedb_convert_balance_latest_price(GNCPriceDB *pdb,
gnc_numeric balance,
- gnc_commodity *balance_currency,
- gnc_commodity *new_currency)
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency)
{
GNCPrice *price, *currency_price;
GList *price_list, *list_helper;
@@ -1774,8 +1774,8 @@
gnc_numeric
gnc_pricedb_convert_balance_nearest_price(GNCPriceDB *pdb,
gnc_numeric balance,
- gnc_commodity *balance_currency,
- gnc_commodity *new_currency,
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency,
Timespec t)
{
GNCPrice *price, *currency_price;
@@ -2028,7 +2028,7 @@
void
gnc_pricedb_substitute_commodity(GNCPriceDB *db,
- gnc_commodity *old_c,
+ gnc_commodity *old_c,
gnc_commodity *new_c)
{
GNCPriceFixupData data;
Modified: gnucash/trunk/src/engine/gnc-pricedb.h
===================================================================
--- gnucash/trunk/src/engine/gnc-pricedb.h 2006-02-27 16:08:39 UTC (rev 13413)
+++ gnucash/trunk/src/engine/gnc-pricedb.h 2006-02-27 23:57:16 UTC (rev 13414)
@@ -276,77 +276,77 @@
gboolean gnc_pricedb_remove_price(GNCPriceDB *db, GNCPrice *p);
gboolean gnc_pricedb_remove_old_prices(GNCPriceDB *db, Timespec cutoff,
- gboolean delete_user, gboolean delete_last);
+ const gboolean delete_user, gboolean delete_last);
/** gnc_pricedb_lookup_latest - find the most recent price for the
given commodity in the given currency. Returns NULL on
failure. */
GNCPrice * gnc_pricedb_lookup_latest(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency);
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency);
/** gnc_pricedb_lookup_latest_any_currency - find the most recent prices
for the given commodity in any available currency. Prices will be
returned as a GNCPrice list (see above). */
GList *gnc_pricedb_lookup_latest_any_currency(GNCPriceDB *db,
- gnc_commodity *commodity);
+ const gnc_commodity *commodity);
/** gnc_pricedb_has_prices - return an indication of whether or not
there are any prices for a given commodity in the given currency.
Returns TRUE if there are prices, FALSE otherwise. */
gboolean gnc_pricedb_has_prices(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency);
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency);
/** gnc_pricedb_get_prices - return all the prices for a given
commodity in the given currency. Returns NULL on failure. The
result is a GNCPrice list (see above). */
GList * gnc_pricedb_get_prices(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency);
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency);
/** gnc_pricedb_lookup_at_time - return all prices that match the given
commodity, currency, and timespec. Prices will be returned as a
GNCPrice list (see above). */
GList * gnc_pricedb_lookup_at_time(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency,
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency,
Timespec t);
/** gnc_pricedb_lookup_at_time_any_currency - return all prices that match the
given commodity and timespec in any available currency. Prices will be
returned as a GNCPrice list (see above). */
GList * gnc_pricedb_lookup_at_time_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t);
/** gnc_pricedb_lookup_day - return all prices that match the given
commodity, currency, and timespec. Prices will be returned as a
GNCPrice list (see above). */
GList * gnc_pricedb_lookup_day(GNCPriceDB *db,
- gnc_commodity *commodity,
- gnc_commodity *currency,
+ const gnc_commodity *commodity,
+ const gnc_commodity *currency,
Timespec t);
/** gnc_pricedb_lookup_day_any_currency - return all prices that match the
given commodity and timespec in any available currency. Prices will be
returned as a GNCPrice list (see above). */
GList * gnc_pricedb_lookup_day_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t);
/** gnc_pricedb_lookup_nearest_in_time - return the price for the given
commodity in the given currency nearest to the given time t. */
GNCPrice * gnc_pricedb_lookup_nearest_in_time(GNCPriceDB *db,
- gnc_commodity *c,
- gnc_commodity *currency,
+ const gnc_commodity *c,
+ const gnc_commodity *currency,
Timespec t);
/** gnc_pricedb_lookup_nearest_in_time_any_currency - return all prices that
match the given commodity and timespec in any available currency. Prices
will be returned as a GNCPrice list (see above). */
GList * gnc_pricedb_lookup_nearest_in_time_any_currency(GNCPriceDB *db,
- gnc_commodity *c,
+ const gnc_commodity *c,
Timespec t);
/** gnc_pricedb_convert_balance_latest_price - Convert a balance
@@ -354,16 +354,16 @@
gnc_numeric
gnc_pricedb_convert_balance_latest_price(GNCPriceDB *pdb,
gnc_numeric balance,
- gnc_commodity *balance_currency,
- gnc_commodity *new_currency);
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency);
/** gnc_pricedb_convert_balance_nearest_price - Convert a balance
from one currency to another. */
gnc_numeric
gnc_pricedb_convert_balance_nearest_price(GNCPriceDB *pdb,
gnc_numeric balance,
- gnc_commodity *balance_currency,
- gnc_commodity *new_currency,
+ const gnc_commodity *balance_currency,
+ const gnc_commodity *new_currency,
Timespec t);
/** gnc_pricedb_foreach_price - call f once for each price in db, until
More information about the gnucash-changes
mailing list