r18770 - gnucash/trunk/src - C++ compatibility: export is a keyword, so don't use it as a member name.
Christian Stimming
cstim at code.gnucash.org
Mon Mar 1 13:30:37 EST 2010
Author: cstim
Date: 2010-03-01 13:30:37 -0500 (Mon, 01 Mar 2010)
New Revision: 18770
Trac: http://svn.gnucash.org/trac/changeset/18770
Modified:
gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
gnucash/trunk/src/backend/xml/gnc-backend-xml.c
gnucash/trunk/src/libqof/qof/qofbackend-p.h
gnucash/trunk/src/libqof/qof/qofbackend.c
gnucash/trunk/src/libqof/qof/qofsession.c
Log:
C++ compatibility: export is a keyword, so don't use it as a member name.
Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2010-03-01 18:04:33 UTC (rev 18769)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2010-03-01 18:30:37 UTC (rev 18770)
@@ -949,7 +949,7 @@
be->run_query = gnc_sql_run_query;
be->free_query = gnc_sql_free_query;
- be->export = NULL;
+ be->export_fn = NULL;
gnc_sql_init( &dbi_be->sql_be );
}
Modified: gnucash/trunk/src/backend/xml/gnc-backend-xml.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-03-01 18:04:33 UTC (rev 18769)
+++ gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-03-01 18:30:37 UTC (rev 18770)
@@ -1129,7 +1129,7 @@
be->load_config = NULL;
be->get_config = NULL;
- be->export = gnc_xml_be_write_accounts_to_file;
+ be->export_fn = gnc_xml_be_write_accounts_to_file;
gnc_be->dirname = NULL;
gnc_be->fullpath = NULL;
Modified: gnucash/trunk/src/libqof/qof/qofbackend-p.h
===================================================================
--- gnucash/trunk/src/libqof/qof/qofbackend-p.h 2010-03-01 18:04:33 UTC (rev 18769)
+++ gnucash/trunk/src/libqof/qof/qofbackend-p.h 2010-03-01 18:30:37 UTC (rev 18770)
@@ -364,7 +364,7 @@
* removed ASAP. This is a temporary hack-around until period-closing
* is fully implemented.
*/
- void (*export) (QofBackend *, QofBook *);
+ void (*export_fn) (QofBackend *, QofBook *);
};
Modified: gnucash/trunk/src/libqof/qof/qofbackend.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofbackend.c 2010-03-01 18:04:33 UTC (rev 18769)
+++ gnucash/trunk/src/libqof/qof/qofbackend.c 2010-03-01 18:30:37 UTC (rev 18770)
@@ -142,7 +142,7 @@
/* to be removed */
be->price_lookup = NULL;
- be->export = NULL;
+ be->export_fn = NULL;
}
void
Modified: gnucash/trunk/src/libqof/qof/qofsession.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofsession.c 2010-03-01 18:04:33 UTC (rev 18769)
+++ gnucash/trunk/src/libqof/qof/qofsession.c 2010-03-01 18:30:37 UTC (rev 18770)
@@ -1694,11 +1694,11 @@
return FALSE;
be->percentage = percentage_func;
- if (be->export)
+ if (be->export_fn)
{
int err;
- (be->export)(be, book);
+ (be->export_fn)(be, book);
err = qof_backend_get_error(be);
if (ERR_BACKEND_NO_ERR != err)
More information about the gnucash-changes
mailing list