[libgda] GI: replacing allow-none annotation with nullable
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] GI: replacing allow-none annotation with nullable
- Date: Tue, 9 Oct 2018 21:40:58 +0000 (UTC)
commit 879b5cadd84d97a601b0c5988bbe32e599126aae
Author: Daniel Espinosa <esodan gmail com>
Date: Mon Oct 8 17:05:28 2018 -0500
GI: replacing allow-none annotation with nullable
control-center/gdaui-dsn-editor.c | 2 +-
control-center/gdaui-login-dialog.c | 4 +-
control-center/support.c | 2 +-
.../data-entries/gdaui-data-cell-renderer-info.c | 9 ++-
.../data-entries/gdaui-data-cell-renderer-info.h | 1 -
.../gdaui-data-cell-renderer-textual.c | 2 +-
libgda-ui/data-entries/gdaui-entry-combo.c | 2 +-
libgda-ui/data-entries/gdaui-entry-number.c | 2 +-
libgda-ui/data-entries/gdaui-entry-string.c | 2 +-
libgda-ui/data-entries/gdaui-entry.c | 6 +-
libgda-ui/data-entries/gdaui-formatted-entry.c | 6 +-
.../plugins/gdaui-data-cell-renderer-password.c | 2 +-
libgda-ui/gdaui-basic-form.c | 10 +--
libgda-ui/gdaui-cloud.c | 6 +-
libgda-ui/gdaui-combo.c | 4 +-
libgda-ui/gdaui-data-entry.c | 8 +--
libgda-ui/gdaui-grid.c | 2 +-
libgda-ui/gdaui-init.c | 6 +-
libgda-ui/gdaui-login.c | 4 +-
libgda-ui/gdaui-plugin.h | 16 ++---
libgda-ui/gdaui-provider-selector.c | 2 +-
libgda-ui/gdaui-raw-form.c | 2 +-
libgda-ui/gdaui-raw-grid.c | 4 +-
libgda-ui/gdaui-rt-editor.c | 2 +-
libgda-ui/gdaui-server-operation.c | 6 +-
libgda-ui/gdaui-set.c | 6 +-
libgda-ui/marshallers/gdaui-marshal.list | 1 +
libgda/gda-attributes-manager.c | 6 +-
libgda/gda-batch.c | 2 +-
libgda/gda-column.c | 8 +--
libgda/gda-column.h | 2 +-
libgda/gda-config.c | 6 +-
libgda/gda-connection-event.c | 2 +-
libgda/gda-data-access-wrapper.c | 2 +-
libgda/gda-data-model-array.c | 4 +-
libgda/gda-data-model-bdb.c | 2 +-
libgda/gda-data-model-import.c | 4 +-
libgda/gda-data-model-iter.c | 8 +--
libgda/gda-data-model-ldap.c | 8 +--
libgda/gda-data-model.c | 32 ++++-----
libgda/gda-data-pivot.c | 12 ++--
libgda/gda-data-proxy.c | 2 +-
libgda/gda-data-select.c | 20 +++---
libgda/gda-ddl-table.c | 2 +-
libgda/gda-holder.c | 12 ++--
libgda/gda-holder.h | 2 +-
libgda/gda-lockable.c | 2 +-
libgda/gda-lockable.h | 6 +-
libgda/gda-meta-store.c | 70 +++++++++---------
libgda/gda-meta-struct-io.c | 6 +-
libgda/gda-meta-struct.c | 32 ++++-----
libgda/gda-meta-struct.h | 4 +-
libgda/gda-provider.c | 2 +-
libgda/gda-quark-list.c | 4 +-
libgda/gda-repetitive-statement.c | 2 +-
libgda/gda-row.c | 4 +-
libgda/gda-server-operation.c | 4 +-
libgda/gda-server-provider-impl.h | 8 +--
libgda/gda-server-provider.c | 84 +++++++++++-----------
libgda/gda-set.c | 20 +++---
libgda/gda-sql-builder.c | 24 +++----
libgda/gda-statement-extra.h | 2 +-
libgda/gda-statement.c | 10 +--
libgda/gda-transaction-status.c | 4 +-
libgda/gda-tree-manager.c | 20 +++---
libgda/gda-tree-mgr-ldap.c | 2 +-
libgda/gda-tree-mgr-tables.c | 2 +-
libgda/gda-tree-node.c | 6 +-
libgda/gda-tree.c | 16 ++---
libgda/gda-util.c | 28 ++++----
libgda/gda-value.c | 10 +--
libgda/gda-value.h | 2 +-
libgda/gda-xa-transaction.c | 12 ++--
libgda/handlers/gda-handler-string.c | 2 +-
libgda/providers-support/gda-pstmt.c | 2 +-
libgda/sql-parser/gda-sql-parser.c | 10 +--
libgda/sql-parser/gda-statement-struct-decl.h | 5 --
libgda/sql-parser/gda-statement-struct-parts.h | 18 ++---
libgda/sql-parser/gda-statement-struct-select.c | 2 +-
libgda/sqlite/virtual/gda-ldap-connection.c | 38 +++++-----
libgda/sqlite/virtual/gda-ldap-connection.h | 6 +-
libgda/sqlite/virtual/gda-vconnection-data-model.c | 8 +--
libgda/sqlite/virtual/gda-vconnection-data-model.h | 12 ++--
libgda/sqlite/virtual/gda-vconnection-hub.c | 4 +-
libgda/thread-wrapper/gda-connect.c | 6 +-
libgda/thread-wrapper/itsignaler.c | 12 ++--
tools/base/base-tool-command.c | 10 +--
tools/base/base-tool-command.h | 4 +-
tools/base/base-tool-input.c | 8 +--
tools/base/base-tool-output.c | 6 +-
tools/browser/browser-connections-list.c | 2 +-
tools/browser/browser-page.c | 4 +-
tools/browser/browser-perspective.c | 4 +-
tools/browser/browser-window.c | 2 +-
tools/browser/canvas/browser-canvas-column.c | 2 +-
tools/browser/canvas/browser-canvas-db-relations.c | 6 +-
tools/browser/canvas/browser-canvas-item.c | 4 +-
tools/browser/data-manager/data-source-editor.c | 2 +-
tools/browser/data-manager/data-source-manager.c | 2 +-
tools/browser/data-manager/data-source.c | 4 +-
tools/browser/fk-declare.c | 4 +-
tools/browser/ldap-browser/mgr-ldap-classes.c | 2 +-
tools/browser/ldap-browser/mgr-ldap-entries.c | 2 +-
tools/browser/query-exec/query-editor.c | 6 +-
tools/browser/ui-customize.c | 4 +-
tools/browser/ui-formgrid.c | 8 +--
tools/common/t-connection.c | 18 ++---
tools/common/t-context.c | 10 +--
tools/common/t-favorites-actions.c | 4 +-
tools/common/t-favorites.c | 4 +-
tools/common/t-utils.c | 2 +-
tools/common/web-server.c | 2 +-
112 files changed, 447 insertions(+), 445 deletions(-)
---
diff --git a/control-center/gdaui-dsn-editor.c b/control-center/gdaui-dsn-editor.c
index 2e0170348..91a281ae8 100644
--- a/control-center/gdaui-dsn-editor.c
+++ b/control-center/gdaui-dsn-editor.c
@@ -571,7 +571,7 @@ gdaui_dsn_editor_get_dsn (GdauiDsnEditor *config)
/**
* gdaui_dsn_editor_set_dsn
* @editor: a #GdauiDsnEditor widget
- * @dsn_info: (allow-none): a #GdaDsnInfo pointer or %NULL
+ * @dsn_info: (nullable): a #GdaDsnInfo pointer or %NULL
*
*
* Requests that @editor update its contents with @dsn_info's contents
diff --git a/control-center/gdaui-login-dialog.c b/control-center/gdaui-login-dialog.c
index 7e220d12a..9106edc67 100644
--- a/control-center/gdaui-login-dialog.c
+++ b/control-center/gdaui-login-dialog.c
@@ -233,8 +233,8 @@ gdaui_login_dialog_get_type (void)
/**
* gdaui_login_dialog_new
- * @title: (allow-none): title of the dialog, or %NULL
- * @parent: (allow-none): transient parent of the dialog, or %NULL
+ * @title: (nullable): title of the dialog, or %NULL
+ * @parent: (nullable): transient parent of the dialog, or %NULL
*
* Creates a new login dialog widget.
*
diff --git a/control-center/support.c b/control-center/support.c
index e97348fd4..4c1ae1e99 100644
--- a/control-center/support.c
+++ b/control-center/support.c
@@ -21,7 +21,7 @@
/**
* support_create_pixbuf_for_provider:
- * @pinfo: (allow-none): a #GdaProviderInfo, or %NULL
+ * @pinfo: (nullable): a #GdaProviderInfo, or %NULL
*
* Creates a new #GdkPixbuf using @pinfo's icon. The new pixbuf will at most be SUPPORT_ICON_SIZE pixels
high.
*
diff --git a/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
index 5ac229d4c..9a56a957a 100644
--- a/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.c
@@ -145,13 +145,20 @@ gdaui_data_cell_renderer_info_class_init (GdauiDataCellRendererInfoClass *class)
PROP_GROUP,
g_param_spec_pointer ("group", NULL, NULL,
G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
+
+ /**
+ * GdauiDataCellRendererInfo::status-changed:
+ * @cell_renderer_info: Widget that receive the signal
+ * @path: a string with the path of the attribute
+ * @requested_action: (type Gda.ValueAttribute): action made
+ */
info_cell_signals[STATUS_CHANGED] =
g_signal_new ("status-changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdauiDataCellRendererInfoClass, status_changed),
NULL, NULL,
- _gdaui_marshal_VOID__STRING_ENUM,
+ _gdaui_marshal_VOID__STRING_FLAGS,
G_TYPE_NONE, 2,
G_TYPE_STRING,
GDA_TYPE_VALUE_ATTRIBUTE);
diff --git a/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
index 229f1dd3e..db26c66fc 100644
--- a/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-info.h
@@ -33,7 +33,6 @@ G_DECLARE_DERIVABLE_TYPE (GdauiDataCellRendererInfo, gdaui_data_cell_renderer_in
struct _GdauiDataCellRendererInfoClass
{
GtkCellRendererClass parent_class;
-
void (* status_changed) (GdauiDataCellRendererInfo *cell_renderer_info,
const gchar *path,
GdaValueAttribute requested_action);
diff --git a/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
index 3d828d02f..f971e7561 100644
--- a/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
+++ b/libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c
@@ -540,7 +540,7 @@ gdaui_data_cell_renderer_textual_set_property (GObject *object,
/**
* gdaui_data_cell_renderer_textual_new:
- * @dh: (allow-none): a #GdaDataHandler object, or %NULL
+ * @dh: (nullable): a #GdaDataHandler object, or %NULL
* @type: the #GType being edited
* @options: options as a string
*
diff --git a/libgda-ui/data-entries/gdaui-entry-combo.c b/libgda-ui/data-entries/gdaui-entry-combo.c
index d2920e094..e57cfe3fb 100644
--- a/libgda-ui/data-entries/gdaui-entry-combo.c
+++ b/libgda-ui/data-entries/gdaui-entry-combo.c
@@ -426,7 +426,7 @@ combo_contents_changed_cb (G_GNUC_UNUSED GdauiCombo *entry, GdauiEntryCombo *com
/**
* gdaui_entry_combo_set_values:
* @combo: a #GdauiEntryCombo widet
- * @values: (element-type GValue) (allow-none): a list of #GValue values, or %NULL
+ * @values: (element-type GValue) (nullable): a list of #GValue values, or %NULL
*
* Sets the values of @combo to the specified ones. None of the
* values provided in the list is modified.
diff --git a/libgda-ui/data-entries/gdaui-entry-number.c b/libgda-ui/data-entries/gdaui-entry-number.c
index b6320a0ee..54145ca1d 100644
--- a/libgda-ui/data-entries/gdaui-entry-number.c
+++ b/libgda-ui/data-entries/gdaui-entry-number.c
@@ -149,7 +149,7 @@ gdaui_entry_number_is_type_numeric (GType type)
* gdaui_entry_number_new:
* @dh: the data handler to be used by the new widget
* @type: the requested data type (compatible with @dh)
- * @options: (allow-none): some options formatting the new entry, or %NULL
+ * @options: (nullable): some options formatting the new entry, or %NULL
*
* Creates a new data entry widget. Known options are: THOUSAND_SEP, NB_DECIMALS and CURRENCY
*
diff --git a/libgda-ui/data-entries/gdaui-entry-string.c b/libgda-ui/data-entries/gdaui-entry-string.c
index c7eba74d4..b4d32d1e8 100644
--- a/libgda-ui/data-entries/gdaui-entry-string.c
+++ b/libgda-ui/data-entries/gdaui-entry-string.c
@@ -154,7 +154,7 @@ gdaui_entry_string_init (GdauiEntryString *mgstr)
* gdaui_entry_string_new:
* @dh: the data handler to be used by the new widget
* @type: the requested data type (compatible with @dh)
- * @options: (allow-none): some options formatting the new entry, or %NULL
+ * @options: (nullable): some options formatting the new entry, or %NULL
*
* Creates a new data entry widget. Known options are: MAX_SIZE, MULTILINE, and HIDDEN
*
diff --git a/libgda-ui/data-entries/gdaui-entry.c b/libgda-ui/data-entries/gdaui-entry.c
index 0998d101e..baf172036 100644
--- a/libgda-ui/data-entries/gdaui-entry.c
+++ b/libgda-ui/data-entries/gdaui-entry.c
@@ -304,8 +304,8 @@ adjust_display (GdauiEntry *entry, gchar *existing_text)
/**
* gdaui_entry_new:
- * @prefix: (allow-none): a prefix (not modifiable) string, or %NULL
- * @suffix: (allow-none): a suffix (not modifiable) string, or %NULL
+ * @prefix: (nullable): a prefix (not modifiable) string, or %NULL
+ * @suffix: (nullable): a suffix (not modifiable) string, or %NULL
*
* Creates a new #GdauiEntry widget.
*
@@ -390,7 +390,7 @@ gdaui_entry_get_text (GdauiEntry *entry)
/**
* gdaui_entry_set_text:
* @entry: a #GdauiEntry widget
- * @text: (allow-none): the text to set into @entry, or %NULL
+ * @text: (nullable): the text to set into @entry, or %NULL
*
* Sets @text into @entry.
*
diff --git a/libgda-ui/data-entries/gdaui-formatted-entry.c b/libgda-ui/data-entries/gdaui-formatted-entry.c
index 813572563..83f381b6d 100644
--- a/libgda-ui/data-entries/gdaui-formatted-entry.c
+++ b/libgda-ui/data-entries/gdaui-formatted-entry.c
@@ -416,7 +416,7 @@ gdaui_formatted_entry_assume_delete (GdauiEntry *entry, gint virt_start_pos, gin
/**
* gdaui_formatted_entry_new:
* @format: a format string
- * @mask: (allow-none): a mask string, or %NULL
+ * @mask: (nullable): a mask string, or %NULL
*
* Creates a new #GdauiFormattedEntry widget.
*
@@ -499,8 +499,8 @@ gdaui_formatted_entry_get_text (GdauiFormattedEntry *entry)
/**
* gdaui_formatted_entry_set_insert_func:
* @entry: a #GdauiFormattedEntry widget
- * @insert_func: (allow-none) (scope notified): a #GdauiFormattedEntryInsertFunc, or %NULL
- * @data: (allow-none): a pointer which will be passed to @insert_func
+ * @insert_func: (nullable) (scope notified): a #GdauiFormattedEntryInsertFunc, or %NULL
+ * @data: (nullable): a pointer which will be passed to @insert_func
*
* Specifies that @entry should call @insert_func when the user wants to insert a char
* which is anot allowed, to perform other actions
diff --git a/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
index 75a7e50ea..dfa605ae6 100644
--- a/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
+++ b/libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c
@@ -337,7 +337,7 @@ gdaui_data_cell_renderer_password_set_property (GObject *object,
/**
* gdaui_data_cell_renderer_password_new
- * @dh: (allow-none): a #GdaDataHandler object, or %NULL
+ * @dh: (nullable): a #GdaDataHandler object, or %NULL
* @type: the #GType being edited
*
* Creates a new #GdauiDataCellRendererPassword.
diff --git a/libgda-ui/gdaui-basic-form.c b/libgda-ui/gdaui-basic-form.c
index 8b4742d73..b58274d95 100644
--- a/libgda-ui/gdaui-basic-form.c
+++ b/libgda-ui/gdaui-basic-form.c
@@ -1868,7 +1868,7 @@ gdaui_basic_form_widget_grab_focus (GtkWidget *widget)
/**
* gdaui_basic_form_entry_grab_focus:
* @form: a #GdauiBasicForm widget
- * @holder: (allow-none): a #GdaHolder object, or %NULL
+ * @holder: (nullable): a #GdaHolder object, or %NULL
*
* Makes the data entry corresponding to @holder grab the focus for the window it's in. If @holder is %NULL,
* then the focus is on the first entry which needs attention.
@@ -1907,7 +1907,7 @@ gdaui_basic_form_entry_grab_focus (GdauiBasicForm *form, GdaHolder *holder)
/**
* gdaui_basic_form_entry_set_editable:
* @form: a #GdauiBasicForm widget
- * @holder: (allow-none): a #GdaHolder object; or %NULL
+ * @holder: (nullable): a #GdaHolder object; or %NULL
* @editable: %TRUE if corresponding data entry must be editable
*
* Sets the #GdauiDataEntry in @form which corresponds to the
@@ -2093,9 +2093,9 @@ gdaui_basic_form_get_label_widget (GdauiBasicForm *form, GdaHolder *holder)
/**
* gdaui_basic_form_new_in_dialog:
* @data_set: a #GdaSet object
- * @parent: (allow-none): the parent window for the new dialog, or %NULL
- * @title: (allow-none): the title of the dialog window, or %NULL
- * @header: (allow-none): a helper text displayed at the top of the dialog, or %NULL
+ * @parent: (nullable): the parent window for the new dialog, or %NULL
+ * @title: (nullable): the title of the dialog window, or %NULL
+ * @header: (nullable): a helper text displayed at the top of the dialog, or %NULL
*
* Creates a new #GdauiBasicForm widget in the same way as gdaui_basic_form_new()
* and puts it into a #GtkDialog widget. The returned dialog has the "Ok" and "Cancel" buttons
diff --git a/libgda-ui/gdaui-cloud.c b/libgda-ui/gdaui-cloud.c
index 82457a95b..0e832ee13 100644
--- a/libgda-ui/gdaui-cloud.c
+++ b/libgda-ui/gdaui-cloud.c
@@ -995,7 +995,7 @@ text_tag_table_foreach_cb (GtkTextTag *tag, FilterData *fdata)
/**
* gdaui_cloud_filter:
* @cloud: a #GdauiCloud widget
- * @filter: (allow-none): the filter to use, or %NULL to remove any filter
+ * @filter: (nullable): the filter to use, or %NULL to remove any filter
*
* Filters the elements displayed in @cloud, by altering their color.
*
@@ -1057,8 +1057,8 @@ gdaui_cloud_create_filter_widget (GdauiCloud *cloud)
/**
* gdaui_cloud_set_weight_func:
* @cloud: a #GdauiCloud widget
- * @func: (allow-none) (scope notified): a #GdauiCloudWeightFunc function which computes weights, or %NULL
to unset
- * @data: (allow-none): a pointer to pass as last argument of @func each time it is called, or %NULL
+ * @func: (nullable) (scope notified): a #GdauiCloudWeightFunc function which computes weights, or %NULL to
unset
+ * @data: (nullable): a pointer to pass as last argument of @func each time it is called, or %NULL
*
* Specifies a function called by @cloud to compute each row's respective weight.
*
diff --git a/libgda-ui/gdaui-combo.c b/libgda-ui/gdaui-combo.c
index a44673814..fdbc6d727 100644
--- a/libgda-ui/gdaui-combo.c
+++ b/libgda-ui/gdaui-combo.c
@@ -523,7 +523,7 @@ _gdaui_combo_get_selected (GdauiCombo *combo)
* _gdaui_combo_set_selected_ext
* @combo: a #GdauiCombo widget
* @values: (element-type GObject.Value): a list of #GValue objects
- * @cols_index: (allow-none) (array): array of gint, index of column to which each value in @values
corresponds, or %NULL
+ * @cols_index: (nullable) (array): array of gint, index of column to which each value in @values
corresponds, or %NULL
*
* Sets the currently selected row of @combo from the values stored in @values, assuming that
* these values correspond to the columns listed in @cols_index. @cols_index must contain at least as
@@ -558,7 +558,7 @@ _gdaui_combo_set_selected_ext (GdauiCombo *combo, const GSList *values, gint *co
* _gdaui_combo_get_selected_ext
* @combo: a #GdauiCombo widget
* @n_cols: the number of columns for which values are requested
- * @cols_index: (array) (allow-none) (array length=n_cols): an array of @n_cols #gint indicating which
column to get a value for, or %NULL
+ * @cols_index: (array) (nullable) (array length=n_cols): an array of @n_cols #gint indicating which column
to get a value for, or %NULL
*
* Get a list of the currently selected values in @combo. The list itself must be free'd using
g_slist_free(),
* but not the values it contains. If there is no selected value in @combo, then %NULL is returned.
diff --git a/libgda-ui/gdaui-data-entry.c b/libgda-ui/gdaui-data-entry.c
index c4e88bedf..d740b5f4e 100644
--- a/libgda-ui/gdaui-data-entry.c
+++ b/libgda-ui/gdaui-data-entry.c
@@ -143,7 +143,7 @@ gdaui_data_entry_get_value_type (GdauiDataEntry *de)
/**
* gdaui_data_entry_set_value:
* @de: a #GtkWidget object which implements the #GdauiDataEntry interface
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
*
* Push a value into the #GdauiDataEntry. The value parameter must either be:
* <itemizedlist>
@@ -191,7 +191,7 @@ gdaui_data_entry_get_value (GdauiDataEntry *de)
/**
* gdaui_data_entry_validate:
* @de: a #GtkWidget object which implements the #GdauiDataEntry interface
- * @error: (allow-none): a place to store an erro, or %NULL
+ * @error: (nullable): a place to store an erro, or %NULL
*
* Tests the validity of @de's contents. This function must be overrided by implementators.
*
@@ -215,7 +215,7 @@ gdaui_data_entry_validate (GdauiDataEntry *de, GError **error)
/**
* gdaui_data_entry_set_reference_value:
* @de: a #GtkWidget object which implements the #GdauiDataEntry interface
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
*
* Push a value into the GdauiDataEntry in the same way as gdaui_data_entry_set_value() but
* also sets this value as the reference value.
@@ -277,7 +277,7 @@ gdaui_data_entry_get_reference_value (GdauiDataEntry *de)
/**
* gdaui_data_entry_set_default_value:
* @de: a #GtkWidget object which implements the #GdauiDataEntry interface
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
*
* Sets the default value for the GdauiDataEntry which gets displayed when the
* user forces the default value. If it is not set then it is set to type GDA_TYPE_NULL.
diff --git a/libgda-ui/gdaui-grid.c b/libgda-ui/gdaui-grid.c
index 5750b7e1c..96be4d799 100644
--- a/libgda-ui/gdaui-grid.c
+++ b/libgda-ui/gdaui-grid.c
@@ -191,7 +191,7 @@ gdaui_grid_dispose (GObject *object)
/**
* gdaui_grid_new:
- * @model: (allow-none): a #GdaDataModel, or %NULL
+ * @model: (nullable): a #GdaDataModel, or %NULL
*
* Creates a new #GdauiGrid widget suitable to display the data in @model
*
diff --git a/libgda-ui/gdaui-init.c b/libgda-ui/gdaui-init.c
index 320955b78..749d40cd5 100644
--- a/libgda-ui/gdaui-init.c
+++ b/libgda-ui/gdaui-init.c
@@ -104,7 +104,7 @@ gdaui_init (void)
/**
* gdaui_new_data_entry:
* @type: a #GType
- * @plugin_name: (allow-none): the name of an entry plugin, or %NULL
+ * @plugin_name: (nullable): the name of an entry plugin, or %NULL
*
* Creates a new #GdauiDataEntry widget, taking into account the requested entry name
* if @plugin_name is not %NULL (if no entry of that name is found, then the default data
@@ -203,7 +203,7 @@ gdaui_new_data_entry (GType type, const gchar *plugin_name)
/*
* _gdaui_new_cell_renderer
* @type: a #GType
- * @plugin_name: (allow-none): the name of an entry plugin, or %NULL
+ * @plugin_name: (nullable): the name of an entry plugin, or %NULL
*
* Creates a new #GtkCellRenderer object which is suitable to use in
* a #GtkTreeView widget, taking into account the requested entry name
@@ -795,7 +795,7 @@ gdaui_get_default_path (void)
/**
* gdaui_set_default_path:
- * @path: (allow-none): a path, or %NULL to unset
+ * @path: (nullable): a path, or %NULL to unset
*
* Define the default path used when saving a file, or when showing a #GtkFileChooser file chooser.
*
diff --git a/libgda-ui/gdaui-login.c b/libgda-ui/gdaui-login.c
index cee9149fe..1fccce77d 100644
--- a/libgda-ui/gdaui-login.c
+++ b/libgda-ui/gdaui-login.c
@@ -493,7 +493,7 @@ cnc_params_editor_changed_cb (G_GNUC_UNUSED GdauiProviderSpecEditor *editor, Gda
/**
* gdaui_login_new:
- * @dsn: (allow-none): a data source name, or %NULL
+ * @dsn: (nullable): a data source name, or %NULL
*
* Creates a new login widget which enables the user to specify connection parameters.
*
@@ -618,7 +618,7 @@ gdaui_login_get_connection_information (GdauiLogin *login)
/**
* gdaui_login_set_dsn:
* @login: a #GdauiLogin object
- * @dsn: (allow-none): a data source name, or %NULL
+ * @dsn: (nullable): a data source name, or %NULL
*
* Changes the information displayed in @login, to represent @dsn.
* If @login's mode has %GDA_UI_LOGIN_HIDE_DSN_SELECTION_MODE, then
diff --git a/libgda-ui/gdaui-plugin.h b/libgda-ui/gdaui-plugin.h
index 2baef1dc6..5fb712253 100644
--- a/libgda-ui/gdaui-plugin.h
+++ b/libgda-ui/gdaui-plugin.h
@@ -30,7 +30,7 @@
* GdauiEntryCreateFunc:
* @handler: a #GdaDataHandler
* @type: a #GType
- * @options: (allow-none): options, or %NULL
+ * @options: (nullable): options, or %NULL
* @Returns: a new #GdauiDataEntry
*
* Defines a function which creates a #GdauiDataEntry widget
@@ -41,7 +41,7 @@ typedef GdauiDataEntry *(*GdauiEntryCreateFunc)(GdaDataHandler *handler, GType
* GdauiCellCreateFunc:
* @handler: a #GdaDataHandler
* @type: a #GType
- * @options: (allow-none): options, or %NULL
+ * @options: (nullable): options, or %NULL
* @Returns:a new #GtkCellRenderer
*
* Defines a function which creates a #GtkCellRenderer object
@@ -52,13 +52,13 @@ typedef GtkCellRenderer *(*GdauiCellCreateFunc) (GdaDataHandler *handler, GType
/**
* GdauiPlugin:
* @plugin_name: the name of the plugin
- * @plugin_descr: (allow-none): a description for the plugin, or %NULL
- * @plugin_file: (allow-none): the shared object implementing the plugin, can be %NULL for internal plugins
+ * @plugin_descr: (nullable): a description for the plugin, or %NULL
+ * @plugin_file: (nullable): the shared object implementing the plugin, can be %NULL for internal plugins
* @nb_g_types: number of types the plugin can handle, or %0 for any type
- * @valid_g_types: (allow-none): an array of #GType, containing the accepted types, its size is @nb_g_types,
or %NULL if @nb_g_types is %0
- * @options_xml_spec: (allow-none): a string describing the plugin's options, or %NULL
- * @entry_create_func: (allow-none): the function called to create a #GdauiDataEntry, or %NULL
- * @cell_create_func: (allow-none): the function called to create a #GtkCellRenderer, or %NULL
+ * @valid_g_types: (nullable): an array of #GType, containing the accepted types, its size is @nb_g_types,
or %NULL if @nb_g_types is %0
+ * @options_xml_spec: (nullable): a string describing the plugin's options, or %NULL
+ * @entry_create_func: (nullable): the function called to create a #GdauiDataEntry, or %NULL
+ * @cell_create_func: (nullable): the function called to create a #GtkCellRenderer, or %NULL
*
* Structure representing a plugin.
*
diff --git a/libgda-ui/gdaui-provider-selector.c b/libgda-ui/gdaui-provider-selector.c
index 872e12104..7d4b29f6e 100644
--- a/libgda-ui/gdaui-provider-selector.c
+++ b/libgda-ui/gdaui-provider-selector.c
@@ -129,7 +129,7 @@ gdaui_provider_selector_get_provider (GdauiProviderSelector *selector)
/**
* gdaui_provider_selector_set_provider:
* @selector: a #GdauiProviderSelector widget
- * @provider: (allow-none): the provider to be selected, or %NULL for the default (SQLite)
+ * @provider: (nullable): the provider to be selected, or %NULL for the default (SQLite)
*
* Forces @selector to be set on @provider
*
diff --git a/libgda-ui/gdaui-raw-form.c b/libgda-ui/gdaui-raw-form.c
index d16b75fe6..365914d74 100644
--- a/libgda-ui/gdaui-raw-form.c
+++ b/libgda-ui/gdaui-raw-form.c
@@ -430,7 +430,7 @@ gdaui_raw_form_init (GdauiRawForm *wid)
/**
* gdaui_raw_form_new:
- * @model: (allow-none): a #GdaDataModel, or %NULL
+ * @model: (nullable): a #GdaDataModel, or %NULL
*
* Creates a new #GdauiRawForm widget to display data in @model
*
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 9eec7acdf..5d4659011 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -898,8 +898,8 @@ remove_formatting_function (GdauiRawGrid *grid, GdauiRawGridFormatFunc func)
* gdaui_raw_grid_add_formatting_function:
* @grid: a #GdauiRawGrid widget
* @func: a #GdauiRawGridFormatFunc function pointer
- * @data: (allow-none): a pointer to pass to the @func function when called
- * @dnotify: (allow-none): destroy notifier for @data
+ * @data: (nullable): a pointer to pass to the @func function when called
+ * @dnotify: (nullable): destroy notifier for @data
*
* This function allows you to specify that the @func function needs to be called
* whenever the rendering of a cell in @grid needs to be done. It is similar in purpose
diff --git a/libgda-ui/gdaui-rt-editor.c b/libgda-ui/gdaui-rt-editor.c
index b274e652d..143072f2d 100644
--- a/libgda-ui/gdaui-rt-editor.c
+++ b/libgda-ui/gdaui-rt-editor.c
@@ -1257,7 +1257,7 @@ spaces_since_start_of_line (GtkTextIter *iter)
* get_markup_token:
* @iter: starting position
* @out_nb_spaces_before: a place to set the value returned by spaces_since_start_of_line() if called
- * @out_end: (allow-none): place to put the last used position, or %NULL
+ * @out_end: (nullable): place to put the last used position, or %NULL
* @rte: the #GdauiRtEditor
*
* Parses marking tokens, nothing else
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index 5246b630b..53d3357e3 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -1041,9 +1041,9 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
/**
* gdaui_server_operation_new_in_dialog:
* @op: a #GdaServerOperation object
- * @parent: (allow-none): the parent window for the new dialog, or %NULL
- * @title: (allow-none): the title of the dialog window, or %NULL
- * @header: (allow-none): a helper text displayed at the top of the dialog, or %NULL
+ * @parent: (nullable): the parent window for the new dialog, or %NULL
+ * @title: (nullable): the title of the dialog window, or %NULL
+ * @header: (nullable): a helper text displayed at the top of the dialog, or %NULL
*
* Creates a new #GdauiServerOperation widget in the same way as gdaui_server_operation_new()
* and puts it into a #GtkDialog widget. The returned dialog has the "Ok" and "Cancel" buttons
diff --git a/libgda-ui/gdaui-set.c b/libgda-ui/gdaui-set.c
index 397549424..e9c48e643 100644
--- a/libgda-ui/gdaui-set.c
+++ b/libgda-ui/gdaui-set.c
@@ -110,7 +110,7 @@ gdaui_set_group_copy (GdauiSetGroup *sg)
/**
* gdaui_set_group_free:
- * @sg: (allow-none): a #GdauiSetGroup struct to free
+ * @sg: (nullable): a #GdauiSetGroup struct to free
*
* Frees any resources taken by @sg struct. If @sg is %NULL, then nothing happens.
*
@@ -126,7 +126,7 @@ gdaui_set_group_free (GdauiSetGroup *sg)
/**
* gdaui_set_group_set_source:
* @sg: a #GdauiSetGroup struct to free
- * @source (allow-none): a #GdauiSetSource struct or NULL
+ * @source (nullable): a #GdauiSetSource struct or NULL
*
* Set source to @source. if @source is #NULL, then @group nodes contains exactly one entry.
*
@@ -294,7 +294,7 @@ gdaui_set_source_copy (GdauiSetSource *s)
/**
* gdaui_set_source_free:
- * @s: (allow-none): a #GdauiSetSource struct to free
+ * @s: (nullable): a #GdauiSetSource struct to free
*
* Frees any resources taken by @s struct. If @s is %NULL, then nothing happens.
*
diff --git a/libgda-ui/marshallers/gdaui-marshal.list b/libgda-ui/marshallers/gdaui-marshal.list
index 73a302c01..63cb83288 100644
--- a/libgda-ui/marshallers/gdaui-marshal.list
+++ b/libgda-ui/marshallers/gdaui-marshal.list
@@ -40,6 +40,7 @@ VOID:STRING,INT
POINTER:POINTER
BOOLEAN:POINTER
VOID:STRING,ENUM
+VOID:STRING,FLAGS
VOID:BOOLEAN
VOID:INT
BOOLEAN:STRING
diff --git a/libgda/gda-attributes-manager.c b/libgda/gda-attributes-manager.c
index bd425e51b..217d18e07 100644
--- a/libgda/gda-attributes-manager.c
+++ b/libgda/gda-attributes-manager.c
@@ -91,7 +91,7 @@ objattrs_unref (ObjAttrs *attrs)
/**
* gda_attributes_manager_new:
* @for_objects: set to TRUE if attributes will be set on objects.
- * @signal_func: (allow-none) (scope call): a function to be called whenever an attribute changes on an
object (if @for_objects is TRUE), or %NULL
+ * @signal_func: (nullable) (scope call): a function to be called whenever an attribute changes on an object
(if @for_objects is TRUE), or %NULL
* @signal_data: user data passed as last argument of @signal_func when it is called
*
* Creates a new #GdaAttributesManager, which can store (name, value) attributes for pointers or GObject
objects
@@ -249,7 +249,7 @@ manager_real_set (GdaAttributesManager *mgr, gpointer ptr,
* @mgr: a #GdaAttributesManager
* @ptr: a pointer to the resources to which the attribute will apply
* @att_name: an attribute's name
- * @value: (transfer none) (allow-none): a #GValue, or %NULL
+ * @value: (transfer none) (nullable): a #GValue, or %NULL
*
* Associates an attribute named @att_name to @ptr, with the value @value. Any previous association is
replaced by
* this one, and if @value is %NULL then the association is removed.
@@ -271,7 +271,7 @@ gda_attributes_manager_set (GdaAttributesManager *mgr, gpointer ptr, const gchar
* @mgr: a #GdaAttributesManager
* @ptr: a pointer to the resources to which the attribute will apply
* @att_name: an attribute's name
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
* @destroy: function called when @att_name has to be freed
*
* Does the same as gda_attributes_manager_set() except that @destroy is called when @att_name needs
diff --git a/libgda/gda-batch.c b/libgda/gda-batch.c
index 6fd0e557a..fa2a58f3b 100644
--- a/libgda/gda-batch.c
+++ b/libgda/gda-batch.c
@@ -339,7 +339,7 @@ gda_batch_get_statements (GdaBatch *batch)
/**
* gda_batch_get_parameters:
* @batch: a #GdaBatch object
- * @out_params: (out) (transfer full) (allow-none): a place to store a new #GdaSet object, or %NULL
+ * @out_params: (out) (transfer full) (nullable): a place to store a new #GdaSet object, or %NULL
* @error: a place to store errors, or %NULL
*
* Get a new #GdaSet object which groups all the execution parameters
diff --git a/libgda/gda-column.c b/libgda/gda-column.c
index 5e2aea93b..2e274be25 100644
--- a/libgda/gda-column.c
+++ b/libgda/gda-column.c
@@ -519,7 +519,7 @@ gda_column_set_position (GdaColumn *column, gint position)
* gda_column_get_default_value:
* @column: a #GdaColumn.
*
- * Returns: (allow-none): @column's default value, as a #GValue object, or %NULL if column does not have a
default value
+ * Returns: (nullable): @column's default value, as a #GValue object, or %NULL if column does not have a
default value
*/
const GValue *
gda_column_get_default_value (GdaColumn *column)
@@ -532,7 +532,7 @@ gda_column_get_default_value (GdaColumn *column)
/**
* gda_column_set_default_value:
* @column: a #GdaColumn.
- * @default_value: (allow-none): default #GValue for the column
+ * @default_value: (nullable): default #GValue for the column
*
* Sets @column's default #GValue.
*/
@@ -571,8 +571,8 @@ gda_column_get_attribute (GdaColumn *column, const gchar *attribute)
* gda_column_set_attribute:
* @column: a #GdaColumn
* @attribute: attribute name as a static string
- * @value: (allow-none): a #GValue, or %NULL
- * @destroy: (allow-none): a function to be called when @attribute is not needed anymore, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
+ * @destroy: (nullable): a function to be called when @attribute is not needed anymore, or %NULL
*
* Set the value associated to a named attribute. The @attribute string is 'stolen' by this method, and
* the memory it uses will be freed using the @destroy function when no longer needed (if @destroy is %NULL,
diff --git a/libgda/gda-column.h b/libgda/gda-column.h
index 7005d7733..f8748a5e7 100644
--- a/libgda/gda-column.h
+++ b/libgda/gda-column.h
@@ -92,7 +92,7 @@ void gda_column_set_attribute (GdaColumn *column, const gchar *a
* gda_column_set_attribute_static:
* @holder: a #GdaHolder
* @attribute: attribute's name
- * @value: (allow-none): the value to set the attribute to, or %NULL
+ * @value: (nullable): the value to set the attribute to, or %NULL
*
* This function is similar to gda_column_set_attribute() but for static strings
*/
diff --git a/libgda/gda-config.c b/libgda/gda-config.c
index b0973eae7..a5526f377 100644
--- a/libgda/gda-config.c
+++ b/libgda/gda-config.c
@@ -150,7 +150,7 @@ gda_dsn_info_copy (const GdaDsnInfo *source)
/**
* gda_dsn_info_free:
- * @dsn: (allow-none): a #GdaDsnInfo struct to free
+ * @dsn: (nullable): a #GdaDsnInfo struct to free
*
* Frees any resources taken by @dsn struct. If @dsn is %NULL, then nothing happens.
*
@@ -215,8 +215,8 @@ make_cmp_string (const gchar *key_values_string)
/**
* gda_dsn_info_equal:
- * @dsn1: (allow-none): a #GdaDsnInfo
- * @dsn2: (allow-none): a #GdaDsnInfo
+ * @dsn1: (nullable): a #GdaDsnInfo
+ * @dsn2: (nullable): a #GdaDsnInfo
*
* Compares @dsn1 and @dsn2.
*
diff --git a/libgda/gda-connection-event.c b/libgda/gda-connection-event.c
index 0590f754a..195f2b44a 100644
--- a/libgda/gda-connection-event.c
+++ b/libgda/gda-connection-event.c
@@ -201,7 +201,7 @@ gda_connection_event_get_description (GdaConnectionEvent *event)
/**
* gda_connection_event_set_description:
* @event: a #GdaConnectionEvent.
- * @description: (allow-none): a description, or %NULL (to unset current description if any)
+ * @description: (nullable): a description, or %NULL (to unset current description if any)
*
* Sets @event's @description. This function should not be called directly.
*/
diff --git a/libgda/gda-data-access-wrapper.c b/libgda/gda-data-access-wrapper.c
index 420bc72a5..753d68032 100644
--- a/libgda/gda-data-access-wrapper.c
+++ b/libgda/gda-data-access-wrapper.c
@@ -389,7 +389,7 @@ gda_data_access_wrapper_new (GdaDataModel *model)
/**
* gda_data_access_wrapper_set_mapping:
* @wrapper: a #GdaDataAccessWrapper object
- * @mapping: (allow-none) (array length=mapping_size): an array of #gint which represents the mapping
between @wrapper's columns
+ * @mapping: (nullable) (array length=mapping_size): an array of #gint which represents the mapping between
@wrapper's columns
* and the columns of the wrapped data model
* @mapping_size: the size of @mapping.
*
diff --git a/libgda/gda-data-model-array.c b/libgda/gda-data-model-array.c
index 7b8bce5a3..c1616f7dd 100644
--- a/libgda/gda-data-model-array.c
+++ b/libgda/gda-data-model-array.c
@@ -357,7 +357,7 @@ gda_data_model_array_new_with_g_types_v (gint cols, GType *types)
*
* Makes a copy of @src into a new #GdaDataModelArray object
*
- * Returns: (transfer full) (allow-none): a new data model, or %NULL if an error occurred
+ * Returns: (transfer full) (nullable): a new data model, or %NULL if an error occurred
*/
GdaDataModelArray *
gda_data_model_array_copy_model (GdaDataModel *src, GError **error)
@@ -412,7 +412,7 @@ gda_data_model_array_copy_model (GdaDataModel *src, GError **error)
* Like gda_data_model_array_copy_model(), makes a copy of @src, but copies only some
* columns.
*
- * Returns: (transfer full) (allow-none): a new data model, or %NULL if an error occurred
+ * Returns: (transfer full) (nullable): a new data model, or %NULL if an error occurred
*
* Since: 5.2.0
*/
diff --git a/libgda/gda-data-model-bdb.c b/libgda/gda-data-model-bdb.c
index 3e5f11b8a..cbebfe2fe 100644
--- a/libgda/gda-data-model-bdb.c
+++ b/libgda/gda-data-model-bdb.c
@@ -463,7 +463,7 @@ gda_data_model_bdb_get_property (GObject *object,
/**
* gda_data_model_bdb_new:
* @filename: name of the file containing the database
- * @db_name: (allow-none): the name of the database within @filename, or %NULL
+ * @db_name: (nullable): the name of the database within @filename, or %NULL
*
* Creates a new #GdaDataModel object to access the contents of the Berkeley DB file @file,
* for the database @db_name if not %NULL
diff --git a/libgda/gda-data-model-import.c b/libgda/gda-data-model-import.c
index a8da8f04a..5d6357228 100644
--- a/libgda/gda-data-model-import.c
+++ b/libgda/gda-data-model-import.c
@@ -793,7 +793,7 @@ gda_data_model_import_get_property (GObject *object,
* gda_data_model_import_new_file:
* @filename: the file to import data from
* @random_access: TRUE if random access will be required
- * @options: (transfer none) (allow-none): importing options
+ * @options: (transfer none) (nullable): importing options
*
* Creates a new #GdaDataModel object which contains the data stored within the @filename file.
*
@@ -834,7 +834,7 @@ gda_data_model_import_new_file (const gchar *filename, gboolean random_access,
* gda_data_model_import_new_mem:
* @data: a string containing the data to import
* @random_access: TRUE if random access will be required
- * @options: (transfer none) (allow-none): importing options, see gda_data_model_import_new_file() for more
information
+ * @options: (transfer none) (nullable): importing options, see gda_data_model_import_new_file() for more
information
*
* Creates a new #GdaDataModel object which contains the data stored in the @data string.
*
diff --git a/libgda/gda-data-model-iter.c b/libgda/gda-data-model-iter.c
index 708ef6792..cdcd5070f 100644
--- a/libgda/gda-data-model-iter.c
+++ b/libgda/gda-data-model-iter.c
@@ -1014,7 +1014,7 @@ gda_data_model_iter_get_holder_for_field (GdaDataModelIter *iter, gint col)
*
* Get the value stored at the column @col in @iter. The returned value must not be modified.
*
- * Returns: (allow-none) (transfer none): the #GValue, or %NULL if the value could not be fetched
+ * Returns: (nullable) (transfer none): the #GValue, or %NULL if the value could not be fetched
*/
const GValue *
gda_data_model_iter_get_value_at (GdaDataModelIter *iter, gint col)
@@ -1040,11 +1040,11 @@ gda_data_model_iter_get_value_at (GdaDataModelIter *iter, gint col)
* gda_data_model_iter_get_value_at_e:
* @iter: a #GdaDataModelIter object
* @col: the requested column
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Get the value stored at the column @col in @iter. The returned value must not be modified.
*
- * Returns: (allow-none) (transfer none): the #GValue, or %NULL if the value could not be fetched
+ * Returns: (nullable) (transfer none): the #GValue, or %NULL if the value could not be fetched
*
* Since: 4.2.10
*/
@@ -1105,7 +1105,7 @@ gda_data_model_iter_set_value_at (GdaDataModelIter *iter, gint col, const GValue
*
* Get the value stored at the column @field_name in @iter
*
- * Returns: (allow-none) (transfer none): the #GValue, or %NULL
+ * Returns: (nullable) (transfer none): the #GValue, or %NULL
*/
const GValue *
gda_data_model_iter_get_value_for_field (GdaDataModelIter *iter, const gchar *field_name)
diff --git a/libgda/gda-data-model-ldap.c b/libgda/gda-data-model-ldap.c
index 1a4565e73..7f22a1eee 100644
--- a/libgda/gda-data-model-ldap.c
+++ b/libgda/gda-data-model-ldap.c
@@ -187,9 +187,9 @@ gda_data_model_ldap_get_type (void)
/**
* gda_data_model_ldap_new_with_config:
* @cnc: an LDAP opened connection (must be a balid #GdaLdapConnection)
- * @base_dn: (allow-none): the base DN to search on, or %NULL
- * @filter: (allow-none): an LDAP filter, for example "(objectClass=*)"
- * @attributes: (allow-none): the list (CSV format) of attributes to fetch, each in the format
<attname>[::<GType>]
+ * @base_dn: (nullable): the base DN to search on, or %NULL
+ * @filter: (nullable): an LDAP filter, for example "(objectClass=*)"
+ * @attributes: (nullable): the list (CSV format) of attributes to fetch, each in the format
<attname>[::<GType>]
* @scope: the search scope
*
* Creates a new #GdaDataModel object to extract some LDAP contents. The returned data model will
@@ -238,7 +238,7 @@ gda_data_model_ldap_new_with_config (GdaConnection *cnc,
/**
* gda_data_model_ldap_compute_columns:
* @cnc: a #GdaConnection
- * @attributes: (allow-none): a string describing which LDAP attributes to retreive, or %NULL
+ * @attributes: (nullable): a string describing which LDAP attributes to retreive, or %NULL
*
* Computes the #GdaColumn of the data model which would be created using @attributes when calling
* gda_data_model_ldap_new_with_config().
diff --git a/libgda/gda-data-model.c b/libgda/gda-data-model.c
index 4244ed463..83c63c0dd 100644
--- a/libgda/gda-data-model.c
+++ b/libgda/gda-data-model.c
@@ -488,7 +488,7 @@ gda_data_model_get_n_columns (GdaDataModel *model)
* WARNING: the returned #GdaColumn object belongs to the @model model and
* and should not be destroyed; any modification will affect the whole data model.
*
- * Returns: (transfer none) (allow-none): the description of the column.
+ * Returns: (transfer none) (nullable): the description of the column.
*/
GdaColumn *
gda_data_model_describe_column (GdaDataModel *model, gint col)
@@ -659,7 +659,7 @@ gda_data_model_set_column_title (GdaDataModel *model, gint col, const gchar *tit
* Upon errors %NULL will be returned and @error will be assigned a
* #GError from the #GDA_DATA_MODEL_ERROR domain.
*
- * Returns: (allow-none) (transfer none): a #GValue containing the value stored in the given
+ * Returns: (nullable) (transfer none): a #GValue containing the value stored in the given
* position, or %NULL on error (out-of-bound position, etc).
*/
const GValue *
@@ -698,7 +698,7 @@ gda_data_model_get_value_at (GdaDataModel *model, gint col, gint row, GError **e
* Upon errors %NULL will be returned and @error will be assigned a
* #GError from the #GDA_DATA_MODEL_ERROR domain.
*
- * Returns: (allow-none) (transfer none): a #GValue containing the value stored in the given
+ * Returns: (nullable) (transfer none): a #GValue containing the value stored in the given
* position, or %NULL on error (out-of-bound position, wrong data type, etc).
*/
const GValue *
@@ -797,7 +797,7 @@ gda_data_model_set_value_at (GdaDataModel *model, gint col, gint row, const GVal
* gda_data_model_set_values:
* @model: a #GdaDataModel object.
* @row: row number.
- * @values: (element-type GObject.Value) (transfer none) (allow-none): a list of #GValue (or %NULL), one for
at most the number of columns of @model
+ * @values: (element-type GObject.Value) (transfer none) (nullable): a list of #GValue (or %NULL), one for
at most the number of columns of @model
* @error: a place to store errors, or %NULL
*
* In a similar way to gda_data_model_set_value_at(), this method modifies a data model's contents
@@ -898,7 +898,7 @@ gda_data_model_create_iter (GdaDataModel *model)
/**
* gda_data_model_append_values:
* @model: a #GdaDataModel object.
- * @values: (element-type GObject.Value) (allow-none): #GList of #GValue* representing the row to add. The
+ * @values: (element-type GObject.Value) (nullable): #GList of #GValue* representing the row to add. The
* length must match model's column count. These #GValue
* are value-copied (the user is still responsible for freeing them).
* @error: a place to store errors, or %NULL
@@ -1071,7 +1071,7 @@ gda_data_model_get_row_from_values (GdaDataModel *model, GSList *values, gint *c
* gda_data_model_send_hint:
* @model: a #GdaDataModel
* @hint: (transfer none): a hint to send to the model
- * @hint_value: (allow-none): an optional value to specify the hint, or %NULL
+ * @hint_value: (nullable): an optional value to specify the hint, or %NULL
*
* Sends a hint to the data model. The hint may or may not be handled by the data
* model, depending on its implementation
@@ -1119,9 +1119,9 @@ static gchar *export_to_text_separated (GdaDataModel *model, const gint *cols, g
* gda_data_model_export_to_string:
* @model: a #GdaDataModel
* @format: the format in which to export data
- * @cols: (array length=nb_cols) (allow-none): an array containing which columns of @model will be exported,
or %NULL for all columns
+ * @cols: (array length=nb_cols) (nullable): an array containing which columns of @model will be exported,
or %NULL for all columns
* @nb_cols: the number of columns in @cols
- * @rows: (array length=nb_rows) (allow-none): an array containing which rows of @model will be exported, or
%NULL for all rows
+ * @rows: (array length=nb_rows) (nullable): an array containing which rows of @model will be exported, or
%NULL for all rows
* @nb_rows: the number of rows in @rows
* @options: list of options for the export
*
@@ -1432,9 +1432,9 @@ gda_data_model_export_to_string (GdaDataModel *model, GdaDataModelIOFormat forma
* @model: a #GdaDataModel
* @format: the format in which to export data
* @file: the filename to export to
- * @cols: (array length=nb_cols) (allow-none): an array containing which columns of @model will be exported,
or %NULL for all columns
+ * @cols: (array length=nb_cols) (nullable): an array containing which columns of @model will be exported,
or %NULL for all columns
* @nb_cols: the number of columns in @cols
- * @rows: (array length=nb_rows) (allow-none): an array containing which rows of @model will be exported, or
%NULL for all rows
+ * @rows: (array length=nb_rows) (nullable): an array containing which rows of @model will be exported, or
%NULL for all rows
* @nb_rows: the number of rows in @rows
* @options: list of options for the export
* @error: a place to store errors, or %NULL
@@ -1650,11 +1650,11 @@ xml_set_boolean (xmlNodePtr node, const gchar *name, gboolean value)
/*
* gda_data_model_to_xml_node
* @model: a #GdaDataModel object.
- * @cols: (allow-none) (array length=nb_cols): an array containing which columns of @model will be exported,
or %NULL for all columns
+ * @cols: (nullable) (array length=nb_cols): an array containing which columns of @model will be exported,
or %NULL for all columns
* @nb_cols: the number of columns in @cols
- * @rows: (allow-none) (array length=nb_rows): an array containing which rows of @model will be exported, or
%NULL for all rows
+ * @rows: (nullable) (array length=nb_rows): an array containing which rows of @model will be exported, or
%NULL for all rows
* @nb_rows: the number of rows in @rows
- * @name: (allow-none): name to use for the XML resulting table or %NULL.
+ * @name: (nullable): name to use for the XML resulting table or %NULL.
*
* Converts a #GdaDataModel into a xmlNodePtr (as used in libxml).
*
@@ -1938,7 +1938,7 @@ gda_data_model_add_data_from_xml_node (GdaDataModel *model, xmlNodePtr node, GEr
* @to: the destination #GdaDataModel
* @from: the source #GdaDataModel
* @overwrite: TRUE if @to is completely overwritten by @from's data, and FALSE if @from's data is appended
to @to
- * @cols_trans: (element-type gint gint) (allow-none): a #GHashTable for columns translating, or %NULL
+ * @cols_trans: (element-type gint gint) (nullable): a #GHashTable for columns translating, or %NULL
* @error: a place to store errors, or %NULL
*
* Copy the contents of the @from data model to the @to data model. The copy stops as soon as an error
@@ -2202,7 +2202,7 @@ gda_data_model_import_from_model (GdaDataModel *to, GdaDataModel *from,
* gda_data_model_import_from_string:
* @model: a #GdaDataModel
* @string: the string to import data from
- * @cols_trans: (element-type gint gint) (allow-none): a hash table containing which columns of @model will
be imported, or %NULL for all columns, see gda_data_model_import_from_model()
+ * @cols_trans: (element-type gint gint) (nullable): a hash table containing which columns of @model will be
imported, or %NULL for all columns, see gda_data_model_import_from_model()
* @options: list of options for the export
* @error: a place to store errors, or %NULL
*
@@ -2237,7 +2237,7 @@ gda_data_model_import_from_string (GdaDataModel *model,
* gda_data_model_import_from_file:
* @model: a #GdaDataModel
* @file: the filename to import from
- * @cols_trans: (element-type gint gint) (allow-none): a #GHashTable for columns translating, or %NULL, see
gda_data_model_import_from_model()
+ * @cols_trans: (element-type gint gint) (nullable): a #GHashTable for columns translating, or %NULL, see
gda_data_model_import_from_model()
* @options: list of options for the export
* @error: a place to store errors, or %NULL
*
diff --git a/libgda/gda-data-pivot.c b/libgda/gda-data-pivot.c
index 86d89aaf4..df458a7cd 100644
--- a/libgda/gda-data-pivot.c
+++ b/libgda/gda-data-pivot.c
@@ -372,7 +372,7 @@ gda_data_pivot_get_property (GObject *object,
/**
* gda_data_pivot_new:
- * @model: (allow-none): a #GdaDataModel to analyse data from, or %NULL
+ * @model: (nullable): a #GdaDataModel to analyse data from, or %NULL
*
* Creates a new #GdaDataModel which will contain analysed data from @model.
*
@@ -1312,8 +1312,8 @@ parse_field_spec (GdaDataPivot *pivot, const gchar *field, const gchar *alias, G
* @pivot: a #GdaDataPivot object
* @field_type: the type of field to add
* @field: the field description, see below
- * @alias: (allow-none): the field alias, or %NULL
- * @error: (allow-none): ta place to store errors, or %NULL
+ * @alias: (nullable): the field alias, or %NULL
+ * @error: (nullable): ta place to store errors, or %NULL
*
* Specifies that @field has to be included in the analysis.
* @field is a field specification with the following accepted syntaxes:
@@ -1435,8 +1435,8 @@ gda_data_pivot_add_field (GdaDataPivot *pivot, GdaDataPivotFieldType field_type,
* @pivot: a #GdaDataPivot object
* @aggregate_type: the type of aggregate operation to perform
* @field: the field description, see below
- * @alias: (allow-none): the field alias, or %NULL
- * @error: (allow-none): ta place to store errors, or %NULL
+ * @alias: (nullable): the field alias, or %NULL
+ * @error: (nullable): ta place to store errors, or %NULL
*
* Specifies that @field has to be included in the analysis.
* @field is a field specification with the following accepted syntaxes:
@@ -1548,7 +1548,7 @@ gda_data_pivot_add_data (GdaDataPivot *pivot, GdaDataPivotAggregate aggregate_ty
/**
* gda_data_pivot_populate:
* @pivot: a #GdaDataPivot object
- * @error: (allow-none): ta place to store errors, or %NULL
+ * @error: (nullable): ta place to store errors, or %NULL
*
* Acutally populates @pivot by analysing the data from the provided data model.
*
diff --git a/libgda/gda-data-proxy.c b/libgda/gda-data-proxy.c
index 37e221f19..d9e923dd7 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -3167,7 +3167,7 @@ apply_filter_statement (GdaDataProxy *proxy, GError **error)
/**
* gda_data_proxy_set_filter_expr:
* @proxy: a #GdaDataProxy object
- * @filter_expr: (allow-none): an SQL based expression which will filter the contents of @proxy, or %NULL to
remove any previous filter
+ * @filter_expr: (nullable): an SQL based expression which will filter the contents of @proxy, or %NULL to
remove any previous filter
* @error: a place to store errors, or %NULL
*
* Sets a filter among the rows presented by @proxy. The filter is defined by a filter expression
diff --git a/libgda/gda-data-select.c b/libgda/gda-data-select.c
index f0e25662c..faf24b37d 100644
--- a/libgda/gda-data-select.c
+++ b/libgda/gda-data-select.c
@@ -1121,7 +1121,7 @@ param_name_to_int (const gchar *pname, gint *result, gboolean *old_val)
* gda_data_select_set_modification_statement_sql:
* @model: a #GdaDataSelect data model
* @sql: an SQL text
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Offers the same feature as gda_data_select_set_modification_statement() but using an SQL statement.
*
@@ -1203,7 +1203,7 @@ check_acceptable_statement (GdaDataSelect *model, GError **error)
* gda_data_select_set_modification_statement:
* @model: a #GdaDataSelect data model
* @mod_stmt: a #GdaStatement (INSERT, UPDATE or DELETE)
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Informs @model that it should allow modifications to the data in some columns and some rows
* using @mod_stmt to propagate those modifications into the database.
@@ -1534,7 +1534,7 @@ gda_data_select_set_modification_statement (GdaDataSelect *model, GdaStatement *
/**
* gda_data_select_compute_modification_statements:
* @model: a #GdaDataSelect data model
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Makes @model try to compute INSERT, UPDATE and DELETE statements to be used when modifying @model's
contents.
* Note: any modification statement set using gda_data_select_set_modification_statement() will first be
unset
@@ -1555,7 +1555,7 @@ gda_data_select_compute_modification_statements (GdaDataSelect *model, GError **
* gda_data_select_compute_modification_statements_ext:
* @model: a #GdaDataSelect data model
* @cond_type: the type of condition for the modifications where one row only should be identified
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Makes @model try to compute INSERT, UPDATE and DELETE statements to be used when modifying @model's
contents.
* Note: any modification statement set using gda_data_select_set_modification_statement() will first be
unset
@@ -1653,7 +1653,7 @@ row_selection_condition_foreach_func (GdaSqlAnyPart *part, G_GNUC_UNUSED gpointe
* gda_data_select_set_row_selection_condition:
* @model: a #GdaDataSelect data model
* @expr: (transfer none): a #GdaSqlExpr expression
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Offers the same features as gda_data_select_set_row_selection_condition_sql() but using a #GdaSqlExpr
* structure instead of an SQL syntax.
@@ -1692,7 +1692,7 @@ gda_data_select_set_row_selection_condition (GdaDataSelect *model, GdaSqlExpr *
* gda_data_select_set_row_selection_condition_sql:
* @model: a #GdaDataSelect data model
* @sql_where: an SQL condition (without the WHERE keyword)
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Specifies the SQL condition corresponding to the WHERE part of a SELECT statement which would
* return only 1 row (the expression of the primary key).
@@ -1767,7 +1767,7 @@ gda_data_select_set_row_selection_condition_sql (GdaDataSelect *model, const gch
/**
* gda_data_select_compute_row_selection_condition:
* @model: a #GdaDataSelect object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Offers the same features as gda_data_select_set_row_selection_condition() but the expression
* is computed from the meta data associated to the connection being used when @model was created.
@@ -3644,7 +3644,7 @@ set_column_properties_from_select_stmt (GdaDataSelect *model, GdaConnection *cnc
/**
* gda_data_select_compute_columns_attributes:
* @model: a #GdaDataSelect data model
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Computes correct attributes for each of @model's columns, which includes the "NOT NULL" attribute, the
* default value, the precision and scale for numeric values.
@@ -3677,7 +3677,7 @@ gda_data_select_compute_columns_attributes (GdaDataSelect *model, GError **error
/**
* gda_data_select_rerun:
* @model: a #GdaDataSelect data model
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Requests that @model be re-run to have an updated result. If an error occurs,
* then @model will not be changed.
@@ -3810,7 +3810,7 @@ gda_data_select_rerun (GdaDataSelect *model, GError **error)
/**
* gda_data_select_prepare_for_offline:
* @model: a #GdaDataSelect object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Use this method to make sure all the data contained in the data model are stored on the client
* side (and that no subsquent call to the server will be necessary to access that data), at the cost of
diff --git a/libgda/gda-ddl-table.c b/libgda/gda-ddl-table.c
index 6065136a9..2f48397eb 100644
--- a/libgda/gda-ddl-table.c
+++ b/libgda/gda-ddl-table.c
@@ -438,7 +438,7 @@ gda_ddl_table_get_columns (GdaDdlTable *self)
* Use this method to obtain internal list of all fkeys. The internal list
* should not be freed.
*
- * Returns: (element-type Gda.DdlFkey): A list of #GdaDdlFkey objects or %NULL if the internal list is not
+ * Returns: (transfer none) (element-type Gda.DdlFkey): A list of #GdaDdlFkey objects or %NULL if the
internal list is not
* set or %NULL is passed
*
* Since: 6.0
diff --git a/libgda/gda-holder.c b/libgda/gda-holder.c
index 47b446664..d2e23e410 100644
--- a/libgda/gda-holder.c
+++ b/libgda/gda-holder.c
@@ -419,7 +419,7 @@ gda_holder_copy (GdaHolder *orig)
/**
* gda_holder_new_inline:
* @type: a valid GLib type
- * @id: (allow-none): the id of the holder to create, or %NULL
+ * @id: (nullable): the id of the holder to create, or %NULL
* @...: value to set
*
* Creates a new #GdaHolder object with an ID set to @id, of type @type,
@@ -751,7 +751,7 @@ gda_holder_get_id (GdaHolder *holder)
*
* If @holder is invalid, then the returned value is %NULL.
*
- * Returns: (allow-none) (transfer none): the value, or %NULL
+ * Returns: (nullable) (transfer none): the value, or %NULL
*/
const GValue *
gda_holder_get_value (GdaHolder *holder)
@@ -784,7 +784,7 @@ gda_holder_get_value (GdaHolder *holder)
/**
* gda_holder_get_value_str:
* @holder: a #GdaHolder object
- * @dh: (allow-none): a #GdaDataHandler to use, or %NULL
+ * @dh: (nullable): a #GdaDataHandler to use, or %NULL
*
* Same functionality as gda_holder_get_value() except that it returns the value as a string
* (the conversion is done using @dh if not %NULL, or the default data handler otherwise).
@@ -821,7 +821,7 @@ static gboolean real_gda_holder_set_value (GdaHolder *holder, GValue *value, gbo
/**
* gda_holder_set_value:
* @holder: a #GdaHolder object
- * @value: (allow-none): a value to set the holder to, or %NULL
+ * @value: (nullable): a value to set the holder to, or %NULL
* @error: a place to store errors, or %NULL
*
* Sets the value within the holder. If @holder is an alias for another
@@ -1302,7 +1302,7 @@ gda_holder_force_invalid (GdaHolder *holder)
/**
* gda_holder_force_invalid_e:
* @holder: a #GdaHolder object
- * @error: (allow-none) (transfer full): a #GError explaining why @holder is declared invalid, or %NULL
+ * @error: (nullable) (transfer full): a #GError explaining why @holder is declared invalid, or %NULL
*
* Forces a holder to be invalid; to set it valid again, a new value must be assigned
* to it using gda_holder_set_value() or gda_holder_take_value().
@@ -1368,7 +1368,7 @@ gda_holder_is_valid (GdaHolder *holder)
/**
* gda_holder_is_valid_e:
* @holder: a #GdaHolder object
- * @error: (allow-none): a place to store invalid error, or %NULL
+ * @error: (nullable): a place to store invalid error, or %NULL
*
* Get the validity of @holder (that is, of the value held by @holder)
*
diff --git a/libgda/gda-holder.h b/libgda/gda-holder.h
index 286161caf..7fe3d4f45 100644
--- a/libgda/gda-holder.h
+++ b/libgda/gda-holder.h
@@ -156,7 +156,7 @@ void gda_holder_set_attribute (GdaHolder *holder, cons
* gda_holder_set_attribute_static:
* @holder: a #GdaHolder
* @attribute: attribute's name
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
*
* This function is similar to gda_holder_set_attribute() but for static strings
*/
diff --git a/libgda/gda-lockable.c b/libgda/gda-lockable.c
index 34fce5188..1946c4c45 100644
--- a/libgda/gda-lockable.c
+++ b/libgda/gda-lockable.c
@@ -30,7 +30,7 @@ void
gda_lockable_default_init (GdaLockableInterface *iface) {}
/**
- * gda_lockable_lock: (virtual )
+ * gda_lockable_lock:
* @lockable: a #GdaLockable object.
*
* Locks @lockable. If it is already locked by another thread, the current thread will block until it is
unlocked
diff --git a/libgda/gda-lockable.h b/libgda/gda-lockable.h
index 833945418..da2b22a82 100644
--- a/libgda/gda-lockable.h
+++ b/libgda/gda-lockable.h
@@ -31,9 +31,9 @@ struct _GdaLockableInterface {
GTypeInterface g_iface;
/* virtual table */
- void (* lock) (GdaLockable *lock);
- gboolean (* trylock) (GdaLockable *lock);
- void (* unlock) (GdaLockable *lock);
+ void (* lock) (GdaLockable *lockable);
+ gboolean (* trylock) (GdaLockable *lockable);
+ void (* unlock) (GdaLockable *lockable);
};
/**
diff --git a/libgda/gda-meta-store.c b/libgda/gda-meta-store.c
index 7cfa65517..9fbc72ba6 100644
--- a/libgda/gda-meta-store.c
+++ b/libgda/gda-meta-store.c
@@ -358,7 +358,7 @@ gda_meta_context_get_table (GdaMetaContext *ctx)
* @ctx: a #GdaMetaContext struct to add column/value pais to
* @column: (transfer none): the column's name
* @value: (transfer none): the column's value
- * @cnc: (allow-none): a #GdaConnection to be used when identifier are normalized, or NULL
+ * @cnc: (nullable): a #GdaConnection to be used when identifier are normalized, or NULL
*
* Sets a new column/value pair to the given context @ctx. Column, must be a column in the given table's
* name setted by #gda_meta_context_set_table () (a table in the <link linkend="information_schema">database
@@ -388,7 +388,7 @@ gda_meta_context_set_column (GdaMetaContext *ctx, const gchar* column, const GVa
* @ctx: a #GdaMetaContext struct to set colums to
* @columns: (element-type utf8 GObject.Value): a #GHashTable with the table's columns' name and their values
* to use in context.
- * @cnc: (allow-none): a #GdaConnection to used to normalize identifiers quoting, or NULL
+ * @cnc: (nullable): a #GdaConnection to used to normalize identifiers quoting, or NULL
*
* Set columns to use in the context. The #GHashTable use column's name as key and a #GValue as value,
* to represent its value.
@@ -435,7 +435,7 @@ gda_meta_context_set_columns (GdaMetaContext *ctx, GHashTable *columns, GdaConne
/**
* gda_meta_context_free:
- * @ctx: (allow-none): a #GdaMetaContext struct to free
+ * @ctx: (nullable): a #GdaMetaContext struct to free
*
* Frees any resources taken by @ctx struct. If @ctx is %NULL, then nothing happens.
*
@@ -1042,7 +1042,7 @@ gda_meta_store_new_with_file (const gchar *file_name)
/**
* gda_meta_store_new:
- * @cnc_string: (allow-none): a connection string, or %NULL for an in-memory internal database
+ * @cnc_string: (nullable): a connection string, or %NULL for an in-memory internal database
*
* Create a new #GdaMetaStore object.
*
@@ -1266,7 +1266,7 @@ gda_meta_store_set_identifiers_style (GdaMetaStore *store, GdaSqlIdentifierStyle
/**
* gda_meta_store_set_reserved_keywords_func:
* @store: a #GdaMetaStore object
- * @func: (allow-none) (scope call): a #GdaSqlReservedKeywordsFunc function, or %NULL
+ * @func: (nullable) (scope call): a #GdaSqlReservedKeywordsFunc function, or %NULL
*
* Specifies a function which @store will use to determine if a keyword is an SQL reserved
* keyword or not.
@@ -2932,7 +2932,7 @@ gda_meta_store_sql_identifier_quote (const gchar *id, GdaConnection *cnc)
* gda_meta_store_extract:
* @store: a #GdaMetaStore object
* @select_sql: a SELECT statement
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
* @...: a list of (variable name (gchar *), GValue *value) terminated with NULL, representing values for
all the
* variables mentioned in @select_sql. If there is no variable then this part can be omitted.
*
@@ -3050,7 +3050,7 @@ gda_meta_store_extract (GdaMetaStore *store, const gchar *select_sql, GError **e
* gda_meta_store_extract_v: (rename-to gda_meta_store_extract)
* @store: a #GdaMetaStore object
* @select_sql: a SELECT statement
- * @vars: (element-type utf8 GObject.Value) (allow-none): a hash table with all variables names as keys and
GValue* as
+ * @vars: (element-type utf8 GObject.Value) (nullable): a hash table with all variables names as keys and
GValue* as
* value, representing values for all the variables mentioned in @select_sql. If there is no variable then
this part can be
* omitted.
* @error: a place to store errors, or %NULL
@@ -3173,10 +3173,10 @@ static gint find_row_in_model (GdaDataModel *find_in, GdaDataModel *data, gint r
* gda_meta_store_modify:
* @store: a #GdaMetaStore object
* @table_name: the name of the table to modify within @store
- * @new_data: (allow-none): a #GdaDataModel containing the new data to set in @table_name, or %NULL (treated
as a data model
+ * @new_data: (nullable): a #GdaDataModel containing the new data to set in @table_name, or %NULL (treated
as a data model
* with no row at all)
- * @condition: (allow-none): SQL expression (which may contain variables) defining the rows which are being
obsoleted by @new_data, or %NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @condition: (nullable): SQL expression (which may contain variables) defining the rows which are being
obsoleted by @new_data, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
* @...: a list of (variable name (gchar *), GValue *value) terminated with NULL, representing values for
all the
* variables mentioned in @condition.
*
@@ -3241,7 +3241,7 @@ gda_meta_store_modify (GdaMetaStore *store, const gchar *table_name,
* gda_meta_store_modify_with_context:
* @store: a #GdaMetaStore object
* @context: (transfer none): a #GdaMetaContext context describing what to modify in @store
- * @new_data: (transfer none) (allow-none): a #GdaDataModel containing the new data to set in @table_name,
or %NULL (treated as a data model
+ * @new_data: (transfer none) (nullable): a #GdaDataModel containing the new data to set in @table_name, or
%NULL (treated as a data model
* with no row at all)
* @error: a place to store errors, or %NULL
*
@@ -3292,13 +3292,13 @@ gda_meta_store_modify_with_context (GdaMetaStore *store, GdaMetaContext *context
* gda_meta_store_modify_v: (rename-to gda_meta_store_modify)
* @store: a #GdaMetaStore object
* @table_name: the name of the table to modify within @store
- * @new_data: (allow-none): a #GdaDataModel containing the new data to set in @table_name, or %NULL (treated
as a data model
+ * @new_data: (nullable): a #GdaDataModel containing the new data to set in @table_name, or %NULL (treated
as a data model
* with no row at all)
- * @condition: (allow-none): SQL expression (which may contain variables) defining the rows which are being
obsoleted by @new_data, or %NULL
+ * @condition: (nullable): SQL expression (which may contain variables) defining the rows which are being
obsoleted by @new_data, or %NULL
* @nvalues: number of values in @value_names and @values
* @value_names: (array length=nvalues): names of values
* @values: (array length=nvalues): values
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Propagates an update to @store, the update's contents is represented by @new_data, this function is
* primarily reserved to database providers.
@@ -3875,7 +3875,7 @@ out:
/**
* _gda_meta_store_begin_data_reset:
* @store: a #GdaMetaStore object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Sets @store in a mode where only the modifications completely overriding a table
* will be allowed, where no detailed modifications report is made and where the "suggest-update"
@@ -3920,7 +3920,7 @@ _gda_meta_store_begin_data_reset (GdaMetaStore *store, GError **error)
/**
* _gda_meta_store_cancel_data_reset:
* @store: a #GdaMetaStore object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Cancels any modification done since _gda_meta_store_begin_data_reset() was called.
*
@@ -3953,7 +3953,7 @@ _gda_meta_store_cancel_data_reset (GdaMetaStore *store, GError **error)
/**
* _gda_meta_store_finish_data_reset:
* @store: a #GdaMetaStore object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Commits any modification done since _gda_meta_store_begin_data_reset() was called.
*
@@ -4127,7 +4127,7 @@ gda_meta_store_schema_get_depend_tables (GdaMetaStore *store, const gchar *table
/**
* gda_meta_store_schema_get_structure:
* @store: a #GdaMetaStore object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates a new #GdaMetaStruct object representing @store's internal database structure.
*
@@ -4243,7 +4243,7 @@ gda_meta_store_schema_get_structure (GdaMetaStore *store, GError **error)
* @store: a #GdaMetaStore object
* @att_name: name of the attribute to get
* @att_value: (out): the place to store the attribute value
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* The #GdaMetaStore object maintains a list of (name,value) attributes (attributes names starting with a '_'
* character are for internal use only and cannot be altered). This method and the
gda_meta_store_set_attribute_value()
@@ -4315,8 +4315,8 @@ gda_meta_store_get_attribute_value (GdaMetaStore *store, const gchar *att_name,
* gda_meta_store_set_attribute_value:
* @store: a #GdaMetaStore object
* @att_name: name of the attribute to set
- * @att_value: (allow-none): value of the attribute to set, or %NULL to unset the attribute
- * @error: (allow-none): a place to store errors, or %NULL
+ * @att_value: (nullable): value of the attribute to set, or %NULL to unset the attribute
+ * @error: (nullable): a place to store errors, or %NULL
*
* Set the value of the attribute named @att_name to @att_value; see gda_meta_store_get_attribute_value() for
* more information.
@@ -4407,7 +4407,7 @@ gda_meta_store_set_attribute_value (GdaMetaStore *store, const gchar *att_name,
* gda_meta_store_schema_add_custom_object:
* @store: a #GdaMetaStore object
* @xml_description: an XML description of the table or view to add to @store
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* The internal database used by @store can be 'augmented' with some user-defined database objects
* (such as tables or views). This method allows one to add a new database object.
@@ -4662,7 +4662,7 @@ gda_meta_store_schema_add_custom_object (GdaMetaStore *store, const gchar *xml_d
* gda_meta_store_schema_remove_custom_object:
* @store: a #GdaMetaStore object
* @obj_name: name of the custom object to remove
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Removes the custom database object named @obj_name.
*
@@ -5008,18 +5008,18 @@ arguments_to_name (const gchar *catalog, const gchar *schema, const gchar *table
/**
* gda_meta_store_declare_foreign_key:
* @store: a #GdaMetaStore
- * @mstruct: (allow-none): a #GdaMetaStruct, or %NULL
+ * @mstruct: (nullable): a #GdaMetaStruct, or %NULL
* @fk_name: the name of the foreign key to declare
- * @catalog: (allow-none): the catalog in which the table (for which the foreign key is for) is, or %NULL
- * @schema: (allow-none): the schema in which the table (for which the foreign key is for) is, or %NULL
+ * @catalog: (nullable): the catalog in which the table (for which the foreign key is for) is, or %NULL
+ * @schema: (nullable): the schema in which the table (for which the foreign key is for) is, or %NULL
* @table: the name of the table (for which the foreign key is for)
- * @ref_catalog: (allow-none): the catalog in which the referenced table is, or %NULL
- * @ref_schema: (allow-none): the schema in which the referenced table is, or %NULL
+ * @ref_catalog: (nullable): the catalog in which the referenced table is, or %NULL
+ * @ref_schema: (nullable): the schema in which the referenced table is, or %NULL
* @ref_table: the name of the referenced table
* @nb_cols: the number of columns involved (>0)
* @colnames: (array length=nb_cols): an array of column names from the table for which the foreign key is
for
* @ref_colnames: (array length=nb_cols): an array of column names from the referenced table
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Defines a new declared foreign key into @store. If another declared foreign key is already defined
* between the two tables and with the same name, then it is first removed.
@@ -5241,15 +5241,15 @@ gda_meta_store_declare_foreign_key (GdaMetaStore *store, GdaMetaStruct *mstruct,
/**
* gda_meta_store_undeclare_foreign_key:
* @store: a #GdaMetaStore
- * @mstruct: (allow-none): a #GdaMetaStruct, or %NULL
+ * @mstruct: (nullable): a #GdaMetaStruct, or %NULL
* @fk_name: the name of the foreign key to declare
- * @catalog: (allow-none): the catalog in which the table (for which the foreign key is for) is, or %NULL
- * @schema: (allow-none): the schema in which the table (for which the foreign key is for) is, or %NULL
+ * @catalog: (nullable): the catalog in which the table (for which the foreign key is for) is, or %NULL
+ * @schema: (nullable): the schema in which the table (for which the foreign key is for) is, or %NULL
* @table: the name of the table (for which the foreign key is for)
- * @ref_catalog: (allow-none): the catalog in which the referenced table is, or %NULL
- * @ref_schema: (allow-none): the schema in which the referenced table is, or %NULL
+ * @ref_catalog: (nullable): the catalog in which the referenced table is, or %NULL
+ * @ref_schema: (nullable): the schema in which the referenced table is, or %NULL
* @ref_table: the name of the referenced table
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Removes a declared foreign key from @store.
*
diff --git a/libgda/gda-meta-struct-io.c b/libgda/gda-meta-struct-io.c
index b3f88411e..bc4660d01 100644
--- a/libgda/gda-meta-struct-io.c
+++ b/libgda/gda-meta-struct-io.c
@@ -42,10 +42,10 @@ static GdaMetaDbObject *create_view_object (GdaMetaStruct *mstruct, const GValue
/**
* gda_meta_struct_load_from_xml_file:
* @mstruct: a #GdaMetaStruct object
- * @catalog: (allow-none): the catalog name, or %NULL
- * @schema: (allow-none): the schema name, or %NULL
+ * @catalog: (nullable): the catalog name, or %NULL
+ * @schema: (nullable): the schema name, or %NULL
* @xml_spec_file: the specifications as the name of an XML file
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Loads an XML description into @mstruct. This method is still experimental and no description
* the XML file structure is given, and no guarantee that it will remain as it is given.
diff --git a/libgda/gda-meta-struct.c b/libgda/gda-meta-struct.c
index c836ebbbe..5c8491018 100644
--- a/libgda/gda-meta-struct.c
+++ b/libgda/gda-meta-struct.c
@@ -367,10 +367,10 @@ prepare_sql_identifier_for_compare (gchar *str)
* gda_meta_struct_complement:
* @mstruct: a #GdaMetaStruct object
* @type: the type of object to add (which can be GDA_META_DB_UNKNOWN)
- * @catalog: (allow-none): the catalog the object belongs to (as a G_TYPE_STRING GValue), or %NULL
- * @schema: (allow-none): the schema the object belongs to (as a G_TYPE_STRING GValue), or %NULL
+ * @catalog: (nullable): the catalog the object belongs to (as a G_TYPE_STRING GValue), or %NULL
+ * @schema: (nullable): the schema the object belongs to (as a G_TYPE_STRING GValue), or %NULL
* @name: the object's name (as a G_TYPE_STRING GValue), not %NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates a new #GdaMetaDbObject structure in @mstruct to represent the database object (of type @type)
* which can be uniquely identified as @catalog.@schema.@name.
@@ -1346,9 +1346,9 @@ array_type_to_sql (GdaMetaStore *store, const GValue *specific_name)
/**
* gda_meta_struct_complement_schema:
* @mstruct: a #GdaMetaStruct object
- * @catalog: (allow-none): name of a catalog, or %NULL
- * @schema: (allow-none): name of a schema, or %NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @catalog: (nullable): name of a catalog, or %NULL
+ * @schema: (nullable): name of a schema, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* This method is similar to gda_meta_struct_complement() but creates #GdaMetaDbObject for all the
* database object which are in the @schema schema (and in the @catalog catalog).
@@ -1550,7 +1550,7 @@ real_gda_meta_struct_complement_all (GdaMetaStruct *mstruct, gboolean default_on
/**
* gda_meta_struct_complement_default:
* @mstruct: a #GdaMetaStruct object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* This method is similar to gda_meta_struct_complement() and gda_meta_struct_complement_all()
* but creates #GdaMetaDbObject for all the
@@ -1570,7 +1570,7 @@ gda_meta_struct_complement_default (GdaMetaStruct *mstruct, GError **error)
/**
* gda_meta_struct_complement_all:
* @mstruct: a #GdaMetaStruct object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* This method is similar to gda_meta_struct_complement() and gda_meta_struct_complement_default()
* but creates #GdaMetaDbObject for all the database object.
@@ -1589,7 +1589,7 @@ gda_meta_struct_complement_all (GdaMetaStruct *mstruct, GError **error)
* gda_meta_struct_complement_depend:
* @mstruct: a #GdaMetaStruct object
* @dbo: a #GdaMetaDbObject part of @mstruct
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* This method is similar to gda_meta_struct_complement() but creates #GdaMetaDbObject for all the
dependencies
* of @dbo.
@@ -1699,7 +1699,7 @@ db_object_sort_func (GdaMetaDbObject *dbo1, GdaMetaDbObject *dbo2)
* gda_meta_struct_sort_db_objects:
* @mstruct: a #GdaMetaStruct object
* @sort_type: the kind of sorting requested
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Reorders the list of database objects within @mstruct in a way specified by @sort_type.
*
@@ -1830,8 +1830,8 @@ gda_meta_struct_get_all_db_objects (GdaMetaStruct *mstruct)
/**
* gda_meta_struct_get_db_object:
* @mstruct: a #GdaMetaStruct object
- * @catalog: (allow-none): the catalog the object belongs to (as a G_TYPE_STRING GValue), or %NULL
- * @schema: (allow-none): the schema the object belongs to (as a G_TYPE_STRING GValue), or %NULL
+ * @catalog: (nullable): the catalog the object belongs to (as a G_TYPE_STRING GValue), or %NULL
+ * @schema: (nullable): the schema the object belongs to (as a G_TYPE_STRING GValue), or %NULL
* @name: the object's name (as a G_TYPE_STRING GValue), not %NULL
*
* Tries to locate the #GdaMetaDbObject structure representing the database object named after
@@ -1904,7 +1904,7 @@ gda_meta_struct_get_table_column (GdaMetaStruct *mstruct, GdaMetaTable *table, c
* gda_meta_struct_dump_as_graph:
* @mstruct: a #GdaMetaStruct object
* @info: informs what kind of information to show in the resulting graph
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates a new graph (in the GraphViz syntax) representation of @mstruct.
*
@@ -2509,7 +2509,7 @@ copyerror:
* _gda_meta_struct_add_db_object:
* @mstruct: a #GdaMetaStruct object
* @dbo: a #GdaMetaDbObject structure
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Adds @dbo to the database objects known to @mstruct. In any case (whether an error occured or not)
* @dbo's ownership is then transferred to @smtruct and should
@@ -2587,8 +2587,8 @@ gda_meta_table_column_get_attribute (GdaMetaTableColumn *tcol, const gchar *attr
* gda_meta_table_column_set_attribute:
* @tcol: a #GdaMetaTableColumn
* @attribute: attribute name as a static string
- * @value: (allow-none): a #GValue, or %NULL
- * @destroy: (allow-none): function called when @attribute has to be freed, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
+ * @destroy: (nullable): function called when @attribute has to be freed, or %NULL
*
* Set the value associated to a named attribute.
*
diff --git a/libgda/gda-meta-struct.h b/libgda/gda-meta-struct.h
index c4f121435..20a208e9a 100644
--- a/libgda/gda-meta-struct.h
+++ b/libgda/gda-meta-struct.h
@@ -246,7 +246,7 @@ typedef struct {
* @gtype: the detected column's #GType
* @pkey: tells if the column is part of a primary key
* @nullok: tells if the column can be %NULL
- * @default_value: (allow-none): the column's default value, represented as a valid SQL value (surrounded by
simple quotes for strings, ...), or %NULL if column has no default value
+ * @default_value: (nullable): the column's default value, represented as a valid SQL value (surrounded by
simple quotes for strings, ...), or %NULL if column has no default value
*
* This structure represents a table of view's column, its contents must not be modified.
*/
@@ -284,7 +284,7 @@ void gda_meta_table_column_set_attribute (GdaMetaTableColumn *tcol, con
* gda_meta_table_column_set_attribute_static:
* @column: a #GdaMetaTableColumn
* @attribute: attribute's name
- * @value: (allow-none): a #GValue, or %NULL
+ * @value: (nullable): a #GValue, or %NULL
*
* This function is similar to gda_meta_table_column_set_attribute() but for static strings
*/
diff --git a/libgda/gda-provider.c b/libgda/gda-provider.c
index 93182e6e0..ccb9df857 100644
--- a/libgda/gda-provider.c
+++ b/libgda/gda-provider.c
@@ -211,7 +211,7 @@ gda_provider_render_operation (GdaProvider *provider, GdaConnection *cnc,
* @stmt:
* @params: (nullable):
* @flags:
- * @params_used: (allow-none) (element-type Gda.Holder) (out) (transfer container):
+ * @params_used: (nullable) (element-type Gda.Holder) (out) (transfer container):
* @error:
*
* Returns: (transfer full):
diff --git a/libgda/gda-quark-list.c b/libgda/gda-quark-list.c
index 78457cf38..bb2ebbf28 100644
--- a/libgda/gda-quark-list.c
+++ b/libgda/gda-quark-list.c
@@ -279,7 +279,7 @@ gda_quark_list_clear (GdaQuarkList *qlist)
/**
* gda_quark_list_free:
- * @qlist: (allow-none): a #GdaQuarkList, or %NULL
+ * @qlist: (nullable): a #GdaQuarkList, or %NULL
*
* Releases all memory occupied by the given #GdaQuarkList.
*/
@@ -547,7 +547,7 @@ protect_foreach (G_GNUC_UNUSED gchar *key, ProtectedValue *pvalue, G_GNUC_UNUSED
/**
* gda_quark_list_protect_values:
- * @qlist: (allow-none): a #GdaQuarkList, or %NULL
+ * @qlist: (nullable): a #GdaQuarkList, or %NULL
*
* Call this function to get rid of the clear version of all the values stored in @qlist. If @qlist is %NULL,
* then this function does nothing.
diff --git a/libgda/gda-repetitive-statement.c b/libgda/gda-repetitive-statement.c
index 714574da8..2ace42d6c 100644
--- a/libgda/gda-repetitive-statement.c
+++ b/libgda/gda-repetitive-statement.c
@@ -146,7 +146,7 @@ gda_repetitive_statement_new (GdaStatement *stmt)
* gda_repetitive_statement_get_template_set:
* @rstmt: a #GdaRepetitiveStatement object
* @set: a place to store the returned template set
- * @error: (allow-none): a place to store error, or %NULL
+ * @error: (nullable): a place to store error, or %NULL
*
* Gets a new #GdaSet object with the parameters used by the template statement in the
* @rstmt object.
diff --git a/libgda/gda-row.c b/libgda/gda-row.c
index 65ed76350..71026b084 100644
--- a/libgda/gda-row.c
+++ b/libgda/gda-row.c
@@ -296,7 +296,7 @@ gda_row_invalidate_value (G_GNUC_UNUSED GdaRow *row, GValue *value)
* gda_row_invalidate_value_e:
* @row: a #GdaRow
* @value: a #GValue belonging to @row (obtained with gda_row_get_value()).
- * @error: (allow-none) (transfer full): the error which lead to the invalidation
+ * @error: (nullable) (transfer full): the error which lead to the invalidation
*
* Marks @value as being invalid. This method is mainly used by database
* providers' implementations to report any error while reading a value from the database.
@@ -363,7 +363,7 @@ gda_row_value_is_valid (GdaRow *row, GValue *value)
* gda_row_value_is_valid_e:
* @row: a #GdaRow.
* @value: a #GValue belonging to @row (obtained with gda_row_get_value()).
- * @error: (allow-none): a place to store the invalid error, or %NULL
+ * @error: (nullable): a place to store the invalid error, or %NULL
*
* Tells if @value has been marked as being invalid by gda_row_invalidate_value().
* This method is mainly used by database
diff --git a/libgda/gda-server-operation.c b/libgda/gda-server-operation.c
index cfe32a377..2362d945f 100644
--- a/libgda/gda-server-operation.c
+++ b/libgda/gda-server-operation.c
@@ -3043,7 +3043,7 @@ gda_server_operation_create_table_arg_get_fkey_refs (GdaServerOperationCreateTab
/**
* gda_server_operation_render:
* @op: a #GdaServerOperation object
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Creates an SQL statement (possibly using some specific extensions of the DBMS) corresponding to the
* @op operation. Note that the returned string may actually contain more than one SQL statement.
@@ -3051,7 +3051,7 @@ gda_server_operation_create_table_arg_get_fkey_refs (GdaServerOperationCreateTab
* This function's purpose is mainly informative to get the actual SQL code which would be executed to
perform
* the operation; to actually perform the operation, use gda_server_operation_perform().
*
- * Returns: (transfer full) (allow-none): a new string, or %NULL if an error occurred or operation cannot be
rendered as SQL.
+ * Returns: (transfer full) (nullable): a new string, or %NULL if an error occurred or operation cannot be
rendered as SQL.
*/
gchar *
gda_server_operation_render (GdaServerOperation *op, GError **error)
diff --git a/libgda/gda-server-provider-impl.h b/libgda/gda-server-provider-impl.h
index efb6bf9e5..ae1f6b80d 100644
--- a/libgda/gda-server-provider-impl.h
+++ b/libgda/gda-server-provider-impl.h
@@ -93,9 +93,9 @@ typedef struct {
* @provider: a #GdaServerProvider
* @cnc: a #GdaConnection
* @stmt: a #GdaStatement
- * @params: (allow-none): a #GdaSet object (which can be obtained using
gda_statement_get_parameters()), or %NULL
+ * @params: (nullable): a #GdaSet object (which can be obtained using
gda_statement_get_parameters()), or %NULL
* @flags: SQL rendering flags, as #GdaStatementSqlFlag OR'ed values
- * @params_used: (allow-none) (element-type Gda.Holder) (out) (transfer container): a place to store
the list of individual #GdaHolder objects within @params which have been used
+ * @params_used: (nullable) (element-type Gda.Holder) (out) (transfer container): a place to store
the list of individual #GdaHolder objects within @params which have been used
* @error: a place to store errors, or %NULL
*
* Renders @stmt as an SQL statement, adapted to the SQL dialect used by @cnc
@@ -108,7 +108,7 @@ typedef struct {
/**
* identifier_quote:
* @provider: a #GdaServerProvider
- * @cnc: (allow-none): a #GdaConnection, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
* @id: a string
* @for_meta_store: if %TRUE, then the result have to respect the #GdaMetaStore convention
* @force_quotes: if %TRUE, then quotes have to be added
@@ -131,7 +131,7 @@ typedef struct {
* @provider: a #GdaServerProvider
* @cnc: a #GdaConnection
* @params: (transfer none): a #GdaQuarkList containing the connection parameters (HOST, DATABASE,
etc.)
- * @auth: (transfer none) (allow-none): a #GdaQuarkList containing the connection authentification
parameters (USERNAME, PASSWORD, etc.), or %NULL
+ * @auth: (transfer none) (nullable): a #GdaQuarkList containing the connection authentification
parameters (USERNAME, PASSWORD, etc.), or %NULL
*
* Open the connection. @params and @auth must be left unchanged.
*
diff --git a/libgda/gda-server-provider.c b/libgda/gda-server-provider.c
index a4b29782b..30127ac8f 100644
--- a/libgda/gda-server-provider.c
+++ b/libgda/gda-server-provider.c
@@ -323,7 +323,7 @@ gda_server_provider_get_property (GObject *object,
* gda_server_provider_set_impl_functions:
* @klass: a #GdaServerProviderClass object
* @type: a #GdaServerProviderFunctionsType type
- * @functions_set: (allow-none): a pointer to the function set, or %NULL
+ * @functions_set: (nullable): a pointer to the function set, or %NULL
*
* Upon creation, used by provider's implementors to set the implementation functions. Passing %NULL
* as the @functions_set has no effect.
@@ -469,7 +469,7 @@ _gda_server_provider_create_worker (GdaServerProvider *provider, gboolean for_cn
/**
* gda_server_provider_get_real_main_context:
- * @cnc: (allow-none): a #GdaConnection, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
*
* Obtain a #GMainContext on which to iterate. This function is reserved to database provider's
implementations.
*
@@ -678,9 +678,9 @@ worker_supports_operation (WorkerSupportsOperationData *data, G_GNUC_UNUSED GErr
/**
* gda_server_provider_supports_operation:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object which would be used to perform an action, or %NULL
+ * @cnc: (nullable): a #GdaConnection object which would be used to perform an action, or %NULL
* @type: the type of operation requested
- * @options: (allow-none): a list of named parameters, or %NULL
+ * @options: (nullable): a list of named parameters, or %NULL
*
* Tells if @provider supports the @type of operation on the @cnc connection, using the
* (optional) @options parameters.
@@ -854,10 +854,10 @@ worker_create_operation (WorkerCreateOperationData *data, GError **error)
/**
* gda_server_provider_create_operation:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object which will be used to perform an action, or %NULL
+ * @cnc: (nullable): a #GdaConnection object which will be used to perform an action, or %NULL
* @type: the type of operation requested
- * @options: (allow-none): a list of parameters or %NULL
- * @error: (allow-none): a place to store an error, or %NULL
+ * @options: (nullable): a list of parameters or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Creates a new #GdaServerOperation object which can be modified in order to perform the @type type of
* action. The @options can contain:
@@ -866,7 +866,7 @@ worker_create_operation (WorkerCreateOperationData *data, GError **error)
* <listitem>named values which may change the contents of the GdaServerOperation, see <link
linkend="gda-server-op-information-std">this section</link> for more information</listitem>
* </itemizedlist>
*
- * Returns: (transfer full) (allow-none): a new #GdaServerOperation object, or %NULL in the provider does
not support the @type type of operation or if an error occurred
+ * Returns: (transfer full) (nullable): a new #GdaServerOperation object, or %NULL in the provider does not
support the @type type of operation or if an error occurred
*/
GdaServerOperation *
gda_server_provider_create_operation (GdaServerProvider *provider, GdaConnection *cnc,
@@ -1013,9 +1013,9 @@ worker_render_operation (WorkerRenderOperationData *data, GError **error)
/**
* gda_server_provider_render_operation:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object which will be used to render the action, or %NULL
+ * @cnc: (nullable): a #GdaConnection object which will be used to render the action, or %NULL
* @op: a #GdaServerOperation object
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Creates an SQL statement (possibly using some specific extensions of the DBMS) corresponding to the
* @op operation. Note that the returned string may actually contain more than one SQL statement.
@@ -1023,7 +1023,7 @@ worker_render_operation (WorkerRenderOperationData *data, GError **error)
* This function's purpose is mainly informative to get the actual SQL code which would be executed to
perform
* the operation; to actually perform the operation, use gda_server_provider_perform_operation().
*
- * Returns: (transfer full) (allow-none): a new string, or %NULL if an error occurred or operation cannot be
rendered as SQL.
+ * Returns: (transfer full) (nullable): a new string, or %NULL if an error occurred or operation cannot be
rendered as SQL.
*/
gchar *
gda_server_provider_render_operation (GdaServerProvider *provider, GdaConnection *cnc,
@@ -1099,9 +1099,9 @@ worker_perform_operation (WorkerPerformOperationData *data, GError **error)
/**
* gda_server_provider_perform_operation:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object which will be used to perform the action, or %NULL
+ * @cnc: (nullable): a #GdaConnection object which will be used to perform the action, or %NULL
* @op: a #GdaServerOperation object
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Performs the operation described by @op. Note that @op is not destroyed by this method
* and can be reused.
@@ -1202,7 +1202,7 @@ worker_supports_feature (WorkerSupportsFeatureData *data, G_GNUC_UNUSED GError *
/**
* gda_server_provider_supports_feature:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @feature: #GdaConnectionFeature feature to test
*
* Tests if a feature is supported
@@ -1281,7 +1281,7 @@ worker_get_data_handler (WorkerTypeData *data, G_GNUC_UNUSED GError **error)
/**
* gda_server_provider_get_data_handler_g_type:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @for_type: a #GType
*
* Find a #GdaDataHandler object to manipulate data of type @for_type. The returned object must not be
modified.
@@ -1339,7 +1339,7 @@ gda_server_provider_get_data_handler_g_type (GdaServerProvider *provider, GdaCon
/**
* gda_server_provider_get_data_handler_dbms:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @for_type: a DBMS type definition
*
* Find a #GdaDataHandler object to manipulate data of type @for_type.
@@ -1412,7 +1412,7 @@ worker_get_default_dbms_type (WorkerTypeData *data, G_GNUC_UNUSED GError **error
/**
* gda_server_provider_get_default_dbms_type:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object or %NULL
+ * @cnc: (nullable): a #GdaConnection object or %NULL
* @type: a #GType value type
*
* Get the name of the most common data type which has @type type.
@@ -1421,7 +1421,7 @@ worker_get_default_dbms_type (WorkerTypeData *data, G_GNUC_UNUSED GError **error
* there is no DBMS data type which could contain data of the @g_type type (for example %NULL may be
* returned if a DBMS has integers only up to 4 bytes and a #G_TYPE_INT64 is requested).
*
- * Returns: (transfer none) (allow-none): the name of the DBMS type, or %NULL
+ * Returns: (transfer none) (nullable): the name of the DBMS type, or %NULL
*/
const gchar *
gda_server_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConnection *cnc, GType type)
@@ -1475,10 +1475,10 @@ gda_server_provider_get_default_dbms_type (GdaServerProvider *provider, GdaConne
/**
* gda_server_provider_string_to_value:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @string: the SQL string to convert to a value
* @preferred_type: a #GType, or #G_TYPE_INVALID
- * @dbms_type: (allow-none): place to get the actual database type used if the conversion succeeded, or %NULL
+ * @dbms_type: (nullable): place to get the actual database type used if the conversion succeeded, or %NULL
*
* Use @provider to create a new #GValue from a single string representation.
*
@@ -1593,7 +1593,7 @@ gda_server_provider_string_to_value (GdaServerProvider *provider, GdaConnection
/**
* gda_server_provider_value_to_sql_string:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @from: #GValue to convert from
*
* Produces a fully quoted and escaped string from a GValue
@@ -1644,7 +1644,7 @@ worker_escape_string (WorkerEscapeData *data, G_GNUC_UNUSED GError **error)
/**
* gda_server_provider_escape_string:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @str: a string to escape
*
* Escapes @str for use within an SQL command (to avoid SQL injection attacks). Note that the returned value
still needs
@@ -1715,7 +1715,7 @@ worker_unescape_string (WorkerEscapeData *data, G_GNUC_UNUSED GError **error)
/**
* gda_server_provider_unescape_string:
* @provider: a server provider.
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @str: a string to escape
*
* Unescapes @str for use within an SQL command. This is the exact opposite of
gda_server_provider_escape_string().
@@ -1791,7 +1791,7 @@ worker_create_parser (WorkerParserData *data, G_GNUC_UNUSED GError **error)
/**
* gda_server_provider_create_parser:
* @provider: a #GdaServerProvider provider object
- * @cnc: (allow-none): a #GdaConnection, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
*
* Creates a new #GdaSqlParser object which is adapted to @provider (and possibly depending on
* @cnc for the actual database version).
@@ -2099,11 +2099,11 @@ stage2_open_connection (GdaWorker *worker, GdaConnection *cnc, gpointer result)
* @provider: a #GdaServerProvider
* @cnc: a #GdaConnection
* @params: (transfer full): parameters specifying the connection's attributes
- * @auth: (allow-none) (transfer full): authentification parameters, or %NULL
- * @cb_func: (allow-none): a #GdaConnectionOpenFunc function, or %NULL
- * @data: (allow-none): data to pass to @cb_func, or %NULL
- * @out_job_id: (allow-none): a place to store the job ID, or %NULL
- * @error: (allow-none): a place to store error, or %NULL
+ * @auth: (nullable) (transfer full): authentification parameters, or %NULL
+ * @cb_func: (nullable): a #GdaConnectionOpenFunc function, or %NULL
+ * @data: (nullable): data to pass to @cb_func, or %NULL
+ * @out_job_id: (nullable): a place to store the job ID, or %NULL
+ * @error: (nullable): a place to store error, or %NULL
*
* Call the open_connection() in the worker thread.
*
@@ -2297,7 +2297,7 @@ stage2_close_connection (GdaConnection *cnc, gpointer result)
* _gda_server_provider_close_connection:
* @provider: a #GdaServerProvider
* @cnc: a #GdaConnection
- * @error: (allow-none): a place to store error, or %NULL
+ * @error: (nullable): a place to store error, or %NULL
*
* Call the close_connection() in the worker thread.
*/
@@ -2371,9 +2371,9 @@ worker_statement_prepare (WorkerPrepareStatementData *data, GError **error)
/*
* _gda_server_provider_statement_prepare:
* @provider: a #GdaServerProvider
- * @cnc: (allow-none): a #GdaConnection
+ * @cnc: (nullable): a #GdaConnection
* @stmt: a #GdaStatement
- * @error: (allow-none): a place to store error, or %NULL
+ * @error: (nullable): a place to store error, or %NULL
*
* Call the prepare_statement() in the worker thread
*/
@@ -2480,11 +2480,11 @@ worker_statement_execute (WorkerExecuteStatementData *data, GError **error)
* @provider: a #GdaServerProvider
* @cnc: a #GdaConnection
* @stmt: a #GdaStatement
- * @params: (allow-none): parameters to bind variables in @stmt, or %NULL
+ * @params: (nullable): parameters to bind variables in @stmt, or %NULL
* @model_usage: the requested usage of the returned #GdaDataModel if @stmt is a SELECT statement
- * @col_types: (allow-none): requested column types of the returned #GdaDataModel if @stmt is a SELECT
statement, or %NULL
- * @last_inserted_row: (allow-none): a place to store the last inserted row information, or %NULL
- * @error: (allow-none): a place to store error, or %NULL
+ * @col_types: (nullable): requested column types of the returned #GdaDataModel if @stmt is a SELECT
statement, or %NULL
+ * @last_inserted_row: (nullable): a place to store the last inserted row information, or %NULL
+ * @error: (nullable): a place to store error, or %NULL
*
* Call the prepare_statement() in the worker thread
*/
@@ -2883,8 +2883,8 @@ get_meta_nb_values_args (GdaServerProviderMetaType type)
}
/*
- * @call_error: (allow-none)
- * @loc_error: (allow-none)
+ * @call_error: (nullable)
+ * @loc_error: (nullable)
*/
static gboolean
meta_finalize_result (gpointer retval, GError **call_error, GError **loc_error)
@@ -3897,7 +3897,7 @@ gda_server_provider_internal_get_parser (GdaServerProvider *prov)
/**
* gda_server_provider_perform_operation_default:
* @provider: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object which will be used to perform an action, or %NULL
+ * @cnc: (nullable): a #GdaConnection object which will be used to perform an action, or %NULL
* @op: a #GdaServerOperation object
* @error: a place to store an error, or %NULL
*
@@ -4048,7 +4048,7 @@ param_to_null_foreach (GdaSqlAnyPart *part, G_GNUC_UNUSED gpointer data, G_GNUC_
/**
* gda_select_alter_select_for_empty:
* @stmt: a SELECT #GdaStatement
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates a new #GdaStatement, selecting the same data as @stmt, but which always returns an
* empty (no row) data model. This is use dy database providers' implementations.
@@ -4102,9 +4102,9 @@ gda_select_alter_select_for_empty (GdaStatement *stmt, G_GNUC_UNUSED GError **er
/**
* gda_server_provider_handler_find:
* @prov: a #GdaServerProvider
- * @cnc: (allow-none): a #GdaConnection
+ * @cnc: (nullable): a #GdaConnection
* @g_type: a #GType
- * @dbms_type: (allow-none): a database type
+ * @dbms_type: (nullable): a database type
*
* Reserved to database provider's implementations: get the #GdaDataHandler associated to @prov
* for connection @cnc. You probably want to use gda_server_provider_get_data_handler_g_type().
diff --git a/libgda/gda-set.c b/libgda/gda-set.c
index 5da071348..f24700157 100644
--- a/libgda/gda-set.c
+++ b/libgda/gda-set.c
@@ -47,7 +47,7 @@ extern gchar *gda_lang_locale;
/**
* GdaSetGroup:
* @nodes: (element-type Gda.SetNode): list of GdaSetNode, at least one entry
- * @nodes_source: (allow-none): if NULL, then @nodes contains exactly one entry
+ * @nodes_source: (nullable): if NULL, then @nodes contains exactly one entry
*
* Since 5.2, you must consider this struct as opaque. Any access to its internal must use public API.
* Don't try to use #gda_set_group_free on a struct that was created manually.
@@ -128,7 +128,7 @@ gda_set_group_copy (GdaSetGroup *sg)
/**
* gda_set_group_free:
- * @sg: (allow-none): a #GdaSetGroup struct to free
+ * @sg: (nullable): a #GdaSetGroup struct to free
*
* Frees any resources taken by @sg struct. If @sg is %NULL, then nothing happens.
*
@@ -319,7 +319,7 @@ gda_set_source_copy (GdaSetSource *s)
/**
* gda_set_source_free:
- * @s: (allow-none): a #GdaSetSource struct to free
+ * @s: (nullable): a #GdaSetSource struct to free
*
* Frees any resources taken by @s struct. If @s is %NULL, then nothing happens.
*
@@ -497,7 +497,7 @@ gda_set_node_copy (GdaSetNode *node)
/**
* gda_set_node_free:
- * @node: (allow-none): a #GdaSetNode struct to free
+ * @node: (nullable): a #GdaSetNode struct to free
*
* Frees any resources taken by @node struct. If @node is %NULL, then nothing happens.
*
@@ -560,7 +560,7 @@ gda_set_node_get_data_model (GdaSetNode *node)
/**
* gda_set_node_set_data_model:
* @node: a #GdaSetNode struct to set data model to
- * @model: (allow-none): a #GdaDataModel to be used by @node
+ * @model: (nullable): a #GdaDataModel to be used by @node
*
* Set a #GdaDataModel to be used by @node. @model increment its reference
* counting when set. Internally referenced column number is set to first column
@@ -1177,7 +1177,7 @@ gda_set_new_inline (gint nb, ...)
/**
* gda_set_set_holder_value:
* @set: a #GdaSet object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
* @holder_id: the ID of the holder to set the value
* @...: value, of the correct type, depending on the requested holder's type (not NULL)
*
@@ -1267,7 +1267,7 @@ gda_set_set_holder_value (GdaSet *set, GError **error, const gchar *holder_id, .
*
* Get the value of the #GdaHolder which ID is @holder_id
*
- * Returns: (allow-none) (transfer none): the requested GValue, or %NULL (see gda_holder_get_value())
+ * Returns: (nullable) (transfer none): the requested GValue, or %NULL (see gda_holder_get_value())
*/
const GValue *
gda_set_get_holder_value (GdaSet *set, const gchar *holder_id)
@@ -1313,7 +1313,7 @@ xml_validity_error_func (void *ctx, const char *msg, ...)
/**
* gda_set_new_from_spec_string:
* @xml_spec: a string
- * @error: (allow-none): a place to store the error, or %NULL
+ * @error: (nullable): a place to store the error, or %NULL
*
* Creates a new #GdaSet object from the @xml_spec
* specifications
@@ -1405,7 +1405,7 @@ gda_set_new_from_spec_string (const gchar *xml_spec, GError **error)
/**
* gda_set_new_from_spec_node:
* @xml_spec: a #xmlNodePtr for a <parameters> tag
- * @error: (allow-none): a place to store the error, or %NULL
+ * @error: (nullable): a place to store the error, or %NULL
*
* Creates a new #GdaSet object from the @xml_spec
* specifications
@@ -2015,7 +2015,7 @@ set_remove_source (GdaSet *set, GdaSetSource *source)
/**
* gda_set_is_valid:
* @set: a #GdaSet object
- * @error: (allow-none): a place to store validation errors, or %NULL
+ * @error: (nullable): a place to store validation errors, or %NULL
*
* This method tells if all @set's #GdaHolder objects are valid, and if
* they represent a valid combination of values, as defined by rules
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index ffb2c7cca..ddc022a25 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -274,7 +274,7 @@ use_part (SqlPart *p, GdaSqlAnyPart *parent)
/**
* gda_sql_builder_get_statement:
* @builder: a #GdaSqlBuilder object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates a new #GdaStatement statement from @builder's contents.
*
@@ -311,7 +311,7 @@ gda_sql_builder_get_statement (GdaSqlBuilder *builder, GError **error)
* The returned pointer belongs to @builder's internal representation.
* Use gda_sql_statement_copy() if you need to keep it.
*
- * Returns: (transfer none) (allow-none): a #GdaSqlStatement pointer
+ * Returns: (transfer none) (nullable): a #GdaSqlStatement pointer
*
* Since: 4.2
*/
@@ -446,8 +446,8 @@ gda_sql_builder_set_where (GdaSqlBuilder *builder, GdaSqlBuilderId cond_id)
* gda_sql_builder_select_add_field:
* @builder: a #GdaSqlBuilder object
* @field_name: a field name
- * @table_name: (allow-none): a table name, or %NULL
- * @alias: (allow-none): an alias (eg. for the "AS" clause), or %NULL
+ * @table_name: (nullable): a table name, or %NULL
+ * @alias: (nullable): an alias (eg. for the "AS" clause), or %NULL
*
* Valid only for: SELECT statements.
*
@@ -619,7 +619,7 @@ gda_sql_builder_add_field_value (GdaSqlBuilder *builder, const gchar *field_name
* gda_sql_builder_add_field_value_as_gvalue:
* @builder: a #GdaSqlBuilder object
* @field_name: a field name
- * @value: (allow-none): value to set the field to, or %NULL or a GDA_TYPE_NULL value to represent an SQL
NULL
+ * @value: (nullable): value to set the field to, or %NULL or a GDA_TYPE_NULL value to represent an SQL NULL
*
* Valid only for: INSERT, UPDATE statements.
*
@@ -781,8 +781,8 @@ gda_sql_builder_add_field_value_id (GdaSqlBuilder *builder, GdaSqlBuilderId fiel
/**
* gda_sql_builder_add_expr_value:
* @builder: a #GdaSqlBuilder object
- * @dh: (allow-none): deprecated useless argument, just pass %NULL
- * @value: (allow-none): value to set the expression to, or %NULL or a GDA_TYPE_NULL value to represent an
SQL NULL
+ * @dh: (nullable): deprecated useless argument, just pass %NULL
+ * @value: (nullable): value to set the expression to, or %NULL or a GDA_TYPE_NULL value to represent an SQL
NULL
*
* Defines an expression in @builder which may be reused to build other parts of a statement.
*
@@ -828,7 +828,7 @@ gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, G_GNUC_UNUSED GdaDataHan
/**
* gda_sql_builder_add_expr:
* @builder: a #GdaSqlBuilder object
- * @dh: (allow-none): deprecated useless argument, just pass %NULL
+ * @dh: (nullable): deprecated useless argument, just pass %NULL
* @type: the GType of the following argument
* @...: value to set the expression to, of the type specified by @type
*
@@ -939,7 +939,7 @@ gda_sql_builder_add_id (GdaSqlBuilder *builder, const gchar *str)
* gda_sql_builder_add_field_id:
* @builder: a #GdaSqlBuilder object
* @field_name: a field name
- * @table_name: (allow-none): a table name, or %NULL
+ * @table_name: (nullable): a table name, or %NULL
*
* Defines an expression representing a field in @builder,
* which may be reused to build other parts of a statement,
@@ -1135,7 +1135,7 @@ typedef struct {
* gda_sql_builder_select_add_target_id:
* @builder: a #GdaSqlBuilder object
* @table_id: the ID of the expression holding a table reference (not %0)
- * @alias: (allow-none): the alias to give to the target, or %NULL
+ * @alias: (nullable): the alias to give to the target, or %NULL
*
* Adds a new target to a SELECT statement. If there already exists a target representing
* the same table and the same alias (or with the same absence of alias) then the same target
@@ -1225,7 +1225,7 @@ gda_sql_builder_select_add_target_id (GdaSqlBuilder *builder, GdaSqlBuilderId ta
* gda_sql_builder_select_add_target:
* @builder: a #GdaSqlBuilder object
* @table_name: the name of the target table
- * @alias: (allow-none): the alias to give to the target, or %NULL
+ * @alias: (nullable): the alias to give to the target, or %NULL
*
* Adds a new target to a SELECT statement
*
@@ -1413,7 +1413,7 @@ gda_sql_builder_join_add_field (GdaSqlBuilder *builder, GdaSqlBuilderId join_id,
* @builder: a #GdaSqlBuiler
* @expr_id: the ID of the expression to use during sorting (not %0)
* @asc: %TRUE for an ascending sorting
- * @collation_name: (allow-none): name of the collation to use when sorting, or %NULL
+ * @collation_name: (nullable): name of the collation to use when sorting, or %NULL
*
* Adds a new ORDER BY expression to a SELECT statement.
*
diff --git a/libgda/gda-statement-extra.h b/libgda/gda-statement-extra.h
index 559231c04..1acfbd143 100644
--- a/libgda/gda-statement-extra.h
+++ b/libgda/gda-statement-extra.h
@@ -59,7 +59,7 @@ typedef gchar *(*GdaSqlRenderingExpr) (GdaSqlExpr *expr, GdaSqlRenderingCon
/**
* GdaSqlRenderingPSpecFunc:
* @pspec: #GdaSqlParamSpec to render
- * @expr: (allow-none): #GdaSqlExpr which may hold the default value for the parameter, or %NULL
+ * @expr: (nullable): #GdaSqlExpr which may hold the default value for the parameter, or %NULL
* @context: the rendering context
* @is_default: pointer to a #gboolean which is set to TRUE if value should be considered as a default value
* @is_null: pointer to a #gboolean which is set to TRUE if value should be considered as NULL
diff --git a/libgda/gda-statement.c b/libgda/gda-statement.c
index bed980d0e..26cd35f12 100644
--- a/libgda/gda-statement.c
+++ b/libgda/gda-statement.c
@@ -356,7 +356,7 @@ gda_statement_check_structure (GdaStatement *stmt, GError **error)
/**
* gda_statement_check_validity:
* @stmt: a #GdaStatement object
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
* @error: a place to store errors, or %NULL
*
* If @cnc is not %NULL then checks that every object (table, field, function) used in @stmt
@@ -493,7 +493,7 @@ get_params_foreach_func (GdaSqlAnyPart *node, GdaSet **params, GError **error)
/**
* gda_statement_get_parameters:
* @stmt: a #GdaStatement object
- * @out_params: (out) (allow-none) (transfer full): a place to store a new #GdaSet object, or %NULL
+ * @out_params: (out) (nullable) (transfer full): a place to store a new #GdaSet object, or %NULL
* @error: a place to store errors, or %NULL
*
* Get a new #GdaSet object which groups all the execution parameters
@@ -796,10 +796,10 @@ default_render_value (const GValue *value, GdaSqlRenderingContext *context, GErr
/**
* gda_statement_to_sql_extended:
* @stmt: a #GdaStatement object
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
- * @params: (allow-none): parameters contained in a single #GdaSet object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
+ * @params: (nullable): parameters contained in a single #GdaSet object, or %NULL
* @flags: a set of flags to control the rendering
- * @params_used: (element-type GdaHolder) (out) (transfer container) (allow-none):a place to store the list
of actual #GdaHolder objects in @params used to do the rendering, or %NULL
+ * @params_used: (element-type GdaHolder) (out) (transfer container) (nullable):a place to store the list of
actual #GdaHolder objects in @params used to do the rendering, or %NULL
* @error: a place to store errors, or %NULL
*
* Renders @stmt as an SQL statement, with some control on how it is rendered.
diff --git a/libgda/gda-transaction-status.c b/libgda/gda-transaction-status.c
index 9429abe69..848e589b3 100644
--- a/libgda/gda-transaction-status.c
+++ b/libgda/gda-transaction-status.c
@@ -251,7 +251,7 @@ gda_transaction_status_free_events (GdaTransactionStatus *tstatus, GdaTransactio
/**
* gda_transaction_status_find:
*
- * Returns: (transfer full) (allow-none):
+ * Returns: (transfer full) (nullable):
*/
GdaTransactionStatus *
gda_transaction_status_find (GdaTransactionStatus *tstatus, const gchar *str, GdaTransactionStatusEvent
**destev)
@@ -303,7 +303,7 @@ gda_transaction_status_find (GdaTransactionStatus *tstatus, const gchar *str, Gd
* Find a pointer to the "current" _unnamed_ transaction, which is the last
* transaction if there are several nested transactions
*
- * Returns: (transfer full) (allow-none):
+ * Returns: (transfer full) (nullable):
*/
GdaTransactionStatus *
gda_transaction_status_find_current (GdaTransactionStatus *tstatus, GdaTransactionStatusEvent **destev,
gboolean unnamed_only)
diff --git a/libgda/gda-tree-manager.c b/libgda/gda-tree-manager.c
index 8a3f55578..6a8aaf58f 100644
--- a/libgda/gda-tree-manager.c
+++ b/libgda/gda-tree-manager.c
@@ -27,10 +27,10 @@
/**
* GdaTreeManagerNodesFunc:
* @manager: a #GdaTreeManager
- * @node: (allow-none): a #GdaTreeNode object, or %NULL
+ * @node: (nullable): a #GdaTreeNode object, or %NULL
* @children_nodes: (element-type GdaTreeNode): a list of #GdaTreeNode nodes which have previously been
created by a similar call and
* need to be updated ore moved
- * @out_error: (out) (allow-none): a boolean to store if there was an error (can be %NULL)
+ * @out_error: (out) (nullable): a boolean to store if there was an error (can be %NULL)
* @error: a place to store errors, or %NULL
*
* Returns: (transfer container) (element-type GdaTreeNode): a new list of #GdaTreeNode objects.
@@ -39,8 +39,8 @@
/**
* GdaTreeManagerNodeFunc:
* @manager: a #GdaTreeManager
- * @parent: (allow-none): the parent the new node may have, or %NULL
- * @name: (allow-none): name given to the new node, or %NULL
+ * @parent: (nullable): the parent the new node may have, or %NULL
+ * @name: (nullable): name given to the new node, or %NULL
*
* Returns: (transfer full): a new #GdaTreeNode
*/
@@ -225,10 +225,10 @@ gda_tree_manager_get_property (GObject *object,
/*
* @manager: a #GdaTreeManager object
- * @node: (allow-none): a #GdaTreeNode object, or %NULL
+ * @node: (nullable): a #GdaTreeNode object, or %NULL
* @children_nodes: (element-type GdaTreeNode): a list of #GdaTreeNode nodes which have previously been
created by a similar call and
* need to be updated ore moved
- * @out_error: (out) (allow-none): a boolean to store if there was an error (can be %NULL)
+ * @out_error: (out) (nullable): a boolean to store if there was an error (can be %NULL)
* @error: a place to store errors, or %NULL
*
* Creates (or updates) the list of #GdaTreeNode objects which are placed as children of @node. The returned
@@ -315,7 +315,7 @@ gda_tree_manager_new_with_func (GdaTreeManagerNodesFunc update_func)
* gda_tree_manager_add_new_node_attribute:
* @manager: a #GdaTreeManager
* @attribute: an attribute name
- * @value: (allow-none): the attribute's value, or %NULL
+ * @value: (nullable): the attribute's value, or %NULL
*
* Requests that for any new node managed (eg. created) by @manager, a new attribute will be set. This allows
* one to customize the attributes of new nodes created by an existing #GdaTreeManager.
@@ -358,8 +358,8 @@ gda_tree_manager_add_new_node_attribute (GdaTreeManager *manager, const gchar *a
/**
* gda_tree_manager_create_node:
* @manager: a #GdaTreeManager
- * @parent: (allow-none): the parent the new node may have, or %NULL
- * @name: (allow-none): name given to the new node, or %NULL
+ * @parent: (nullable): the parent the new node may have, or %NULL
+ * @name: (nullable): name given to the new node, or %NULL
*
* Requests that @manager creates a new #GdaTreeNode. The new node is not in any
* way linked to @manager yet, consider this method as a #GdaTreeNode factory.
@@ -469,7 +469,7 @@ gda_tree_manager_get_managers (GdaTreeManager *manager)
/**
* gda_tree_manager_set_node_create_func:
* @manager: a #GdaTreeManager tree manager object
- * @func: (allow-none) (scope call): a #GdaTreeManagerNodeFunc function pointer, or %NULL
+ * @func: (nullable) (scope call): a #GdaTreeManagerNodeFunc function pointer, or %NULL
*
* Sets the function to be called when a new node is being created by @manager. If @func is %NULL
* then each created node will be a #GdaTreeNode object.
diff --git a/libgda/gda-tree-mgr-ldap.c b/libgda/gda-tree-mgr-ldap.c
index fa4990086..fcf69b7fb 100644
--- a/libgda/gda-tree-mgr-ldap.c
+++ b/libgda/gda-tree-mgr-ldap.c
@@ -207,7 +207,7 @@ gda_tree_mgr_ldap_get_property (GObject *object,
/**
* gda_tree_mgr_ldap_new:
* @cnc: a #GdaConnection object
- * @dn: (allow-none): an LDAP Distinguished Name or %NULL
+ * @dn: (nullable): an LDAP Distinguished Name or %NULL
*
* Creates a new #GdaTreeManager object which will list the children of the LDAP entry which Distinguished
name
* is @dn. If @dn is %NULL, then the tree manager will look in the tree itself for an attribute named "dn"
and
diff --git a/libgda/gda-tree-mgr-tables.c b/libgda/gda-tree-mgr-tables.c
index 0f83cc322..f9d8526b9 100644
--- a/libgda/gda-tree-mgr-tables.c
+++ b/libgda/gda-tree-mgr-tables.c
@@ -214,7 +214,7 @@ gda_tree_mgr_tables_get_property (GObject *object,
/**
* gda_tree_mgr_tables_new:
* @cnc: a #GdaConnection object
- * @schema: (allow-none): a schema name or %NULL
+ * @schema: (nullable): a schema name or %NULL
*
* Creates a new #GdaTreeManager object which will add one tree node for each table found in the
* @schema if it is not %NULL, or for each table visible by default in @cnc.
diff --git a/libgda/gda-tree-node.c b/libgda/gda-tree-node.c
index 5ddf1012a..81a33b24e 100644
--- a/libgda/gda-tree-node.c
+++ b/libgda/gda-tree-node.c
@@ -420,7 +420,7 @@ gda_tree_node_dump_children (GdaTreeNode *node, const gchar *prefix, GString *in
/**
* gda_tree_node_new:
- * @name: (allow-none): a name, or %NULL
+ * @name: (nullable): a name, or %NULL
*
* Creates a new #GdaTreeNode object
*
@@ -438,7 +438,7 @@ gda_tree_node_new (const gchar *name)
* _gda_tree_node_add_children:
* @node: a #GdaTreeNode
* @mgr: a #GdaTreeManager object
- * @childen: (allow-none): a list of #GdaTreeNode objects, or %NULL
+ * @childen: (nullable): a list of #GdaTreeNode objects, or %NULL
*
* Requests that @node take the list of nodes in @children as its children. The children list
* may be a new list of children, or may be an update of a list of children which previously existed.
@@ -692,7 +692,7 @@ gda_tree_node_get_node_attribute (GdaTreeNode *node, const gchar *attribute)
* gda_tree_node_set_node_attribute:
* @node: a #GdaTreeNode
* @attribute: attribute name
- * @value: (transfer none) (allow-none): a #GValue, or %NULL
+ * @value: (transfer none) (nullable): a #GValue, or %NULL
* @destroy: a function to be called when @attribute is not needed anymore, or %NULL
*
* Set the value associated to a named attribute. The @attribute string is used AS IT IS by this method (eg.
diff --git a/libgda/gda-tree.c b/libgda/gda-tree.c
index f493ecab6..4cb8b094c 100644
--- a/libgda/gda-tree.c
+++ b/libgda/gda-tree.c
@@ -335,7 +335,7 @@ gda_tree_clean (GdaTree *tree)
/**
* gda_tree_update_all:
* @tree: a #GdaTree object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Requests that @tree be populated with nodes. If an error occurs, then @tree's contents is left
* unchanged, and otherwise @tree's previous contents is completely replaced by the new one.
@@ -356,7 +356,7 @@ gda_tree_update_all (GdaTree *tree, GError **error)
* gda_tree_update_part:
* @tree: a #GdaTree object
* @node: a #GdaTreeNode node in @tree
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Requests that @tree be populated with nodes, starting from @node
*
@@ -392,8 +392,8 @@ gda_tree_update_part (GdaTree *tree, GdaTreeNode *node, GError **error)
/**
* gda_tree_update_children:
* @tree: a #GdaTree object
- * @node: (allow-none): a #GdaTreeNode node in @tree, or %NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @node: (nullable): a #GdaTreeNode node in @tree, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Update the children of @node in @tree (not recursively, to update recursively, use
* gda_tree_update_part()). If @node is %NULL then the top level nodes are updated.
@@ -437,8 +437,8 @@ gda_tree_update_children (GdaTree *tree, GdaTreeNode *node, GError **error)
/**
* gda_tree_dump:
* @tree: a #GdaTree
- * @node: (allow-none): a #GdaTreeNode to start the dump from, or %NULL for a full dump
- * @stream: (allow-none): a stream to send the dump to, or %NULL for STDOUT
+ * @node: (nullable): a #GdaTreeNode to start the dump from, or %NULL for a full dump
+ * @stream: (nullable): a stream to send the dump to, or %NULL for STDOUT
*
* Dumps the contents of @tree to @stream, using a hierarchical view.
*
@@ -470,7 +470,7 @@ static GSList *decompose_path_as_segments (const gchar *path, gboolean use_names
/**
* gda_tree_get_nodes_in_path:
* @tree: a #GdaTree object
- * @tree_path: (allow-none): full path to the required nodes (if @use_names is %TRUE, then it must start
with '/'), or %NULL
+ * @tree_path: (nullable): full path to the required nodes (if @use_names is %TRUE, then it must start with
'/'), or %NULL
* @use_names: if %TRUE, then @tree_path will be interpreted as a unix style path, and if %FALSE,
* then @tree_path will be interpreted similarly to the #GtkTreePath's string representation.
*
@@ -632,7 +632,7 @@ build_node_path (GdaTree *tree, GdaTreeNode *node, GArray *array)
*
* Locates a #GdaTreeNode using the @tree_path path.
*
- * Returns: (transfer none) (allow-none): the requested #GdaTreeNode pointer, or %NULL if not found
+ * Returns: (transfer none) (nullable): the requested #GdaTreeNode pointer, or %NULL if not found
*
* Since: 4.2
*/
diff --git a/libgda/gda-util.c b/libgda/gda-util.c
index c124f8c91..8a44317b3 100644
--- a/libgda/gda-util.c
+++ b/libgda/gda-util.c
@@ -410,9 +410,9 @@ gda_utility_check_data_model (GdaDataModel *model, gint nbcols, ...)
* gda_utility_data_model_dump_data_to_xml:
* @model: a #GdaDataModel
* @parent: the parent XML node
- * @cols: (allow-none) (array length=nb_cols): an array containing which columns of @model will be exported,
or %NULL for all columns
+ * @cols: (nullable) (array length=nb_cols): an array containing which columns of @model will be exported,
or %NULL for all columns
* @nb_cols: the number of columns in @cols
- * @rows: (allow-none) (array length=nb_rows): an array containing which rows of @model will be exported, or
%NULL for all rows
+ * @rows: (nullable) (array length=nb_rows): an array containing which rows of @model will be exported, or
%NULL for all rows
* @nb_rows: the number of rows in @rows
* @use_col_ids: set to %TRUE to add column ID information
*
@@ -911,7 +911,7 @@ dml_statements_check_select_structure (GdaConnection *cnc, GdaSqlStatement *sel_
/**
* gda_compute_unique_table_row_condition_with_cnc:
- * @cnc: (allow-none): a #GdaConnection, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
* @stsel: a #GdaSqlSelectStatement
* @mtable: a #GdaMetaTable
* @require_pk: set to %TRUE if a primary key is required
@@ -1117,10 +1117,10 @@ gda_compute_unique_table_row_condition (GdaSqlStatementSelect *stsel, GdaMetaTab
* @cnc: a #GdaConnection
* @select_stmt: a SELECT #GdaStatement (compound statements not handled)
* @require_pk: TRUE if the created statement have to use a primary key
- * @insert_stmt: (allow-none) (transfer full): a place to store the created INSERT statement, or %NULL
- * @update_stmt: (allow-none) (transfer full): a place to store the created UPDATE statement, or %NULL
- * @delete_stmt: (allow-none) (transfer full): a place to store the created DELETE statement, or %NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @insert_stmt: (nullable) (transfer full): a place to store the created INSERT statement, or %NULL
+ * @update_stmt: (nullable) (transfer full): a place to store the created UPDATE statement, or %NULL
+ * @delete_stmt: (nullable) (transfer full): a place to store the created DELETE statement, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Creates an INSERT, an UPDATE and a DELETE statement from a SELECT statement
* using the database metadata available in @cnc's meta store. Each statements are computed only if
@@ -1516,7 +1516,7 @@ null_param_unknown_foreach_func (GdaSqlAnyPart *part, NullData *data, GError **e
* gda_rewrite_sql_statement_for_null_parameters:
* @sqlst: (transfer full): a #GdaSqlStatement
* @params: a #GdaSet to be used as parameters when executing @stmt
- * @out_modified: (allow-none): a place to store the boolean which tells if @stmt has been modified or not,
or %NULL
+ * @out_modified: (nullable): a place to store the boolean which tells if @stmt has been modified or not, or
%NULL
* @error: a place to store errors, or %NULL
*
* Modifies @sqlst to take into account any parameter which might be %NULL: if @sqlst contains the
@@ -1604,7 +1604,7 @@ gda_rewrite_sql_statement_for_null_parameters (GdaSqlStatement *sqlst, GdaSet *p
* gda_rewrite_statement_for_null_parameters:
* @stmt: (transfer none): a #GdaStatement
* @params: a #GdaSet to be used as parameters when executing @stmt
- * @out_stmt: (transfer full) (allow-none): a place to store the new #GdaStatement, or %NULL
+ * @out_stmt: (transfer full) (nullable): a place to store the new #GdaStatement, or %NULL
* @error: a place to store errors, or %NULL
*
* Modifies @stmt to take into account any parameter which might be %NULL: if @stmt contains the
@@ -2099,7 +2099,7 @@ cmp_func (gconstpointer a, gconstpointer b)
* If no completion is available, then the returned array contains just one NULL entry, and
* if it was not possible to try to compute a completions list, then %NULL is returned.
*
- * Returns: (transfer full) (array zero-terminated=1) (allow-none): a new array of strings, or %NULL (use
g_strfreev() to free the returned array)
+ * Returns: (transfer full) (array zero-terminated=1) (nullable): a new array of strings, or %NULL (use
g_strfreev() to free the returned array)
*/
gchar **
gda_completion_list_get (GdaConnection *cnc, const gchar *sql, gint start, gint end)
@@ -2334,7 +2334,7 @@ concat_ident (const char *prefix, const gchar *ident)
*
* For example the <![CDATA["test.\"ATable\""]]> string will result in the array: <![CDATA[{"test",
"\"ATable\"", NULL}]]>
*
- * Returns: (transfer full) (array zero-terminated=1) (allow-none): a new %NULL-terminated array of strings,
or NULL (use g_strfreev() to free the returned array)
+ * Returns: (transfer full) (array zero-terminated=1) (nullable): a new %NULL-terminated array of strings,
or NULL (use g_strfreev() to free the returned array)
*/
gchar **
gda_sql_identifier_split (const gchar *id)
@@ -2364,8 +2364,8 @@ static gboolean _sql_identifier_needs_quotes (const gchar *str);
/**
* gda_sql_identifier_quote:
* @id: an SQL identifier
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
- * @prov: (allow-none): a #GdaServerProvider object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
+ * @prov: (nullable): a #GdaServerProvider object, or %NULL
* @for_meta_store set to %TRUE if the returned string will be used in a #GdaMetaStore
* @force_quotes: set to %TRUE to force the returned string to be quoted
*
@@ -2879,7 +2879,7 @@ gda_dsn_split (const gchar *string, gchar **out_dsn, gchar **out_username, gchar
* @out_cnc_params: (out): a place to store the new string containing the <connection_params> part
* @out_provider: (out): a place to store the new string containing the <provider> part
* @out_username: (out): a place to store the new string containing the <username> part
- * @out_password: (out): (allow-none): a place to store the new string containing the <password> part,
or %NULL
+ * @out_password: (out): (nullable): a place to store the new string containing the <password> part,
or %NULL
*
* Extract the provider, connection parameters, username and password from @string.
* in @string, the various parts are strings
diff --git a/libgda/gda-value.c b/libgda/gda-value.c
index 3f29badb4..cfc80f905 100644
--- a/libgda/gda-value.c
+++ b/libgda/gda-value.c
@@ -813,7 +813,7 @@ gda_blob_free (GdaBlob *blob)
/**
* gda_blob_set_op:
* @blob: a #GdaBlob value
- * @op: (allow-none): a #GdaBlobOp object, or %NULL
+ * @op: (nullable): a #GdaBlobOp object, or %NULL
*
* Correctly assigns @op to @blob (increases @op's reference count)
*/
@@ -1311,7 +1311,7 @@ gda_numeric_get_precision (const GdaNumeric *numeric)
*
* Get the string representation of @numeric, in the C locale format (dot as a fraction separator).
*
- * Returns: (transfer full) (allow-none): a new string representing the stored valued in @numeric
+ * Returns: (transfer full) (nullable): a new string representing the stored valued in @numeric
*
* Since: 5.0.2
*/
@@ -1837,7 +1837,7 @@ gda_value_new_null (void)
/**
* gda_value_new_default:
- * @default_val: (allow-none): the default value as a string, or %NULL
+ * @default_val: (nullable): the default value as a string, or %NULL
*
* Creates a new default value.
*
@@ -2152,7 +2152,7 @@ gda_value_new_from_xml (const xmlNodePtr node)
/**
* gda_value_free:
- * @value: (transfer full) (allow-none): the resource to free (or %NULL)
+ * @value: (transfer full) (nullable): the resource to free (or %NULL)
*
* Deallocates all memory associated to a #GValue.
*/
@@ -3452,7 +3452,7 @@ gda_binary_to_string (const GdaBinary *bin, guint maxlen)
/**
* gda_string_to_binary:
- * @str: (allow-none): a string to convert, or %NULL
+ * @str: (nullable): a string to convert, or %NULL
*
* Performs the reverse of gda_binary_to_string() (note that for any "\xyz" succession
* of 4 characters where "xyz" represents a valid octal value, the resulting read value will
diff --git a/libgda/gda-value.h b/libgda/gda-value.h
index 1c65d0893..f3ab10154 100644
--- a/libgda/gda-value.h
+++ b/libgda/gda-value.h
@@ -133,7 +133,7 @@ void gda_binary_free (GdaBinary *binary);
/**
* GdaBlob:
* @data: data buffer, as a #GdaBinary
- * @op: (allow-none): a pointer to a #GdaBlopOp, or %NULL
+ * @op: (nullable): a pointer to a #GdaBlopOp, or %NULL
*
* Represents some binary data, accessed through a #GdaBlobOp object.
* @op is generally set up by database providers when giving access to an existing BLOB in
diff --git a/libgda/gda-xa-transaction.c b/libgda/gda-xa-transaction.c
index 47dea1c6b..e81332c01 100644
--- a/libgda/gda-xa-transaction.c
+++ b/libgda/gda-xa-transaction.c
@@ -239,7 +239,7 @@ gda_xa_transaction_new (guint32 format, const gchar *global_transaction_id)
* @xa_trans: a #GdaXaTransaction object
* @cnc: the connection to add to @xa_trans
* @branch: the branch qualifier
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Registers @cnc to be used by @xa_trans to create a distributed transaction.
*
@@ -337,7 +337,7 @@ gda_xa_transaction_unregister_connection (GdaXaTransaction *xa_trans, GdaConnect
/**
* gda_xa_transaction_begin:
* @xa_trans: a #GdaXaTransaction object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Begins a distributed transaction (managed by @xa_trans). Please note that this phase may fail
* for some connections if a (normal) transaction is already started (this depends on the database
@@ -403,7 +403,7 @@ gda_xa_transaction_begin (GdaXaTransaction *xa_trans, GError **error)
/**
* gda_xa_transaction_commit:
* @xa_trans: a #GdaXaTransaction object
- * @cnc_to_recover: (allow-none) (element-type Gda.Connection) (out callee-allocates): a place to store the
list of connections for which the commit phase failed, or %NULL
+ * @cnc_to_recover: (nullable) (element-type Gda.Connection) (out callee-allocates): a place to store the
list of connections for which the commit phase failed, or %NULL
* @error: a place to store errors, or %NULL
*
* Commits a distributed transaction (managed by @xa_trans). The commit is composed of two phases:
@@ -523,7 +523,7 @@ gda_xa_transaction_commit (GdaXaTransaction *xa_trans, GSList **cnc_to_recover,
/**
* gda_xa_transaction_rollback:
* @xa_trans: a #GdaXaTransaction object
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Cancels a distributed transaction (managed by @xa_trans).
*
@@ -564,8 +564,8 @@ gda_xa_transaction_rollback (GdaXaTransaction *xa_trans, GError **error)
/**
* gda_xa_transaction_commit_recovered:
* @xa_trans: a #GdaXaTransaction object
- * @cnc_to_recover: (allow-none) (element-type Gda.Connection) (out callee-allocates): a place to store the
list of connections for which the there were data to recover and which failed to be actually committed, or
%NULL
- * @error: (allow-none): a place to store errors, or %NULL
+ * @cnc_to_recover: (nullable) (element-type Gda.Connection) (out callee-allocates): a place to store the
list of connections for which the there were data to recover and which failed to be actually committed, or
%NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Tries to commit the data prepared but which failed to commit (see gda_xa_transaction_commit()). This
* method allows one to terminate a distributed transaction which succeeded but for which some
diff --git a/libgda/handlers/gda-handler-string.c b/libgda/handlers/gda-handler-string.c
index dea49ec49..152c37c5b 100644
--- a/libgda/handlers/gda-handler-string.c
+++ b/libgda/handlers/gda-handler-string.c
@@ -61,7 +61,7 @@ gda_handler_string_new (void)
/**
* gda_handler_string_new_with_provider:
* @prov: a #GdaServerProvider object
- * @cnc: (allow-none): a #GdaConnection object, or %NULL
+ * @cnc: (nullable): a #GdaConnection object, or %NULL
*
* Creates a data handler for strings, which will use some specific methods implemented
* by the @prov object (possibly also @cnc).
diff --git a/libgda/providers-support/gda-pstmt.c b/libgda/providers-support/gda-pstmt.c
index a674c1d15..2b7b23364 100644
--- a/libgda/providers-support/gda-pstmt.c
+++ b/libgda/providers-support/gda-pstmt.c
@@ -166,7 +166,7 @@ gda_pstmt_finalize (GObject *object)
/**
* gda_pstmt_set_gda_statement:
* @pstmt: a #GdaPStmt object
- * @stmt: (allow-none): a #GdaStatement object, or %NULL
+ * @stmt: (nullable): a #GdaStatement object, or %NULL
*
* Informs @pstmt that it corresponds to the preparation of the @stmt statement
*/
diff --git a/libgda/sql-parser/gda-sql-parser.c b/libgda/sql-parser/gda-sql-parser.c
index d4531f094..53ccdfac0 100644
--- a/libgda/sql-parser/gda-sql-parser.c
+++ b/libgda/sql-parser/gda-sql-parser.c
@@ -390,7 +390,7 @@ gda_sql_parser_get_property (GObject *object,
* gda_sql_parser_parse_string:
* @parser: a #GdaSqlParser object
* @sql: the SQL string to parse
- * @remain: (out) (allow-none): location to store a pointer to remaining part of @sql in case @sql has
multiple statement, or %NULL
+ * @remain: (out) (nullable): location to store a pointer to remaining part of @sql in case @sql has
multiple statement, or %NULL
* @error: location to store error, or %NULL
*
* Parses @sql and creates a #GdaStatement statement from the first SQL statement contained in @sql: if @sql
@@ -400,7 +400,7 @@ gda_sql_parser_get_property (GObject *object,
* To include variables in the @sql string, see the
* <link linkend="GdaSqlParser.description">GdaSqlParser's object description</link>.
*
- * Returns: (transfer full) (allow-none): a new #GdaStatement object, or %NULL if an error occurred
+ * Returns: (transfer full) (nullable): a new #GdaStatement object, or %NULL if an error occurred
*/
GdaStatement *
gda_sql_parser_parse_string (GdaSqlParser *parser, const gchar *sql, const gchar **remain, GError **error)
@@ -629,7 +629,7 @@ gda_sql_parser_parse_string (GdaSqlParser *parser, const gchar *sql, const gchar
* gda_sql_parser_parse_string_as_batch:
* @parser: a #GdaSqlParser object
* @sql: the SQL string to parse
- * @remain: (out) (allow-none): location to store a pointer to remaining part of @sql in case an error
occurred while parsing @sql, or %NULL
+ * @remain: (out) (nullable): location to store a pointer to remaining part of @sql in case an error
occurred while parsing @sql, or %NULL
* @error: location to store error, or %NULL
*
* Parse @sql and creates a #GdaBatch object which contains all the #GdaStatement objects created while
parsing (one object
@@ -644,7 +644,7 @@ gda_sql_parser_parse_string (GdaSqlParser *parser, const gchar *sql, const gchar
* To include variables in the @sql string, see the
* <link linkend="GdaSqlParser.description">GdaSqlParser's object description</link>.
*
- * Returns: (transfer full) (allow-none): a new #GdaBatch object, or %NULL if an error occurred
+ * Returns: (transfer full) (nullable): a new #GdaBatch object, or %NULL if an error occurred
*/
GdaBatch *
gda_sql_parser_parse_string_as_batch (GdaSqlParser *parser, const gchar *sql, const gchar **remain,
@@ -730,7 +730,7 @@ gda_sql_parser_parse_string_as_batch (GdaSqlParser *parser, const gchar *sql, co
*
* if @sql is %NULL, then the returned #GdaBatch object will contain no statement.
*
- * Returns: (transfer full) (allow-none): a new #GdaBatch object, or %NULL if an error occurred
+ * Returns: (transfer full) (nullable): a new #GdaBatch object, or %NULL if an error occurred
*/
GdaBatch *
gda_sql_parser_parse_file_as_batch (GdaSqlParser *parser, const gchar *filename, GError **error)
diff --git a/libgda/sql-parser/gda-statement-struct-decl.h b/libgda/sql-parser/gda-statement-struct-decl.h
index 44afdbc58..f70f4e416 100644
--- a/libgda/sql-parser/gda-statement-struct-decl.h
+++ b/libgda/sql-parser/gda-statement-struct-decl.h
@@ -43,11 +43,6 @@ typedef enum {
GDA_SQL_MISSING_IDENTIFIER_ERROR,
GDA_SQL_VALIDATION_ERROR
} GdaSqlError;
-/*
- * GdaSqlErrorType:
- *
- **/
-typedef GdaSqlError GdaSqlErrorType;
/*
* Struct declarations
diff --git a/libgda/sql-parser/gda-statement-struct-parts.h b/libgda/sql-parser/gda-statement-struct-parts.h
index 06d116059..bb7140a65 100644
--- a/libgda/sql-parser/gda-statement-struct-parts.h
+++ b/libgda/sql-parser/gda-statement-struct-parts.h
@@ -93,13 +93,13 @@ typedef struct _GdaSqlSelectOrder GdaSqlSelectOrder;
/**
* GdaSqlExpr:
* @any: inheritance structure
- * @value: (allow-none): a #GValue, or %NULL. Please see specific note about this field.
- * @param_spec: (allow-none): a #GdaSqlParamSpec, or %NULL if this is not a variable
- * @func: (allow-none): not %NULL if expression is a function or aggregate
- * @cond: (allow-none): not %NULL if expression is a condition or an operation
- * @select: (allow-none): not %NULL if expression is a sub select statement (#GdaSqlStatementSelect or
#GdaSqlStatementCompound)
- * @case_s: (allow-none): not %NULL if expression is a CASE WHEN ... expression
- * @cast_as: (allow-none): not %NULL if expression must be cast to another data type
+ * @value: (nullable): a #GValue, or %NULL. Please see specific note about this field.
+ * @param_spec: (nullable): a #GdaSqlParamSpec, or %NULL if this is not a variable
+ * @func: (nullable): not %NULL if expression is a function or aggregate
+ * @cond: (nullable): not %NULL if expression is a condition or an operation
+ * @select: (nullable): not %NULL if expression is a sub select statement (#GdaSqlStatementSelect or
#GdaSqlStatementCompound)
+ * @case_s: (nullable): not %NULL if expression is a CASE WHEN ... expression
+ * @cast_as: (nullable): not %NULL if expression must be cast to another data type
* @value_is_ident: Please see specific note about the @value field
*
* This structure contains any expression, either as a value (the @value part is set),
@@ -512,8 +512,8 @@ typedef enum {
* @any: inheritance structure
* @type: type of join
* @position: represents a join between a target at (pos < @position) and the one at @position
- * @expr: (allow-none): joining expression, or %NULL
- * @use: (allow-none): list of #GdaSqlField pointers to use when joining, or %NULL
+ * @expr: (nullable): joining expression, or %NULL
+ * @use: (nullable): list of #GdaSqlField pointers to use when joining, or %NULL
*
* This structure represents a join between two targets in a SELECT statement.
*/
diff --git a/libgda/sql-parser/gda-statement-struct-select.c b/libgda/sql-parser/gda-statement-struct-select.c
index 8770c04c7..e31bdb864 100644
--- a/libgda/sql-parser/gda-statement-struct-select.c
+++ b/libgda/sql-parser/gda-statement-struct-select.c
@@ -247,7 +247,7 @@ _gda_sql_statement_select_serialize (gpointer stmt)
* gda_sql_statement_select_take_distinct:
* @stmt: a #GdaSqlStatement pointer
* @distinct: a TRUE/FALSE value
- * @distinct_expr: (allow-none): a #GdaSqlExpr pointer representing what the DISTINCT is on, or %NULL
+ * @distinct_expr: (nullable): a #GdaSqlExpr pointer representing what the DISTINCT is on, or %NULL
*
* Sets the DISTINCT clause of @stmt.
*
diff --git a/libgda/sqlite/virtual/gda-ldap-connection.c b/libgda/sqlite/virtual/gda-ldap-connection.c
index de3d53f9c..6479269c3 100644
--- a/libgda/sqlite/virtual/gda-ldap-connection.c
+++ b/libgda/sqlite/virtual/gda-ldap-connection.c
@@ -671,9 +671,9 @@ _ldap_table_create_model_func (GdaVconnectionDataModelSpec *spec, G_GNUC_UNUSED
* gda_ldap_connection_declare_table:
* @cnc: a #GdaLdapConnection
* @table_name: a table name, not %NULL
- * @base_dn: (allow-none): the base DN of the LDAP search, or %NULL for @cnc's own base DN
- * @filter: (allow-none): the search filter of the LDAP search, or %NULL for a default filter of
"(ObjectClass=*)"
- * @attributes: (allow-none): the search attributes of the LDAP search, or %NULL if only the DN is required
+ * @base_dn: (nullable): the base DN of the LDAP search, or %NULL for @cnc's own base DN
+ * @filter: (nullable): the search filter of the LDAP search, or %NULL for a default filter of
"(ObjectClass=*)"
+ * @attributes: (nullable): the search attributes of the LDAP search, or %NULL if only the DN is required
* @scope: the search scope of the LDAP search
* @error: a place to store errors, or %NULL
*
@@ -788,10 +788,10 @@ gda_ldap_connection_undeclare_table (GdaLdapConnection *cnc, const gchar *table_
* gda_ldap_connection_describe_table:
* @cnc: a #GdaLdapConnection
* @table_name: a table name, not %NULL
- * @out_base_dn: (allow-none) (transfer none): a place to store the LDAP search base DN, or %NULL
- * @out_filter: (allow-none) (transfer none): a place to store the LDAP search filter, or %NULL
- * @out_attributes: (allow-none) (transfer none): a place to store the LDAP search attributes, or %NULL
- * @out_scope: (allow-none) (transfer none): a place to store the LDAP search scope, or %NULL
+ * @out_base_dn: (nullable) (transfer none): a place to store the LDAP search base DN, or %NULL
+ * @out_filter: (nullable) (transfer none): a place to store the LDAP search filter, or %NULL
+ * @out_attributes: (nullable) (transfer none): a place to store the LDAP search attributes, or %NULL
+ * @out_scope: (nullable) (transfer none): a place to store the LDAP search scope, or %NULL
* @error: a place to store errors, or %NULL
*
* Get information about a virtual table, the information which has been passed to
@@ -888,7 +888,7 @@ gda_ldap_entry_free (GdaLdapEntry *entry)
/**
* gda_ldap_entry_new:
- * @dn: (allow-none): a Distinguished name, or %NULL
+ * @dn: (nullable): a Distinguished name, or %NULL
*
* Creates a new #GdaLdapEntry. This function is useful when using gda_ldap_modify_entry()
*
@@ -991,8 +991,8 @@ GdaLdapEntry **_gda_ldap_get_entry_children (GdaLdapConnection *cnc, const gchar
/**
* gda_ldap_describe_entry:
* @cnc: a #GdaLdapConnection connection
- * @dn: (allow-none): the Distinguished Name of the LDAP entry to describe
- * @error: (allow-none): a place to store errors, or %NULL
+ * @dn: (nullable): the Distinguished Name of the LDAP entry to describe
+ * @error: (nullable): a place to store errors, or %NULL
*
* Describes the LDAP entry which DN is @dn. If @dn is %NULL, then the top entry (as specified when
* the LDAP connection was opened) is described.
@@ -1012,9 +1012,9 @@ gda_ldap_describe_entry (GdaLdapConnection *cnc, const gchar *dn, GError **error
/**
* gda_ldap_get_entry_children:
* @cnc: a #GdaLdapConnection connection
- * @dn: (allow-none): the Distinguished Name of the LDAP entry to get children from
- * @attributes: (allow-none) (array zero-terminated=1) (element-type gchar*): a %NULL terminated array of
attributes to fetch for each child, or %NULL if no attribute is requested
- * @error: (allow-none): a place to store errors, or %NULL
+ * @dn: (nullable): the Distinguished Name of the LDAP entry to get children from
+ * @attributes: (nullable) (array zero-terminated=1) (element-type gchar*): a %NULL terminated array of
attributes to fetch for each child, or %NULL if no attribute is requested
+ * @error: (nullable): a place to store errors, or %NULL
*
* Get the list of children entries for the LDAP entry which DN is @dn. If the @dn entry does not have any
* child, then this function returns an array which first element is %NULL.
@@ -1153,7 +1153,7 @@ gda_ldap_entry_get_attributes_list (GdaLdapConnection *cnc, GdaLdapEntry *entry)
/**
* gda_ldap_attributes_list_free:
- * @list: (allow-none): a #GSList of #GdaLdapAttributeDefinition pointers, or %NULL
+ * @list: (nullable): a #GSList of #GdaLdapAttributeDefinition pointers, or %NULL
*
* Frees the list returned by gda_ldap_entry_get_attributes_list().
*
@@ -1185,7 +1185,7 @@ _gda_ldap_modify (GdaLdapConnection *cnc, GdaLdapModificationType modtype,
* gda_ldap_add_entry:
* @cnc: a #GdaLdapConnection
* @entry: a #GdaLDapEntry describing the LDAP entry to add
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Creates a new LDAP entry.
*
@@ -1207,7 +1207,7 @@ gda_ldap_add_entry (GdaLdapConnection *cnc, GdaLdapEntry *entry, GError **error)
* gda_ldap_remove_entry:
* @cnc: a #GdaLdapConnection
* @dn: the DN of the LDAP entry to remove
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Delete an LDAP entry.
*
@@ -1236,7 +1236,7 @@ _gda_ldap_rename_entry (GdaLdapConnection *cnc, const gchar *current_dn, const g
* @cnc: a #GdaLdapConnection
* @current_dn: the current DN of the entry
* @new_dn: the new DN of the entry
- * @error: (allow-none): a place to store an error, or %NULL
+ * @error: (nullable): a place to store an error, or %NULL
*
* Renames an LDAP entry.
*
@@ -1259,8 +1259,8 @@ gda_ldap_rename_entry (GdaLdapConnection *cnc, const gchar *current_dn, const gc
* @cnc: a #GdaLdapConnection
* @modtype: the type of modification to perform
* @entry: a #GdaLDapEntry describing the LDAP entry to apply modifications, along with the attributes which
will be modified
- * @ref_entry: (allow-none): a #GdaLDapEntry describing the reference LDAP entry, if @modtype is
%GDA_LDAP_MODIFICATION_ATTR_DIFF
- * @error: (allow-none): a place to store an error, or %NULL
+ * @ref_entry: (nullable): a #GdaLDapEntry describing the reference LDAP entry, if @modtype is
%GDA_LDAP_MODIFICATION_ATTR_DIFF
+ * @error: (nullable): a place to store an error, or %NULL
*
* Modifies an LDAP entry.
*
diff --git a/libgda/sqlite/virtual/gda-ldap-connection.h b/libgda/sqlite/virtual/gda-ldap-connection.h
index 22d58a611..03db6fb3a 100644
--- a/libgda/sqlite/virtual/gda-ldap-connection.h
+++ b/libgda/sqlite/virtual/gda-ldap-connection.h
@@ -139,7 +139,7 @@ gboolean gda_ldap_connection_describe_table (GdaLdapConnection *cnc, cons
* GdaLdapAttribute:
* @attr_name: the name of the attribute
* @nb_values: the number of values in @values, or %0
- * @values: (allow-none) (array length=nb_values) (array zero-terminated=1): the attribute' values as
#GValue values, (terminated by a %NULL)
+ * @values: (nullable) (array length=nb_values) (array zero-terminated=1): the attribute' values as #GValue
values, (terminated by a %NULL)
*
* This structure holds information about the values of a single attribute (of a single LDAP entry).
*/
@@ -153,7 +153,7 @@ typedef struct {
* GdaLdapEntry:
* @dn: the Distinguished Name of the entry
* @nb_attributes: the number of attributes in @attributes, or %0
- * @attributes: (allow-none) (array length=nb_attributes) (array zero-terminated=1): the entry's attributes,
(terminated by a %NULL)
+ * @attributes: (nullable) (array length=nb_attributes) (array zero-terminated=1): the entry's attributes,
(terminated by a %NULL)
* @attributes_hash: a hash table where the key is an attribute name, and the value the correcponding
#GdaLdapAttribute
*
* This structure holds information about the attributes of a single LDAP entry.
@@ -207,7 +207,7 @@ typedef enum {
* @oid: the OID of the class
* @nb_names: the number of values in @values (always >= 1)
* @names: all the class names
- * @description: (allow-none): the class's description, or %NULL
+ * @description: (nullable): the class's description, or %NULL
* @kind: the class kind
* @obsolete: defines is LDAP class is obsolete
* @nb_req_attributes: the number of values in @req_attributes
diff --git a/libgda/sqlite/virtual/gda-vconnection-data-model.c
b/libgda/sqlite/virtual/gda-vconnection-data-model.c
index 0a1096b2e..69b767167 100644
--- a/libgda/sqlite/virtual/gda-vconnection-data-model.c
+++ b/libgda/sqlite/virtual/gda-vconnection-data-model.c
@@ -268,7 +268,7 @@ gda_vconnection_data_model_add_model (GdaVconnectionDataModel *cnc,
* gda_vconnection_data_model_add:
* @cnc: a #GdaVconnectionDataModel connection
* @spec: a #GdaVconnectionDataModelSpec structure, used AS IS (not copied) and can be modified
- * @spec_free_func: (allow-none): function to call when freeing @spec, or %NULL
+ * @spec_free_func: (nullable): function to call when freeing @spec, or %NULL
* @table_name: the name of the table
* @error: a place to store errors, or %NULL
*
@@ -431,7 +431,7 @@ gda_vconnection_data_model_remove (GdaVconnectionDataModel *cnc, const gchar *ta
* Find the #GdaVconnectionDataModelSpec specifying how the table named @table_name is represented
* in @cnc.
*
- * Returns: (transfer none) (allow-none): a #GdaVconnectionDataModelSpec pointer, of %NULL if there is no
table named @table_name
+ * Returns: (transfer none) (nullable): a #GdaVconnectionDataModelSpec pointer, of %NULL if there is no
table named @table_name
*
* Since: 4.2.6
*/
@@ -458,7 +458,7 @@ gda_vconnection_data_model_get (GdaVconnectionDataModel *cnc, const gchar *table
* either if no table named @table_name exists, or if that table actually exists but no #GdaDataModel
* has yet been created. For a more general approach, use the gda_vconnection_data_model_get().
*
- * Returns: (transfer none) (allow-none): the #GdaDataModel, or %NULL
+ * Returns: (transfer none) (nullable): the #GdaDataModel, or %NULL
*/
GdaDataModel *
gda_vconnection_data_model_get_model (GdaVconnectionDataModel *cnc, const gchar *table_name)
@@ -483,7 +483,7 @@ gda_vconnection_data_model_get_model (GdaVconnectionDataModel *cnc, const gchar
*
* Find the name of the table associated to @model in @cnc
*
- * Returns: (transfer none) (allow-none): the table name, or %NULL if not found
+ * Returns: (transfer none) (nullable): the table name, or %NULL if not found
*/
const gchar *
gda_vconnection_data_model_get_table_name (GdaVconnectionDataModel *cnc, GdaDataModel *model)
diff --git a/libgda/sqlite/virtual/gda-vconnection-data-model.h
b/libgda/sqlite/virtual/gda-vconnection-data-model.h
index 4df05c09a..0e48346a5 100644
--- a/libgda/sqlite/virtual/gda-vconnection-data-model.h
+++ b/libgda/sqlite/virtual/gda-vconnection-data-model.h
@@ -59,7 +59,7 @@ typedef GdaDataModel *(*GdaVconnectionDataModelCreateModelFunc) (GdaVconnectionD
/**
* GdaVconnectionDataModelFunc:
- * @Param1: (allow-none): a pointer to a #GdaDataModel
+ * @Param1: (nullable): a pointer to a #GdaDataModel
* @Param2: the name of the table represented by @Param1
* @Param3: a data pointer, passed as last ergument to gda_vconnection_data_model_foreach()
*
@@ -135,11 +135,11 @@ typedef GdaDataModel *(*GdaVconnectionDataModelCreateFModelFunc) (GdaVconnection
/**
* GdaVconnectionDataModelSpec:
- * @data_model: (allow-none): a #GdaDataModel, or %NULL
- * @create_columns_func: (allow-none): a pointer to a #GdaVconnectionDataModelCreateColumnsFunc function, or
%NULL
- * @create_model_func: (allow-none): a pointer to a #GdaVconnectionDataModelCreateModelFunc function, or
%NULL
- * @create_filter_func: (allow-none): a pointer to a #GdaVconnectionDataModelParseFilterFunc function, or
%NULL
- * @create_filtered_model_func: (allow-none): a pointer to a #GdaVconnectionDataModelCreateFModelFunc
function, or %NULL
+ * @data_model: (nullable): a #GdaDataModel, or %NULL
+ * @create_columns_func: (nullable): a pointer to a #GdaVconnectionDataModelCreateColumnsFunc function, or
%NULL
+ * @create_model_func: (nullable): a pointer to a #GdaVconnectionDataModelCreateModelFunc function, or %NULL
+ * @create_filter_func: (nullable): a pointer to a #GdaVconnectionDataModelParseFilterFunc function, or %NULL
+ * @create_filtered_model_func: (nullable): a pointer to a #GdaVconnectionDataModelCreateFModelFunc
function, or %NULL
*
* This structure holds all the information supplied to declare a virtual table using
* gda_vconnection_data_model_add(). You don't need to provider pointers for all the functions and
diff --git a/libgda/sqlite/virtual/gda-vconnection-hub.c b/libgda/sqlite/virtual/gda-vconnection-hub.c
index 615b82ba2..48d264cca 100644
--- a/libgda/sqlite/virtual/gda-vconnection-hub.c
+++ b/libgda/sqlite/virtual/gda-vconnection-hub.c
@@ -150,7 +150,7 @@ gda_vconnection_hub_get_type (void)
* gda_vconnection_hub_add:
* @hub: a #GdaVconnectionHub connection
* @cnc: a #GdaConnection
- * @ns: (allow-none): a namespace, or %NULL
+ * @ns: (nullable): a namespace, or %NULL
* @error: a place to store errors, or %NULL
*
* Make all the tables of @cnc appear as tables (of the same name) in the @hub connection.
@@ -262,7 +262,7 @@ get_hub_cnc_by_cnc (GdaVconnectionHub *hub, GdaConnection *cnc)
/**
* gda_vconnection_hub_get_connection:
* @hub: a #GdaVconnectionHub connection
- * @ns: (allow-none): a name space, or %NULL
+ * @ns: (nullable): a name space, or %NULL
*
* Find the #GdaConnection object in @hub associated to the @ns name space
*
diff --git a/libgda/thread-wrapper/gda-connect.c b/libgda/thread-wrapper/gda-connect.c
index 2f6e88d17..812a89363 100644
--- a/libgda/thread-wrapper/gda-connect.c
+++ b/libgda/thread-wrapper/gda-connect.c
@@ -250,10 +250,10 @@ sig_closure_new (gpointer instance, GMainContext *context, gboolean swapped, GCa
* @instance: the instance to connect to
* @detailed_signal: a string of the form "signal-name::detail"
* @c_handler: the GCallback to connect
- * @data: (allow-none): data to pass to @c_handler, or %NULL
- * @destroy_data: (allow-none): function to destroy @data when not needed anymore, or %NULL
+ * @data: (nullable): data to pass to @c_handler, or %NULL
+ * @destroy_data: (nullable): function to destroy @data when not needed anymore, or %NULL
* @connect_flags: a combination of #GConnectFlags.
- * @context: (allow-none): the #GMainContext in which signals will actually be treated, or %NULL for the
default one
+ * @context: (nullable): the #GMainContext in which signals will actually be treated, or %NULL for the
default one
*
* Connects a GCallback function to a signal for a particular object. The difference with g_signal_connect()
is that the
* callback will be called from withing the thread which is the owner of @context. If needed you may have to
use g_main_context_acquire()
diff --git a/libgda/thread-wrapper/itsignaler.c b/libgda/thread-wrapper/itsignaler.c
index 2b1593890..76541311a 100644
--- a/libgda/thread-wrapper/itsignaler.c
+++ b/libgda/thread-wrapper/itsignaler.c
@@ -114,7 +114,7 @@ struct _ITSignaler {
/**
* itsignaler_ref:
- * @its: (allow-none): a #ITSignaler object
+ * @its: (nullable): a #ITSignaler object
*
* Increases the reference count of @its. If @its is %NULL, then nothing happens.
*
@@ -267,7 +267,7 @@ _itsignaler_unref (ITSignaler *its, gboolean give_to_bg)
/**
* itsignaler_unref:
- * @its: (allow-none): a #ITSignaler object
+ * @its: (nullable): a #ITSignaler object
*
* Decrease the reference count of @its; when the rerefence count reaches zero, the object
* is freed. If @its is %NULL, then nothing happens.
@@ -584,7 +584,7 @@ itsignaler_unix_get_poll_fd (ITSignaler *its)
* itsignaler_push_notification:
* @its: a #ITSignaler pointer
* @data: a pointer to some data.
- * @destroy_func: (allow-none): a function to be called to free @data, or %NULL
+ * @destroy_func: (nullable): a function to be called to free @data, or %NULL
*
* Use this function to push a notification.
*
@@ -895,10 +895,10 @@ void its_source_finalize (GSource *source)
/**
* itsignaler_add:
* @its: a #ITSignaler object
- * @context: (allow-none): a GMainContext (if %NULL, the default context will be used).
+ * @context: (nullable): a GMainContext (if %NULL, the default context will be used).
* @func: callback function to be called when a notification is ready
* @data: data to pass to @func
- * @notify: (allow-none): a function to call when data is no longer in use, or NULL.
+ * @notify: (nullable): a function to call when data is no longer in use, or NULL.
*
* Have @its call @func (with @data) in the context of @context. Remove using itsignaler_remove(). This
function
* is similar to itsignaler_create_source() but is packaged for easier usage.
@@ -929,7 +929,7 @@ itsignaler_add (ITSignaler *its, GMainContext *context, ITSignalerFunc func, gpo
/**
* itsignaler_remove:
* @its: a #ITSignaler object
- * @context: (allow-none): a GMainContext (if NULL, the default context will be used).
+ * @context: (nullable): a GMainContext (if NULL, the default context will be used).
* @id: the ID of the source as returned by itsignaler_add()
*
* Does the reverse of itsignaler_add().
diff --git a/tools/base/base-tool-command.c b/tools/base/base-tool-command.c
index ddc9edc31..f65f10f3c 100644
--- a/tools/base/base-tool-command.c
+++ b/tools/base/base-tool-command.c
@@ -48,7 +48,7 @@ base_tool_command_result_new (GdaConnection *cnc, ToolCommandResultType type)
/**
* base_tool_command_result_free:
- * @res: (allow-none): a #ToolCommandResult, or %NULL
+ * @res: (nullable): a #ToolCommandResult, or %NULL
*
* Frees any resource used by @res
*/
@@ -118,7 +118,7 @@ base_tool_command_group_new (void)
/**
* base_tool_command_group_free:
- * @group: (allow-none) (transfer full): a #ToolCommandGroup pointer
+ * @group: (nullable) (transfer full): a #ToolCommandGroup pointer
*
* Frees any resource used by @group
*/
@@ -437,8 +437,8 @@ base_tool_command_is_internal (const gchar *cmde)
* @cmde: an internal command as a string (name + arguments), without the '.' or '\\' beginning
* @limit_width: pass to %TRUE if, in case the command is a HELP command, the width must be limited by a
terminal's width
* @color_term: pass to %TRUE if, in case the command is a HELP command, the output will be for a terminal
color
- * @user_data: (allow-none): a pointer, see the #ToolCommandFunc type
- * @error: (allow-none): a place to store errors, or %NULL
+ * @user_data: (nullable): a pointer, see the #ToolCommandFunc type
+ * @error: (nullable): a place to store errors, or %NULL
*
* Executes @cmde, which must be an internal command.
*
@@ -508,7 +508,7 @@ base_tool_command_get_all_commands (ToolCommandGroup *group)
/**
* base_tool_command_get_commands:
* @group: a #ToolCommandGroup group of commands
- * @prefix: (allow-none): a prefix
+ * @prefix: (nullable): a prefix
*
* Get a list of all the commands (sorted by group) in @group, starting by @prefix
*
diff --git a/tools/base/base-tool-command.h b/tools/base/base-tool-command.h
index 038e4810d..4a1fbaf4d 100644
--- a/tools/base/base-tool-command.h
+++ b/tools/base/base-tool-command.h
@@ -70,8 +70,8 @@ void base_tool_command_result_free (ToolCommandResult *res);
* @command: the #ToolCommand to execute
* @argc: @argv's size
* @argv: the arguments (not including the command's name itself)
- * @user_data: (allow-none): a pointer to some use data, corresponds to the @user_data argument of
base_tool_command_group_execute()
- * @error: (allow-none): a place to store errors
+ * @user_data: (nullable): a pointer to some use data, corresponds to the @user_data argument of
base_tool_command_group_execute()
+ * @error: (nullable): a place to store errors
*
* Function defining a command's execution code
*/
diff --git a/tools/base/base-tool-input.c b/tools/base/base-tool-input.c
index ddb01ed81..c6610cd01 100644
--- a/tools/base/base-tool-input.c
+++ b/tools/base/base-tool-input.c
@@ -345,10 +345,10 @@ _base_tool_completion (const char *text, int start, int end)
/**
* base_tool_input_set_completion_func:
- * @group: (allow-none): a #ToolCommandGroup, or %NULL
- * @func: (allow-none): a #ToolInputCompletionFunc, or %NULL
- * @func_data: (allow-none): a pointer to pass when calling @func
- * @start_chars_to_ignore: (allow-none): a list of characters to ignore at the beginning of commands
+ * @group: (nullable): a #ToolCommandGroup, or %NULL
+ * @func: (nullable): a #ToolInputCompletionFunc, or %NULL
+ * @func_data: (nullable): a pointer to pass when calling @func
+ * @start_chars_to_ignore: (nullable): a list of characters to ignore at the beginning of commands
*
* Defines the completion function.
*/
diff --git a/tools/base/base-tool-output.c b/tools/base/base-tool-output.c
index 3737fdc2d..a11447541 100644
--- a/tools/base/base-tool-output.c
+++ b/tools/base/base-tool-output.c
@@ -454,8 +454,8 @@ tree_to_string (GdaTree *tree, ToolOutputFormat format, FILE *stream, GdaSet *op
* base_tool_output_result_to_string:
* @res: a #ToolCommandResult
* @format: a #ToolOutputFormat format specification
- * @stream: (allow-none): a stream which the returned string will be put to, or %NULL
- * @options: (allow-none): a #GdaSet containing options, or %NULL
+ * @stream: (nullable): a stream which the returned string will be put to, or %NULL
+ * @options: (nullable): a #GdaSet containing options, or %NULL
*
* Converts @res to a string
*
@@ -742,7 +742,7 @@ check_shell_argument (const gchar *arg)
/**
* base_tool_output_output_string:
- * @stream: (allow-none): an outout stream, or %NULL
+ * @stream: (nullable): an outout stream, or %NULL
* @str: a string
*
* "Outputs" @str to @stream, or to stdout if @stream is %NULL
diff --git a/tools/browser/browser-connections-list.c b/tools/browser/browser-connections-list.c
index b6f89b61c..87936f17b 100644
--- a/tools/browser/browser-connections-list.c
+++ b/tools/browser/browser-connections-list.c
@@ -296,7 +296,7 @@ connection_new_cb (G_GNUC_UNUSED GtkButton *button, G_GNUC_UNUSED BrowserConnect
/**
* browser_connections_list_show
- * @current: (allow-none): a connection to select for displayed properties, or %NULL
+ * @current: (nullable): a connection to select for displayed properties, or %NULL
*
* Creates a new #BrowserConnectionsList widget and displays it.
* Only one is created and shown (singleton)
diff --git a/tools/browser/browser-page.c b/tools/browser/browser-page.c
index fb8e3d650..fe44f668b 100644
--- a/tools/browser/browser-page.c
+++ b/tools/browser/browser-page.c
@@ -70,8 +70,8 @@ browser_page_class_init (G_GNUC_UNUSED gpointer g_class)
/**
* browser_page_customize:
* @page: an object implementing the #BrowserPage interface
- * @toolbar: (allow-none):
- * @header: (allow-none):
+ * @toolbar: (nullable):
+ * @header: (nullable):
*
* Add optional custom UI elements to @toolbar, @header and @menu. any call to the
* browser_page_uncustomize() function will undo all the customizations to
diff --git a/tools/browser/browser-perspective.c b/tools/browser/browser-perspective.c
index ac61c3834..3779b1373 100644
--- a/tools/browser/browser-perspective.c
+++ b/tools/browser/browser-perspective.c
@@ -82,8 +82,8 @@ browser_perspective_class_init (G_GNUC_UNUSED gpointer g_class)
/**
* browser_perspective_customize:
* @perspective: an object implementing the #BrowserPerspective interface
- * @toolbar: (allow-none):
- * @header: (allow-none):
+ * @toolbar: (nullable):
+ * @header: (nullable):
*
* Add optional custom UI elements to @toolbar, @header and @menu. any call to the
* browser_perspective_uncustomize() function will undo all the customizations to
diff --git a/tools/browser/browser-window.c b/tools/browser/browser-window.c
index d59cc2ebc..a0a13db4e 100644
--- a/tools/browser/browser-window.c
+++ b/tools/browser/browser-window.c
@@ -724,7 +724,7 @@ browser_window_get_connection (BrowserWindow *bwin)
/*
* perspective_data_new
* @bwin: a #BrowserWindow in which the perspective will be
- * @factory: (allow-none): a #BrowserPerspectiveFactory, or %NULL
+ * @factory: (nullable): a #BrowserPerspectiveFactory, or %NULL
*
* Creates a new #PerspectiveData structure, it increases @tcnc's reference count.
*
diff --git a/tools/browser/canvas/browser-canvas-column.c b/tools/browser/canvas/browser-canvas-column.c
index d24dbd632..d610094bb 100644
--- a/tools/browser/canvas/browser-canvas-column.c
+++ b/tools/browser/canvas/browser-canvas-column.c
@@ -218,7 +218,7 @@ browser_canvas_column_extra_event (BrowserCanvasItem *citem, GdkEventType event
/**
* browser_canvas_column_new:
- * @parent: (allow-none): the parent item, or %NULL
+ * @parent: (nullable): the parent item, or %NULL
* @mstruct: the #GdaMetaStruct @column is from
* @column: the represented entity's column
* @x: the x coordinate of the text
diff --git a/tools/browser/canvas/browser-canvas-db-relations.c
b/tools/browser/canvas/browser-canvas-db-relations.c
index 2265ca1d2..f7b94399f 100644
--- a/tools/browser/canvas/browser-canvas-db-relations.c
+++ b/tools/browser/canvas/browser-canvas-db-relations.c
@@ -319,7 +319,7 @@ cloud_object_selected_cb (G_GNUC_UNUSED ObjectsCloud *ocloud, G_GNUC_UNUSED Obje
/**
* browser_canvas_db_relations_new
- * @mstruct: (allow-none): a #GdaMetaStruct object, or %NULL
+ * @mstruct: (nullable): a #GdaMetaStruct object, or %NULL
*
* Creates a new canvas widget to display the relations between the database's tables.
*
@@ -869,8 +869,8 @@ browser_canvas_db_relations_get_table_item (BrowserCanvasDbRelations *canvas, G
/**
* browser_canvas_db_relations_add_table
* @canvas: a #BrowserCanvasDbRelations canvas
- * @table_catalog: (allow-none): the catalog in which the table is, or %NULL
- * @table_schema: (allow-none): the schema in which the table is, or %NULL
+ * @table_catalog: (nullable): the catalog in which the table is, or %NULL
+ * @table_schema: (nullable): the schema in which the table is, or %NULL
* @table_name: the table's name
*
* Add a table to @canvas.
diff --git a/tools/browser/canvas/browser-canvas-item.c b/tools/browser/canvas/browser-canvas-item.c
index e8310359a..b88fccad4 100644
--- a/tools/browser/canvas/browser-canvas-item.c
+++ b/tools/browser/canvas/browser-canvas-item.c
@@ -267,8 +267,8 @@ browser_canvas_item_get_canvas (BrowserCanvasItem *item)
/**
* browser_canvas_item_get_edge_nodes
* @item: a #BrowserCanvasItem object
- * @from: (allow-none): a place to store the FROM part of the edge, or %NULL
- * @to: (allow-none): a place to store the TO part of the edge, or %NULL
+ * @from: (nullable): a place to store the FROM part of the edge, or %NULL
+ * @to: (nullable): a place to store the TO part of the edge, or %NULL
*
* If the @item canvas item represents a "link" between two other canvas items (an edge), then
* set @from and @to to those items.
diff --git a/tools/browser/data-manager/data-source-editor.c b/tools/browser/data-manager/data-source-editor.c
index 5fbac076a..200648aa6 100644
--- a/tools/browser/data-manager/data-source-editor.c
+++ b/tools/browser/data-manager/data-source-editor.c
@@ -275,7 +275,7 @@ update_dependencies_display (DataSourceEditor *editor)
/**
* data_source_editor_display_source
* @editor: a #DataSourceEditor widget
- * @source: (allow-none): the #DataSource for which properties are displayed, or %NULL
+ * @source: (nullable): the #DataSource for which properties are displayed, or %NULL
*
* Update @editor's display with @source's properties
*/
diff --git a/tools/browser/data-manager/data-source-manager.c
b/tools/browser/data-manager/data-source-manager.c
index 493eaf0d2..43ee82712 100644
--- a/tools/browser/data-manager/data-source-manager.c
+++ b/tools/browser/data-manager/data-source-manager.c
@@ -372,7 +372,7 @@ data_source_manager_add_source (DataSourceManager *mgr, DataSource *source)
/**
* data_source_manager_replace_all
* @mgr: a #DataSourceManager object
- * @sources_list: (allow-none): a list of #DataSource objects, or %NULL
+ * @sources_list: (nullable): a list of #DataSource objects, or %NULL
*
* Replaces all the data sources by the ones in @sources_list.
*/
diff --git a/tools/browser/data-manager/data-source.c b/tools/browser/data-manager/data-source.c
index b462ee283..272dff3a0 100644
--- a/tools/browser/data-manager/data-source.c
+++ b/tools/browser/data-manager/data-source.c
@@ -541,9 +541,9 @@ init_from_table_node (DataSource *source, xmlNodePtr node, GError **error)
* data_source_add_dependency
* @source: a #DataSource
* @table: the name of the referenced table
- * @id: (allow-none): the ID of the referenced data source, or %NULL if its ID is the same as the table name
+ * @id: (nullable): the ID of the referenced data source, or %NULL if its ID is the same as the table name
* @col_name_size: the size of @col_names
- * @col_names: (allow-none): names of the FK columns involved in the foreign key, or %NULL
+ * @col_names: (nullable): names of the FK columns involved in the foreign key, or %NULL
* @error: a place to store errors, or %NULL
*
* Adds a dependency on the @table table, only for DATA_SOURCE_TABLE sources
diff --git a/tools/browser/fk-declare.c b/tools/browser/fk-declare.c
index 1289e60e7..2c82d504a 100644
--- a/tools/browser/fk-declare.c
+++ b/tools/browser/fk-declare.c
@@ -535,7 +535,7 @@ update_dialog_response_sensitiveness (FkDeclare *decl)
/**
* fk_declare_write
* @decl: a #FkDeclare widget
- * @bwin: (allow-none): a #BrowserWindow, or %NULL
+ * @bwin: (nullable): a #BrowserWindow, or %NULL
* @error: a place to store errors or %NULL
*
* Actually declares the new foreign key in the meta store
@@ -607,7 +607,7 @@ fk_declare_write (FkDeclare *decl, BrowserWindow *bwin, GError **error)
/**
* fk_declare_undeclare:
* @mstruct: the #GdaMEtaStruct to delete the FK from
- * @bwin: (allow-none): a #BrowserWindow, or %NULL
+ * @bwin: (nullable): a #BrowserWindow, or %NULL
* @decl_fk: the #GdaMetaTableForeignKey fk to delete
* @error: a place to store errors, or %NULL
*
diff --git a/tools/browser/ldap-browser/mgr-ldap-classes.c b/tools/browser/ldap-browser/mgr-ldap-classes.c
index 7129105f1..eb1dbc94d 100644
--- a/tools/browser/ldap-browser/mgr-ldap-classes.c
+++ b/tools/browser/ldap-browser/mgr-ldap-classes.c
@@ -120,7 +120,7 @@ mgr_ldap_classes_get_type (void)
* mgr_ldap_classes_new:
* @cnc: a #GdaConnection object
* @flat: %TRUE if listing all the classes, if %TRUE, then @classname is ignored.
- * @classname: (allow-none): an LDAP class or %NULL for the "top" class
+ * @classname: (nullable): an LDAP class or %NULL for the "top" class
*
* Creates a new #GdaTreeManager object which will list the children classes
*
diff --git a/tools/browser/ldap-browser/mgr-ldap-entries.c b/tools/browser/ldap-browser/mgr-ldap-entries.c
index 1d83befc6..78596e242 100644
--- a/tools/browser/ldap-browser/mgr-ldap-entries.c
+++ b/tools/browser/ldap-browser/mgr-ldap-entries.c
@@ -119,7 +119,7 @@ mgr_ldap_entries_get_type (void)
/**
* mgr_ldap_entries_new:
* @cnc: a #TConnection object
- * @dn: (allow-none): a schema name or %NULL
+ * @dn: (nullable): a schema name or %NULL
*
* Creates a new #BrowserTreeManager object which will list the children of the LDAP entry which
Distinguished name
* is @dn. If @dn is %NULL, then the tree manager will look in the tree itself for an attribute named "dn"
and
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index 1f6c7a7ec..d9a659472 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -1237,7 +1237,7 @@ get_date_format (time_t time)
/**
* query_editor_start_history_batch
* @editor: a #QueryEditor widget.
- * @hist_batch: (allow-none): a #QueryEditorHistoryBatch to add, or %NULL
+ * @hist_batch: (nullable): a #QueryEditorHistoryBatch to add, or %NULL
*
* @hist_hash ref is _NOT_ stolen here
*/
@@ -1354,7 +1354,7 @@ timestamps_update_cb (QueryEditor *editor)
/**
* query_editor_add_history_item
* @editor: a #QueryEditor widget.
- * @hist_item: (allow-none): a #QueryEditorHistoryItem to add, or %NULL
+ * @hist_item: (nullable): a #QueryEditorHistoryItem to add, or %NULL
*
* Adds some text. @text_data is useful only if @editor's mode is HISTORY, it will be ignored
* otherwise.
@@ -1429,7 +1429,7 @@ query_editor_add_history_item (QueryEditor *editor, QueryEditorHistoryItem *hist
/**
* query_editor_get_current_history_item
* @editor: a #QueryEditor widget.
- * @out_in_batch: (allow-none): a pointer to store the #QueryEditorHistoryBatch the returned item is in, or
%NULL
+ * @out_in_batch: (nullable): a pointer to store the #QueryEditorHistoryBatch the returned item is in, or
%NULL
*
* Get the current selected #QueryEditorHistoryItem
* passed to query_editor_add_history_item().
diff --git a/tools/browser/ui-customize.c b/tools/browser/ui-customize.c
index 9602eb1bc..0b12f3e3b 100644
--- a/tools/browser/ui-customize.c
+++ b/tools/browser/ui-customize.c
@@ -98,8 +98,8 @@ customization_data_get (GObject *object)
/**
* customization_data_init:
* @object: an object being customized (#BrowserPerspective or #BrowserPage)
- * @toolbar: (allow-none): a #GtkToolbar
- * @header: (allow-none): a #GtkHeaderBar
+ * @toolbar: (nullable): a #GtkToolbar
+ * @header: (nullable): a #GtkHeaderBar
*
* Initializes the customization for @object
*/
diff --git a/tools/browser/ui-formgrid.c b/tools/browser/ui-formgrid.c
index bff6a942f..62861dbd1 100644
--- a/tools/browser/ui-formgrid.c
+++ b/tools/browser/ui-formgrid.c
@@ -845,7 +845,7 @@ handle_user_prefs_for_sql_statement (UiFormGrid *formgrid, TConnection *tcnc,
/**
* ui_formgrid_handle_user_prefs
* @formgrid: a #UiFormGrid widget
- * @tcnc: (allow-none): a #TConnection, or %NULL to let @formgrid determine it itself
+ * @tcnc: (nullable): a #TConnection, or %NULL to let @formgrid determine it itself
* @stmt: the #GdaStatement which has been executed to produce the #GdaDataModel displayed in @formgrid
*
* Takes into account the UI preferences of the user
@@ -1041,7 +1041,7 @@ ui_formgrid_get_grid_widget (UiFormGrid *formgrid)
/**
* ui_formgrid_set_connection
* @formgrid: a #UiFormGrid widget
- * @tcnc: (allow-none): a #TConnection, or %NULL
+ * @tcnc: (nullable): a #TConnection, or %NULL
*
* Tells @formgrid to use @tcnc as connection when actions have to be executed
*/
@@ -1109,8 +1109,8 @@ compute_modification_statements (UiFormGrid *formgrid, GdaDataModel *model)
/**
* ui_formgrid_set_refresh_func:
* @formgrid: a #UiFormGrid widget
- * @callback: (allow-none): a callback, or %NULL
- * @user_data: (allow-none): a pointer passed to the @callback function, or %NULL
+ * @callback: (nullable): a callback, or %NULL
+ * @user_data: (nullable): a pointer passed to the @callback function, or %NULL
*
* If @callback is not %NULL, then a "Refresh" button is added to @formgrid which, when clicked,
* calls @callback. The callback function will have a first argument which is a button, and a second argument
diff --git a/tools/common/t-connection.c b/tools/common/t-connection.c
index 9295d28fd..65c8abc6c 100644
--- a/tools/common/t-connection.c
+++ b/tools/common/t-connection.c
@@ -709,11 +709,11 @@ t_connection_name_is_valid (const gchar *name)
/**
* t_connection_open:
- * @cnc_name: (allow-none): a name to give to the new connection, or %NULL (a new name is automatically
chosen)
+ * @cnc_name: (nullable): a name to give to the new connection, or %NULL (a new name is automatically chosen)
* @cnc_string: a connection string, or DSN name
- * @auth_string: (allow-none): an authentication string, or %NULL
+ * @auth_string: (nullable): an authentication string, or %NULL
* @use_term: if %TRUE, then standard stdin and stdout are used to read and display missing information
(username or password)
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Open a connection.
*
@@ -1421,7 +1421,7 @@ t_connection_render_pretty_sql (TConnection *tcnc, GdaStatement *stmt)
* @stmt: a #GdaStatement
* @params: a #GdaSet as parameters, or %NULL
* @model_usage: how the returned data model (if any) will be used
- * @last_insert_row: (allow-none): a place to store a new GdaSet object which contains the values of the
last inserted row, or %NULL.
+ * @last_insert_row: (nullable): a place to store a new GdaSet object which contains the values of the last
inserted row, or %NULL.
* @error: a place to store errors, or %NULL
*
* Executes @stmt by @tcnc.
@@ -2332,10 +2332,10 @@ t_connection_ldap_get_base_dn (TConnection *tcnc)
* t_connection_describe_table:
* @tcnc: a #TConnection
* @table_name: a table name, not %NULL
- * @out_base_dn: (allow-none) (transfer none): a place to store the LDAP search base DN, or %NULL
- * @out_filter: (allow-none) (transfer none): a place to store the LDAP search filter, or %NULL
- * @out_attributes: (allow-none) (transfer none): a place to store the LDAP search attributes, or %NULL
- * @out_scope: (allow-none) (transfer none): a place to store the LDAP search scope, or %NULL
+ * @out_base_dn: (nullable) (transfer none): a place to store the LDAP search base DN, or %NULL
+ * @out_filter: (nullable) (transfer none): a place to store the LDAP search filter, or %NULL
+ * @out_attributes: (nullable) (transfer none): a place to store the LDAP search attributes, or %NULL
+ * @out_scope: (nullable) (transfer none): a place to store the LDAP search scope, or %NULL
* @error: a place to store errors, or %NULL
*/
gboolean
@@ -2430,7 +2430,7 @@ t_connection_undeclare_table (TConnection *tcnc,
/**
* t_connection_set_query_buffer:
* @tcnc: a #TConnection
- * @sql: (allow-none): a string, or %NULL
+ * @sql: (nullable): a string, or %NULL
*
* Set @tcnc's associated query buffer
*/
diff --git a/tools/common/t-context.c b/tools/common/t-context.c
index 6c2d66617..613705145 100644
--- a/tools/common/t-context.c
+++ b/tools/common/t-context.c
@@ -445,7 +445,7 @@ t_context_get_id (TContext *console)
/**
* t_context_set_command_group:
* @console: a #TContext object
- * @group: (allow-none) (transfer none): a #ToolCommandGroup
+ * @group: (nullable) (transfer none): a #ToolCommandGroup
*
* Defines @console's commands group
*/
@@ -500,7 +500,7 @@ t_context_set_output_format (TContext *console, ToolOutputFormat format)
/**
* t_context_get_output_stream:
* @console: a #TContext
- * @out_is_pipe: (allow-none): a place to store information about the stream being a pipe or not, or %NULL
+ * @out_is_pipe: (nullable): a place to store information about the stream being a pipe or not, or %NULL
*
* Returns: the current output stream, or %NULL if none defined (i.e. stdout)
*/
@@ -516,8 +516,8 @@ t_context_get_output_stream (TContext *console, gboolean *out_is_pipe)
/**
* t_context_set_output_file:
* @console: a #TContext
- * @file: (allow-none): a string representing the output string, or %NULL (i.e. stdout)
- * @error: (allow-none): a place to store errors, or %NULL
+ * @file: (nullable): a string representing the output string, or %NULL (i.e. stdout)
+ * @error: (nullable): a place to store errors, or %NULL
*
* Note: the "| cmd" is an accepted notation to pipe the outpit stream to another program
*
@@ -626,7 +626,7 @@ t_connection_status_changed_cb (TConnection *tcnc, GdaConnectionStatus status, T
/**
* t_context_set_connection:
* @console: a #TContext
- * @tcnc: (allow-none): the #TConnection to use, or %NULL
+ * @tcnc: (nullable): the #TConnection to use, or %NULL
*
* Defines the connection used by @context
*/
diff --git a/tools/common/t-favorites-actions.c b/tools/common/t-favorites-actions.c
index 3d5e7c6c3..575d02d75 100644
--- a/tools/common/t-favorites-actions.c
+++ b/tools/common/t-favorites-actions.c
@@ -139,7 +139,7 @@ t_favorites_actions_get (TFavorites *bfav, TConnection *tcnc, GdaSet *set)
/**
* t_favorites_action_free
- * @action: (allow-none): a #TFavoritesAction, or %NULL
+ * @action: (nullable): a #TFavoritesAction, or %NULL
*
* Frees @action
*/
@@ -158,7 +158,7 @@ t_favorites_action_free (TFavoritesAction *action)
/**
* t_favorites_actions_list_free
- * @actions_list: (allow-none): a list of #TFavoritesAction, or %NULL
+ * @actions_list: (nullable): a list of #TFavoritesAction, or %NULL
*
* Free a list of #TFavoritesAction (frees the list and each #TFavoritesAction)
*/
diff --git a/tools/common/t-favorites.c b/tools/common/t-favorites.c
index 204e9b38a..9027d908f 100644
--- a/tools/common/t-favorites.c
+++ b/tools/common/t-favorites.c
@@ -1158,7 +1158,7 @@ t_favorites_delete (TFavorites *bfav, guint session_id,
* @bfav: a #TFavorites
* @session_id: 0 for now
* @contents: the favorite's contents
- * @out_fav: (allow-none): a #TFavoritesAttributes to be filled with the favorite's attributes, or %NULL
+ * @out_fav: (nullable): a #TFavoritesAttributes to be filled with the favorite's attributes, or %NULL
* @error: a place to store errors, or %NULL
*
* Get all the information about a favorite from its id: fills the @out_fav
@@ -1184,7 +1184,7 @@ t_favorites_find (TFavorites *bfav, guint session_id, const gchar *contents,
* @session_id: 0 for now
* @type: the favorite's type
* @name: the favorite's name
- * @out_fav: (allow-none): a #TFavoritesAttributes to be filled with the favorite's attributes, or %NULL
+ * @out_fav: (nullable): a #TFavoritesAttributes to be filled with the favorite's attributes, or %NULL
* @error: a place to store errors, or %NULL
*
* Get all the information about a favorite from its id: fills the @out_fav
diff --git a/tools/common/t-utils.c b/tools/common/t-utils.c
index 0c7889834..3e2a2f78a 100644
--- a/tools/common/t-utils.c
+++ b/tools/common/t-utils.c
@@ -133,7 +133,7 @@ t_utils_compute_prompt (TContext *console, gboolean in_command, gboolean for_rea
* t_utils_split_text_into_single_commands:
* @console: a #TContext
* @commands: a string containing one or more internal or SQL commands
- * @error: (allow-none): a place to store errors, or %NULL
+ * @error: (nullable): a place to store errors, or %NULL
*
* Splits @commands into separate commands, either internal or SQL.
* Also this function:
diff --git a/tools/common/web-server.c b/tools/common/web-server.c
index bb9627955..47719e9ae 100644
--- a/tools/common/web-server.c
+++ b/tools/common/web-server.c
@@ -333,7 +333,7 @@ server_callback (G_GNUC_UNUSED SoupServer *server, SoupMessage *msg,
/**
* web_server_new:
* @port: the port to listen on
- * @auth_token: (allow-none): the authentication token, or %NULL
+ * @auth_token: (nullable): the authentication token, or %NULL
*
* Creates a new server of type @type
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
