gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Sep 5 15:06:56 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/1141e9a9 (commit)
via https://github.com/Gnucash/gnucash/commit/3363a2c5 (commit)
from https://github.com/Gnucash/gnucash/commit/1df569e9 (commit)
commit 1141e9a9b8b3a45d622e6182c890e40dcb09f396
Merge: 1df569e 3363a2c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Sep 5 12:06:16 2014 -0700
Merge branch 'maint'
diff --cc src/app-utils/test/test-option-util.c
index dc99f32,0000000..8fef4c0
mode 100644,000000..100644
--- a/src/app-utils/test/test-option-util.c
+++ b/src/app-utils/test/test-option-util.c
@@@ -1,126 -1,0 +1,126 @@@
+/********************************************************************
+ * test-option-util.c: GLib g_test test suite for Split.c. *
+ * Copyright 2013 John Ralls <jralls at ceridwen.us> *
+ * *
+ * This program is free software; you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation; either version 2 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, you can retrieve it from *
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html *
+ * or contact: *
+ * *
+ * Free Software Foundation Voice: +1-617-542-5942 *
+ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
+ * Boston, MA 02110-1301, USA gnu at gnu.org *
+ ********************************************************************/
+
+#include <config.h>
+#include <glib.h>
+#include <unittest-support.h>
+#include <qofbookslots.h>
+
+#include "../option-util.h"
+
+static const gchar *suitename = "/app-utils/option-util";
+void test_suite_option_util (void);
+
+typedef struct
+{
+ QofBook *book;
+ GSList *hdlrs;
+} Fixture;
+
+/* Expose a mostly-private QofInstance function to load options into
+ * the Book.
+ */
- extern KvpFrame *qof_instance_get_slots (QofInstance*);
++extern KvpFrame *qof_instance_get_slots (const QofInstance*);
+
+static void
+setup (Fixture *fixture, gconstpointer pData)
+{
+ fixture->book = qof_book_new ();
+ fixture->hdlrs = NULL;
+}
+
+static void
+setup_kvp (Fixture *fixture, gconstpointer pData)
+{
+ QofBook *book;
+ KvpFrame *slots;
+ setup (fixture, pData);
+ book = fixture->book;
+ slots = qof_instance_get_slots (QOF_INSTANCE (book));
+ qof_begin_edit (QOF_INSTANCE (book));
+ qof_instance_set (QOF_INSTANCE (book),
+ "trading-accts", "t",
+ "split-action-num-field", "t",
+ "autoreadonly-days", (double)21,
+ NULL);
+
+ kvp_frame_set_string (slots, "options/Business/Company Name",
+ "Bogus Company");
+ qof_commit_edit (QOF_INSTANCE (book));
+}
+
+static void
+teardown (Fixture *fixture, gconstpointer pData)
+{
+ qof_book_destroy (fixture->book);
+ g_slist_free_full (fixture->hdlrs, test_free_log_handler);
+ test_clear_error_list();
+}
+
+static void
+test_option_load_from_kvp (Fixture *fixture, gconstpointer pData)
+{
+ QofBook *book = fixture->book;
+ GNCOptionDB *odb = gnc_option_db_new_for_type (QOF_ID_BOOK);
+
+ qof_book_load_options (book, gnc_option_db_load_from_kvp, odb);
+ g_assert (gnc_option_db_lookup_boolean_option (odb, OPTION_SECTION_ACCOUNTS,
+ OPTION_NAME_TRADING_ACCOUNTS, FALSE));
+ g_assert_cmpstr (gnc_option_db_lookup_string_option (odb, "Business", "Company Name", FALSE), ==, "Bogus Company");
+ g_assert_cmpfloat (gnc_option_db_lookup_number_option (odb, OPTION_SECTION_ACCOUNTS, OPTION_NAME_AUTO_READONLY_DAYS, FALSE), ==, 21);
+
+ gnc_option_db_destroy (odb);
+}
+
+static void
+test_option_save_to_kvp (Fixture *fixture, gconstpointer pData)
+{
+ QofBook *book = fixture->book;
+ GNCOptionDB *odb = gnc_option_db_new_for_type (QOF_ID_BOOK);
+ KvpFrame *slots = qof_instance_get_slots (QOF_INSTANCE (book));
+
+ g_assert (gnc_option_db_set_boolean_option (odb, OPTION_SECTION_ACCOUNTS,
+ OPTION_NAME_TRADING_ACCOUNTS,
+ TRUE));
+ g_assert (gnc_option_db_set_string_option (odb, "Business", "Company Name",
+ "Bogus Company"));
+ g_assert (gnc_option_db_set_number_option (odb, OPTION_SECTION_ACCOUNTS,
+ OPTION_NAME_AUTO_READONLY_DAYS,
+ 17));
+ qof_book_save_options (book, gnc_option_db_save_to_kvp, odb, TRUE);
+ g_assert_cmpstr (kvp_frame_get_string (slots, "options/Accounts/Use Trading Accounts"), == , "t");
+ g_assert_cmpstr (kvp_frame_get_string (slots, "options/Business/Company Name"), ==, "Bogus Company");
+ g_assert_cmpfloat (kvp_frame_get_double (slots, "options/Accounts/Day Threshold for Read-Only Transactions (red line)"), ==, 17);
+
+ gnc_option_db_destroy (odb);
+}
+
+
+void
+test_suite_option_util (void)
+{
+ GNC_TEST_ADD (suitename, "Option DB Load from KVP", Fixture, NULL, setup_kvp, test_option_load_from_kvp, teardown);
+ GNC_TEST_ADD (suitename, "Option DB Save to KVP", Fixture, NULL, setup, test_option_save_to_kvp, teardown);
+
+}
diff --cc src/engine/test/utest-Account.c
index f96abf3,5d717f0..4487c0f
--- a/src/engine/test/utest-Account.c
+++ b/src/engine/test/utest-Account.c
@@@ -2159,12 -2154,10 +2159,12 @@@ test_xaccAccountType_Stuff (void
g_free (cmpstr);
}
else
- g_assert_cmpstr (typestr_uc, == , typename);
+ g_assert_cmpstr (typestr_uc, == , type_name);
g_free (typestr_uc);
+ qof_instance_increase_editlevel (acc);
g_object_set (acc, "type", type, NULL);
+ qof_instance_decrease_editlevel (acc);
if (type == ACCT_TYPE_STOCK || type == ACCT_TYPE_MUTUAL ||
type == ACCT_TYPE_CURRENCY)
g_assert (xaccAccountIsPriced (acc));
diff --cc src/engine/test/utest-Transaction.c
index c2a963f,704b667..488dda6
--- a/src/engine/test/utest-Transaction.c
+++ b/src/engine/test/utest-Transaction.c
@@@ -577,20 -578,20 +577,20 @@@ test_dupe_trans (Fixture *fixture, gcon
{
Timespec posted = gnc_dmy2timespec (12, 7, 2011);
Timespec entered = gnc_dmy2timespec (14, 7, 2011);
- Transaction *new = NULL, *old = fixture->txn;
- QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (old));
- GList *newnode, *oldnode = old->splits;
+ Transaction *newtxn = NULL, *oldtxn = fixture->txn;
+ QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (oldtxn));
+ GList *newnode, *oldnode = oldtxn->splits;
- old->date_posted = posted;
- old->date_entered = entered;
- kvp_frame_set_string (old->inst.kvp_data, "/foo/bar/baz",
+ oldtxn->date_posted = posted;
+ oldtxn->date_entered = entered;
+ kvp_frame_set_string (oldtxn->inst.kvp_data, "/foo/bar/baz",
"The Great Waldo Pepper");
- new = fixture->func->dupe_trans (old);
- newtxn = xaccDupeTransaction (oldtxn);
++ newtxn = fixture->func->dupe_trans (oldtxn);
- g_assert_cmpstr (new->num, ==, old->num);
- g_assert_cmpstr (new->description, ==, old->description);
- for (newnode = new->splits; newnode && oldnode;
+ g_assert_cmpstr (newtxn->num, ==, oldtxn->num);
+ g_assert_cmpstr (newtxn->description, ==, oldtxn->description);
+ for (newnode = newtxn->splits; newnode && oldnode;
newnode = g_list_next (newnode))
{
g_assert (xaccSplitEqual (newnode->data, oldnode->data,
commit 3363a2c5722840b688caf889183205f7095480d6
Author: lmat <dartme18 at gmail.com>
Date: Tue Aug 12 13:56:53 2014 -0400
Replace C++ reserved words for future compatibility with C++
diff --git a/src/app-utils/gnc-component-manager.h b/src/app-utils/gnc-component-manager.h
index 7de280f..45fc187 100644
--- a/src/app-utils/gnc-component-manager.h
+++ b/src/app-utils/gnc-component-manager.h
@@ -104,7 +104,7 @@ typedef gboolean (*GNCComponentFindHandler) (gpointer find_data,
*
* Return: TRUE if the callback did something
*/
-typedef gboolean (*GNCComponentHandler) (const char *class,
+typedef gboolean (*GNCComponentHandler) (const char *component_class,
gint component_id,
gpointer user_data,
gpointer iter_data);
diff --git a/src/backend/xml/io-gncxml-v1.c b/src/backend/xml/io-gncxml-v1.c
index 1c2c1ff..099ccd6 100644
--- a/src/backend/xml/io-gncxml-v1.c
+++ b/src/backend/xml/io-gncxml-v1.c
@@ -2059,7 +2059,7 @@ commodity_restore_parser_new(void)
typedef struct
{
- gchar *namespace;
+ gchar *name_space;
gchar *id;
} CommodityLookupParseInfo;
@@ -2095,8 +2095,8 @@ generic_gnc_commodity_lookup_after_child_handler(gpointer data_for_children,
if (strcmp(child_result->tag, "space") == 0)
{
- if (cpi->namespace) return(FALSE);
- cpi->namespace = (gchar *) child_result->data;
+ if (cpi->name_space) return(FALSE);
+ cpi->name_space = (gchar *) child_result->data;
child_result->should_cleanup = FALSE;
}
else if (strcmp(child_result->tag, "id") == 0)
@@ -2127,14 +2127,14 @@ generic_gnc_commodity_lookup_end_handler(gpointer data_for_children,
g_return_val_if_fail(cpi, FALSE);
- if (cpi->namespace && cpi->id)
+ if (cpi->name_space && cpi->id)
{
gnc_commodity_table *table;
gnc_commodity *com;
table = gnc_commodity_table_get_table (pstatus->book);
- com = gnc_commodity_table_lookup(table, cpi->namespace, cpi->id);
+ com = gnc_commodity_table_lookup(table, cpi->name_space, cpi->id);
if (com)
{
@@ -2143,7 +2143,7 @@ generic_gnc_commodity_lookup_end_handler(gpointer data_for_children,
}
}
- g_free(cpi->namespace);
+ g_free(cpi->name_space);
g_free(cpi->id);
g_free(cpi);
diff --git a/src/backend/xml/io-gncxml-v2.c b/src/backend/xml/io-gncxml-v2.c
index 908bff1..c7ab52e 100644
--- a/src/backend/xml/io-gncxml-v2.c
+++ b/src/backend/xml/io-gncxml-v2.c
@@ -1275,11 +1275,11 @@ write_budget (QofInstance *ent, gpointer data)
}
gboolean
-gnc_xml2_write_namespace_decl (FILE *out, const char *namespace)
+gnc_xml2_write_namespace_decl (FILE *out, const char *name_space)
{
- g_return_val_if_fail(namespace, FALSE);
+ g_return_val_if_fail(name_space, FALSE);
return fprintf(out, "\n xmlns:%s=\"http://www.gnucash.org/XML/%s\"",
- namespace, namespace) >= 0;
+ name_space, name_space) >= 0;
}
static void
diff --git a/src/backend/xml/io-gncxml-v2.h b/src/backend/xml/io-gncxml-v2.h
index 6fc7145..cf819b2 100644
--- a/src/backend/xml/io-gncxml-v2.h
+++ b/src/backend/xml/io-gncxml-v2.h
@@ -147,7 +147,7 @@ QofBookFileType gnc_is_xml_data_file_v2(const gchar *name, gboolean *with_encodi
/** Write a name-space declaration for the provided namespace data type
* within the GNC XML namespace at http://www.gnucash.org/XML.
*/
-gboolean gnc_xml2_write_namespace_decl (FILE *out, const char *namespace);
+gboolean gnc_xml2_write_namespace_decl (FILE *out, const char *name_space);
typedef struct
diff --git a/src/backend/xml/sixtp-dom-generators.c b/src/backend/xml/sixtp-dom-generators.c
index 41ae336..3b15513 100644
--- a/src/backend/xml/sixtp-dom-generators.c
+++ b/src/backend/xml/sixtp-dom-generators.c
@@ -106,7 +106,7 @@ xmlNodePtr
commodity_ref_to_dom_tree(const char *tag, const gnc_commodity *c)
{
xmlNodePtr ret;
- gchar *namespace, *mnemonic;
+ gchar *name_space, *mnemonic;
g_return_val_if_fail(c, NULL);
@@ -116,13 +116,13 @@ commodity_ref_to_dom_tree(const char *tag, const gnc_commodity *c)
{
return NULL;
}
- namespace = g_strdup (gnc_commodity_get_namespace_compat(c));
+ name_space = g_strdup (gnc_commodity_get_namespace_compat(c));
mnemonic = g_strdup (gnc_commodity_get_mnemonic(c));
xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:space",
- checked_char_cast (namespace));
+ checked_char_cast (name_space));
xmlNewTextChild(ret, NULL, BAD_CAST "cmdty:id",
checked_char_cast (mnemonic));
- g_free (namespace);
+ g_free (name_space);
g_free (mnemonic);
return ret;
}
diff --git a/src/business/business-gnome/search-owner.c b/src/business/business-gnome/search-owner.c
index dfc2564..7729fcc 100644
--- a/src/business/business-gnome/search-owner.c
+++ b/src/business/business-gnome/search-owner.c
@@ -44,7 +44,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_owner_class_init (GNCSearchOwnerClass *class);
+static void gnc_search_owner_class_init (GNCSearchOwnerClass *klass);
static void gnc_search_owner_init (GNCSearchOwner *gspaper);
static void gnc_search_owner_finalize (GObject *obj);
@@ -100,13 +100,13 @@ gnc_search_owner_get_type (void)
}
static void
-gnc_search_owner_class_init (GNCSearchOwnerClass *class)
+gnc_search_owner_class_init (GNCSearchOwnerClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_owner_finalize;
@@ -116,7 +116,7 @@ gnc_search_owner_class_init (GNCSearchOwnerClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchOwnerPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchOwnerPrivate));
}
static void
diff --git a/src/business/business-ledger/gncEntryLedger.c b/src/business/business-ledger/gncEntryLedger.c
index 3cc2e85..f2f28b2 100644
--- a/src/business/business-ledger/gncEntryLedger.c
+++ b/src/business/business-ledger/gncEntryLedger.c
@@ -80,7 +80,7 @@ gnc_entry_ledger_get_blank_entry (GncEntryLedger *ledger)
Account *
gnc_entry_ledger_get_account_by_name (GncEntryLedger *ledger, BasicCell * bcell,
- const char *name, gboolean *new)
+ const char *name, gboolean *isnew)
{
const char *placeholder = _("The account %s does not allow transactions.");
const char *missing = _("The account %s does not exist. "
@@ -100,7 +100,7 @@ gnc_entry_ledger_get_account_by_name (GncEntryLedger *ledger, BasicCell * bcell,
return NULL;
/* No changes, as yet. */
- *new = FALSE;
+ *isnew = FALSE;
/* User said yes, they want to create a new account. */
account_types = g_list_prepend (account_types, (gpointer)ACCT_TYPE_CREDIT);
@@ -115,7 +115,7 @@ gnc_entry_ledger_get_account_by_name (GncEntryLedger *ledger, BasicCell * bcell,
g_list_free ( account_types );
if (!account)
return NULL;
- *new = TRUE;
+ *isnew = TRUE;
/* Now have a new account. Update the cell with the name as created. */
account_name = gnc_get_account_name_for_register (account);
diff --git a/src/business/business-ledger/gncEntryLedgerP.h b/src/business/business-ledger/gncEntryLedgerP.h
index 612897b..c04f7c3 100644
--- a/src/business/business-ledger/gncEntryLedgerP.h
+++ b/src/business/business-ledger/gncEntryLedgerP.h
@@ -60,7 +60,7 @@ struct GncEntryLedger_s
GncEntry * gnc_entry_ledger_get_entry (GncEntryLedger *ledger,
VirtualCellLocation vcell_loc);
Account * gnc_entry_ledger_get_account_by_name (GncEntryLedger *ledger, BasicCell * bcell,
- const char *name, gboolean *new);
+ const char *name, gboolean *isnew);
Account * gnc_entry_ledger_get_account (GncEntryLedger *ledger,
const char * cell_name);
GncTaxTable * gnc_entry_ledger_get_taxtable (GncEntryLedger *ledger,
diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c
index 59b226a..5839667 100644
--- a/src/engine/gnc-commodity.c
+++ b/src/engine/gnc-commodity.c
@@ -67,7 +67,7 @@ struct gnc_commodity_s
typedef struct CommodityPrivate
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
char * fullname;
char * mnemonic;
@@ -591,7 +591,7 @@ reset_unique_name(CommodityPrivate *priv)
gnc_commodity_namespace *ns;
g_free(priv->unique_name);
- ns = priv->namespace;
+ ns = priv->name_space;
priv->unique_name = g_strdup_printf("%s::%s",
ns ? ns->name : "",
priv->mnemonic ? priv->mnemonic : "");
@@ -607,7 +607,7 @@ gnc_commodity_init(gnc_commodity* com)
priv = GET_PRIVATE(com);
- priv->namespace = NULL;
+ priv->name_space = NULL;
priv->fullname = CACHE_INSERT("");
priv->mnemonic = CACHE_INSERT("");
priv->cusip = CACHE_INSERT("");
@@ -653,7 +653,7 @@ gnc_commodity_get_property (GObject *object,
switch (prop_id)
{
case PROP_NAMESPACE:
- g_value_take_object(value, priv->namespace);
+ g_value_take_object(value, priv->name_space);
break;
case PROP_FULL_NAME:
g_value_set_string(value, priv->fullname);
@@ -825,7 +825,7 @@ gnc_commodity_class_init(struct _GncCommodityClass* klass)
gnc_commodity *
gnc_commodity_new(QofBook *book, const char * fullname,
- const char * namespace, const char * mnemonic,
+ const char * name_space, const char * mnemonic,
const char * cusip, int fraction)
{
gnc_commodity * retval = g_object_new(GNC_TYPE_COMMODITY, NULL);
@@ -833,18 +833,18 @@ gnc_commodity_new(QofBook *book, const char * fullname,
qof_instance_init_data (&retval->inst, GNC_ID_COMMODITY, book);
gnc_commodity_begin_edit(retval);
- if ( namespace != NULL )
+ if ( name_space != NULL )
{
/* Prevent setting anything except template in namespace template. */
- if (g_strcmp0 (namespace, "template") == 0 &&
+ if (g_strcmp0 (name_space, "template") == 0 &&
g_strcmp0 (mnemonic, "template") != 0)
{
PWARN("Converting commodity %s from namespace template to "
"namespace User", mnemonic);
- namespace = "User";
+ name_space = "User";
}
- gnc_commodity_set_namespace(retval, namespace);
- if (gnc_commodity_namespace_is_iso(namespace))
+ gnc_commodity_set_namespace(retval, name_space);
+ if (gnc_commodity_namespace_is_iso(name_space))
{
gnc_commodity_set_quote_source(retval,
gnc_quote_source_lookup_by_internal("currency") );
@@ -888,7 +888,7 @@ commodity_free(gnc_commodity * cm)
CACHE_REMOVE (priv->cusip);
CACHE_REMOVE (priv->mnemonic);
CACHE_REMOVE (priv->quote_tz);
- priv->namespace = NULL;
+ priv->name_space = NULL;
/* Set through accessor functions */
priv->quote_source = NULL;
@@ -932,7 +932,7 @@ gnc_commodity_copy(gnc_commodity * dest, const gnc_commodity *src)
gnc_commodity_set_fullname (dest, src_priv->fullname);
gnc_commodity_set_mnemonic (dest, src_priv->mnemonic);
- dest_priv->namespace = src_priv->namespace;
+ dest_priv->name_space = src_priv->name_space;
gnc_commodity_set_fraction (dest, src_priv->fraction);
gnc_commodity_set_cusip (dest, src_priv->cusip);
gnc_commodity_set_quote_flag (dest, src_priv->quote_flag);
@@ -958,7 +958,7 @@ gnc_commodity_clone(const gnc_commodity *src, QofBook *dest_book)
dest_priv->cusip = CACHE_INSERT(src_priv->cusip);
dest_priv->quote_tz = CACHE_INSERT(src_priv->quote_tz);
- dest_priv->namespace = src_priv->namespace;
+ dest_priv->name_space = src_priv->name_space;
dest_priv->fraction = src_priv->fraction;
dest_priv->quote_flag = src_priv->quote_flag;
@@ -1005,7 +1005,7 @@ const char *
gnc_commodity_get_namespace(const gnc_commodity * cm)
{
if (!cm) return NULL;
- return gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->namespace);
+ return gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->name_space);
}
const char *
@@ -1015,20 +1015,20 @@ gnc_commodity_get_namespace_compat(const gnc_commodity * cm)
if (!cm) return NULL;
priv = GET_PRIVATE(cm);
- if (!priv->namespace) return NULL;
- if (priv->namespace->iso4217)
+ if (!priv->name_space) return NULL;
+ if (priv->name_space->iso4217)
{
/* Data files are still written with ISO4217. */
return GNC_COMMODITY_NS_ISO;
}
- return gnc_commodity_namespace_get_name(priv->namespace);
+ return gnc_commodity_namespace_get_name(priv->name_space);
}
gnc_commodity_namespace *
gnc_commodity_get_namespace_ds(const gnc_commodity * cm)
{
if (!cm) return NULL;
- return GET_PRIVATE(cm)->namespace;
+ return GET_PRIVATE(cm)->name_space;
}
/********************************************************************
@@ -1215,7 +1215,7 @@ gnc_commodity_set_mnemonic(gnc_commodity * cm, const char * mnemonic)
********************************************************************/
void
-gnc_commodity_set_namespace(gnc_commodity * cm, const char * namespace)
+gnc_commodity_set_namespace(gnc_commodity * cm, const char * name_space)
{
QofBook *book;
gnc_commodity_table *table;
@@ -1226,12 +1226,12 @@ gnc_commodity_set_namespace(gnc_commodity * cm, const char * namespace)
priv = GET_PRIVATE(cm);
book = qof_instance_get_book (&cm->inst);
table = gnc_commodity_table_get_table(book);
- nsp = gnc_commodity_table_add_namespace(table, namespace, book);
- if (priv->namespace == nsp)
+ nsp = gnc_commodity_table_add_namespace(table, name_space, book);
+ if (priv->name_space == nsp)
return;
gnc_commodity_begin_edit(cm);
- priv->namespace = nsp;
+ priv->name_space = nsp;
if (nsp->iso4217)
priv->quote_source = gnc_quote_source_lookup_by_internal("currency");
mark_commodity_dirty(cm);
@@ -1559,7 +1559,7 @@ gnc_commodity_equiv(const gnc_commodity * a, const gnc_commodity * b)
priv_a = GET_PRIVATE(a);
priv_b = GET_PRIVATE(b);
- if (priv_a->namespace != priv_b->namespace) return FALSE;
+ if (priv_a->name_space != priv_b->name_space) return FALSE;
if (g_strcmp0(priv_a->mnemonic, priv_b->mnemonic) != 0) return FALSE;
return TRUE;
}
@@ -1583,13 +1583,13 @@ gnc_commodity_equal(const gnc_commodity * a, const gnc_commodity * b)
priv_b = GET_PRIVATE(b);
same_book = qof_instance_get_book(QOF_INSTANCE(a)) == qof_instance_get_book(QOF_INSTANCE(b));
- if ((same_book && priv_a->namespace != priv_b->namespace)
- || (!same_book && g_strcmp0( gnc_commodity_namespace_get_name(priv_a->namespace),
- gnc_commodity_namespace_get_name(priv_b->namespace)) != 0))
+ if ((same_book && priv_a->name_space != priv_b->name_space)
+ || (!same_book && g_strcmp0( gnc_commodity_namespace_get_name(priv_a->name_space),
+ gnc_commodity_namespace_get_name(priv_b->name_space)) != 0))
{
DEBUG ("namespaces differ: %p(%s) vs %p(%s)",
- priv_a->namespace, gnc_commodity_namespace_get_name(priv_a->namespace),
- priv_b->namespace, gnc_commodity_namespace_get_name(priv_b->namespace));
+ priv_a->name_space, gnc_commodity_namespace_get_name(priv_a->name_space),
+ priv_b->name_space, gnc_commodity_namespace_get_name(priv_b->name_space));
return FALSE;
}
@@ -1649,27 +1649,27 @@ gnc_commodity_namespace_get_name (const gnc_commodity_namespace *ns)
}
GList *
-gnc_commodity_namespace_get_commodity_list(const gnc_commodity_namespace *namespace)
+gnc_commodity_namespace_get_commodity_list(const gnc_commodity_namespace *name_space)
{
- if (!namespace)
+ if (!name_space)
return NULL;
- return namespace->cm_list;
+ return name_space->cm_list;
}
gboolean
-gnc_commodity_namespace_is_iso(const char *namespace)
+gnc_commodity_namespace_is_iso(const char *name_space)
{
- return ((g_strcmp0(namespace, GNC_COMMODITY_NS_ISO) == 0) ||
- (g_strcmp0(namespace, GNC_COMMODITY_NS_CURRENCY) == 0));
+ return ((g_strcmp0(name_space, GNC_COMMODITY_NS_ISO) == 0) ||
+ (g_strcmp0(name_space, GNC_COMMODITY_NS_CURRENCY) == 0));
}
static const gchar *
-gnc_commodity_table_map_namespace(const char * namespace)
+gnc_commodity_table_map_namespace(const char * name_space)
{
- if (g_strcmp0(namespace, GNC_COMMODITY_NS_ISO) == 0)
+ if (g_strcmp0(name_space, GNC_COMMODITY_NS_ISO) == 0)
return GNC_COMMODITY_NS_CURRENCY;
- return namespace;
+ return name_space;
}
/********************************************************************
@@ -1759,14 +1759,14 @@ gnc_commodity_table_get_size(const gnc_commodity_table* tbl)
gnc_commodity *
gnc_commodity_table_lookup(const gnc_commodity_table * table,
- const char * namespace, const char * mnemonic)
+ const char * name_space, const char * mnemonic)
{
gnc_commodity_namespace * nsp = NULL;
unsigned int i;
- if (!table || !namespace || !mnemonic) return NULL;
+ if (!table || !name_space || !mnemonic) return NULL;
- nsp = gnc_commodity_table_find_namespace(table, namespace);
+ nsp = gnc_commodity_table_find_namespace(table, name_space);
if (nsp)
{
@@ -1802,26 +1802,26 @@ gnc_commodity *
gnc_commodity_table_lookup_unique(const gnc_commodity_table *table,
const char * unique_name)
{
- char *namespace;
+ char *name_space;
char *mnemonic;
gnc_commodity *commodity;
if (!table || !unique_name) return NULL;
- namespace = g_strdup (unique_name);
- mnemonic = strstr (namespace, "::");
+ name_space = g_strdup (unique_name);
+ mnemonic = strstr (name_space, "::");
if (!mnemonic)
{
- g_free (namespace);
+ g_free (name_space);
return NULL;
}
*mnemonic = '\0';
mnemonic += 2;
- commodity = gnc_commodity_table_lookup (table, namespace, mnemonic);
+ commodity = gnc_commodity_table_lookup (table, name_space, mnemonic);
- g_free (namespace);
+ g_free (name_space);
return commodity;
}
@@ -1833,7 +1833,7 @@ gnc_commodity_table_lookup_unique(const gnc_commodity_table *table,
gnc_commodity *
gnc_commodity_table_find_full(const gnc_commodity_table * table,
- const char * namespace,
+ const char * name_space,
const char * fullname)
{
gnc_commodity * retval = NULL;
@@ -1843,7 +1843,7 @@ gnc_commodity_table_find_full(const gnc_commodity_table * table,
if (!fullname || (fullname[0] == '\0'))
return NULL;
- all = gnc_commodity_table_get_commodities(table, namespace);
+ all = gnc_commodity_table_get_commodities(table, name_space);
for (iterator = all; iterator; iterator = iterator->next)
{
@@ -1884,7 +1884,7 @@ gnc_commodity_table_insert(gnc_commodity_table * table,
ENTER ("(table=%p, comm=%p) %s %s", table, comm,
(priv->mnemonic == NULL ? "(null)" : priv->mnemonic),
(priv->fullname == NULL ? "(null)" : priv->fullname));
- ns_name = gnc_commodity_namespace_get_name(priv->namespace);
+ ns_name = gnc_commodity_namespace_get_name(priv->name_space);
c = gnc_commodity_table_lookup (table, ns_name, priv->mnemonic);
if (c)
@@ -1897,7 +1897,7 @@ gnc_commodity_table_insert(gnc_commodity_table * table,
/* Backward compatability support for currencies that have
* recently changed. */
- if (priv->namespace->iso4217)
+ if (priv->name_space->iso4217)
{
guint i;
for (i = 0; i < GNC_NEW_ISO_CODES; i++)
@@ -1960,7 +1960,7 @@ gnc_commodity_table_remove(gnc_commodity_table * table,
if (!comm) return;
priv = GET_PRIVATE(comm);
- ns_name = gnc_commodity_namespace_get_name(priv->namespace);
+ ns_name = gnc_commodity_namespace_get_name(priv->name_space);
c = gnc_commodity_table_lookup (table, ns_name, priv->mnemonic);
if (c != comm) return;
@@ -1981,16 +1981,16 @@ gnc_commodity_table_remove(gnc_commodity_table * table,
int
gnc_commodity_table_has_namespace(const gnc_commodity_table * table,
- const char * namespace)
+ const char * name_space)
{
gnc_commodity_namespace * nsp = NULL;
- if (!table || !namespace)
+ if (!table || !name_space)
{
return 0;
}
- nsp = gnc_commodity_table_find_namespace(table, namespace);
+ nsp = gnc_commodity_table_find_namespace(table, name_space);
if (nsp)
{
return 1;
@@ -2068,8 +2068,8 @@ gnc_commodity_is_iso(const gnc_commodity * cm)
if (!cm) return FALSE;
priv = GET_PRIVATE(cm);
- if ( !priv->namespace) return FALSE;
- return priv->namespace->iso4217;
+ if ( !priv->name_space) return FALSE;
+ return priv->name_space->iso4217;
}
gboolean
@@ -2078,7 +2078,7 @@ gnc_commodity_is_currency(const gnc_commodity *cm)
const char *ns_name;
if (!cm) return FALSE;
- ns_name = gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->namespace);
+ ns_name = gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->name_space);
return (!g_strcmp0(ns_name, GNC_COMMODITY_NS_LEGACY) ||
!g_strcmp0(ns_name, GNC_COMMODITY_NS_CURRENCY));
}
@@ -2090,14 +2090,14 @@ gnc_commodity_is_currency(const gnc_commodity *cm)
CommodityList *
gnc_commodity_table_get_commodities(const gnc_commodity_table * table,
- const char * namespace)
+ const char * name_space)
{
gnc_commodity_namespace * ns = NULL;
if (!table)
return NULL;
- ns = gnc_commodity_table_find_namespace(table, namespace);
+ ns = gnc_commodity_table_find_namespace(table, name_space);
if (!ns)
return NULL;
@@ -2139,7 +2139,7 @@ CommodityList *
gnc_commodity_table_get_quotable_commodities(const gnc_commodity_table * table)
{
gnc_commodity_namespace * ns = NULL;
- const char *namespace;
+ const char *name_space;
GList * nslist, * tmp;
GList * l = NULL;
regex_t pattern;
@@ -2160,11 +2160,11 @@ gnc_commodity_table_get_quotable_commodities(const gnc_commodity_table * table)
nslist = gnc_commodity_table_get_namespaces(table);
for (tmp = nslist; tmp; tmp = tmp->next)
{
- namespace = tmp->data;
- if (regexec(&pattern, namespace, 0, NULL, 0) == 0)
+ name_space = tmp->data;
+ if (regexec(&pattern, name_space, 0, NULL, 0) == 0)
{
- DEBUG("Running list of %s commodities", namespace);
- ns = gnc_commodity_table_find_namespace(table, namespace);
+ DEBUG("Running list of %s commodities", name_space);
+ ns = gnc_commodity_table_find_namespace(table, name_space);
if (ns)
{
g_hash_table_foreach(ns->cm_table, &get_quotables_helper1, (gpointer) &l);
@@ -2208,21 +2208,21 @@ gnc_commodity_namespace_finalize_real(GObject* nsp)
gnc_commodity_namespace *
gnc_commodity_table_add_namespace(gnc_commodity_table * table,
- const char * namespace,
+ const char * name_space,
QofBook *book)
{
gnc_commodity_namespace * ns = NULL;
if (!table) return NULL;
- namespace = gnc_commodity_table_map_namespace(namespace);
- ns = gnc_commodity_table_find_namespace(table, namespace);
+ name_space = gnc_commodity_table_map_namespace(name_space);
+ ns = gnc_commodity_table_find_namespace(table, name_space);
if (!ns)
{
ns = g_object_new(GNC_TYPE_COMMODITY_NAMESPACE, NULL);
ns->cm_table = g_hash_table_new(g_str_hash, g_str_equal);
- ns->name = CACHE_INSERT((gpointer)namespace);
- ns->iso4217 = gnc_commodity_namespace_is_iso(namespace);
+ ns->name = CACHE_INSERT((gpointer)name_space);
+ ns->iso4217 = gnc_commodity_namespace_is_iso(name_space);
qof_instance_init_data (&ns->inst, GNC_ID_COMMODITY_NAMESPACE, book);
qof_event_gen (&ns->inst, QOF_EVENT_CREATE, NULL);
@@ -2238,13 +2238,13 @@ gnc_commodity_table_add_namespace(gnc_commodity_table * table,
gnc_commodity_namespace *
gnc_commodity_table_find_namespace(const gnc_commodity_table * table,
- const char * namespace)
+ const char * name_space)
{
- if (!table || !namespace)
+ if (!table || !name_space)
return NULL;
- namespace = gnc_commodity_table_map_namespace(namespace);
- return g_hash_table_lookup(table->ns_table, (gpointer)namespace);
+ name_space = gnc_commodity_table_map_namespace(name_space);
+ return g_hash_table_lookup(table->ns_table, (gpointer)name_space);
}
@@ -2273,18 +2273,18 @@ ns_helper(gpointer key, gpointer value, gpointer user_data)
void
gnc_commodity_table_delete_namespace(gnc_commodity_table * table,
- const char * namespace)
+ const char * name_space)
{
gnc_commodity_namespace * ns;
if (!table) return;
- ns = gnc_commodity_table_find_namespace(table, namespace);
+ ns = gnc_commodity_table_find_namespace(table, name_space);
if (!ns)
return;
qof_event_gen (&ns->inst, QOF_EVENT_REMOVE, NULL);
- g_hash_table_remove(table->ns_table, namespace);
+ g_hash_table_remove(table->ns_table, name_space);
table->ns_list = g_list_remove(table->ns_list, ns);
g_list_free(ns->cm_list);
diff --git a/src/engine/test-core/test-engine-stuff.c b/src/engine/test-core/test-engine-stuff.c
index ad35d9b..a9d9087 100644
--- a/src/engine/test-core/test-engine-stuff.c
+++ b/src/engine/test-core/test-engine-stuff.c
@@ -516,11 +516,11 @@ get_random_commodity_from_table (gnc_commodity_table *table)
do
{
GList *commodities;
- char *namespace;
+ char *name_space;
- namespace = get_random_list_element (namespaces);
+ name_space = get_random_list_element (namespaces);
- commodities = gnc_commodity_table_get_commodities (table, namespace);
+ commodities = gnc_commodity_table_get_commodities (table, name_space);
if (!commodities)
continue;
diff --git a/src/engine/test/utest-Account.c b/src/engine/test/utest-Account.c
index 2a8fe33..5d717f0 100644
--- a/src/engine/test/utest-Account.c
+++ b/src/engine/test/utest-Account.c
@@ -2122,14 +2122,14 @@ test_xaccAccountType_Stuff (void)
TestErrorStruct check3 = { loglevel, logdomain, msg3, 0 };
Account *acc = g_object_new (GNC_TYPE_ACCOUNT, NULL);
- for (type = ACCT_TYPE_NONE; type < ACCT_TYPE_LAST; type++)
+ for (type = ACCT_TYPE_NONE; type < ACCT_TYPE_LAST; type = type + 1)
{
- const gchar *typename = xaccAccountTypeEnumAsString (type);
+ const gchar *type_name = xaccAccountTypeEnumAsString (type);
const gchar *typestr;
gchar *typestr_uc;
- g_assert (typename);
- g_assert_cmpint (xaccAccountStringToEnum (typename), == , type);
+ g_assert (type_name);
+ g_assert_cmpint (xaccAccountStringToEnum (type_name), == , type);
if (type < 0 || type >= NUM_ACCOUNT_TYPES)
continue;
@@ -2137,24 +2137,24 @@ test_xaccAccountType_Stuff (void)
typestr_uc = g_ascii_strup (typestr, strlen (typestr));
if (type == ACCT_TYPE_PAYABLE || type == ACCT_TYPE_RECEIVABLE)
{
- gchar *cmpstr = g_strconcat ("A/", typename, NULL);
+ gchar *cmpstr = g_strconcat ("A/", type_name, NULL);
g_assert_cmpstr (typestr_uc, == , cmpstr);
g_free (cmpstr);
}
else if (type == ACCT_TYPE_CREDIT)
{
- gchar *cmpstr = g_strconcat (typename, " CARD", NULL);
+ gchar *cmpstr = g_strconcat (type_name, " CARD", NULL);
g_assert_cmpstr (typestr_uc, == , cmpstr);
g_free (cmpstr);
}
else if (type == ACCT_TYPE_MUTUAL)
{
- gchar *cmpstr = g_strconcat (typename, " FUND", NULL);
+ gchar *cmpstr = g_strconcat (type_name, " FUND", NULL);
g_assert_cmpstr (typestr_uc, == , cmpstr);
g_free (cmpstr);
}
else
- g_assert_cmpstr (typestr_uc, == , typename);
+ g_assert_cmpstr (typestr_uc, == , type_name);
g_free (typestr_uc);
g_object_set (acc, "type", type, NULL);
@@ -2225,7 +2225,7 @@ test_xaccAccountType_Compatibility (void)
TestErrorStruct check2 = { loglevel, logdomain, msg2, 0 };
gint loghandler;
- for (type = ACCT_TYPE_BANK; type < NUM_ACCOUNT_TYPES; type++)
+ for (type = ACCT_TYPE_BANK; type < NUM_ACCOUNT_TYPES; type = type + 1)
{
GNCAccountType child;
if (type == ACCT_TYPE_ROOT)
@@ -2252,7 +2252,7 @@ test_xaccAccountType_Compatibility (void)
g_assert_cmpint (compat, == , equity_compat);
else if (type == ACCT_TYPE_TRADING)
g_assert_cmpint (compat, == , trading_compat);
- for (child = ACCT_TYPE_NONE; child < ACCT_TYPE_LAST; child++)
+ for (child = ACCT_TYPE_NONE; child < ACCT_TYPE_LAST; child = child + 1)
if (1 << child & compat)
g_assert (xaccAccountTypesCompatible (type, child));
else
@@ -2262,7 +2262,7 @@ test_xaccAccountType_Compatibility (void)
loghandler = g_log_set_handler (logdomain, loglevel,
(GLogFunc)test_null_handler, &check2);
g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler, &check2);
- compat = xaccParentAccountTypesCompatibleWith (++type);
+ compat = xaccParentAccountTypesCompatibleWith (type = type + 1);
g_log_remove_handler (logdomain, loghandler);
g_assert_cmpint (compat, == , 0);
g_assert_cmpint (check2.hits, ==, 1);
diff --git a/src/engine/test/utest-Transaction.c b/src/engine/test/utest-Transaction.c
index 35330a4..704b667 100644
--- a/src/engine/test/utest-Transaction.c
+++ b/src/engine/test/utest-Transaction.c
@@ -578,20 +578,20 @@ test_xaccDupeTransaction (Fixture *fixture, gconstpointer pData)
{
Timespec posted = gnc_dmy2timespec (12, 7, 2011);
Timespec entered = gnc_dmy2timespec (14, 7, 2011);
- Transaction *new = NULL, *old = fixture->txn;
- QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (old));
- GList *newnode, *oldnode = old->splits;
+ Transaction *newtxn = NULL, *oldtxn = fixture->txn;
+ QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (oldtxn));
+ GList *newnode, *oldnode = oldtxn->splits;
- old->date_posted = posted;
- old->date_entered = entered;
- kvp_frame_set_string (old->inst.kvp_data, "/foo/bar/baz",
+ oldtxn->date_posted = posted;
+ oldtxn->date_entered = entered;
+ kvp_frame_set_string (oldtxn->inst.kvp_data, "/foo/bar/baz",
"The Great Waldo Pepper");
- new = xaccDupeTransaction (old);
+ newtxn = xaccDupeTransaction (oldtxn);
- g_assert_cmpstr (new->num, ==, old->num);
- g_assert_cmpstr (new->description, ==, old->description);
- for (newnode = new->splits; newnode && oldnode;
+ g_assert_cmpstr (newtxn->num, ==, oldtxn->num);
+ g_assert_cmpstr (newtxn->description, ==, oldtxn->description);
+ for (newnode = newtxn->splits; newnode && oldnode;
newnode = g_list_next (newnode))
{
g_assert (xaccSplitEqual (newnode->data, oldnode->data,
@@ -600,19 +600,19 @@ test_xaccDupeTransaction (Fixture *fixture, gconstpointer pData)
}
g_assert (newnode == NULL);
g_assert (oldnode == NULL);
- g_assert (timespec_equal (&(new->date_posted), &posted));
- g_assert (timespec_equal (&(new->date_entered), &entered));
- g_assert (qof_instance_version_cmp (QOF_INSTANCE (new),
- QOF_INSTANCE (old)) == 0);
- g_assert (new->orig == NULL);
- g_assert (new->common_currency == fixture->curr);
- g_assert (new->inst.e_type == NULL);
- g_assert (guid_equal (qof_instance_get_guid (QOF_INSTANCE (new)),
+ g_assert (timespec_equal (&(newtxn->date_posted), &posted));
+ g_assert (timespec_equal (&(newtxn->date_entered), &entered));
+ g_assert (qof_instance_version_cmp (QOF_INSTANCE (newtxn),
+ QOF_INSTANCE (oldtxn)) == 0);
+ g_assert (newtxn->orig == NULL);
+ g_assert (newtxn->common_currency == fixture->curr);
+ g_assert (newtxn->inst.e_type == NULL);
+ g_assert (guid_equal (qof_instance_get_guid (QOF_INSTANCE (newtxn)),
guid_null ()));
- g_assert (qof_instance_get_book (QOF_INSTANCE (new)) == old_book);
- g_assert (kvp_frame_compare (old->inst.kvp_data, new->inst.kvp_data) == 0);
+ g_assert (qof_instance_get_book (QOF_INSTANCE (newtxn)) == old_book);
+ g_assert (kvp_frame_compare (oldtxn->inst.kvp_data, newtxn->inst.kvp_data) == 0);
- test_destroy (new);
+ test_destroy (newtxn);
}
/* xaccTransClone
Transaction *
@@ -623,26 +623,26 @@ test_xaccTransClone (Fixture *fixture, gconstpointer pData)
{
Timespec posted = gnc_dmy2timespec (12, 7, 2011);
Timespec entered = gnc_dmy2timespec (14, 7, 2011);
- Transaction *new = NULL, *old = fixture->txn;
- QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (old));
+ Transaction *newtxn = NULL, *oldtxn = fixture->txn;
+ QofBook *old_book = qof_instance_get_book (QOF_INSTANCE (oldtxn));
GList *newnode, *oldnode;
int foo, bar;
- old->date_posted = posted;
- old->date_entered = entered;
- new = xaccTransClone (old);
+ oldtxn->date_posted = posted;
+ oldtxn->date_entered = entered;
+ newtxn = xaccTransClone (oldtxn);
- g_assert_cmpstr (new->num, ==, old->num);
- g_assert_cmpstr (new->description, ==, old->description);
+ g_assert_cmpstr (newtxn->num, ==, oldtxn->num);
+ g_assert_cmpstr (newtxn->description, ==, oldtxn->description);
- g_assert_cmpint (xaccTransCountSplits (old), ==,
- xaccTransCountSplits (new));
+ g_assert_cmpint (xaccTransCountSplits (oldtxn), ==,
+ xaccTransCountSplits (newtxn));
- xaccTransSortSplits (new);
- xaccTransSortSplits (old);
+ xaccTransSortSplits (newtxn);
+ xaccTransSortSplits (oldtxn);
- oldnode = old->splits;
- for (newnode = new->splits; newnode && oldnode;
+ oldnode = oldtxn->splits;
+ for (newnode = newtxn->splits; newnode && oldnode;
newnode = g_list_next (newnode))
{
g_assert (xaccSplitEqual (newnode->data, oldnode->data,
@@ -651,19 +651,19 @@ test_xaccTransClone (Fixture *fixture, gconstpointer pData)
}
g_assert (newnode == NULL);
g_assert (oldnode == NULL);
- g_assert (timespec_equal (&(new->date_posted), &posted));
- g_assert (timespec_equal (&(new->date_entered), &entered));
- g_assert (qof_instance_version_cmp (QOF_INSTANCE (new),
- QOF_INSTANCE (old)) == 0);
- g_assert_cmpint (qof_instance_get_version_check (new), ==,
- qof_instance_get_version_check (old));
- g_assert (new->orig == NULL);
- g_assert (new->common_currency == fixture->curr);
-
- g_assert (qof_instance_get_book (QOF_INSTANCE (new)) == old_book);
- g_assert (kvp_frame_compare (old->inst.kvp_data, new->inst.kvp_data) == 0);
-
- test_destroy (new);
+ g_assert (timespec_equal (&(newtxn->date_posted), &posted));
+ g_assert (timespec_equal (&(newtxn->date_entered), &entered));
+ g_assert (qof_instance_version_cmp (QOF_INSTANCE (newtxn),
+ QOF_INSTANCE (oldtxn)) == 0);
+ g_assert_cmpint (qof_instance_get_version_check (newtxn), ==,
+ qof_instance_get_version_check (oldtxn));
+ g_assert (newtxn->orig == NULL);
+ g_assert (newtxn->common_currency == fixture->curr);
+
+ g_assert (qof_instance_get_book (QOF_INSTANCE (newtxn)) == old_book);
+ g_assert (kvp_frame_compare (oldtxn->inst.kvp_data, newtxn->inst.kvp_data) == 0);
+
+ test_destroy (newtxn);
}
/* xaccTransCopyOnto
diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c
index 0255a36..cbdbca2 100644
--- a/src/gnome-search/dialog-search.c
+++ b/src/gnome-search/dialog-search.c
@@ -909,7 +909,7 @@ gnc_search_dialog_book_option_changed (gpointer new_val, gpointer user_data)
static void
gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
{
- GNCSearchCoreType *new;
+ GNCSearchCoreType *new_sct;
/* First, make sure that the last criterion is ok */
if (sw->crit_list)
@@ -926,16 +926,16 @@ gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
gtk_widget_hide(sw->match_all_label);
}
/* create a new criterion element */
- new = gnc_search_core_type_new_type_name
+ new_sct = gnc_search_core_type_new_type_name
(gnc_search_param_get_param_type (sw->last_param));
- if (new)
+ if (new_sct)
{
struct _crit_data *data;
GtkWidget *w;
int rows;
- w = get_element_widget (sw, new);
+ w = get_element_widget (sw, new_sct);
data = g_object_get_data (G_OBJECT (w), "data");
sw->crit_list = g_list_append (sw->crit_list, data);
@@ -943,8 +943,8 @@ gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
gtk_table_resize (GTK_TABLE (sw->criteria_table), rows + 1, 2);
attach_element (w, sw, rows);
- gnc_search_core_type_grab_focus (new);
- gnc_search_core_type_editable_enters (new);
+ gnc_search_core_type_grab_focus (new_sct);
+ gnc_search_core_type_editable_enters (new_sct);
}
}
diff --git a/src/gnome-search/gnc-general-search.c b/src/gnome-search/gnc-general-search.c
index 7131b4e..a33da6a 100644
--- a/src/gnome-search/gnc-general-search.c
+++ b/src/gnome-search/gnc-general-search.c
@@ -58,7 +58,7 @@ enum
};
static void gnc_general_search_init (GNCGeneralSearch *gsl);
-static void gnc_general_search_class_init (GNCGeneralSearchClass *class);
+static void gnc_general_search_class_init (GNCGeneralSearchClass *klass);
static void gnc_general_search_destroy (GtkObject *object);
typedef struct _GNCGeneralSearchPrivate GNCGeneralSearchPrivate;
diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c
index c8552a3..d54a10e 100644
--- a/src/gnome-search/search-account.c
+++ b/src/gnome-search/search-account.c
@@ -43,7 +43,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_account_class_init (GNCSearchAccountClass *class);
+static void gnc_search_account_class_init (GNCSearchAccountClass *klass);
static void gnc_search_account_init (GNCSearchAccount *gspaper);
static void gnc_search_account_finalize (GObject *obj);
@@ -90,13 +90,13 @@ gnc_search_account_get_type (void)
}
static void
-gnc_search_account_class_init (GNCSearchAccountClass *class)
+gnc_search_account_class_init (GNCSearchAccountClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_account_finalize;
@@ -106,7 +106,7 @@ gnc_search_account_class_init (GNCSearchAccountClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchAccountPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchAccountPrivate));
}
static void
diff --git a/src/gnome-search/search-boolean.c b/src/gnome-search/search-boolean.c
index 3cafd3c..0a67de1 100644
--- a/src/gnome-search/search-boolean.c
+++ b/src/gnome-search/search-boolean.c
@@ -40,7 +40,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_boolean_class_init (GNCSearchBooleanClass *class);
+static void gnc_search_boolean_class_init (GNCSearchBooleanClass *klass);
static void gnc_search_boolean_init (GNCSearchBoolean *gspaper);
static void gnc_search_boolean_finalize (GObject *obj);
@@ -85,13 +85,13 @@ gnc_search_boolean_get_type (void)
}
static void
-gnc_search_boolean_class_init (GNCSearchBooleanClass *class)
+gnc_search_boolean_class_init (GNCSearchBooleanClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_boolean_finalize;
@@ -101,7 +101,7 @@ gnc_search_boolean_class_init (GNCSearchBooleanClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchBooleanPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchBooleanPrivate));
}
static void
diff --git a/src/gnome-search/search-core-type.c b/src/gnome-search/search-core-type.c
index 985c65e..3d0313c 100644
--- a/src/gnome-search/search-core-type.c
+++ b/src/gnome-search/search-core-type.c
@@ -44,7 +44,7 @@ static void grab_focus (GNCSearchCoreType *fe);
static void editable_enters (GNCSearchCoreType *fe);
static gboolean validate (GNCSearchCoreType *fe);
-static void gnc_search_core_type_class_init (GNCSearchCoreTypeClass *class);
+static void gnc_search_core_type_class_init (GNCSearchCoreTypeClass *klass);
static void gnc_search_core_type_init (GNCSearchCoreType *gspaper);
static void gnc_search_core_type_finalize (GObject *obj);
diff --git a/src/gnome-search/search-date.c b/src/gnome-search/search-date.c
index a41503e..3a3e5aa 100644
--- a/src/gnome-search/search-date.c
+++ b/src/gnome-search/search-date.c
@@ -44,7 +44,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_date_class_init (GNCSearchDateClass *class);
+static void gnc_search_date_class_init (GNCSearchDateClass *klass);
static void gnc_search_date_init (GNCSearchDate *gspaper);
static void gnc_search_date_finalize (GObject *obj);
@@ -89,13 +89,13 @@ gnc_search_date_get_type (void)
}
static void
-gnc_search_date_class_init (GNCSearchDateClass *class)
+gnc_search_date_class_init (GNCSearchDateClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_date_finalize;
@@ -107,7 +107,7 @@ gnc_search_date_class_init (GNCSearchDateClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchDatePrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchDatePrivate));
}
static void
diff --git a/src/gnome-search/search-double.c b/src/gnome-search/search-double.c
index 675da1f..d87626f 100644
--- a/src/gnome-search/search-double.c
+++ b/src/gnome-search/search-double.c
@@ -43,7 +43,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_double_class_init (GNCSearchDoubleClass *class);
+static void gnc_search_double_class_init (GNCSearchDoubleClass *klass);
static void gnc_search_double_init (GNCSearchDouble *gspaper);
static void gnc_search_double_finalize (GObject *obj);
@@ -89,13 +89,13 @@ gnc_search_double_get_type (void)
}
static void
-gnc_search_double_class_init (GNCSearchDoubleClass *class)
+gnc_search_double_class_init (GNCSearchDoubleClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_double_finalize;
@@ -107,7 +107,7 @@ gnc_search_double_class_init (GNCSearchDoubleClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchDoublePrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchDoublePrivate));
}
static void
diff --git a/src/gnome-search/search-int64.c b/src/gnome-search/search-int64.c
index a76e382..943fdcd 100644
--- a/src/gnome-search/search-int64.c
+++ b/src/gnome-search/search-int64.c
@@ -43,7 +43,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_int64_class_init (GNCSearchInt64Class *class);
+static void gnc_search_int64_class_init (GNCSearchInt64Class *klass);
static void gnc_search_int64_init (GNCSearchInt64 *gspaper);
static void gnc_search_int64_finalize (GObject *obj);
@@ -90,13 +90,13 @@ gnc_search_int64_get_type (void)
}
static void
-gnc_search_int64_class_init (GNCSearchInt64Class *class)
+gnc_search_int64_class_init (GNCSearchInt64Class *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_int64_finalize;
@@ -108,7 +108,7 @@ gnc_search_int64_class_init (GNCSearchInt64Class *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchInt64Private));
+ g_type_class_add_private(klass, sizeof(GNCSearchInt64Private));
}
static void
diff --git a/src/gnome-search/search-numeric.c b/src/gnome-search/search-numeric.c
index 2c2d834..7778541 100644
--- a/src/gnome-search/search-numeric.c
+++ b/src/gnome-search/search-numeric.c
@@ -43,7 +43,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_numeric_class_init (GNCSearchNumericClass *class);
+static void gnc_search_numeric_class_init (GNCSearchNumericClass *klass);
static void gnc_search_numeric_init (GNCSearchNumeric *gspaper);
static void gnc_search_numeric_finalize (GObject *obj);
@@ -90,13 +90,13 @@ gnc_search_numeric_get_type (void)
}
static void
-gnc_search_numeric_class_init (GNCSearchNumericClass *class)
+gnc_search_numeric_class_init (GNCSearchNumericClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_numeric_finalize;
@@ -108,7 +108,7 @@ gnc_search_numeric_class_init (GNCSearchNumericClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchNumericPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchNumericPrivate));
}
static void
diff --git a/src/gnome-search/search-reconciled.c b/src/gnome-search/search-reconciled.c
index 76658cd..8390c45 100644
--- a/src/gnome-search/search-reconciled.c
+++ b/src/gnome-search/search-reconciled.c
@@ -41,7 +41,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_reconciled_class_init (GNCSearchReconciledClass *class);
+static void gnc_search_reconciled_class_init (GNCSearchReconciledClass *klass);
static void gnc_search_reconciled_init (GNCSearchReconciled *gspaper);
static void gnc_search_reconciled_finalize (GObject *obj);
@@ -86,13 +86,13 @@ gnc_search_reconciled_get_type (void)
}
static void
-gnc_search_reconciled_class_init (GNCSearchReconciledClass *class)
+gnc_search_reconciled_class_init (GNCSearchReconciledClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_reconciled_finalize;
@@ -102,7 +102,7 @@ gnc_search_reconciled_class_init (GNCSearchReconciledClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchReconciledPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchReconciledPrivate));
}
static void
diff --git a/src/gnome-search/search-string.c b/src/gnome-search/search-string.c
index dc5e4c1..04381f8 100644
--- a/src/gnome-search/search-string.c
+++ b/src/gnome-search/search-string.c
@@ -44,7 +44,7 @@ static gboolean gncs_validate (GNCSearchCoreType *fe);
static GtkWidget *gncs_get_widget(GNCSearchCoreType *fe);
static QofQueryPredData* gncs_get_predicate (GNCSearchCoreType *fe);
-static void gnc_search_string_class_init (GNCSearchStringClass *class);
+static void gnc_search_string_class_init (GNCSearchStringClass *klass);
static void gnc_search_string_init (GNCSearchString *gspaper);
static void gnc_search_string_finalize (GObject *obj);
@@ -89,13 +89,13 @@ gnc_search_string_get_type (void)
}
static void
-gnc_search_string_class_init (GNCSearchStringClass *class)
+gnc_search_string_class_init (GNCSearchStringClass *klass)
{
GObjectClass *object_class;
- GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class;
+ GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)klass;
- object_class = G_OBJECT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
+ object_class = G_OBJECT_CLASS (klass);
+ parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_search_string_finalize;
@@ -107,7 +107,7 @@ gnc_search_string_class_init (GNCSearchStringClass *class)
gnc_search_core_type->get_predicate = gncs_get_predicate;
gnc_search_core_type->clone = gncs_clone;
- g_type_class_add_private(class, sizeof(GNCSearchStringPrivate));
+ g_type_class_add_private(klass, sizeof(GNCSearchStringPrivate));
}
static void
@@ -247,10 +247,10 @@ toggle_changed (GtkToggleButton *button, GNCSearchString *fe)
static void
entry_changed (GtkEntry *entry, GNCSearchString *fe)
{
- const char *new;
+ const char *new_str;
- new = gtk_entry_get_text(entry);
- gnc_search_string_set_value (fe, new);
+ new_str = gtk_entry_get_text(entry);
+ gnc_search_string_set_value (fe, new_str);
}
static GtkWidget *
diff --git a/src/gnome-utils/assistant-xml-encoding.c b/src/gnome-utils/assistant-xml-encoding.c
index 7d03042..558e2e5 100644
--- a/src/gnome-utils/assistant-xml-encoding.c
+++ b/src/gnome-utils/assistant-xml-encoding.c
@@ -408,14 +408,14 @@ conv_free (conv_type *conv)
static conv_type *
conv_copy (const conv_type *conv)
{
- conv_type *new = NULL;
+ conv_type *new_type = NULL;
if (conv)
{
- new = g_new(conv_type, 1);
- new->encoding = conv->encoding;
- new->utf8_string = g_strdup (conv->utf8_string);
+ new_type = g_new(conv_type, 1);
+ new_type->encoding = conv->encoding;
+ new_type->utf8_string = g_strdup (conv->utf8_string);
}
- return new;
+ return new_type;
}
static gint
diff --git a/src/gnome-utils/dialog-commodity.c b/src/gnome-utils/dialog-commodity.c
index 86f01e0..6aed72a 100644
--- a/src/gnome-utils/dialog-commodity.c
+++ b/src/gnome-utils/dialog-commodity.c
@@ -249,7 +249,7 @@ gnc_ui_select_commodity_create(const gnc_commodity * orig_sel,
SelectCommodityWindow * retval = g_new0(SelectCommodityWindow, 1);
GtkBuilder *builder;
const char *title, *text;
- gchar *namespace;
+ gchar *name_space;
GtkWidget *button, *label;
builder = gtk_builder_new();
@@ -303,13 +303,13 @@ gnc_ui_select_commodity_create(const gnc_commodity * orig_sel,
gnc_ui_update_namespace_picker(retval->namespace_combo,
gnc_commodity_get_namespace(orig_sel),
mode);
- namespace = gnc_ui_namespace_picker_ns(retval->namespace_combo);
- gnc_ui_update_commodity_picker(retval->commodity_combo, namespace,
+ name_space = gnc_ui_namespace_picker_ns(retval->namespace_combo);
+ gnc_ui_update_commodity_picker(retval->commodity_combo, name_space,
gnc_commodity_get_printname(orig_sel));
g_object_unref(G_OBJECT(builder));
- g_free(namespace);
+ g_free(name_space);
return retval;
}
@@ -334,10 +334,10 @@ gnc_ui_select_commodity_new_cb(GtkButton * button,
{
SelectCommodityWindow * w = user_data;
- gchar * namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
+ gchar * name_space = gnc_ui_namespace_picker_ns (w->namespace_combo);
const gnc_commodity * new_commodity =
- gnc_ui_new_commodity_modal_full(namespace,
+ gnc_ui_new_commodity_modal_full(name_space,
w->dialog,
w->default_cusip,
w->default_fullname,
@@ -353,7 +353,7 @@ gnc_ui_select_commodity_new_cb(GtkButton * button,
gnc_commodity_get_namespace(new_commodity),
gnc_commodity_get_printname(new_commodity));
}
- g_free(namespace);
+ g_free(name_space);
}
@@ -377,18 +377,18 @@ gnc_ui_select_commodity_changed_cb (GtkComboBox *cbwe,
gpointer user_data)
{
SelectCommodityWindow * w = user_data;
- gchar *namespace;
+ gchar *name_space;
const gchar *fullname;
gboolean ok;
ENTER("cbwe=%p, user_data=%p", cbwe, user_data);
- namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
+ name_space = gnc_ui_namespace_picker_ns (w->namespace_combo);
fullname = gtk_entry_get_text(GTK_ENTRY (gtk_bin_get_child(GTK_BIN (GTK_COMBO_BOX(w->commodity_combo)))));
- DEBUG("namespace=%s, name=%s", namespace, fullname);
+ DEBUG("namespace=%s, name=%s", name_space, fullname);
w->selection = gnc_commodity_table_find_full(gnc_get_current_commodities(),
- namespace, fullname);
- g_free(namespace);
+ name_space, fullname);
+ g_free(name_space);
ok = (w->selection != NULL);
gtk_widget_set_sensitive(w->ok_button, ok);
@@ -418,13 +418,13 @@ gnc_ui_select_commodity_namespace_changed_cb (GtkComboBox *cbwe,
gpointer user_data)
{
SelectCommodityWindow * w = user_data;
- gchar *namespace;
+ gchar *name_space;
ENTER("cbwe=%p, user_data=%p", cbwe, user_data);
- namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
- DEBUG("namespace=%s", namespace);
- gnc_ui_update_commodity_picker(w->commodity_combo, namespace, NULL);
- g_free(namespace);
+ name_space = gnc_ui_namespace_picker_ns (w->namespace_combo);
+ DEBUG("name_space=%s", name_space);
+ gnc_ui_update_commodity_picker(w->commodity_combo, name_space, NULL);
+ g_free(name_space);
LEAVE(" ");
}
@@ -445,7 +445,7 @@ collate(gconstpointer a, gconstpointer b)
void
gnc_ui_update_commodity_picker (GtkWidget *cbwe,
- const gchar * namespace,
+ const gchar * name_space,
const gchar * init_string)
{
GList * commodities;
@@ -460,7 +460,7 @@ gnc_ui_update_commodity_picker (GtkWidget *cbwe,
gchar *name;
g_return_if_fail(GTK_IS_COMBO_BOX(cbwe));
- g_return_if_fail(namespace);
+ g_return_if_fail(name_space);
/* Erase the old entries */
combo_box = GTK_COMBO_BOX(cbwe);
@@ -474,7 +474,7 @@ gnc_ui_update_commodity_picker (GtkWidget *cbwe,
gtk_combo_box_set_active(combo_box, -1);
table = gnc_commodity_table_get_table (gnc_get_current_book ());
- commodities = gnc_commodity_table_get_commodities(table, namespace);
+ commodities = gnc_commodity_table_get_commodities(table, name_space);
for (iterator = commodities; iterator; iterator = iterator->next)
{
commodity_items =
@@ -710,19 +710,19 @@ gnc_ui_update_namespace_picker (GtkWidget *cbwe,
gchar *
gnc_ui_namespace_picker_ns (GtkWidget *cbwe)
{
- const gchar *namespace;
+ const gchar *name_space;
g_return_val_if_fail(GTK_IS_COMBO_BOX (cbwe), NULL);
- namespace = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( GTK_COMBO_BOX(cbwe)))));
+ name_space = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( GTK_COMBO_BOX(cbwe)))));
- if (g_strcmp0 (namespace, GNC_COMMODITY_NS_ISO) == 0)
+ if (g_strcmp0 (name_space, GNC_COMMODITY_NS_ISO) == 0)
{
/* In case the user types in ISO4217, map it to CURRENCY. */
return g_strdup(GNC_COMMODITY_NS_CURRENCY);
}
else
- return g_strdup(namespace);
+ return g_strdup(name_space);
}
@@ -765,7 +765,7 @@ void
gnc_ui_commodity_changed_cb(GtkWidget * dummy, gpointer user_data)
{
CommodityWindow * w = user_data;
- gchar *namespace;
+ gchar *name_space;
const char * fullname;
const char * mnemonic;
gboolean ok;
@@ -773,13 +773,13 @@ gnc_ui_commodity_changed_cb(GtkWidget * dummy, gpointer user_data)
ENTER("widget=%p, user_data=%p", dummy, user_data);
if (!w->is_currency)
{
- namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
+ name_space = gnc_ui_namespace_picker_ns (w->namespace_combo);
fullname = gtk_entry_get_text(GTK_ENTRY(w->fullname_entry));
mnemonic = gtk_entry_get_text(GTK_ENTRY(w->mnemonic_entry));
- DEBUG("namespace=%s, name=%s, mnemonic=%s", namespace, fullname, mnemonic);
- ok = (fullname && namespace && mnemonic &&
- fullname[0] && namespace[0] && mnemonic[0]);
- g_free(namespace);
+ DEBUG("namespace=%s, name=%s, mnemonic=%s", name_space, fullname, mnemonic);
+ ok = (fullname && name_space && mnemonic &&
+ fullname[0] && name_space[0] && mnemonic[0]);
+ g_free(name_space);
}
else
{
@@ -1137,7 +1137,7 @@ gnc_ui_commodity_update_quote_info(CommodityWindow *win,
static gnc_commodity *
gnc_ui_common_commodity_modal(gnc_commodity *commodity,
GtkWidget * parent,
- const char * namespace,
+ const char * name_space,
const char * cusip,
const char * fullname,
const char * mnemonic,
@@ -1154,7 +1154,7 @@ gnc_ui_common_commodity_modal(gnc_commodity *commodity,
/* If a commodity was provided, copy out the existing info */
if (commodity)
{
- namespace = gnc_commodity_get_namespace (commodity);
+ name_space = gnc_commodity_get_namespace (commodity);
fullname = gnc_commodity_get_fullname (commodity);
mnemonic = gnc_commodity_get_mnemonic (commodity);
user_symbol = gnc_commodity_get_nice_symbol (commodity);
@@ -1164,13 +1164,13 @@ gnc_ui_common_commodity_modal(gnc_commodity *commodity,
else
{
/* Not allowed to create new currencies */
- if (gnc_commodity_namespace_is_iso(namespace))
+ if (gnc_commodity_namespace_is_iso(name_space))
{
- namespace = NULL;
+ name_space = NULL;
}
}
- win = gnc_ui_build_commodity_dialog(namespace, parent, fullname,
+ win = gnc_ui_build_commodity_dialog(name_space, parent, fullname,
mnemonic, user_symbol, cusip,
fraction, (commodity != NULL));
@@ -1217,7 +1217,7 @@ gnc_ui_common_commodity_modal(gnc_commodity *commodity,
* Create and run the new/edit commodity dialog. *
********************************************************/
gnc_commodity *
-gnc_ui_new_commodity_modal_full(const char * namespace,
+gnc_ui_new_commodity_modal_full(const char * name_space,
GtkWidget * parent,
const char * cusip,
const char * fullname,
@@ -1228,7 +1228,7 @@ gnc_ui_new_commodity_modal_full(const char * namespace,
gnc_commodity *result;
ENTER(" ");
- result = gnc_ui_common_commodity_modal(NULL, parent, namespace, cusip,
+ result = gnc_ui_common_commodity_modal(NULL, parent, name_space, cusip,
fullname, mnemonic, user_symbol,
10000);
LEAVE(" ");
@@ -1284,7 +1284,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
gnc_quote_source *source;
QuoteSourceType type;
const char * fullname = gtk_entry_get_text(GTK_ENTRY(w->fullname_entry));
- gchar *namespace = gnc_ui_namespace_picker_ns (w->namespace_combo);
+ gchar *name_space = gnc_ui_namespace_picker_ns (w->namespace_combo);
const char * mnemonic = gtk_entry_get_text(GTK_ENTRY(w->mnemonic_entry));
const char * user_symbol = gtk_entry_get_text(GTK_ENTRY(w->user_symbol_entry));
const char * code = gtk_entry_get_text(GTK_ENTRY(w->code_entry));
@@ -1297,7 +1297,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
ENTER(" ");
/* Special case currencies */
- if (gnc_commodity_namespace_is_iso (namespace))
+ if (gnc_commodity_namespace_is_iso (name_space))
{
if (w->edit_commodity)
{
@@ -1329,7 +1329,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
/* Don't allow user to create commodities in namespace
* "template". That's reserved for scheduled transaction use.
*/
- if (g_utf8_collate(namespace, "template") == 0)
+ if (g_utf8_collate(name_space, "template") == 0)
{
gnc_warning_dialog (w->dialog,
_("%s is a reserved commodity type."
@@ -1338,23 +1338,23 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
}
if (fullname && fullname[0] &&
- namespace && namespace[0] &&
+ name_space && name_space[0] &&
mnemonic && mnemonic[0])
{
c = gnc_commodity_table_lookup (gnc_get_current_commodities(),
- namespace, mnemonic);
+ name_space, mnemonic);
if ((!w->edit_commodity && c) ||
(w->edit_commodity && c && (c != w->edit_commodity)))
{
gnc_warning_dialog (w->dialog, "%s", _("That commodity already exists."));
- g_free(namespace);
+ g_free(name_space);
return FALSE;
}
if (!w->edit_commodity)
{
- c = gnc_commodity_new(book, fullname, namespace, mnemonic, code, fraction);
+ c = gnc_commodity_new(book, fullname, name_space, mnemonic, code, fraction);
w->edit_commodity = c;
gnc_commodity_begin_edit(c);
}
@@ -1367,7 +1367,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
gnc_commodity_set_fullname (c, fullname);
gnc_commodity_set_mnemonic (c, mnemonic);
- gnc_commodity_set_namespace (c, namespace);
+ gnc_commodity_set_namespace (c, name_space);
gnc_commodity_set_cusip (c, code);
gnc_commodity_set_fraction (c, fraction);
}
@@ -1375,7 +1375,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
gnc_commodity_user_set_quote_flag (c, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (w->get_quote_check)));
- for (type = SOURCE_SINGLE; type < SOURCE_MAX; type++)
+ for (type = SOURCE_SINGLE; type < SOURCE_MAX; type=type+1)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->source_button[type])))
break;
@@ -1398,10 +1398,10 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
_("You must enter a non-empty \"Full name\", "
"\"Symbol/abbreviation\", "
"and \"Type\" for the commodity."));
- g_free(namespace);
+ g_free(name_space);
return FALSE;
}
- g_free(namespace);
+ g_free(name_space);
LEAVE(" ");
return TRUE;
}
diff --git a/src/gnome-utils/dialog-commodity.h b/src/gnome-utils/dialog-commodity.h
index 3fab415..a1d4c00 100644
--- a/src/gnome-utils/dialog-commodity.h
+++ b/src/gnome-utils/dialog-commodity.h
@@ -167,7 +167,7 @@ gnc_ui_select_commodity_modal(gnc_commodity * orig_sel,
* @return The newly created commodity, or NULL if the user cancelled.
*/
gnc_commodity *
-gnc_ui_new_commodity_modal_full(const char * namespace,
+gnc_ui_new_commodity_modal_full(const char * name_space,
GtkWidget * parent,
const char * cusip,
const char * fullname,
@@ -255,7 +255,7 @@ gchar *gnc_ui_namespace_picker_ns (GtkWidget *cbwe);
* the combo box appears.
*/
void gnc_ui_update_commodity_picker(GtkWidget *cbwe,
- const gchar *namespace,
+ const gchar *name_space,
const gchar *sel);
/** @} */
diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c
index 53f2e94..4ae4473 100644
--- a/src/gnome-utils/dialog-preferences.c
+++ b/src/gnome-utils/dialog-preferences.c
@@ -1221,7 +1221,7 @@ gnc_preferences_dialog_create(void)
*
* @internal
*
- * @param class Unused.
+ * @param class_name Unused.
*
* @param component_id Unused.
*
@@ -1230,7 +1230,7 @@ gnc_preferences_dialog_create(void)
* @param iter_data Unused.
*/
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *class_name, gint component_id,
gpointer user_data, gpointer iter_data)
{
GtkWidget *dialog;
diff --git a/src/gnome-utils/dialog-reset-warnings.c b/src/gnome-utils/dialog-reset-warnings.c
index e61fc08..eb45d28 100644
--- a/src/gnome-utils/dialog-reset-warnings.c
+++ b/src/gnome-utils/dialog-reset-warnings.c
@@ -313,13 +313,13 @@ gnc_reset_warnings_add_section (RWDialog *rw_dialog, const gchar *prefs_group, G
* dialog.
*
* @internal
- * @param class Unused.
+ * @param class_name Unused.
* @param component_id Unused.
* @param user_data A pointer to the rw structure.
* @param iter_data Unused.
***********************************************************************/
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *class_name, gint component_id,
gpointer user_data, gpointer iter_data)
{
RWDialog *rw_dialog = user_data;
diff --git a/src/gnome-utils/dialog-totd.c b/src/gnome-utils/dialog-totd.c
index b26e77d..0d37335 100644
--- a/src/gnome-utils/dialog-totd.c
+++ b/src/gnome-utils/dialog-totd.c
@@ -174,7 +174,7 @@ gnc_totd_dialog_startup_toggled_cb (GtkToggleButton *button,
static gboolean
gnc_totd_initialize (void)
{
- gchar *filename, *contents, *new;
+ gchar *filename, *contents, *new_str;
gsize length;
GError *error;
@@ -209,9 +209,9 @@ gnc_totd_initialize (void)
contents = g_strdup (tip_list[tip_count]);
else
{
- new = g_strjoin ("\n", contents, tip_list[tip_count], NULL);
+ new_str = g_strjoin ("\n", contents, tip_list[tip_count], NULL);
g_free (contents);
- contents = new;
+ contents = new_str;
}
}
}
@@ -223,9 +223,9 @@ gnc_totd_initialize (void)
/* Convert any escaped characters while counting the strings */
for (tip_count = 0; tip_list[tip_count] != NULL; tip_count++)
{
- new = g_strcompress(tip_list[tip_count]);
+ new_str = g_strcompress(tip_list[tip_count]);
g_free(tip_list[tip_count]);
- tip_list[tip_count] = new;
+ tip_list[tip_count] = new_str;
}
@@ -250,7 +250,7 @@ gnc_totd_initialize (void)
*
* @internal
*
- * @param class Unused.
+ * @param class_name Unused.
*
* @param component_id Unused.
*
@@ -259,7 +259,7 @@ gnc_totd_initialize (void)
* @param iter_data Unused.
***********************************************************************/
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *class_name, gint component_id,
gpointer user_data, gpointer iter_data)
{
TotdDialog *totd_dialog = user_data;
diff --git a/src/gnome-utils/gnc-amount-edit.c b/src/gnome-utils/gnc-amount-edit.c
index 5edc823..a724e25 100644
--- a/src/gnome-utils/gnc-amount-edit.c
+++ b/src/gnome-utils/gnc-amount-edit.c
@@ -59,7 +59,7 @@ static guint amount_edit_signals [LAST_SIGNAL] = { 0 };
static void gnc_amount_edit_init (GNCAmountEdit *gae);
-static void gnc_amount_edit_class_init (GNCAmountEditClass *class);
+static void gnc_amount_edit_class_init (GNCAmountEditClass *klass);
static void gnc_amount_edit_changed (GtkEditable *gae, gpointer data);
static gint gnc_amount_edit_key_press (GtkWidget *widget,
GdkEventKey *event);
diff --git a/src/gnome-utils/gnc-cell-renderer-date.c b/src/gnome-utils/gnc-cell-renderer-date.c
index dbc3fba..e2249b4 100644
--- a/src/gnome-utils/gnc-cell-renderer-date.c
+++ b/src/gnome-utils/gnc-cell-renderer-date.c
@@ -46,7 +46,7 @@ enum {
static void gcrd_init (GncCellRendererDate *date);
-static void gcrd_class_init (GncCellRendererDateClass *class);
+static void gcrd_class_init (GncCellRendererDateClass *klass);
static void gcrd_set_property (GObject *object,
guint param_id,
@@ -187,16 +187,16 @@ gcrd_init (GncCellRendererDate *date)
}
static void
-gcrd_class_init (GncCellRendererDateClass *class)
+gcrd_class_init (GncCellRendererDateClass *klass)
{
GncCellRendererPopupClass *popup_class;
GtkCellRendererClass *cell_class;
GObjectClass *gobject_class;
- popup_class = GNC_CELL_RENDERER_POPUP_CLASS (class);
- cell_class = GTK_CELL_RENDERER_CLASS (class);
- parent_class = GNC_CELL_RENDERER_POPUP_CLASS (g_type_class_peek_parent (class));
- gobject_class = G_OBJECT_CLASS (class);
+ popup_class = GNC_CELL_RENDERER_POPUP_CLASS (klass);
+ cell_class = GTK_CELL_RENDERER_CLASS (klass);
+ parent_class = GNC_CELL_RENDERER_POPUP_CLASS (g_type_class_peek_parent (klass));
+ gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gcrd_set_property;
gobject_class->get_property = gcrd_get_property;
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index 054028f..137613b 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -38,7 +38,7 @@
#include "gnc-date.h"
static void gnc_popup_entry_init (GncPopupEntry *entry);
-static void gnc_popup_entry_class_init (GncPopupEntryClass *class);
+static void gnc_popup_entry_class_init (GncPopupEntryClass *klass);
static void gpw_cell_editable_init (GtkCellEditableIface *iface);
static gboolean gpw_key_press_event (GtkWidget *box,
GdkEventKey *key_event);
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.c b/src/gnome-utils/gnc-cell-renderer-popup.c
index f025cfe..587c9c0 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup.c
@@ -42,7 +42,7 @@ enum {
};
static void gcrp_init (GncCellRendererPopup *popup);
-static void gcrp_class_init (GncCellRendererPopupClass *class);
+static void gcrp_class_init (GncCellRendererPopupClass *klass);
static GtkCellEditable *
gcrp_start_editing (GtkCellRenderer *cell,
@@ -141,21 +141,21 @@ gcrp_init (GncCellRendererPopup *popup)
}
static void
-gcrp_class_init (GncCellRendererPopupClass *class)
+gcrp_class_init (GncCellRendererPopupClass *klass)
{
- GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+ GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
- parent_class = GTK_CELL_RENDERER_TEXT_CLASS (g_type_class_peek_parent (class));
+ parent_class = GTK_CELL_RENDERER_TEXT_CLASS (g_type_class_peek_parent (klass));
cell_class->start_editing = gcrp_start_editing;
cell_class->get_size = gcrp_get_size;
- class->show_popup = gcrp_show_popup;
- class->hide_popup = gcrp_hide_popup;
+ klass->show_popup = gcrp_show_popup;
+ klass->hide_popup = gcrp_hide_popup;
signals[SHOW_POPUP] = g_signal_new (
"show-popup",
- G_TYPE_FROM_CLASS (class),
+ G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GncCellRendererPopupClass, show_popup),
NULL, NULL,
@@ -169,7 +169,7 @@ gcrp_class_init (GncCellRendererPopupClass *class)
signals[HIDE_POPUP] = g_signal_new (
"hide-popup",
- G_TYPE_FROM_CLASS (class),
+ G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GncCellRendererPopupClass, hide_popup),
NULL, NULL,
diff --git a/src/gnome-utils/gnc-combott.c b/src/gnome-utils/gnc-combott.c
index b747d77..87ec6e0 100644
--- a/src/gnome-utils/gnc-combott.c
+++ b/src/gnome-utils/gnc-combott.c
@@ -76,7 +76,7 @@ typedef struct GncCombottPrivate
/** Declarations *********************************************************/
static void gctt_init (GncCombott *combott);
-static void gctt_class_init (GncCombottClass *class);
+static void gctt_class_init (GncCombottClass *klass);
static void gctt_set_property (GObject *object,
guint param_id,
@@ -143,22 +143,22 @@ gnc_combott_get_type (void)
static void
-gctt_class_init (GncCombottClass *class)
+gctt_class_init (GncCombottClass *klass)
{
GObjectClass *gobject_class;
- parent_class = g_type_class_peek_parent (class);
- gobject_class = G_OBJECT_CLASS (class);
+ parent_class = g_type_class_peek_parent (klass);
+ gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gctt_set_property;
gobject_class->get_property = gctt_get_property;
gobject_class->finalize = gctt_finalize;
- class->changed = gctt_changed;
+ klass->changed = gctt_changed;
combott_signals[CHANGED] =
g_signal_new ("changed",
- G_OBJECT_CLASS_TYPE (class),
+ G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GncCombottClass, changed),
NULL, NULL,
@@ -196,7 +196,7 @@ gctt_class_init (GncCombottClass *class)
1,
G_PARAM_READWRITE));
- g_type_class_add_private(class, sizeof(GncCombottPrivate));
+ g_type_class_add_private(klass, sizeof(GncCombottPrivate));
}
diff --git a/src/gnome-utils/gnc-currency-edit.c b/src/gnome-utils/gnc-currency-edit.c
index ac7654f..6a33bc9 100644
--- a/src/gnome-utils/gnc-currency-edit.c
+++ b/src/gnome-utils/gnc-currency-edit.c
@@ -72,7 +72,7 @@
static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_currency_edit_init (GNCCurrencyEdit *gce);
-static void gnc_currency_edit_class_init (GNCCurrencyEditClass *class);
+static void gnc_currency_edit_class_init (GNCCurrencyEditClass *klass);
static void gnc_currency_edit_finalize (GObject *object);
static void gnc_currency_edit_mnemonic_changed (GObject *gobject,
GParamSpec *pspec,
diff --git a/src/gnome-utils/gnc-date-delta.c b/src/gnome-utils/gnc-date-delta.c
index 7f3b517..d8614f7 100644
--- a/src/gnome-utils/gnc-date-delta.c
+++ b/src/gnome-utils/gnc-date-delta.c
@@ -59,7 +59,7 @@ static guint date_delta_signals [LAST_SIGNAL] = { 0 };
static void gnc_date_delta_init (GNCDateDelta *gdd);
-static void gnc_date_delta_class_init (GNCDateDeltaClass *class);
+static void gnc_date_delta_class_init (GNCDateDeltaClass *klass);
static void gnc_date_delta_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
diff --git a/src/gnome-utils/gnc-date-format.c b/src/gnome-utils/gnc-date-format.c
index 7db92e2..2dac520 100644
--- a/src/gnome-utils/gnc-date-format.c
+++ b/src/gnome-utils/gnc-date-format.c
@@ -85,7 +85,7 @@ struct _GNCDateFormatPriv
static guint date_format_signals [LAST_SIGNAL] = { 0 };
static void gnc_date_format_init (GNCDateFormat *gdf);
-static void gnc_date_format_class_init (GNCDateFormatClass *class);
+static void gnc_date_format_class_init (GNCDateFormatClass *klass);
static void gnc_date_format_finalize (GObject *object);
static void gnc_date_format_compute_format(GNCDateFormat *gdf);
diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c
index 8275c7f..f25e792 100644
--- a/src/gnome-utils/gnc-dense-cal.c
+++ b/src/gnome-utils/gnc-dense-cal.c
@@ -76,7 +76,7 @@ static const gchar* MARK_COLOR = "Yellow";
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gnc.gui.dense-cal"
-static void gnc_dense_cal_class_init(GncDenseCalClass *class);
+static void gnc_dense_cal_class_init(GncDenseCalClass *klass);
static void gnc_dense_cal_init(GncDenseCal *dcal);
static void gnc_dense_cal_finalize(GObject *object);
static void gnc_dense_cal_dispose(GObject *object);
diff --git a/src/gnome-utils/gnc-general-select.c b/src/gnome-utils/gnc-general-select.c
index 02f72e9..ef6deea 100644
--- a/src/gnome-utils/gnc-general-select.c
+++ b/src/gnome-utils/gnc-general-select.c
@@ -47,7 +47,7 @@ enum
static void gnc_general_select_init (GNCGeneralSelect *gsl);
-static void gnc_general_select_class_init (GNCGeneralSelectClass *class);
+static void gnc_general_select_class_init (GNCGeneralSelectClass *klass);
static void gnc_general_select_dispose (GObject *object);
static void gnc_general_select_finalize (GObject *object);
diff --git a/src/gnome-utils/gnc-period-select.c b/src/gnome-utils/gnc-period-select.c
index 064d876..74d70f7 100644
--- a/src/gnome-utils/gnc-period-select.c
+++ b/src/gnome-utils/gnc-period-select.c
@@ -58,7 +58,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
/** Declarations *********************************************************/
static void gnc_period_select_init (GncPeriodSelect *gce);
-static void gnc_period_select_class_init (GncPeriodSelectClass *class);
+static void gnc_period_select_class_init (GncPeriodSelectClass *klass);
static void gnc_period_select_finalize (GObject *object);
static GtkComboBoxClass *parent_class;
diff --git a/src/gnome-utils/gnc-plugin.c b/src/gnome-utils/gnc-plugin.c
index 3351295..28dd419 100644
--- a/src/gnome-utils/gnc-plugin.c
+++ b/src/gnome-utils/gnc-plugin.c
@@ -158,33 +158,33 @@ gnc_plugin_add_to_window (GncPlugin *plugin,
GncMainWindow *window,
GQuark type)
{
- GncPluginClass *class;
+ GncPluginClass *klass;
GtkActionGroup *action_group;
g_return_if_fail (GNC_IS_PLUGIN (plugin));
- class = GNC_PLUGIN_GET_CLASS (plugin);
+ klass = GNC_PLUGIN_GET_CLASS (plugin);
ENTER (": plugin %s(%p), window %p", gnc_plugin_get_name(plugin),
plugin, window);
/*
* Update window with additional UI items
*/
- if (class->actions_name)
+ if (klass->actions_name)
{
DEBUG ("%s: %d actions to merge with gui from %s",
- class->actions_name, (class->n_actions + class->n_toggle_actions), class->ui_filename);
- gnc_main_window_merge_actions (window, class->actions_name,
- class->actions, class->n_actions,
- class->toggle_actions, class->n_toggle_actions,
- class->ui_filename, plugin);
+ klass->actions_name, (klass->n_actions + klass->n_toggle_actions), klass->ui_filename);
+ gnc_main_window_merge_actions (window, klass->actions_name,
+ klass->actions, klass->n_actions,
+ klass->toggle_actions, klass->n_toggle_actions,
+ klass->ui_filename, plugin);
- if (class->important_actions)
+ if (klass->important_actions)
{
action_group =
- gnc_main_window_get_action_group(window, class->actions_name);
+ gnc_main_window_get_action_group(window, klass->actions_name);
gnc_plugin_set_important_actions(action_group,
- class->important_actions);
+ klass->important_actions);
}
}
@@ -210,10 +210,10 @@ gnc_plugin_remove_from_window (GncPlugin *plugin,
GncMainWindow *window,
GQuark type)
{
- GncPluginClass *class;
+ GncPluginClass *klass;
g_return_if_fail (GNC_IS_PLUGIN (plugin));
- class = GNC_PLUGIN_GET_CLASS (plugin);
+ klass = GNC_PLUGIN_GET_CLASS (plugin);
ENTER (": plugin %s(%p), window %p", gnc_plugin_get_name(plugin),
plugin, window);
@@ -230,11 +230,11 @@ gnc_plugin_remove_from_window (GncPlugin *plugin,
/*
* Update window to remove UI items
*/
- if (class->actions_name)
+ if (klass->actions_name)
{
DEBUG ("%s: %d actions to unmerge",
- class->actions_name, (class->n_actions + class->n_toggle_actions));
- gnc_main_window_unmerge_actions (window, class->actions_name);
+ klass->actions_name, (klass->n_actions + klass->n_toggle_actions));
+ gnc_main_window_unmerge_actions (window, klass->actions_name);
}
LEAVE ("");
}
diff --git a/src/gnome-utils/gnc-tree-model-commodity.c b/src/gnome-utils/gnc-tree-model-commodity.c
index a3a8934..c11e7b1 100644
--- a/src/gnome-utils/gnc-tree-model-commodity.c
+++ b/src/gnome-utils/gnc-tree-model-commodity.c
@@ -312,7 +312,7 @@ gnc_tree_model_commodity_get_commodity (GncTreeModelCommodity *model,
static const gchar *
iter_to_string (GtkTreeIter *iter)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity = NULL;
#ifdef G_THREADS_ENABLED
#ifndef HAVE_GLIB_2_32
@@ -344,11 +344,11 @@ iter_to_string (GtkTreeIter *iter)
switch (GPOINTER_TO_INT(iter->user_data))
{
case GPOINTER_TO_INT(ITER_IS_NAMESPACE):
- namespace = (gnc_commodity_namespace *) iter->user_data2;
+ name_space = (gnc_commodity_namespace *) iter->user_data2;
snprintf(string, ITER_STRING_LEN,
"[stamp:%x data:%d (NAMESPACE), %p (%s), %d]",
iter->stamp, GPOINTER_TO_INT(iter->user_data),
- iter->user_data2, gnc_commodity_namespace_get_name (namespace),
+ iter->user_data2, gnc_commodity_namespace_get_name (name_space),
GPOINTER_TO_INT(iter->user_data3));
break;
@@ -446,7 +446,7 @@ gnc_tree_model_commodity_get_iter (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity = NULL;
GList *list;
guint i, depth;
@@ -485,8 +485,8 @@ gnc_tree_model_commodity_get_iter (GtkTreeModel *tree_model,
/* Verify the first part of the path: the namespace. */
list = gnc_commodity_table_get_namespaces_list(ct);
i = gtk_tree_path_get_indices (path)[0];
- namespace = g_list_nth_data (list, i);
- if (!namespace)
+ name_space = g_list_nth_data (list, i);
+ if (!name_space)
{
LEAVE("invalid path at namespace");
return FALSE;
@@ -497,14 +497,14 @@ gnc_tree_model_commodity_get_iter (GtkTreeModel *tree_model,
/* Return an iterator for the namespace. */
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
+ iter->user_data2 = name_space;
iter->user_data3 = GINT_TO_POINTER(i);
LEAVE("iter (ns) %s", iter_to_string(iter));
return TRUE;
}
/* Verify the second part of the path: the commodity. */
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
i = gtk_tree_path_get_indices (path)[1];
commodity = g_list_nth_data (list, i);
if (!commodity)
@@ -530,7 +530,7 @@ gnc_tree_model_commodity_get_path (GtkTreeModel *tree_model,
GncTreeModelCommodityPrivate *priv;
GtkTreePath *path;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *ns_list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), NULL);
@@ -562,11 +562,11 @@ gnc_tree_model_commodity_get_path (GtkTreeModel *tree_model,
/* Get the namespaces list. */
ns_list = gnc_commodity_table_get_namespaces_list(ct);
- namespace = gnc_commodity_get_namespace_ds((gnc_commodity*)iter->user_data2);
+ name_space = gnc_commodity_get_namespace_ds((gnc_commodity*)iter->user_data2);
/* Create a path to the commodity. */
path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, g_list_index (ns_list, namespace));
+ gtk_tree_path_append_index (path, g_list_index (ns_list, name_space));
gtk_tree_path_append_index (path, GPOINTER_TO_INT(iter->user_data3));
debug_path(LEAVE, path);
return path;
@@ -579,7 +579,7 @@ gnc_tree_model_commodity_get_value (GtkTreeModel *tree_model,
GValue *value)
{
GncTreeModelCommodity *model = GNC_TREE_MODEL_COMMODITY (tree_model);
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
gnc_quote_source *source;
@@ -591,12 +591,12 @@ gnc_tree_model_commodity_get_value (GtkTreeModel *tree_model,
if (iter->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)iter->user_data2;
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
switch (column)
{
case GNC_TREE_MODEL_COMMODITY_COL_NAMESPACE:
g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, gnc_commodity_namespace_get_name (namespace));
+ g_value_set_string (value, gnc_commodity_namespace_get_name (name_space));
break;
default:
g_value_init (value, G_TYPE_STRING);
@@ -708,7 +708,7 @@ gnc_tree_model_commodity_iter_next (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
int n;
@@ -728,8 +728,8 @@ gnc_tree_model_commodity_iter_next (GtkTreeModel *tree_model,
}
else if (iter->user_data == ITER_IS_COMMODITY)
{
- namespace = gnc_commodity_get_namespace_ds((gnc_commodity *)iter->user_data2);
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = gnc_commodity_get_namespace_ds((gnc_commodity *)iter->user_data2);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
}
else
{
@@ -758,7 +758,7 @@ gnc_tree_model_commodity_iter_children (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), FALSE);
@@ -788,8 +788,8 @@ gnc_tree_model_commodity_iter_children (GtkTreeModel *tree_model,
if (parent->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)parent->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)parent->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
if (list == NULL)
{
LEAVE("no commodities");
@@ -812,7 +812,7 @@ static gboolean
gnc_tree_model_commodity_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (iter != NULL, FALSE);
@@ -825,8 +825,8 @@ gnc_tree_model_commodity_iter_has_child (GtkTreeModel *tree_model,
return FALSE;
}
- namespace = (gnc_commodity_namespace *)iter->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
LEAVE("%s children", list ? "has" : "no");
return list != NULL;
}
@@ -838,7 +838,7 @@ gnc_tree_model_commodity_iter_n_children (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), -1);
@@ -857,8 +857,8 @@ gnc_tree_model_commodity_iter_n_children (GtkTreeModel *tree_model,
if (iter->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)iter->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
LEAVE("cm list length %d", g_list_length(list));
return g_list_length (list);
}
@@ -876,7 +876,7 @@ gnc_tree_model_commodity_iter_nth_child (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), FALSE);
@@ -902,8 +902,8 @@ gnc_tree_model_commodity_iter_nth_child (GtkTreeModel *tree_model,
if (parent->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)parent->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)parent->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
iter->stamp = model->stamp;
iter->user_data = ITER_IS_COMMODITY;
@@ -926,7 +926,7 @@ gnc_tree_model_commodity_iter_parent (GtkTreeModel *tree_model,
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), FALSE);
@@ -946,12 +946,12 @@ gnc_tree_model_commodity_iter_parent (GtkTreeModel *tree_model,
ct = priv->commodity_table;
list = gnc_commodity_table_get_namespaces_list(ct);
- namespace = gnc_commodity_get_namespace_ds((gnc_commodity*)child->user_data2);
+ name_space = gnc_commodity_get_namespace_ds((gnc_commodity*)child->user_data2);
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
- iter->user_data3 = GINT_TO_POINTER(g_list_index(list, namespace));
+ iter->user_data2 = name_space;
+ iter->user_data3 = GINT_TO_POINTER(g_list_index(list, name_space));
LEAVE("ns iter %p (%s)", iter, iter_to_string(iter));
return TRUE;
}
@@ -970,7 +970,7 @@ gnc_tree_model_commodity_get_iter_from_commodity (GncTreeModelCommodity *model,
gnc_commodity *commodity,
GtkTreeIter *iter)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
gint n;
@@ -980,14 +980,14 @@ gnc_tree_model_commodity_get_iter_from_commodity (GncTreeModelCommodity *model,
ENTER("model %p, commodity %p, iter %p", model, commodity, iter);
- namespace = gnc_commodity_get_namespace_ds(commodity);
- if (namespace == NULL)
+ name_space = gnc_commodity_get_namespace_ds(commodity);
+ if (name_space == NULL)
{
LEAVE("no namespace");
return FALSE;
}
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
if (list == NULL)
{
LEAVE("empty list");
@@ -1052,7 +1052,7 @@ gnc_tree_model_commodity_get_path_from_commodity (GncTreeModelCommodity *model,
*/
gboolean
gnc_tree_model_commodity_get_iter_from_namespace (GncTreeModelCommodity *model,
- gnc_commodity_namespace *namespace,
+ gnc_commodity_namespace *name_space,
GtkTreeIter *iter)
{
GncTreeModelCommodityPrivate *priv;
@@ -1060,10 +1060,10 @@ gnc_tree_model_commodity_get_iter_from_namespace (GncTreeModelCommodity *model,
gint n;
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (model), FALSE);
- g_return_val_if_fail ((namespace != NULL), FALSE);
+ g_return_val_if_fail ((name_space != NULL), FALSE);
g_return_val_if_fail ((iter != NULL), FALSE);
- ENTER("model %p, namespace %p, iter %p", model, namespace, iter);
+ ENTER("model %p, namespace %p, iter %p", model, name_space, iter);
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
list = gnc_commodity_table_get_namespaces_list(priv->commodity_table);
@@ -1073,7 +1073,7 @@ gnc_tree_model_commodity_get_iter_from_namespace (GncTreeModelCommodity *model,
return FALSE;
}
- n = g_list_index(list, namespace);
+ n = g_list_index(list, name_space);
if (n == -1)
{
LEAVE("");
@@ -1082,7 +1082,7 @@ gnc_tree_model_commodity_get_iter_from_namespace (GncTreeModelCommodity *model,
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
+ iter->user_data2 = name_space;
iter->user_data3 = GINT_TO_POINTER(n);
LEAVE("iter %s", iter_to_string(iter));
return TRUE;
@@ -1348,13 +1348,13 @@ gnc_tree_model_commodity_event_handler (QofInstance *entity,
}
else if (GNC_IS_COMMODITY_NAMESPACE(entity))
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
- namespace = GNC_COMMODITY_NAMESPACE(entity);
- name = gnc_commodity_namespace_get_name(namespace);
+ name_space = GNC_COMMODITY_NAMESPACE(entity);
+ name = gnc_commodity_namespace_get_name(name_space);
if (event_type != QOF_EVENT_DESTROY)
{
- if (!gnc_tree_model_commodity_get_iter_from_namespace (model, namespace, &iter))
+ if (!gnc_tree_model_commodity_get_iter_from_namespace (model, name_space, &iter))
{
LEAVE("no iter");
return;
diff --git a/src/gnome-utils/gnc-tree-model-commodity.h b/src/gnome-utils/gnc-tree-model-commodity.h
index aa01bcd..dc9b88a 100644
--- a/src/gnome-utils/gnc-tree-model-commodity.h
+++ b/src/gnome-utils/gnc-tree-model-commodity.h
@@ -193,7 +193,7 @@ gnc_commodity *gnc_tree_model_commodity_get_commodity (GncTreeModelCommodity *mo
*
* @return TRUE if the returned iter is valid, FALSE otherwise. */
gboolean gnc_tree_model_commodity_get_iter_from_namespace (GncTreeModelCommodity *model,
- gnc_commodity_namespace *namespace,
+ gnc_commodity_namespace *name_space,
GtkTreeIter *iter);
/** Convert a commodity pointer into a GtkTreeIter.
diff --git a/src/gnome-utils/gnc-tree-model-price.c b/src/gnome-utils/gnc-tree-model-price.c
index e133d1e..c62b749 100644
--- a/src/gnome-utils/gnc-tree-model-price.c
+++ b/src/gnome-utils/gnc-tree-model-price.c
@@ -375,7 +375,7 @@ static const gchar *
iter_to_string (GncTreeModelPrice *model, GtkTreeIter *iter)
{
GncTreeModelPricePrivate *priv;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GNCPrice *price;
#ifdef G_THREADS_ENABLED
@@ -410,11 +410,11 @@ iter_to_string (GncTreeModelPrice *model, GtkTreeIter *iter)
switch (GPOINTER_TO_INT(iter->user_data))
{
case GPOINTER_TO_INT(ITER_IS_NAMESPACE):
- namespace = (gnc_commodity_namespace *) iter->user_data2;
+ name_space = (gnc_commodity_namespace *) iter->user_data2;
snprintf(string, ITER_STRING_LEN,
"[stamp:%x data:%d (NAMESPACE), %p (%s), %d]",
iter->stamp, GPOINTER_TO_INT(iter->user_data),
- iter->user_data2, gnc_commodity_namespace_get_name (namespace),
+ iter->user_data2, gnc_commodity_namespace_get_name (name_space),
GPOINTER_TO_INT(iter->user_data3));
break;
@@ -517,7 +517,7 @@ gnc_tree_model_price_get_iter (GtkTreeModel *tree_model,
GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity = NULL;
GNCPrice *price;
GList *ns_list, *cm_list, *price_list;
@@ -554,8 +554,8 @@ gnc_tree_model_price_get_iter (GtkTreeModel *tree_model,
ct = qof_book_get_data (priv->book, GNC_COMMODITY_TABLE);
ns_list = gnc_commodity_table_get_namespaces_list(ct);
i = gtk_tree_path_get_indices (path)[0];
- namespace = g_list_nth_data (ns_list, i);
- if (!namespace)
+ name_space = g_list_nth_data (ns_list, i);
+ if (!name_space)
{
LEAVE("invalid path at namespace");
return FALSE;
@@ -566,14 +566,14 @@ gnc_tree_model_price_get_iter (GtkTreeModel *tree_model,
/* Return an iterator for the namespace. */
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
+ iter->user_data2 = name_space;
iter->user_data3 = GINT_TO_POINTER(i);
LEAVE("iter (ns) %s", iter_to_string(model, iter));
return TRUE;
}
/* Verify the second part of the path: the commodity. */
- cm_list = gnc_commodity_namespace_get_commodity_list(namespace);
+ cm_list = gnc_commodity_namespace_get_commodity_list(name_space);
i = gtk_tree_path_get_indices (path)[1];
commodity = g_list_nth_data (cm_list, i);
if (!commodity)
@@ -625,7 +625,7 @@ gnc_tree_model_price_get_path (GtkTreeModel *tree_model,
GncTreeModelPrice *model = GNC_TREE_MODEL_PRICE (tree_model);
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GList *ns_list, *cm_list;
GtkTreePath *path;
@@ -662,9 +662,9 @@ gnc_tree_model_price_get_path (GtkTreeModel *tree_model,
{
/* Create a path to the commodity. */
commodity = (gnc_commodity*)iter->user_data2;
- namespace = gnc_commodity_get_namespace_ds(commodity);
+ name_space = gnc_commodity_get_namespace_ds(commodity);
path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, g_list_index (ns_list, namespace));
+ gtk_tree_path_append_index (path, g_list_index (ns_list, name_space));
gtk_tree_path_append_index (path, GPOINTER_TO_INT(iter->user_data3));
debug_path(LEAVE, path);
return path;
@@ -672,10 +672,10 @@ gnc_tree_model_price_get_path (GtkTreeModel *tree_model,
/* Create a path to the price. */
commodity = gnc_price_get_commodity((GNCPrice*)iter->user_data2);
- namespace = gnc_commodity_get_namespace_ds(commodity);
- cm_list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = gnc_commodity_get_namespace_ds(commodity);
+ cm_list = gnc_commodity_namespace_get_commodity_list(name_space);
path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, g_list_index (ns_list, namespace));
+ gtk_tree_path_append_index (path, g_list_index (ns_list, name_space));
gtk_tree_path_append_index (path, g_list_index (cm_list, commodity));
gtk_tree_path_append_index (path, GPOINTER_TO_INT(iter->user_data3));
debug_path(LEAVE, path);
@@ -690,7 +690,7 @@ gnc_tree_model_price_get_value (GtkTreeModel *tree_model,
{
GncTreeModelPrice *model = GNC_TREE_MODEL_PRICE (tree_model);
GncTreeModelPricePrivate *priv;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GNCPrice *price;
@@ -703,12 +703,12 @@ gnc_tree_model_price_get_value (GtkTreeModel *tree_model,
if (iter->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)iter->user_data2;
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
switch (column)
{
case GNC_TREE_MODEL_PRICE_COL_COMMODITY:
g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, gnc_commodity_namespace_get_name (namespace));
+ g_value_set_string (value, gnc_commodity_namespace_get_name (name_space));
break;
case GNC_TREE_MODEL_PRICE_COL_VISIBILITY:
g_value_init (value, G_TYPE_BOOLEAN);
@@ -815,7 +815,7 @@ gnc_tree_model_price_iter_next (GtkTreeModel *tree_model,
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
gnc_commodity *commodity;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
gint n;
@@ -843,8 +843,8 @@ gnc_tree_model_price_iter_next (GtkTreeModel *tree_model,
}
else if (iter->user_data == ITER_IS_COMMODITY)
{
- namespace = gnc_commodity_get_namespace_ds((gnc_commodity *)iter->user_data2);
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = gnc_commodity_get_namespace_ds((gnc_commodity *)iter->user_data2);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
n = GPOINTER_TO_INT(iter->user_data3) + 1;
iter->user_data2 = g_list_nth_data(list, n);
if (iter->user_data2 == NULL)
@@ -887,7 +887,7 @@ gnc_tree_model_price_iter_children (GtkTreeModel *tree_model,
GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GList *list;
@@ -918,8 +918,8 @@ gnc_tree_model_price_iter_children (GtkTreeModel *tree_model,
if (parent->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)parent->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)parent->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
if (list == NULL)
{
LEAVE("no commodities");
@@ -962,7 +962,7 @@ gnc_tree_model_price_iter_has_child (GtkTreeModel *tree_model,
{
GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
gboolean result;
GList *list;
@@ -982,8 +982,8 @@ gnc_tree_model_price_iter_has_child (GtkTreeModel *tree_model,
if (iter->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)iter->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
LEAVE("%s children", list ? "has" : "no");
return list != NULL;
}
@@ -1007,7 +1007,7 @@ gnc_tree_model_price_iter_n_children (GtkTreeModel *tree_model,
GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GList *list;
gint n;
@@ -1029,8 +1029,8 @@ gnc_tree_model_price_iter_n_children (GtkTreeModel *tree_model,
if (iter->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)iter->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)iter->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
LEAVE("cm list length %d", g_list_length(list));
return g_list_length (list);
}
@@ -1058,7 +1058,7 @@ gnc_tree_model_price_iter_nth_child (GtkTreeModel *tree_model,
GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GList *list;
@@ -1085,8 +1085,8 @@ gnc_tree_model_price_iter_nth_child (GtkTreeModel *tree_model,
if (parent->user_data == ITER_IS_NAMESPACE)
{
- namespace = (gnc_commodity_namespace *)parent->user_data2;
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = (gnc_commodity_namespace *)parent->user_data2;
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
iter->stamp = model->stamp;
iter->user_data = ITER_IS_COMMODITY;
@@ -1124,7 +1124,7 @@ gnc_tree_model_price_iter_parent (GtkTreeModel *tree_model,
GncTreeModelPricePrivate *priv;
gnc_commodity_table *ct;
gnc_commodity * commodity;
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
g_return_val_if_fail (GNC_IS_TREE_MODEL_PRICE (tree_model), FALSE);
@@ -1146,19 +1146,19 @@ gnc_tree_model_price_iter_parent (GtkTreeModel *tree_model,
{
ct = qof_book_get_data (priv->book, GNC_COMMODITY_TABLE);
list = gnc_commodity_table_get_namespaces_list(ct);
- namespace = gnc_commodity_get_namespace_ds((gnc_commodity*)child->user_data2);
+ name_space = gnc_commodity_get_namespace_ds((gnc_commodity*)child->user_data2);
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
- iter->user_data3 = GINT_TO_POINTER(g_list_index(list, namespace));
+ iter->user_data2 = name_space;
+ iter->user_data3 = GINT_TO_POINTER(g_list_index(list, name_space));
LEAVE("ns iter %p (%s)", iter, iter_to_string(model, iter));
return TRUE;
}
commodity = gnc_price_get_commodity ((GNCPrice*)child->user_data2);
- namespace = gnc_commodity_get_namespace_ds(commodity);
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ name_space = gnc_commodity_get_namespace_ds(commodity);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
iter->stamp = model->stamp;
iter->user_data = ITER_IS_COMMODITY;
@@ -1270,7 +1270,7 @@ gnc_tree_model_price_get_iter_from_commodity (GncTreeModelPrice *model,
gnc_commodity *commodity,
GtkTreeIter *iter)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
GList *list;
gint n;
@@ -1279,14 +1279,14 @@ gnc_tree_model_price_get_iter_from_commodity (GncTreeModelPrice *model,
g_return_val_if_fail ((commodity != NULL), FALSE);
g_return_val_if_fail ((iter != NULL), FALSE);
- namespace = gnc_commodity_get_namespace_ds(commodity);
- if (namespace == NULL)
+ name_space = gnc_commodity_get_namespace_ds(commodity);
+ if (name_space == NULL)
{
LEAVE("no namespace");
return FALSE;
}
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
if (list == NULL)
{
LEAVE("empty list");
@@ -1315,7 +1315,7 @@ gnc_tree_model_price_get_iter_from_commodity (GncTreeModelPrice *model,
*/
gboolean
gnc_tree_model_price_get_iter_from_namespace (GncTreeModelPrice *model,
- gnc_commodity_namespace *namespace,
+ gnc_commodity_namespace *name_space,
GtkTreeIter *iter)
{
GncTreeModelPricePrivate *priv;
@@ -1323,9 +1323,9 @@ gnc_tree_model_price_get_iter_from_namespace (GncTreeModelPrice *model,
GList *list;
gint n;
- ENTER("model %p, namespace %p, iter %p", model, namespace, iter);
+ ENTER("model %p, namespace %p, iter %p", model, name_space, iter);
g_return_val_if_fail (GNC_IS_TREE_MODEL_PRICE (model), FALSE);
- g_return_val_if_fail ((namespace != NULL), FALSE);
+ g_return_val_if_fail ((name_space != NULL), FALSE);
g_return_val_if_fail ((iter != NULL), FALSE);
priv = GNC_TREE_MODEL_PRICE_GET_PRIVATE(model);
@@ -1334,13 +1334,13 @@ gnc_tree_model_price_get_iter_from_namespace (GncTreeModelPrice *model,
if (list == NULL)
return FALSE;
- n = g_list_index(list, namespace);
+ n = g_list_index(list, name_space);
if (n == -1)
return FALSE;
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
- iter->user_data2 = namespace;
+ iter->user_data2 = name_space;
iter->user_data3 = GINT_TO_POINTER(n);
LEAVE("iter %s", iter_to_string(model, iter));
return TRUE;
@@ -1618,13 +1618,13 @@ gnc_tree_model_price_event_handler (QofInstance *entity,
}
else if (GNC_IS_COMMODITY_NAMESPACE(entity))
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
- namespace = GNC_COMMODITY_NAMESPACE(entity);
- name = gnc_commodity_namespace_get_name(namespace);
+ name_space = GNC_COMMODITY_NAMESPACE(entity);
+ name = gnc_commodity_namespace_get_name(name_space);
if (event_type != QOF_EVENT_DESTROY)
{
- if (!gnc_tree_model_price_get_iter_from_namespace (model, namespace, &iter))
+ if (!gnc_tree_model_price_get_iter_from_namespace (model, name_space, &iter))
{
LEAVE("no iter");
return;
diff --git a/src/gnome-utils/gnc-tree-model-price.h b/src/gnome-utils/gnc-tree-model-price.h
index 91edb31..6a89d03 100644
--- a/src/gnome-utils/gnc-tree-model-price.h
+++ b/src/gnome-utils/gnc-tree-model-price.h
@@ -220,7 +220,7 @@ GNCPrice *gnc_tree_model_price_get_price (GncTreeModelPrice *model,
*
* @return TRUE if the returned iter is valid, FALSE otherwise. */
gboolean gnc_tree_model_price_get_iter_from_namespace (GncTreeModelPrice *model,
- gnc_commodity_namespace *namespace,
+ gnc_commodity_namespace *name_space,
GtkTreeIter *iter);
/** Convert a commodity pointer into a GtkTreeIter.
diff --git a/src/gnome-utils/gnc-tree-view-commodity.c b/src/gnome-utils/gnc-tree-view-commodity.c
index fc0ee00..eb9a9c2 100644
--- a/src/gnome-utils/gnc-tree-view-commodity.c
+++ b/src/gnome-utils/gnc-tree-view-commodity.c
@@ -545,7 +545,7 @@ gnc_tree_view_commodity_filter_helper (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
filter_user_data *fd = data;
@@ -556,8 +556,8 @@ gnc_tree_view_commodity_filter_helper (GtkTreeModel *model,
{
if (fd->user_ns_fn)
{
- namespace = gnc_tree_model_commodity_get_namespace (GNC_TREE_MODEL_COMMODITY(model), iter);
- return fd->user_ns_fn(namespace, fd->user_data);
+ name_space = gnc_tree_model_commodity_get_namespace (GNC_TREE_MODEL_COMMODITY(model), iter);
+ return fd->user_ns_fn(name_space, fd->user_data);
}
return TRUE;
}
diff --git a/src/gnome-utils/gnc-tree-view-price.c b/src/gnome-utils/gnc-tree-view-price.c
index f42715d..7f3113d 100644
--- a/src/gnome-utils/gnc-tree-view-price.c
+++ b/src/gnome-utils/gnc-tree-view-price.c
@@ -558,7 +558,7 @@ gnc_tree_view_price_filter_helper (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- gnc_commodity_namespace *namespace;
+ gnc_commodity_namespace *name_space;
gnc_commodity *commodity;
GNCPrice *price;
filter_user_data *fd = data;
@@ -570,8 +570,8 @@ gnc_tree_view_price_filter_helper (GtkTreeModel *model,
{
if (fd->user_ns_fn)
{
- namespace = gnc_tree_model_price_get_namespace (GNC_TREE_MODEL_PRICE(model), iter);
- return fd->user_ns_fn(namespace, fd->user_data);
+ name_space = gnc_tree_model_price_get_namespace (GNC_TREE_MODEL_PRICE(model), iter);
+ return fd->user_ns_fn(name_space, fd->user_data);
}
return TRUE;
}
diff --git a/src/gnome-utils/search-param.c b/src/gnome-utils/search-param.c
index 65f66a6..4943de0 100644
--- a/src/gnome-utils/search-param.c
+++ b/src/gnome-utils/search-param.c
@@ -33,7 +33,7 @@
#include "search-param.h"
-static void gnc_search_param_class_init (GNCSearchParamClass *class);
+static void gnc_search_param_class_init (GNCSearchParamClass *klass);
static void gnc_search_param_init (GNCSearchParam *gspaper);
static void gnc_search_param_finalize (GObject *obj);
diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c
index 9d3e619..3917f69 100644
--- a/src/gnome/dialog-commodities.c
+++ b/src/gnome/dialog-commodities.c
@@ -60,7 +60,7 @@ typedef struct
GtkWidget * remove_button;
gboolean show_currencies;
- gboolean new;
+ gboolean is_new;
} CommoditiesDialog;
@@ -214,15 +214,15 @@ static void
add_clicked (CommoditiesDialog *cd)
{
gnc_commodity *commodity;
- const char *namespace;
+ const char *name_space;
commodity = gnc_tree_view_commodity_get_selected_commodity (cd->commodity_tree);
if (commodity)
- namespace = gnc_commodity_get_namespace (commodity);
+ name_space = gnc_commodity_get_namespace (commodity);
else
- namespace = NULL;
+ name_space = NULL;
- commodity = gnc_ui_new_commodity_modal (namespace, cd->dialog);
+ commodity = gnc_ui_new_commodity_modal (name_space, cd->dialog);
}
void
@@ -274,7 +274,7 @@ gnc_commodities_show_currencies_toggled (GtkToggleButton *toggle,
}
static gboolean
-gnc_commodities_dialog_filter_ns_func (gnc_commodity_namespace *namespace,
+gnc_commodities_dialog_filter_ns_func (gnc_commodity_namespace *name_space,
gpointer data)
{
CommoditiesDialog *cd = data;
@@ -282,7 +282,7 @@ gnc_commodities_dialog_filter_ns_func (gnc_commodity_namespace *namespace,
GList *list;
/* Never show the template list */
- name = gnc_commodity_namespace_get_name (namespace);
+ name = gnc_commodity_namespace_get_name (name_space);
if (g_strcmp0 (name, "template") == 0)
return FALSE;
@@ -291,7 +291,7 @@ gnc_commodities_dialog_filter_ns_func (gnc_commodity_namespace *namespace,
return FALSE;
/* Show any other namespace that has commodities */
- list = gnc_commodity_namespace_get_commodity_list(namespace);
+ list = gnc_commodity_namespace_get_commodity_list(name_space);
return (list != NULL);
}
@@ -385,7 +385,7 @@ refresh_handler (GHashTable *changes, gpointer user_data)
}
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *klass, gint component_id,
gpointer user_data, gpointer iter_data)
{
CommoditiesDialog *cd = user_data;
diff --git a/src/gnome/dialog-fincalc.c b/src/gnome/dialog-fincalc.c
index e768907..639a7a5 100644
--- a/src/gnome/dialog-fincalc.c
+++ b/src/gnome/dialog-fincalc.c
@@ -484,7 +484,7 @@ close_handler (gpointer user_data)
}
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *klass, gint component_id,
gpointer user_data, gpointer iter_data)
{
FinCalcDialog *fcd = user_data;
diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c
index d359bb5..8eec4e8 100644
--- a/src/gnome/dialog-price-edit-db.c
+++ b/src/gnome/dialog-price-edit-db.c
@@ -346,7 +346,7 @@ gnc_prices_dialog_selection_changed (GtkTreeSelection *treeselection,
static gboolean
-gnc_price_dialog_filter_ns_func (gnc_commodity_namespace *namespace,
+gnc_price_dialog_filter_ns_func (gnc_commodity_namespace *name_space,
gpointer data)
{
PricesDialog *pdb_dialog = data;
@@ -355,12 +355,12 @@ gnc_price_dialog_filter_ns_func (gnc_commodity_namespace *namespace,
GList *item;
/* Never show the template list */
- name = gnc_commodity_namespace_get_name (namespace);
+ name = gnc_commodity_namespace_get_name (name_space);
if (g_strcmp0 (name, "template") == 0)
return FALSE;
/* See if this namespace has commodities */
- cm_list = gnc_commodity_namespace_get_commodity_list(namespace);
+ cm_list = gnc_commodity_namespace_get_commodity_list(name_space);
for (item = cm_list; item; item = g_list_next(item))
{
@@ -511,7 +511,7 @@ refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *klass, gint component_id,
gpointer user_data, gpointer iter_data)
{
PricesDialog *pdb_dialog = user_data;
diff --git a/src/gnome/dialog-price-editor.c b/src/gnome/dialog-price-editor.c
index 282282e..ac980dc 100644
--- a/src/gnome/dialog-price-editor.c
+++ b/src/gnome/dialog-price-editor.c
@@ -79,7 +79,7 @@ typedef struct
GNCPrice *price;
gboolean changed;
- gboolean new;
+ gboolean is_new;
} PriceEditDialog;
@@ -141,7 +141,7 @@ price_to_gui (PriceEditDialog *pedit_dialog)
{
gnc_commodity *commodity = NULL;
gnc_commodity *currency = NULL;
- const gchar *namespace, *fullname;
+ const gchar *name_space, *fullname;
const char *source;
const char *type;
gnc_numeric value;
@@ -154,12 +154,12 @@ price_to_gui (PriceEditDialog *pedit_dialog)
if (commodity)
{
- namespace = gnc_commodity_get_namespace(commodity);
+ name_space = gnc_commodity_get_namespace(commodity);
fullname = gnc_commodity_get_printname(commodity);
gnc_ui_update_namespace_picker(pedit_dialog->namespace_cbwe,
- namespace, DIAG_COMM_ALL);
+ name_space, DIAG_COMM_ALL);
gnc_ui_update_commodity_picker(pedit_dialog->commodity_cbwe,
- namespace, fullname);
+ name_space, fullname);
currency = gnc_price_get_currency (pedit_dialog->price);
date = gnc_price_get_time (pedit_dialog->price);
@@ -200,17 +200,17 @@ gui_to_price (PriceEditDialog *pedit_dialog)
{
gnc_commodity *commodity;
gnc_commodity *currency;
- gchar *namespace;
+ gchar *name_space;
const gchar *fullname;
const char *source;
const char *type;
gnc_numeric value;
Timespec date;
- namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
+ name_space = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
fullname = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( GTK_COMBO_BOX(pedit_dialog->commodity_cbwe)))));
- commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), namespace, fullname);
+ commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), name_space, fullname);
if (!commodity)
return _("You must select a Security.");
@@ -244,7 +244,7 @@ gui_to_price (PriceEditDialog *pedit_dialog)
gnc_price_set_value (pedit_dialog->price, value);
gnc_price_commit_edit (pedit_dialog->price);
- g_free(namespace);
+ g_free(name_space);
return NULL;
}
@@ -262,7 +262,7 @@ pedit_dialog_destroy_cb (GtkWidget *widget, gpointer data)
{
gnc_price_unref (pedit_dialog->price);
pedit_dialog->price = NULL;
- pedit_dialog->new = FALSE;
+ pedit_dialog->is_new = FALSE;
}
g_free (pedit_dialog);
@@ -286,7 +286,7 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
}
gnc_prices_set_changed (pedit_dialog, FALSE);
- if (TRUE == pedit_dialog->new)
+ if (TRUE == pedit_dialog->is_new)
{
gnc_pricedb_add_price (pedit_dialog->price_db, pedit_dialog->price);
}
@@ -297,7 +297,7 @@ pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
if (response == GTK_RESPONSE_APPLY)
{
new_price = gnc_price_clone (pedit_dialog->price, pedit_dialog->book);
- pedit_dialog->new = TRUE;
+ pedit_dialog->is_new = TRUE;
gnc_price_unref (pedit_dialog->price);
pedit_dialog->price = new_price;
@@ -315,14 +315,14 @@ void
pedit_commodity_ns_changed_cb (GtkComboBox *cbwe, gpointer data)
{
PriceEditDialog *pedit_dialog = data;
- gchar *namespace;
+ gchar *name_space;
gnc_prices_set_changed (pedit_dialog, TRUE);
- namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
- gnc_ui_update_commodity_picker (pedit_dialog->commodity_cbwe, namespace, NULL);
+ name_space = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
+ gnc_ui_update_commodity_picker (pedit_dialog->commodity_cbwe, name_space, NULL);
- g_free(namespace);
+ g_free(name_space);
}
@@ -331,17 +331,17 @@ pedit_commodity_changed_cb (GtkComboBox *cbwe, gpointer data)
{
gnc_commodity *commodity = NULL;
gnc_commodity *currency = NULL;
- gchar *namespace;
+ gchar *name_space;
const gchar *fullname;
GList *price_list;
PriceEditDialog *pedit_dialog = data;
gnc_prices_set_changed (pedit_dialog, TRUE);
- namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
+ name_space = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbwe);
fullname = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( GTK_COMBO_BOX(pedit_dialog->commodity_cbwe)))));
- commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), namespace, fullname);
+ commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), name_space, fullname);
if (commodity)
{
@@ -364,7 +364,7 @@ pedit_commodity_changed_cb (GtkComboBox *cbwe, gpointer data)
}
}
- g_free(namespace);
+ g_free(name_space);
}
@@ -389,7 +389,7 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
GtkWidget *box;
GtkWidget *w;
GtkWidget *label;
- gchar *namespace;
+ gchar *name_space;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-price.glade", "liststore1");
@@ -419,9 +419,9 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
pedit_dialog->commodity_cbwe = w;
gnc_cbwe_require_list_item(GTK_COMBO_BOX(pedit_dialog->commodity_cbwe));
- namespace = gnc_ui_namespace_picker_ns(pedit_dialog->namespace_cbwe);
- gnc_ui_update_commodity_picker(pedit_dialog->commodity_cbwe, namespace, NULL);
- g_free(namespace);
+ name_space = gnc_ui_namespace_picker_ns(pedit_dialog->namespace_cbwe);
+ gnc_ui_update_commodity_picker(pedit_dialog->commodity_cbwe, name_space, NULL);
+ g_free(name_space);
box = GTK_WIDGET(gtk_builder_get_object (builder, "currency_box"));
w = gnc_currency_edit_new ();
@@ -505,7 +505,7 @@ refresh_handler (GHashTable *changes, gpointer user_data)
static gboolean
-show_handler (const char *class, gint component_id,
+show_handler (const char *klass, gint component_id,
gpointer user_data, gpointer iter_data)
{
PriceEditDialog *pedit_dialog = user_data;
@@ -556,12 +556,12 @@ gnc_price_edit_dialog (GtkWidget * parent,
gnc_price_set_source (price, DIALOG_PRICE_EDIT_SOURCE);
}
- pedit_dialog->new = TRUE;
+ pedit_dialog->is_new = TRUE;
/* New price will only have one ref, this dialog. */
break;
case GNC_PRICE_EDIT:
gnc_price_ref(price); /* Add ref from this dialog */
- pedit_dialog->new = FALSE;
+ pedit_dialog->is_new = FALSE;
break;
}
diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c
index b9d198a..6e71cbf 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/src/gnome/gnc-split-reg.c
@@ -166,7 +166,7 @@ void gnc_split_reg_size_allocate( GtkWidget *widget,
void gnc_split_reg_handle_exchange_cb (GtkWidget *w, gpointer data);
-static void gnc_split_reg_class_init( GNCSplitRegClass *class );
+static void gnc_split_reg_class_init( GNCSplitRegClass *klass );
static void gnc_split_reg_init( GNCSplitReg *gsr );
static void gnc_split_reg_init2( GNCSplitReg *gsr );
@@ -230,7 +230,7 @@ enum gnc_split_reg_signal_enum
static guint gnc_split_reg_signals[LAST_SIGNAL] = { 0 };
static void
-gnc_split_reg_class_init( GNCSplitRegClass *class )
+gnc_split_reg_class_init( GNCSplitRegClass *klass )
{
int i;
GtkObjectClass *object_class;
@@ -264,7 +264,7 @@ gnc_split_reg_class_init( GNCSplitRegClass *class )
{ LAST_SIGNAL, NULL, 0 }
};
- object_class = (GtkObjectClass*) class;
+ object_class = (GtkObjectClass*) klass;
for ( i = 0; signals[i].s != INCLUDE_DATE_SIGNAL; i++ )
{
@@ -291,27 +291,27 @@ gnc_split_reg_class_init( GNCSplitRegClass *class )
g_assert( i == LAST_SIGNAL );
/* Setup the default handlers. */
- class->enter_ent_cb = gsr_default_enter_handler;
- class->cancel_ent_cb = gsr_default_cancel_handler;
- class->delete_ent_cb = gsr_default_delete_handler;
- class->reinit_ent_cb = gsr_default_reinit_handler;
- class->dup_ent_cb = gsr_default_dup_handler;
- class->schedule_ent_cb = gsr_default_schedule_handler;
- class->expand_ent_cb = gsr_default_expand_handler;
- class->blank_cb = gsr_default_blank_handler;
- class->jump_cb = gsr_default_jump_handler;
- class->cut_cb = gsr_default_cut_handler;
- class->cut_txn_cb = gsr_default_cut_txn_handler;
- class->copy_cb = gsr_default_copy_handler;
- class->copy_txn_cb = gsr_default_copy_txn_handler;
- class->paste_cb = gsr_default_paste_handler;
- class->paste_txn_cb = gsr_default_paste_txn_handler;
- class->void_txn_cb = gsr_default_void_txn_handler;
- class->unvoid_txn_cb = gsr_default_unvoid_txn_handler;
- class->reverse_txn_cb = gsr_default_reverse_txn_handler;
-
- class->help_changed_cb = NULL;
- class->include_date_cb = NULL;
+ klass->enter_ent_cb = gsr_default_enter_handler;
+ klass->cancel_ent_cb = gsr_default_cancel_handler;
+ klass->delete_ent_cb = gsr_default_delete_handler;
+ klass->reinit_ent_cb = gsr_default_reinit_handler;
+ klass->dup_ent_cb = gsr_default_dup_handler;
+ klass->schedule_ent_cb = gsr_default_schedule_handler;
+ klass->expand_ent_cb = gsr_default_expand_handler;
+ klass->blank_cb = gsr_default_blank_handler;
+ klass->jump_cb = gsr_default_jump_handler;
+ klass->cut_cb = gsr_default_cut_handler;
+ klass->cut_txn_cb = gsr_default_cut_txn_handler;
+ klass->copy_cb = gsr_default_copy_handler;
+ klass->copy_txn_cb = gsr_default_copy_txn_handler;
+ klass->paste_cb = gsr_default_paste_handler;
+ klass->paste_txn_cb = gsr_default_paste_txn_handler;
+ klass->void_txn_cb = gsr_default_void_txn_handler;
+ klass->unvoid_txn_cb = gsr_default_unvoid_txn_handler;
+ klass->reverse_txn_cb = gsr_default_reverse_txn_handler;
+
+ klass->help_changed_cb = NULL;
+ klass->include_date_cb = NULL;
}
GtkWidget*
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c
index 5c78ab3..4e57a59 100644
--- a/src/import-export/qif-imp/assistant-qif-import.c
+++ b/src/import-export/qif-imp/assistant-qif-import.c
@@ -1012,7 +1012,7 @@ gnc_ui_qif_import_commodity_update(QIFImportWindow * wind)
GtkWidget *gtkpage;
QIFAssistantPage *page;
const gchar *mnemonic = NULL;
- gchar *namespace = NULL;
+ gchar *name_space = NULL;
const gchar *fullname = NULL;
gnc_commodity *tab_commodity;
@@ -1023,17 +1023,17 @@ gnc_ui_qif_import_commodity_update(QIFImportWindow * wind)
/* Get any changes from the commodity page. */
mnemonic = gtk_entry_get_text(GTK_ENTRY(page->mnemonic_entry));
- namespace = gnc_ui_namespace_picker_ns(page->namespace_combo);
+ name_space = gnc_ui_namespace_picker_ns(page->namespace_combo);
fullname = gtk_entry_get_text(GTK_ENTRY(page->name_entry));
/* Update the commodity with the new values. */
- gnc_commodity_set_namespace(page->commodity, namespace);
+ gnc_commodity_set_namespace(page->commodity, name_space);
gnc_commodity_set_fullname(page->commodity, fullname);
gnc_commodity_set_mnemonic(page->commodity, mnemonic);
/* Add the commodity to the commodity table (if it isn't a duplicate). */
tab_commodity = gnc_commodity_table_lookup(gnc_get_current_commodities(),
- namespace, mnemonic);
+ name_space, mnemonic);
if (!tab_commodity || tab_commodity == page->commodity)
tab_commodity = gnc_commodity_table_insert(gnc_get_current_commodities(),
page->commodity);
@@ -1044,7 +1044,7 @@ gnc_ui_qif_import_commodity_update(QIFImportWindow * wind)
SWIG_NewPointerObj(tab_commodity,
SWIG_TypeQuery("_p_gnc_commodity"), 0));
- g_free(namespace);
+ g_free(name_space);
}
}
@@ -2638,7 +2638,7 @@ gnc_ui_qif_import_comm_valid (GtkAssistant *assistant,
gnc_commodity_table *table;
gnc_commodity_namespace *newns;
- gchar *namespace = gnc_ui_namespace_picker_ns(qpage->namespace_combo);
+ gchar *name_space = gnc_ui_namespace_picker_ns(qpage->namespace_combo);
const gchar *name = gtk_entry_get_text(GTK_ENTRY(qpage->name_entry));
const gchar *mnemonic = gtk_entry_get_text(GTK_ENTRY(qpage->mnemonic_entry));
@@ -2646,7 +2646,7 @@ gnc_ui_qif_import_comm_valid (GtkAssistant *assistant,
{
gnc_warning_dialog(wind->window, "%s",
_("Enter a name or short description, such as \"Red Hat Stock\"."));
- g_free(namespace);
+ g_free(name_space);
return FALSE;
}
else if (!mnemonic || (mnemonic[0] == 0))
@@ -2654,18 +2654,18 @@ gnc_ui_qif_import_comm_valid (GtkAssistant *assistant,
gnc_warning_dialog(wind->window, "%s",
_("Enter the ticker symbol or other well known abbreviation, such as"
" \"RHT\". If there isn't one, or you don't know it, create your own."));
- g_free(namespace);
+ g_free(name_space);
return FALSE;
}
- else if (!namespace || (namespace[0] == 0))
+ else if (!name_space || (name_space[0] == 0))
{
gnc_warning_dialog(wind->window, "%s",
_("Select the exchange on which the symbol is traded, or select the"
" type of investment (such as FUND for mutual funds.) If you don't"
" see your exchange or an appropriate investment type, you can"
" enter a new one."));
- if (namespace)
- g_free(namespace);
+ if (name_space)
+ g_free(name_space);
return FALSE;
}
@@ -2676,34 +2676,34 @@ gnc_ui_qif_import_comm_valid (GtkAssistant *assistant,
book = gnc_get_current_book();
table = gnc_commodity_table_get_table(book);
- if (gnc_commodity_namespace_is_iso(namespace) &&
- !gnc_commodity_table_lookup(table, namespace, mnemonic))
+ if (gnc_commodity_namespace_is_iso(name_space) &&
+ !gnc_commodity_table_lookup(table, name_space, mnemonic))
{
gnc_warning_dialog(wind->window, "%s",
_("You must enter an existing national "
"currency or enter a different type."));
- g_free(namespace);
+ g_free(name_space);
return FALSE;
}
/* Is the namespace a new one? */
- if (!gnc_commodity_table_has_namespace(table, namespace))
+ if (!gnc_commodity_table_has_namespace(table, name_space))
{
/* Register it so that it will appear as an option on other pages. */
- newns = gnc_commodity_table_add_namespace(table, namespace, book);
+ newns = gnc_commodity_table_add_namespace(table, name_space, book);
/* Remember it so it can be removed if the import gets canceled. */
if (newns)
- wind->new_namespaces = g_list_prepend(wind->new_namespaces, namespace);
+ wind->new_namespaces = g_list_prepend(wind->new_namespaces, name_space);
else
{
- g_warning("QIF import: Couldn't create namespace %s", namespace);
- g_free(namespace);
+ g_warning("QIF import: Couldn't create namespace %s", name_space);
+ g_free(name_space);
}
}
else
- g_free(namespace);
+ g_free(name_space);
return TRUE;
}
diff --git a/src/register/ledger-core/gnc-ledger-display.c b/src/register/ledger-core/gnc-ledger-display.c
index 299c18b..539bc58 100644
--- a/src/register/ledger-core/gnc-ledger-display.c
+++ b/src/register/ledger-core/gnc-ledger-display.c
@@ -681,13 +681,13 @@ gnc_ledger_display_internal (Account *lead_account, Query *q,
{
GNCLedgerDisplay *ld;
gint limit;
- const char *class;
+ const char *klass;
GList *splits;
switch (ld_type)
{
case LD_SINGLE:
- class = REGISTER_SINGLE_CM_CLASS;
+ klass = REGISTER_SINGLE_CM_CLASS;
if (reg_type >= NUM_SINGLE_REGISTER_TYPES)
{
@@ -707,14 +707,14 @@ gnc_ledger_display_internal (Account *lead_account, Query *q,
q = NULL;
}
- ld = gnc_find_first_gui_component (class, find_by_leader, lead_account);
+ ld = gnc_find_first_gui_component (klass, find_by_leader, lead_account);
if (ld)
return ld;
break;
case LD_SUBACCOUNT:
- class = REGISTER_SUBACCOUNT_CM_CLASS;
+ klass = REGISTER_SUBACCOUNT_CM_CLASS;
if (!lead_account)
{
@@ -728,14 +728,14 @@ gnc_ledger_display_internal (Account *lead_account, Query *q,
q = NULL;
}
- ld = gnc_find_first_gui_component (class, find_by_leader, lead_account);
+ ld = gnc_find_first_gui_component (klass, find_by_leader, lead_account);
if (ld)
return ld;
break;
case LD_GL:
- class = REGISTER_GL_CM_CLASS;
+ klass = REGISTER_GL_CM_CLASS;
if (!q)
{
@@ -768,7 +768,7 @@ gnc_ledger_display_internal (Account *lead_account, Query *q,
else
gnc_ledger_display_make_query (ld, limit, reg_type);
- ld->component_id = gnc_register_gui_component (class,
+ ld->component_id = gnc_register_gui_component (klass,
refresh_handler,
close_handler, ld);
diff --git a/src/register/ledger-core/gnc-ledger-display2.c b/src/register/ledger-core/gnc-ledger-display2.c
index eff8bc2..67f744b 100644
--- a/src/register/ledger-core/gnc-ledger-display2.c
+++ b/src/register/ledger-core/gnc-ledger-display2.c
@@ -698,7 +698,7 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
{
GNCLedgerDisplay2 *ld;
gint limit;
- const char *class;
+ const char *klass;
GList *splits;
gboolean display_subaccounts = FALSE;
gboolean is_gl = FALSE;
@@ -706,7 +706,7 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
switch (ld_type)
{
case LD2_SINGLE:
- class = REGISTER_SINGLE_CM_CLASS;
+ klass = REGISTER_SINGLE_CM_CLASS;
if (reg_type >= NUM_SINGLE_REGISTER_TYPES2)
{
@@ -726,14 +726,14 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
q = NULL;
}
- ld = gnc_find_first_gui_component (class, find_by_leader, lead_account);
+ ld = gnc_find_first_gui_component (klass, find_by_leader, lead_account);
if (ld)
return ld;
break;
case LD2_SUBACCOUNT:
- class = REGISTER_SUBACCOUNT_CM_CLASS;
+ klass = REGISTER_SUBACCOUNT_CM_CLASS;
if (!lead_account)
{
@@ -747,7 +747,7 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
q = NULL;
}
- ld = gnc_find_first_gui_component (class, find_by_leader, lead_account);
+ ld = gnc_find_first_gui_component (klass, find_by_leader, lead_account);
if (ld)
return ld;
@@ -755,7 +755,7 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
break;
case LD2_GL:
- class = REGISTER_GL_CM_CLASS;
+ klass = REGISTER_GL_CM_CLASS;
if (!q)
{
@@ -790,7 +790,7 @@ gnc_ledger_display2_internal (Account *lead_account, Query *q,
else
gnc_ledger_display2_make_query (ld, limit, reg_type);
- ld->component_id = gnc_register_gui_component (class,
+ ld->component_id = gnc_register_gui_component (klass,
refresh_handler,
close_handler, ld);
diff --git a/src/register/ledger-core/split-register-p.h b/src/register/ledger-core/split-register-p.h
index 7479b0e..0f107ff 100644
--- a/src/register/ledger-core/split-register-p.h
+++ b/src/register/ledger-core/split-register-p.h
@@ -116,9 +116,6 @@ struct sr_info
/* hook to get parent widget */
SRGetParentCallback get_parent;
- /* flag indicating a template register */
- gboolean template;
-
/* The template account which template transaction should belong to */
GncGUID template_account;
diff --git a/src/register/register-gnome/gnucash-cursor.c b/src/register/register-gnome/gnucash-cursor.c
index bba40d9..a53e92f 100644
--- a/src/register/register-gnome/gnucash-cursor.c
+++ b/src/register/register-gnome/gnucash-cursor.c
@@ -506,15 +506,15 @@ gnucash_cursor_init (GnucashCursor *cursor)
static void
-gnucash_cursor_class_init (GnucashCursorClass *class)
+gnucash_cursor_class_init (GnucashCursorClass *klass)
{
GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = G_OBJECT_CLASS (class);
- item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ object_class = G_OBJECT_CLASS (klass);
+ item_class = GNOME_CANVAS_ITEM_CLASS (klass);
- gnucash_cursor_parent_class = g_type_class_peek_parent (class);
+ gnucash_cursor_parent_class = g_type_class_peek_parent (klass);
/* GObject method overrides */
object_class->set_property = gnucash_cursor_set_property;
diff --git a/src/register/register-gnome/gnucash-grid.c b/src/register/register-gnome/gnucash-grid.c
index 3272104..f032a9c 100644
--- a/src/register/register-gnome/gnucash-grid.c
+++ b/src/register/register-gnome/gnucash-grid.c
@@ -856,15 +856,15 @@ gnucash_grid_get_property (GObject *object,
static void
-gnucash_grid_class_init (GnucashGridClass *class)
+gnucash_grid_class_init (GnucashGridClass *klass)
{
GObjectClass *object_class;
GnomeCanvasItemClass *item_class;
- object_class = G_OBJECT_CLASS (class);
- item_class = GNOME_CANVAS_ITEM_CLASS (class);
+ object_class = G_OBJECT_CLASS (klass);
+ item_class = GNOME_CANVAS_ITEM_CLASS (klass);
- gnucash_grid_parent_class = g_type_class_peek_parent (class);
+ gnucash_grid_parent_class = g_type_class_peek_parent (klass);
/* GObject method overrides */
object_class->set_property = gnucash_grid_set_property;
diff --git a/src/register/register-gnome/gnucash-scrolled-window.c b/src/register/register-gnome/gnucash-scrolled-window.c
index b24d36e..fe5d328 100644
--- a/src/register/register-gnome/gnucash-scrolled-window.c
+++ b/src/register/register-gnome/gnucash-scrolled-window.c
@@ -31,7 +31,7 @@ static GtkScrolledWindowClass *parent_class = NULL;
/** Declarations ******************************************************/
-static void gnc_scrolled_window_class_init (GncScrolledWindowClass *class);
+static void gnc_scrolled_window_class_init (GncScrolledWindowClass *klass);
static void gnc_scrolled_window_init (GncScrolledWindow *scrollwin);
@@ -77,11 +77,11 @@ gnc_scrolled_window_new (void)
static void
-gnc_scrolled_window_class_init (GncScrolledWindowClass *class)
+gnc_scrolled_window_class_init (GncScrolledWindowClass *klass)
{
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS (class);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
scroll_class->scrollbar_spacing = 0;
}
diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c
index 06c639e..5a12a06 100644
--- a/src/register/register-gnome/gnucash-sheet.c
+++ b/src/register/register-gnome/gnucash-sheet.c
@@ -2727,15 +2727,15 @@ gnucash_sheet_create_color_hack(GnucashSheet *sheet)
/*************************************************************/
static void
-gnucash_sheet_class_init (GnucashSheetClass *class)
+gnucash_sheet_class_init (GnucashSheetClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- gobject_class = G_OBJECT_CLASS (class);
- widget_class = GTK_WIDGET_CLASS (class);
+ gobject_class = G_OBJECT_CLASS (klass);
+ widget_class = GTK_WIDGET_CLASS (klass);
- sheet_parent_class = g_type_class_peek_parent (class);
+ sheet_parent_class = g_type_class_peek_parent (klass);
/* Method override */
gobject_class->finalize = gnucash_sheet_finalize;
@@ -2900,13 +2900,13 @@ gnucash_sheet_new (Table *table)
static void
-gnucash_register_class_init (GnucashRegisterClass *class)
+gnucash_register_class_init (GnucashRegisterClass *klass)
{
GObjectClass *gobject_class;
- gobject_class = G_OBJECT_CLASS (class);
+ gobject_class = G_OBJECT_CLASS (klass);
- register_parent_class = g_type_class_peek_parent (class);
+ register_parent_class = g_type_class_peek_parent (klass);
register_signals[ACTIVATE_CURSOR] =
g_signal_new("activate_cursor",
@@ -2938,9 +2938,9 @@ gnucash_register_class_init (GnucashRegisterClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- class->activate_cursor = NULL;
- class->redraw_all = NULL;
- class->redraw_help = NULL;
+ klass->activate_cursor = NULL;
+ klass->redraw_all = NULL;
+ klass->redraw_help = NULL;
}
Summary of changes:
src/app-utils/gnc-component-manager.h | 2 +-
src/app-utils/test/test-option-util.c | 2 +-
src/backend/xml/io-gncxml-v1.c | 12 +-
src/backend/xml/io-gncxml-v2.c | 6 +-
src/backend/xml/io-gncxml-v2.h | 2 +-
src/backend/xml/sixtp-dom-generators.c | 8 +-
src/business/business-gnome/search-owner.c | 12 +-
src/business/business-ledger/gncEntryLedger.c | 6 +-
src/business/business-ledger/gncEntryLedgerP.h | 2 +-
src/engine/gnc-commodity.c | 152 ++++++++++-----------
src/engine/test-core/test-engine-stuff.c | 6 +-
src/engine/test/utest-Account.c | 22 +--
src/engine/test/utest-Transaction.c | 94 ++++++-------
src/gnome-search/dialog-search.c | 12 +-
src/gnome-search/gnc-general-search.c | 2 +-
src/gnome-search/search-account.c | 12 +-
src/gnome-search/search-boolean.c | 12 +-
src/gnome-search/search-core-type.c | 2 +-
src/gnome-search/search-date.c | 12 +-
src/gnome-search/search-double.c | 12 +-
src/gnome-search/search-int64.c | 12 +-
src/gnome-search/search-numeric.c | 12 +-
src/gnome-search/search-reconciled.c | 12 +-
src/gnome-search/search-string.c | 18 +--
src/gnome-utils/assistant-xml-encoding.c | 10 +-
src/gnome-utils/dialog-commodity.c | 96 ++++++-------
src/gnome-utils/dialog-commodity.h | 4 +-
src/gnome-utils/dialog-preferences.c | 4 +-
src/gnome-utils/dialog-reset-warnings.c | 4 +-
src/gnome-utils/dialog-totd.c | 14 +-
src/gnome-utils/gnc-amount-edit.c | 2 +-
src/gnome-utils/gnc-cell-renderer-date.c | 12 +-
src/gnome-utils/gnc-cell-renderer-popup-entry.c | 2 +-
src/gnome-utils/gnc-cell-renderer-popup.c | 16 +--
src/gnome-utils/gnc-combott.c | 14 +-
src/gnome-utils/gnc-currency-edit.c | 2 +-
src/gnome-utils/gnc-date-delta.c | 2 +-
src/gnome-utils/gnc-date-format.c | 2 +-
src/gnome-utils/gnc-dense-cal.c | 2 +-
src/gnome-utils/gnc-general-select.c | 2 +-
src/gnome-utils/gnc-period-select.c | 2 +-
src/gnome-utils/gnc-plugin.c | 32 ++---
src/gnome-utils/gnc-tree-model-commodity.c | 92 ++++++-------
src/gnome-utils/gnc-tree-model-commodity.h | 2 +-
src/gnome-utils/gnc-tree-model-price.c | 102 +++++++-------
src/gnome-utils/gnc-tree-model-price.h | 2 +-
src/gnome-utils/gnc-tree-view-commodity.c | 6 +-
src/gnome-utils/gnc-tree-view-price.c | 6 +-
src/gnome-utils/search-param.c | 2 +-
src/gnome/dialog-commodities.c | 18 +--
src/gnome/dialog-fincalc.c | 2 +-
src/gnome/dialog-price-edit-db.c | 8 +-
src/gnome/dialog-price-editor.c | 54 ++++----
src/gnome/gnc-split-reg.c | 48 +++----
src/import-export/qif-imp/assistant-qif-import.c | 40 +++---
src/register/ledger-core/gnc-ledger-display.c | 14 +-
src/register/ledger-core/gnc-ledger-display2.c | 14 +-
src/register/ledger-core/split-register-p.h | 3 -
src/register/register-gnome/gnucash-cursor.c | 8 +-
src/register/register-gnome/gnucash-grid.c | 8 +-
.../register-gnome/gnucash-scrolled-window.c | 8 +-
src/register/register-gnome/gnucash-sheet.c | 20 +--
62 files changed, 560 insertions(+), 563 deletions(-)
More information about the gnucash-changes
mailing list