Remove now redundant casts

The functions all take PyObject * (previous commit) so no
need for the casts

Author: rogerbinns

src/backup.c

@@ -373,10 +373,10 @@ static PyMemberDef backup_members[] = {
 
 static PyGetSetDef backup_getset[] = {
   /* name getter setter doc closure */
-  { "remaining", (getter)APSWBackup_get_remaining, NULL, Backup_remaining_DOC, NULL },
-  { "page_count", (getter)APSWBackup_get_page_count, NULL, Backup_page_count_DOC, NULL },
+  { "remaining", APSWBackup_get_remaining, NULL, Backup_remaining_DOC, NULL },
+  { "page_count", APSWBackup_get_page_count, NULL, Backup_page_count_DOC, NULL },
 #ifndef APSW_OMIT_OLD_NAMES
-  { Backup_page_count_OLDNAME, (getter)APSWBackup_get_page_count, NULL, Backup_page_count_OLDDOC, NULL },
+  { Backup_page_count_OLDNAME, APSWBackup_get_page_count, NULL, Backup_page_count_OLDDOC, NULL },
 #endif
   { 0, 0, 0, 0, 0 }
 };
@@ -392,7 +392,7 @@ static PyMethodDef backup_methods[]
 static PyTypeObject APSWBackupType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.Backup",
   .tp_basicsize = sizeof(APSWBackup),
-  .tp_dealloc = (destructor)APSWBackup_dealloc,
+  .tp_dealloc = APSWBackup_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT,
   .tp_doc = Backup_class_DOC,
   .tp_weaklistoffset = offsetof(APSWBackup, weakreflist),

src/blob.c

@@ -702,7 +702,7 @@ static PyMethodDef APSWBlob_methods[] = {
 static PyTypeObject APSWBlobType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.Blob",
   .tp_basicsize = sizeof(APSWBlob),
-  .tp_dealloc = (destructor)APSWBlob_dealloc,
+  .tp_dealloc = APSWBlob_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT,
   .tp_doc = Blob_class_DOC,
   .tp_weaklistoffset = offsetof(APSWBlob, weakreflist),

src/connection.c

@@ -2614,7 +2614,7 @@ Connection_load_extension(PyObject *self_, PyObject *const *fast_args, Py_ssize_
 static PyTypeObject FunctionCBInfoType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.FunctionCBInfo",
   .tp_basicsize = sizeof(FunctionCBInfo),
-  .tp_dealloc = (destructor)FunctionCBInfo_dealloc,
+  .tp_dealloc = FunctionCBInfo_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = "FunctionCBInfo object",
 };
@@ -5865,24 +5865,24 @@ Connection_register_fts5_function(PyObject *self_, PyObject *const *fast_args, P
 
 static PyGetSetDef Connection_getseters[] = {
   /* name getter setter doc closure */
-  { "filename", (getter)Connection_getmainfilename, NULL, Connection_filename_DOC, NULL },
-  { "filename_journal", (getter)Connection_getjournalfilename, NULL, Connection_filename_journal_DOC, NULL },
-  { "filename_wal", (getter)Connection_getwalfilename, NULL, Connection_filename_wal_DOC, NULL },
-  { "cursor_factory", (getter)Connection_get_cursor_factory, (setter)Connection_set_cursor_factory,
+  { "filename", Connection_getmainfilename, NULL, Connection_filename_DOC, NULL },
+  { "filename_journal", Connection_getjournalfilename, NULL, Connection_filename_journal_DOC, NULL },
+  { "filename_wal", Connection_getwalfilename, NULL, Connection_filename_wal_DOC, NULL },
+  { "cursor_factory", Connection_get_cursor_factory, Connection_set_cursor_factory,
     Connection_cursor_factory_DOC, NULL },
-  { "in_transaction", (getter)Connection_get_in_transaction, NULL, Connection_in_transaction_DOC },
-  { "exec_trace", (getter)Connection_get_exec_trace_attr, (setter)Connection_set_exec_trace_attr,
+  { "in_transaction", Connection_get_in_transaction, NULL, Connection_in_transaction_DOC },
+  { "exec_trace", Connection_get_exec_trace_attr, Connection_set_exec_trace_attr,
     Connection_exec_trace_DOC },
-  { "row_trace", (getter)Connection_get_row_trace_attr, (setter)Connection_set_row_trace_attr,
+  { "row_trace", Connection_get_row_trace_attr, Connection_set_row_trace_attr,
     Connection_row_trace_DOC },
-  { "authorizer", (getter)Connection_get_authorizer_attr, (setter)Connection_set_authorizer_attr,
+  { "authorizer", Connection_get_authorizer_attr, Connection_set_authorizer_attr,
     Connection_authorizer_DOC },
-  { "system_errno", (getter)Connection_get_system_errno, NULL, Connection_system_errno_DOC },
-  { "is_interrupted", (getter)Connection_is_interrupted, NULL, Connection_is_interrupted_DOC },
+  { "system_errno", Connection_get_system_errno, NULL, Connection_system_errno_DOC },
+  { "is_interrupted", Connection_is_interrupted, NULL, Connection_is_interrupted_DOC },
 #ifndef APSW_OMIT_OLD_NAMES
-  { Connection_exec_trace_OLDNAME, (getter)Connection_get_exec_trace_attr, (setter)Connection_set_exec_trace_attr,
+  { Connection_exec_trace_OLDNAME, Connection_get_exec_trace_attr, Connection_set_exec_trace_attr,
     Connection_exec_trace_OLDDOC },
-  { Connection_row_trace_OLDNAME, (getter)Connection_get_row_trace_attr, (setter)Connection_set_row_trace_attr,
+  { Connection_row_trace_OLDNAME, Connection_get_row_trace_attr, Connection_set_row_trace_attr,
     Connection_row_trace_OLDDOC },
 #endif
   /* Sentinel */

src/cursor.c

@@ -1927,32 +1927,32 @@ static PyMethodDef APSWCursor_methods[] = {
 };
 
 static PyGetSetDef APSWCursor_getset[]
-    = { { "description", (getter)APSWCursor_getdescription_dbapi, NULL, Cursor_description_DOC, NULL },
+    = { { "description", APSWCursor_getdescription_dbapi, NULL, Cursor_description_DOC, NULL },
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
-        { "description_full", (getter)APSWCursor_get_description_full, NULL, Cursor_description_full_DOC, NULL },
+        { "description_full", APSWCursor_get_description_full, NULL, Cursor_description_full_DOC, NULL },
 #endif
-        { "is_explain", (getter)APSWCursor_is_explain, NULL, Cursor_is_explain_DOC, NULL },
-        { "is_readonly", (getter)APSWCursor_is_readonly, NULL, Cursor_is_readonly_DOC, NULL },
-        { "has_vdbe", (getter)APSWCursor_has_vdbe, NULL, Cursor_has_vdbe_DOC, NULL },
-        { "bindings_count", (getter)APSWCursor_bindings_count, NULL, Cursor_bindings_count_DOC, NULL },
-        { "bindings_names", (getter)APSWCursor_bindings_names, NULL, Cursor_bindings_names_DOC, NULL },
-        { "expanded_sql", (getter)APSWCursor_expanded_sql, NULL, Cursor_expanded_sql_DOC, NULL },
-        { "exec_trace", (getter)APSWCursor_get_exec_trace_attr, (setter)APSWCursor_set_exec_trace_attr,
+        { "is_explain", APSWCursor_is_explain, NULL, Cursor_is_explain_DOC, NULL },
+        { "is_readonly", APSWCursor_is_readonly, NULL, Cursor_is_readonly_DOC, NULL },
+        { "has_vdbe", APSWCursor_has_vdbe, NULL, Cursor_has_vdbe_DOC, NULL },
+        { "bindings_count", APSWCursor_bindings_count, NULL, Cursor_bindings_count_DOC, NULL },
+        { "bindings_names", APSWCursor_bindings_names, NULL, Cursor_bindings_names_DOC, NULL },
+        { "expanded_sql", APSWCursor_expanded_sql, NULL, Cursor_expanded_sql_DOC, NULL },
+        { "exec_trace", APSWCursor_get_exec_trace_attr, APSWCursor_set_exec_trace_attr,
           Cursor_exec_trace_DOC },
-        { Cursor_exec_trace_OLDNAME, (getter)APSWCursor_get_exec_trace_attr, (setter)APSWCursor_set_exec_trace_attr,
+        { Cursor_exec_trace_OLDNAME, APSWCursor_get_exec_trace_attr, APSWCursor_set_exec_trace_attr,
           Cursor_exec_trace_OLDDOC },
-        { "row_trace", (getter)APSWCursor_get_row_trace_attr, (setter)APSWCursor_set_row_trace_attr,
+        { "row_trace", APSWCursor_get_row_trace_attr, APSWCursor_set_row_trace_attr,
           Cursor_row_trace_DOC },
-        { Cursor_row_trace_OLDNAME, (getter)APSWCursor_get_row_trace_attr, (setter)APSWCursor_set_row_trace_attr,
+        { Cursor_row_trace_OLDNAME, APSWCursor_get_row_trace_attr, APSWCursor_set_row_trace_attr,
           Cursor_row_trace_OLDDOC },
-        { "connection", (getter)APSWCursor_get_connection_attr, NULL, Cursor_connection_DOC },
-        { "get", (getter)APSWCursor_get, NULL, Cursor_get_DOC },
+        { "connection", APSWCursor_get_connection_attr, NULL, Cursor_connection_DOC },
+        { "get", APSWCursor_get, NULL, Cursor_get_DOC },
         { NULL, NULL, NULL, NULL, NULL } };
 
 static PyTypeObject APSWCursorType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.Cursor",
   .tp_basicsize = sizeof(APSWCursor),
-  .tp_dealloc = (destructor)APSWCursor_dealloc,
+  .tp_dealloc = APSWCursor_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
   .tp_doc = Cursor_class_DOC,
   .tp_traverse = (traverseproc)APSWCursor_tp_traverse,
@@ -1992,7 +1992,7 @@ static PyTypeObject PyObjectBindType = {
   .tp_basicsize = sizeof(PyObjectBind),
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_init = (initproc)PyObjectBind_init,
-  .tp_finalize = (destructor)PyObjectBind_finalize,
+  .tp_finalize = PyObjectBind_finalize,
   .tp_new = PyType_GenericNew,
   .tp_doc = Apsw_pyobject_DOC,
 };

src/fts.c

@@ -362,9 +362,9 @@ APSWFTS5Tokenizer_dealloc(PyObject *self_)
 }
 
 static PyGetSetDef APSWFTS5Tokenizer_getset[] = {
-  { "connection", (getter)APSWFTS5Tokenizer_connection, NULL, FTS5Tokenizer_connection_DOC },
-  { "args", (getter)APSWFTS5Tokenizer_args, NULL, FTS5Tokenizer_args_DOC },
-  { "name", (getter)APSWFTS5Tokenizer_name, NULL, FTS5Tokenizer_name_DOC },
+  { "connection", APSWFTS5Tokenizer_connection, NULL, FTS5Tokenizer_connection_DOC },
+  { "args", APSWFTS5Tokenizer_args, NULL, FTS5Tokenizer_args_DOC },
+  { "name", APSWFTS5Tokenizer_name, NULL, FTS5Tokenizer_name_DOC },
   { 0 },
 };
 
@@ -376,7 +376,7 @@ static PyTypeObject APSWFTS5TokenizerType = {
   .tp_doc = FTS5Tokenizer_class_DOC,
   .tp_basicsize = sizeof(APSWFTS5Tokenizer),
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_VECTORCALL,
-  .tp_dealloc = (destructor)APSWFTS5Tokenizer_dealloc,
+  .tp_dealloc = APSWFTS5Tokenizer_dealloc,
   .tp_call = PyVectorcall_Call,
   .tp_vectorcall_offset = offsetof(APSWFTS5Tokenizer, vectorcall),
   .tp_getset = APSWFTS5Tokenizer_getset,
@@ -1419,14 +1419,14 @@ APSWFTS5ExtensionApi_xQueryPhrase(PyObject *self, PyObject *const *fast_args, Py
 #undef EXTFTS
 
 static PyGetSetDef APSWFTS5ExtensionApi_getset[] = {
-  { "phrase_count", (getter)APSWFTS5ExtensionApi_xPhraseCount, NULL, FTS5ExtensionApi_phrase_count_DOC },
-  { "column_count", (getter)APSWFTS5ExtensionApi_xColumnCount, NULL, FTS5ExtensionApi_column_count_DOC },
-  { "row_count", (getter)APSWFTS5ExtensionApi_xRowCount, NULL, FTS5ExtensionApi_row_count_DOC },
-  { "aux_data", (getter)APSWFTS5ExtensionApi_xGetAuxdata, (setter)APSWFTS5ExtensionApi_xSetAuxdata,
+  { "phrase_count", APSWFTS5ExtensionApi_xPhraseCount, NULL, FTS5ExtensionApi_phrase_count_DOC },
+  { "column_count", APSWFTS5ExtensionApi_xColumnCount, NULL, FTS5ExtensionApi_column_count_DOC },
+  { "row_count", APSWFTS5ExtensionApi_xRowCount, NULL, FTS5ExtensionApi_row_count_DOC },
+  { "aux_data", APSWFTS5ExtensionApi_xGetAuxdata, APSWFTS5ExtensionApi_xSetAuxdata,
     FTS5ExtensionApi_aux_data_DOC },
-  { "rowid", (getter)APSWFTS5ExtensionApi_xRowid, NULL, FTS5ExtensionApi_rowid_DOC },
-  { "phrases", (getter)APSWFTS5ExtensionApi_phrases, NULL, FTS5ExtensionApi_phrases_DOC },
-  { "inst_count", (getter)APSWFTS5ExtensionApi_xInstCount, NULL, FTS5ExtensionApi_inst_count_DOC },
+  { "rowid", APSWFTS5ExtensionApi_xRowid, NULL, FTS5ExtensionApi_rowid_DOC },
+  { "phrases", APSWFTS5ExtensionApi_phrases, NULL, FTS5ExtensionApi_phrases_DOC },
+  { "inst_count", APSWFTS5ExtensionApi_xInstCount, NULL, FTS5ExtensionApi_inst_count_DOC },
   { 0 },
 };
 

src/session.c

@@ -2271,11 +2271,11 @@ static PyMethodDef APSWSession_methods[] = {
 };
 
 static PyGetSetDef APSWSession_getset[] = {
-  { "enabled", (getter)APSWSession_get_enabled, (setter)APSWSession_set_enabled, Session_enabled_DOC },
-  { "indirect", (getter)APSWSession_get_indirect, (setter)APSWSession_set_indirect, Session_indirect_DOC },
-  { "is_empty", (getter)APSWSession_get_empty, NULL, Session_is_empty_DOC },
-  { "memory_used", (getter)APSWSession_get_memory_used, NULL, Session_memory_used_DOC },
-  { "changeset_size", (getter)APSWSession_get_changeset_size, NULL, Session_changeset_size_DOC },
+  { "enabled", APSWSession_get_enabled, APSWSession_set_enabled, Session_enabled_DOC },
+  { "indirect", APSWSession_get_indirect, APSWSession_set_indirect, Session_indirect_DOC },
+  { "is_empty", APSWSession_get_empty, NULL, Session_is_empty_DOC },
+  { "memory_used", APSWSession_get_memory_used, NULL, Session_memory_used_DOC },
+  { "changeset_size", APSWSession_get_changeset_size, NULL, Session_changeset_size_DOC },
   { 0 },
 };
 
@@ -2285,7 +2285,7 @@ static PyTypeObject APSWSessionType = {
   .tp_doc = Session_class_DOC,
   .tp_new = PyType_GenericNew,
   .tp_init = (initproc)APSWSession_init,
-  .tp_dealloc = (destructor)APSWSession_dealloc,
+  .tp_dealloc = APSWSession_dealloc,
   .tp_methods = APSWSession_methods,
   .tp_getset = APSWSession_getset,
   .tp_flags = Py_TPFLAGS_BASETYPE | Py_TPFLAGS_DEFAULT,
@@ -2314,7 +2314,7 @@ static PyTypeObject APSWChangesetType = {
 static PyTypeObject APSWChangesetIteratorType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.ChangesetIterator", .tp_basicsize = sizeof(APSWChangesetIterator),
   .tp_iternext = (iternextfunc)APSWChangesetIterator_next,           .tp_iter = APSWChangesetIterator_iter,
-  .tp_dealloc = (destructor)APSWChangesetIterator_dealloc,
+  .tp_dealloc = APSWChangesetIterator_dealloc,
 };
 
 static PyMethodDef APSWChangesetBuilder_methods[] = {
@@ -2335,22 +2335,22 @@ static PyTypeObject APSWChangesetBuilderType = {
   .tp_methods = APSWChangesetBuilder_methods,
   .tp_new = PyType_GenericNew,
   .tp_init = (initproc)APSWChangesetBuilder_init,
-  .tp_dealloc = (destructor)APSWChangesetBuilder_dealloc,
+  .tp_dealloc = APSWChangesetBuilder_dealloc,
   .tp_doc = ChangesetBuilder_class_DOC,
   .tp_weaklistoffset = offsetof(APSWChangesetBuilder, weakreflist),
 };
 
 static PyGetSetDef APSWTableChange_getset[] = {
-  { "name", (getter)APSWTableChange_name, NULL, TableChange_name_DOC },
-  { "column_count", (getter)APSWTableChange_column_count, NULL, TableChange_column_count_DOC },
-  { "op", (getter)APSWTableChange_op, NULL, TableChange_op_DOC },
-  { "opcode", (getter)APSWTableChange_opcode, NULL, TableChange_opcode_DOC },
-  { "indirect", (getter)APSWTableChange_indirect, NULL, TableChange_indirect_DOC },
-  { "old", (getter)APSWTableChange_old, NULL, TableChange_old_DOC },
-  { "new", (getter)APSWTableChange_new, NULL, TableChange_new_DOC },
-  { "conflict", (getter)APSWTableChange_conflict, NULL, TableChange_conflict_DOC },
-  { "fk_conflicts", (getter)APSWTableChange_fk_conflicts, NULL, TableChange_fk_conflicts_DOC },
-  { "pk_columns", (getter)APSWTableChange_pk_columns, NULL, TableChange_pk_columns_DOC },
+  { "name", APSWTableChange_name, NULL, TableChange_name_DOC },
+  { "column_count", APSWTableChange_column_count, NULL, TableChange_column_count_DOC },
+  { "op", APSWTableChange_op, NULL, TableChange_op_DOC },
+  { "opcode", APSWTableChange_opcode, NULL, TableChange_opcode_DOC },
+  { "indirect", APSWTableChange_indirect, NULL, TableChange_indirect_DOC },
+  { "old", APSWTableChange_old, NULL, TableChange_old_DOC },
+  { "new", APSWTableChange_new, NULL, TableChange_new_DOC },
+  { "conflict", APSWTableChange_conflict, NULL, TableChange_conflict_DOC },
+  { "fk_conflicts", APSWTableChange_fk_conflicts, NULL, TableChange_fk_conflicts_DOC },
+  { "pk_columns", APSWTableChange_pk_columns, NULL, TableChange_pk_columns_DOC },
   { 0 },
 };
 
@@ -2359,7 +2359,7 @@ static PyTypeObject APSWTableChangeType = {
   .tp_basicsize = sizeof(APSWTableChange),
   .tp_getset = APSWTableChange_getset,
   .tp_doc = TableChange_class_DOC,
-  .tp_dealloc = (destructor)APSWTableChange_dealloc,
+  .tp_dealloc = APSWTableChange_dealloc,
   .tp_str = (reprfunc)APSWTableChange_tp_str,
 };
 
@@ -2378,5 +2378,5 @@ static PyTypeObject APSWRebaserType = {
   .tp_methods = APSWRebaser_methods,
   .tp_new = PyType_GenericNew,
   .tp_init = (initproc)APSWRebaser_init,
-  .tp_dealloc = (destructor)APSWRebaser_dealloc,
+  .tp_dealloc = APSWRebaser_dealloc,
 };

src/unicode.c

@@ -2528,7 +2528,7 @@ static PyMethodDef OffsetMapper_methods[] = {
 };
 
 static PyGetSetDef OffsetMapper_getset[] = {
-  { "text", (getter)OffsetMapper_text, NULL, "resulting text" },
+  { "text", OffsetMapper_text, NULL, "resulting text" },
   { NULL },
 };
 

src/vfs.c

@@ -182,10 +182,10 @@ apswfcntl_pragma_get_value(PyObject *self, void *Py_UNUSED(unused))
 }
 
 static PyGetSetDef apswfcntl_pragma_getsetters[]
-    = { { "result", (getter)apswfcntl_pragma_get_result, (setter)apswfcntl_pragma_set_result,
+    = { { "result", apswfcntl_pragma_get_result, apswfcntl_pragma_set_result,
           VFSFcntlPragma_result_DOC },
-        { "name", (getter)apswfcntl_pragma_get_name, NULL, VFSFcntlPragma_name_DOC },
-        { "value", (getter)apswfcntl_pragma_get_value, NULL, VFSFcntlPragma_value_DOC },
+        { "name", apswfcntl_pragma_get_name, NULL, VFSFcntlPragma_name_DOC },
+        { "value", apswfcntl_pragma_get_value, NULL, VFSFcntlPragma_value_DOC },
         /* sentinel */
         { NULL, NULL, NULL, NULL } };
 
@@ -1963,7 +1963,7 @@ static PyMethodDef APSWVFS_methods[] = {
 static PyTypeObject APSWVFSType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.VFS",
   .tp_basicsize = sizeof(APSWVFS),
-  .tp_dealloc = (destructor)APSWVFS_dealloc,
+  .tp_dealloc = APSWVFS_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = VFS_class_DOC,
   .tp_methods = APSWVFS_methods,
@@ -3135,7 +3135,7 @@ static PyMethodDef APSWVFSFile_methods[] = {
 static PyTypeObject APSWVFSFileType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.VFSFile",
   .tp_basicsize = sizeof(APSWVFSFile),
-  .tp_dealloc = (destructor)APSWVFSFile_dealloc,
+  .tp_dealloc = APSWVFSFile_dealloc,
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = VFSFile_class_DOC,
   .tp_methods = APSWVFSFile_methods,
@@ -3318,7 +3318,7 @@ static PyMethodDef APSWURIFilenameMethods[]
         { 0, 0, 0, 0 } };
 
 static PyGetSetDef APSWURIFilename_getset[] = {
-  { "parameters", (getter)apswurifilename_parameters, NULL, URIFilename_parameters_DOC },
+  { "parameters", apswurifilename_parameters, NULL, URIFilename_parameters_DOC },
   { 0, 0, 0, 0 },
 };
 

src/vtable.c

@@ -723,20 +723,20 @@ SqliteIndexInfo_get_distinct(PyObject *self, void *Py_UNUSED(unused))
 }
 
 static PyGetSetDef SqliteIndexInfo_getsetters[]
-    = { { "nConstraint", (getter)SqliteIndexInfo_get_nConstraint, NULL, IndexInfo_nConstraint_DOC },
-        { "nOrderBy", (getter)SqliteIndexInfo_get_nOrderBy, NULL, IndexInfo_nOrderBy_DOC },
-        { "idxNum", (getter)SqliteIndexInfo_get_idxNum, (setter)SqliteIndexInfo_set_idxNum, IndexInfo_idxNum_DOC },
-        { "idxStr", (getter)SqliteIndexInfo_get_idxStr, (setter)SqliteIndexInfo_set_idxStr, IndexInfo_idxStr_DOC },
-        { "orderByConsumed", (getter)SqliteIndexInfo_get_orderByConsumed, (setter)SqliteIndexInfo_set_OrderByConsumed,
+    = { { "nConstraint", SqliteIndexInfo_get_nConstraint, NULL, IndexInfo_nConstraint_DOC },
+        { "nOrderBy", SqliteIndexInfo_get_nOrderBy, NULL, IndexInfo_nOrderBy_DOC },
+        { "idxNum", SqliteIndexInfo_get_idxNum, SqliteIndexInfo_set_idxNum, IndexInfo_idxNum_DOC },
+        { "idxStr", SqliteIndexInfo_get_idxStr, SqliteIndexInfo_set_idxStr, IndexInfo_idxStr_DOC },
+        { "orderByConsumed", SqliteIndexInfo_get_orderByConsumed, SqliteIndexInfo_set_OrderByConsumed,
           IndexInfo_orderByConsumed_DOC },
-        { "estimatedCost", (getter)SqliteIndexInfo_get_estimatedCost, (setter)SqliteIndexInfo_set_estimatedCost,
+        { "estimatedCost", SqliteIndexInfo_get_estimatedCost, SqliteIndexInfo_set_estimatedCost,
           IndexInfo_estimatedCost_DOC },
-        { "estimatedRows", (getter)SqliteIndexInfo_get_estimatedRows, (setter)SqliteIndexInfo_set_estimatedRows,
+        { "estimatedRows", SqliteIndexInfo_get_estimatedRows, SqliteIndexInfo_set_estimatedRows,
           IndexInfo_estimatedRows_DOC },
-        { "idxFlags", (getter)SqliteIndexInfo_get_idxFlags, (setter)SqliteIndexInfo_set_idxFlags,
+        { "idxFlags", SqliteIndexInfo_get_idxFlags, SqliteIndexInfo_set_idxFlags,
           IndexInfo_idxFlags_DOC },
-        { "colUsed", (getter)SqliteIndexInfo_get_colUsed, NULL, IndexInfo_colUsed_DOC },
-        { "distinct", (getter)SqliteIndexInfo_get_distinct, NULL, IndexInfo_distinct_DOC },
+        { "colUsed", SqliteIndexInfo_get_colUsed, NULL, IndexInfo_colUsed_DOC },
+        { "distinct", SqliteIndexInfo_get_distinct, NULL, IndexInfo_distinct_DOC },
         /* sentinel */
         { NULL, NULL, NULL, NULL } };