diff --git a/src/engine/Account.c b/src/engine/Account.c index 1585a47b1b..11080a80ef 100644 --- a/src/engine/Account.c +++ b/src/engine/Account.c @@ -49,9 +49,9 @@ #include "qofbackend-p.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" #include "qofid-p.h" #include "qofobject.h" -#include "qofqueryobject.h" static short module = MOD_ACCOUNT; diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 20afc89c63..8934365b55 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -44,11 +44,11 @@ libgncmod_engine_la_SOURCES = \ policy.c \ qofbackend.c \ qofbook.c \ + qofclass.c \ qofid.c \ qofobject.c \ qofquery.c \ qofquerycore.c \ - qofqueryobject.c \ qofsession.c EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c @@ -98,11 +98,11 @@ gncinclude_HEADERS = \ qof.h \ qofbackend.h \ qofbook.h \ + qofclass.h \ qofid.h \ qofobject.h \ qofquery.h \ qofquerycore.h \ - qofqueryobject.h \ qofsession.h noinst_HEADERS = \ @@ -126,11 +126,11 @@ noinst_HEADERS = \ policy-p.h \ qofbackend-p.h \ qofbook-p.h \ + qofclass-p.h \ qofid-p.h \ qofobject-p.h \ qofquery-p.h \ qofquerycore-p.h \ - qofqueryobject-p.h \ qofsession-p.h noinst_SCRIPTS = iso-currencies-to-c diff --git a/src/engine/QueryObject.h b/src/engine/QueryObject.h index dc14c4a46a..4b7287ff9d 100644 --- a/src/engine/QueryObject.h +++ b/src/engine/QueryObject.h @@ -1,5 +1,5 @@ -#include "qofqueryobject.h" +#include "qofclass.h" #define query_object_def _QofParam #define QueryObjectDef QofParam diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c index 9d6f82224d..d844c181c9 100644 --- a/src/engine/Transaction.c +++ b/src/engine/Transaction.c @@ -51,9 +51,9 @@ #include "qofbackend-p.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" #include "qofid-p.h" #include "qofobject.h" -#include "qofqueryobject.h" /* * Design notes on event-generation: transaction-modified-events diff --git a/src/engine/gnc-lot.c b/src/engine/gnc-lot.c index 51934ff101..e1b03638bd 100644 --- a/src/engine/gnc-lot.c +++ b/src/engine/gnc-lot.c @@ -47,11 +47,11 @@ #include "gnc-trace.h" #include "Transaction.h" #include "TransactionP.h" -#include "qofquery.h" -#include "qofqueryobject.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" #include "qofid-p.h" +#include "qofquery.h" /* This static indicates the debugging module that this .o belongs to. */ static short module = MOD_LOT; diff --git a/src/engine/gnc-pricedb.c b/src/engine/gnc-pricedb.c index 5cd42299f1..8f3d3b2802 100644 --- a/src/engine/gnc-pricedb.c +++ b/src/engine/gnc-pricedb.c @@ -37,9 +37,9 @@ #include "qofbackend-p.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" #include "qofid-p.h" #include "qofobject.h" -#include "qofqueryobject.h" /* This static indicates the debugging module that this .o belongs to. */ static short module = MOD_PRICE; diff --git a/src/engine/qof.h b/src/engine/qof.h index 27fb6eaf21..cc6d445d80 100644 --- a/src/engine/qof.h +++ b/src/engine/qof.h @@ -31,10 +31,10 @@ #include "qof/kvp_frame.h" #include "qof/qofbackend.h" #include "qof/qofid.h" -#include "qof/qofquery.h" -#include "qof/qofqueryobject.h" #include "qof/qofbook.h" +#include "qof/qofclass.h" #include "qof/qofobject.h" +#include "qof/qofquery.h" #include "qof/qofquerycore.h" #include "qof/qofsession.h" diff --git a/src/engine/qofbook.c b/src/engine/qofbook.c index 7443a63d64..26197d4acc 100644 --- a/src/engine/qofbook.c +++ b/src/engine/qofbook.c @@ -46,9 +46,9 @@ #include "qofbackend-p.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" #include "qofid-p.h" #include "qofobject-p.h" -#include "qofqueryobject.h" static short module = MOD_ENGINE; diff --git a/src/engine/qofqueryobject-p.h b/src/engine/qofclass-p.h similarity index 89% rename from src/engine/qofqueryobject-p.h rename to src/engine/qofclass-p.h index f36a906195..5b85dc045f 100644 --- a/src/engine/qofqueryobject-p.h +++ b/src/engine/qofclass-p.h @@ -1,5 +1,5 @@ /********************************************************************\ - * qofqueryobject-p.h -- Private API for registering queriable objects * + * qofclass-p.h -- Private API for registering queriable objects * * Copyright (C) 2002 Derek Atkins * * * * This program is free software; you can redistribute it and/or * @@ -21,14 +21,14 @@ * * \********************************************************************/ -#ifndef QOF_QUERYOBJECTP_H -#define QOF_QUERYOBJECTP_H +#ifndef QOF_CLASSP_H +#define QOF_CLASSP_H -#include "qofqueryobject.h" +#include "qofclass.h" void qof_class_init(void); void qof_class_shutdown (void); QofSortFunc qof_class_get_default_sort (QofIdTypeConst obj_name); -#endif /* QOF_QUERYOBJECTP_H */ +#endif /* QOF_CLASSP_H */ diff --git a/src/engine/qofqueryobject.c b/src/engine/qofclass.c similarity index 97% rename from src/engine/qofqueryobject.c rename to src/engine/qofclass.c index a391a8a96b..8bf814ec66 100644 --- a/src/engine/qofqueryobject.c +++ b/src/engine/qofclass.c @@ -1,5 +1,5 @@ /********************************************************************\ - * QueryObject.c -- provide QOF Queriable data objects * + * qofclass.c -- provide QOF paramterized data objects * * Copyright (C) 2002 Derek Atkins * * * * This program is free software; you can redistribute it and/or * @@ -27,7 +27,8 @@ #include "gnc-engine-util.h" #include "gnc-trace.h" -#include "qofqueryobject-p.h" +#include "qofclass.h" +#include "qofclass-p.h" #include "qofquery.h" static short module = MOD_QUERY; diff --git a/src/engine/qofqueryobject.h b/src/engine/qofclass.h similarity index 100% rename from src/engine/qofqueryobject.h rename to src/engine/qofclass.h diff --git a/src/engine/qofquery.c b/src/engine/qofquery.c index df99ea232a..31462465a4 100644 --- a/src/engine/qofquery.c +++ b/src/engine/qofquery.c @@ -35,13 +35,13 @@ #include "qofbackend-p.h" #include "qofbook.h" #include "qofbook-p.h" +#include "qofclass.h" +#include "qofclass-p.h" #include "qofobject.h" #include "qofquery.h" #include "qofquery-p.h" #include "qofquerycore.h" #include "qofquerycore-p.h" -#include "qofqueryobject.h" -#include "qofqueryobject-p.h" static short module = MOD_QUERY; diff --git a/src/engine/qofquerycore.h b/src/engine/qofquerycore.h index a1a20cc834..023a712dcd 100644 --- a/src/engine/qofquerycore.h +++ b/src/engine/qofquerycore.h @@ -26,15 +26,15 @@ @author Copyright (C) 2002 Derek Atkins */ -#ifndef QOF_TYPE_H -#define QOF_TYPE_H +#ifndef QOF_QUERYCORE_H +#define QOF_QUERYCORE_H #include #include "gnc-numeric.h" #include "gnc-date.h" #include "kvp_frame.h" -#include "qofqueryobject.h" +#include "qofclass.h" typedef struct _QofQueryPredData QofQueryPredData; diff --git a/src/engine/test/test-querynew.c b/src/engine/test/test-querynew.c index a295443e2c..8c803ad341 100644 --- a/src/engine/test/test-querynew.c +++ b/src/engine/test/test-querynew.c @@ -7,10 +7,10 @@ #include "gnc-engine-util.h" #include "messages.h" +#include "qofclass-p.h" #include "qofquery.h" #include "qofquerycore.h" #include "qofquerycore-p.h" -#include "qofqueryobject-p.h" #include "test-stuff.h" diff --git a/src/engine/xlate.pl b/src/engine/xlate.pl index 2d2f8cb8c1..e7d4d6bf32 100755 --- a/src/engine/xlate.pl +++ b/src/engine/xlate.pl @@ -173,18 +173,18 @@ foreach (@files) s/query_new_term/_QofQueryTerm/g; s/query_new_sort/_QofQuerySort/g; - s/query_object_def/_QofQueryObject/g; - s/QueryObjectDef/QofQueryObject/g; + s/query_object_def/_QofParam/g; + s/QueryObjectDef/QofParam/g; s/QueryAccess/QofAccessFunc/g; - s/gncQueryObjectRegister/qof_query_object_register/g; - s/gncQueryObjectParameterType/qof_query_object_parameter_type/g; - s/gncQueryObjectGetParameterGetter/qof_query_object_get_parameter_getter/g; - s/gncQueryObjectGetParameter/qof_query_object_get_parameter/g; - s/gncQueryObjectInit/qof_query_object_init/g; - s/gncQueryObjectShutdown/qof_query_object_shutdown/g; - s/gncQueryObjectDefaultSort/qof_query_object_default_sort/g; + s/gncQueryObjectRegister/qof_class_register/g; + s/gncQueryObjectParameterType/qof_class_get_parameter_type/g; + s/gncQueryObjectGetParameterGetter/qof_class_get_parameter_getter/g; + s/gncQueryObjectGetParameter/qof_class_get_parameter/g; + s/gncQueryObjectInit/qof_class_init/g; + s/gncQueryObjectShutdown/qof_class_shutdown/g; + s/gncQueryObjectDefaultSort/qof_class_get_default_sort/g; s/xaccGUIDNULL/guid_null/g; s/xaccGUIDMalloc/guid_malloc/g;