[~qofchoice.cpp] remove, not useful

because the options GLists are populated, but are never actually
queried. The QOF_TYPE_CHOICE definition is moved to qofclass.h

libgnucash/engine/CMakeLists.txt

@@ -108,7 +108,6 @@ set (engine_HEADERS
  qofbook.h
  qofbook.hpp
  qofbookslots.h
- qofchoice.h
  qofclass.h
  qofevent.h
  qofid-p.h
@@ -196,7 +195,6 @@ set (engine_SOURCES
  kvp-value.cpp
  qof-backend.cpp
  qofbook.cpp
- qofchoice.cpp
  qofclass.cpp
  qofevent.cpp
  qofid.cpp

libgnucash/engine/gncAddress.c

@@ -661,10 +661,6 @@ gboolean gncAddressRegister (void)
  };
 
  qof_class_register (GNC_ID_ADDRESS, (QofSortFunc)gncAddressCompare, params);
- if (!qof_choice_add_class(GNC_ID_CUSTOMER, GNC_ID_ADDRESS, ADDRESS_OWNER))
- {
- return FALSE;
- }
 
  return qof_object_register(&GncAddressDesc);
 }

libgnucash/engine/gncCustomer.c

@@ -951,19 +951,7 @@ gboolean gncCustomerRegister (void)
  { NULL },
  };
 
- if (!qof_choice_add_class(GNC_ID_INVOICE, GNC_ID_CUSTOMER, INVOICE_OWNER))
- {
- return FALSE;
- }
- if (!qof_choice_add_class(GNC_ID_JOB, GNC_ID_CUSTOMER, JOB_OWNER))
- {
- return FALSE;
- }
  qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncCustomerCompare, params);
- if (!qof_choice_create(GNC_ID_CUSTOMER))
- {
- return FALSE;
- }
  /* temp */
  _gncCustomerPrintable(NULL);
  return qof_object_register (&gncCustomerDesc);

libgnucash/engine/gncInvoice.c

@@ -2308,10 +2308,6 @@ gboolean gncInvoiceRegister (void)
  qofInvoiceSetBillTo (NULL, NULL);
  qofInvoiceGetBillTo (NULL);
  }
- if (!qof_choice_create (GNC_ID_INVOICE))
- {
- return FALSE;
- }
  return qof_object_register (&gncInvoiceDesc);
 }
 

libgnucash/engine/gncJob.c

@@ -591,15 +591,6 @@ gboolean gncJobRegister (void)
  { NULL },
  };
 
- if (!qof_choice_create(GNC_ID_JOB))
- {
- return FALSE;
- }
- if (!qof_choice_add_class(GNC_ID_INVOICE, GNC_ID_JOB, INVOICE_OWNER))
- {
- return FALSE;
- }
-
  qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
  qofJobGetOwner(NULL);
  qofJobSetOwner(NULL, NULL);

libgnucash/engine/gncVendor.c

@@ -1012,15 +1012,6 @@ gboolean gncVendorRegister (void)
  { NULL },
  };
 
- if (!qof_choice_add_class(GNC_ID_INVOICE, GNC_ID_VENDOR, INVOICE_OWNER))
- {
- return FALSE;
- }
- if (!qof_choice_add_class(GNC_ID_JOB, GNC_ID_VENDOR, JOB_OWNER))
- {
- return FALSE;
- }
-
  qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncVendorCompare, params);
 
  return qof_object_register (&gncVendorDesc);

libgnucash/engine/qof.h

@@ -85,7 +85,6 @@
 #include "qofquery.h"
 #include "qofquerycore.h"
 #include "qofsession.h"
-#include "qofchoice.h"
 #include "qof-string-cache.h"
 
 #endif /* QOF_H_ */