r20392 - gnucash/trunk/src - Move business-options.[hc] from business-utils to app-utils.
Christian Stimming
cstim at code.gnucash.org
Thu Mar 10 17:23:44 EST 2011
Author: cstim
Date: 2011-03-10 17:23:44 -0500 (Thu, 10 Mar 2011)
New Revision: 20392
Trac: http://svn.gnucash.org/trac/changeset/20392
Added:
gnucash/trunk/src/app-utils/business-options.c
gnucash/trunk/src/app-utils/business-options.h
Removed:
gnucash/trunk/src/business/business-utils/business-options.c
gnucash/trunk/src/business/business-utils/business-options.h
Modified:
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/business/business-utils/Makefile.am
Log:
Move business-options.[hc] from business-utils to app-utils.
As "business-core" has been dissolved, the "business-utils" code
has no more requirements than app-utils and can be moved there because of this.
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2011-03-10 20:12:44 UTC (rev 20391)
+++ gnucash/trunk/src/app-utils/Makefile.am 2011-03-10 22:23:44 UTC (rev 20392)
@@ -35,6 +35,7 @@
libgncmod_app_utils_la_SOURCES = \
swig-app-utils.c \
+ business-options.c \
QuickFill.c \
file-utils.c \
gfec.c \
@@ -64,6 +65,7 @@
gncincludedir = ${GNC_INCLUDE_DIR}
gncinclude_HEADERS = \
QuickFill.h \
+ business-options.h \
file-utils.h \
gfec.h \
gnc-basic-gobject.h \
Copied: gnucash/trunk/src/app-utils/business-options.c (from rev 20391, gnucash/trunk/src/business/business-utils/business-options.c)
===================================================================
--- gnucash/trunk/src/app-utils/business-options.c (rev 0)
+++ gnucash/trunk/src/app-utils/business-options.c 2011-03-10 22:23:44 UTC (rev 20392)
@@ -0,0 +1,91 @@
+/*
+ * business-options.c -- Non-GUI Option Utilities for GNC Business Objects
+ *
+ * Written By: Derek Atkins <warlord at MIT.EDU>
+ * Copyright (C) 2003 Derek Atkins
+ *
+ * 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, 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 "business-options.h"
+#include "swig-runtime.h"
+
+#define FUNC_NAME G_STRFUNC
+
+#define LOOKUP_OPTION(fcn) \
+ GNCOption *option; \
+ SCM getter; \
+ SCM value; \
+ \
+ option = gnc_option_db_get_option_by_name (odb, section, name); \
+ \
+ if (option == NULL) \
+ return default_value; \
+ \
+ getter = gnc_option_getter (option); \
+ if (getter == SCM_UNDEFINED) \
+ return default_value; \
+ \
+ value = scm_call_0 (getter); \
+ if (value == SCM_BOOL_F) \
+ return NULL; \
+ SWIG_GetModule(NULL); /* Work-around for SWIG bug. */ \
+ if (!SWIG_IsPointer(value)) \
+ scm_misc_error(fcn, "SCM is not a wrapped pointer.", value)
+
+GncTaxTable*
+gnc_option_db_lookup_taxtable_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncTaxTable * default_value)
+{
+ LOOKUP_OPTION("gnc_option_db_lookup_taxtable_option");
+ return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncTaxTable"), 1, 0);
+}
+
+GncInvoice*
+gnc_option_db_lookup_invoice_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncInvoice * default_value)
+{
+ LOOKUP_OPTION("gnc_option_db_lookup_invoice_option");
+ return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncInvoice"), 1, 0);
+}
+
+GncCustomer*
+gnc_option_db_lookup_customer_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncCustomer * default_value)
+{
+ LOOKUP_OPTION("gnc_option_db_lookup_customer_option");
+ return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncCustomer"), 1, 0);
+}
+
+GncVendor*
+gnc_option_db_lookup_vendor_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncVendor * default_value)
+{
+ LOOKUP_OPTION("gnc_option_db_lookup_vendor_option");
+ return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncVendor"), 1, 0);
+}
Property changes on: gnucash/trunk/src/app-utils/business-options.c
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ LF
Copied: gnucash/trunk/src/app-utils/business-options.h (from rev 20391, gnucash/trunk/src/business/business-utils/business-options.h)
===================================================================
--- gnucash/trunk/src/app-utils/business-options.h (rev 0)
+++ gnucash/trunk/src/app-utils/business-options.h 2011-03-10 22:23:44 UTC (rev 20392)
@@ -0,0 +1,56 @@
+/*
+ * business-options.h -- non-GUI Option Utilities for GNC Business Objects
+ *
+ * Written By: Derek Atkins <warlord at MIT.EDU>
+ * Copyright (C) 2003 Derek Atkins <warlord at MIT.EDU>
+ *
+ * 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, 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
+ */
+
+#ifndef GNC_BUSINESS_OPTIONS_UTILS_H_
+#define GNC_BUSINESS_OPTIONS_UTILS_H_
+
+#include "option-util.h"
+#include "gncTaxTable.h"
+#include "gncInvoice.h"
+#include "gncCustomer.h"
+#include "gncVendor.h"
+
+
+GncTaxTable* gnc_option_db_lookup_taxtable_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncTaxTable * default_value);
+
+GncInvoice* gnc_option_db_lookup_invoice_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncInvoice * default_value);
+
+GncCustomer* gnc_option_db_lookup_customer_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncCustomer * default_value);
+
+GncVendor* gnc_option_db_lookup_vendor_option(GNCOptionDB *odb,
+ const char *section,
+ const char *name,
+ GncVendor * default_value);
+
+
+#endif /* GNC_BUSINESS_OPTIONS_UTILS_H_ */
Property changes on: gnucash/trunk/src/app-utils/business-options.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ LF
Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am 2011-03-10 20:12:44 UTC (rev 20391)
+++ gnucash/trunk/src/business/business-utils/Makefile.am 2011-03-10 22:23:44 UTC (rev 20392)
@@ -5,25 +5,18 @@
-I${top_builddir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
- -I${top_srcdir}/src/app-utils \
- -I${top_srcdir}/src/business/business-core \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${GNOME_CFLAGS}
libgncmod_business_utils_la_SOURCES = \
- gncmod-business-utils.c \
- business-options.c
+ gncmod-business-utils.c
-noinst_HEADERS = \
- business-options.h
-
libgncmod_business_utils_la_LDFLAGS = -avoid-version
libgncmod_business_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgnc-module.la \
- ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GLIB_LIBS} \
Deleted: gnucash/trunk/src/business/business-utils/business-options.c
===================================================================
--- gnucash/trunk/src/business/business-utils/business-options.c 2011-03-10 20:12:44 UTC (rev 20391)
+++ gnucash/trunk/src/business/business-utils/business-options.c 2011-03-10 22:23:44 UTC (rev 20392)
@@ -1,91 +0,0 @@
-/*
- * business-options.c -- Non-GUI Option Utilities for GNC Business Objects
- *
- * Written By: Derek Atkins <warlord at MIT.EDU>
- * Copyright (C) 2003 Derek Atkins
- *
- * 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, 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 "business-options.h"
-#include "swig-runtime.h"
-
-#define FUNC_NAME G_STRFUNC
-
-#define LOOKUP_OPTION(fcn) \
- GNCOption *option; \
- SCM getter; \
- SCM value; \
- \
- option = gnc_option_db_get_option_by_name (odb, section, name); \
- \
- if (option == NULL) \
- return default_value; \
- \
- getter = gnc_option_getter (option); \
- if (getter == SCM_UNDEFINED) \
- return default_value; \
- \
- value = scm_call_0 (getter); \
- if (value == SCM_BOOL_F) \
- return NULL; \
- SWIG_GetModule(NULL); /* Work-around for SWIG bug. */ \
- if (!SWIG_IsPointer(value)) \
- scm_misc_error(fcn, "SCM is not a wrapped pointer.", value)
-
-GncTaxTable*
-gnc_option_db_lookup_taxtable_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncTaxTable * default_value)
-{
- LOOKUP_OPTION("gnc_option_db_lookup_taxtable_option");
- return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncTaxTable"), 1, 0);
-}
-
-GncInvoice*
-gnc_option_db_lookup_invoice_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncInvoice * default_value)
-{
- LOOKUP_OPTION("gnc_option_db_lookup_invoice_option");
- return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncInvoice"), 1, 0);
-}
-
-GncCustomer*
-gnc_option_db_lookup_customer_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncCustomer * default_value)
-{
- LOOKUP_OPTION("gnc_option_db_lookup_customer_option");
- return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncCustomer"), 1, 0);
-}
-
-GncVendor*
-gnc_option_db_lookup_vendor_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncVendor * default_value)
-{
- LOOKUP_OPTION("gnc_option_db_lookup_vendor_option");
- return SWIG_MustGetPtr(value, SWIG_TypeQuery("_p__gncVendor"), 1, 0);
-}
Deleted: gnucash/trunk/src/business/business-utils/business-options.h
===================================================================
--- gnucash/trunk/src/business/business-utils/business-options.h 2011-03-10 20:12:44 UTC (rev 20391)
+++ gnucash/trunk/src/business/business-utils/business-options.h 2011-03-10 22:23:44 UTC (rev 20392)
@@ -1,56 +0,0 @@
-/*
- * business-options.h -- non-GUI Option Utilities for GNC Business Objects
- *
- * Written By: Derek Atkins <warlord at MIT.EDU>
- * Copyright (C) 2003 Derek Atkins <warlord at MIT.EDU>
- *
- * 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, 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
- */
-
-#ifndef GNC_BUSINESS_OPTIONS_UTILS_H_
-#define GNC_BUSINESS_OPTIONS_UTILS_H_
-
-#include "option-util.h"
-#include "gncTaxTable.h"
-#include "gncInvoice.h"
-#include "gncCustomer.h"
-#include "gncVendor.h"
-
-
-GncTaxTable* gnc_option_db_lookup_taxtable_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncTaxTable * default_value);
-
-GncInvoice* gnc_option_db_lookup_invoice_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncInvoice * default_value);
-
-GncCustomer* gnc_option_db_lookup_customer_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncCustomer * default_value);
-
-GncVendor* gnc_option_db_lookup_vendor_option(GNCOptionDB *odb,
- const char *section,
- const char *name,
- GncVendor * default_value);
-
-
-#endif /* GNC_BUSINESS_OPTIONS_UTILS_H_ */
More information about the gnucash-changes
mailing list