[libgda/LIBGDA_5.2] Release 5.2.5
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/LIBGDA_5.2] Release 5.2.5
- Date: Thu, 27 Sep 2018 16:42:52 +0000 (UTC)
commit ff07bb05497967e548ea3766623b73df5e078f8f
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Sep 27 11:26:34 2018 -0500
Release 5.2.5
Updated GObject Introspection annotations
NEWS | 1 +
libgda/gda-data-model-array.c | 7 +-
libgda/gda-data-model.c | 96 +++++++++++----------------
libgda/gda-data-proxy.c | 4 +-
libgda/gda-holder.c | 10 +--
libgda/gda-meta-store.c | 76 +++++++++++----------
libgda/gda-mutex.c | 2 +-
libgda/gda-server-operation.c | 49 +++++++-------
libgda/gda-sql-builder.c | 33 ++++-----
libgda/gda-statement.c | 6 +-
libgda/gda-util.c | 35 +++++-----
libgda/gda-value.c | 14 ++--
libgda/sql-parser/gda-statement-struct-decl.h | 2 +-
13 files changed, 146 insertions(+), 189 deletions(-)
---
diff --git a/NEWS b/NEWS
index b21a72d09..dbe238d9b 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ libgda 5.2.5 2018-09-25
- Updated SQLite to 3.8.11.1
- Fix SQLCipher build by embedding source code for 3.4.2 version
- Fix SQLCipher disabling
+ - Updated GObject Introspection annotations
- Fix Doc generation
- Bugs corrected: #787685 #789382 #761560 #761529 #760420 #761424 #754263 #754208
- Corrected HTML output containing <SCRIPT> tag
diff --git a/libgda/gda-data-model-array.c b/libgda/gda-data-model-array.c
index 852cf248f..481df8792 100644
--- a/libgda/gda-data-model-array.c
+++ b/libgda/gda-data-model-array.c
@@ -325,7 +325,7 @@ gda_data_model_array_new_with_g_types (gint cols, ...)
}
/**
- * gda_data_model_array_new_with_g_types_v:
+ * gda_data_model_array_new_with_g_types_v: (rename-to gda_data_model_array_new_with_g_types)
* @cols: number of columns for rows in this data model.
* @types: (array): array of types of the columns of the model to create as #GType, as many as indicated by
@cols
*
@@ -336,7 +336,6 @@ gda_data_model_array_new_with_g_types (gint cols, ...)
*
* Since: 4.2.6
*
- * Rename to: gda_data_model_array_new_with_g_types
*/
GdaDataModel *
gda_data_model_array_new_with_g_types_v (gint cols, GType *types)
@@ -361,7 +360,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)
@@ -416,7 +415,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.c b/libgda/gda-data-model.c
index 2fdab0eee..ba56d6701 100644
--- a/libgda/gda-data-model.c
+++ b/libgda/gda-data-model.c
@@ -399,7 +399,7 @@ gda_data_model_thaw (GdaDataModel *model)
}
/**
- * gda_data_model_set_notify:
+ * gda_data_model_set_notify: (virtual i_set_notify)
* @model: a #GdaDataModel object.
* @do_notify_changes: Set to TRUE if you require notifications.
*
@@ -407,7 +407,6 @@ gda_data_model_thaw (GdaDataModel *model)
*
* Deprecated: 5.2: use gda_data_model_freeze() and gda_data_model_thaw() instead
*
- * Virtual: i_set_notify
*/
void
gda_data_model_set_notify (GdaDataModel *model, gboolean do_notify_changes)
@@ -418,12 +417,11 @@ gda_data_model_set_notify (GdaDataModel *model, gboolean do_notify_changes)
}
/**
- * gda_data_model_get_notify:
+ * gda_data_model_get_notify: (virtual i_get_notify)
* @model: a #GdaDataModel object.
*
* Returns the status of notifications changes on the given data model.
*
- * Virtual: i_get_notify
*/
gboolean
gda_data_model_get_notify (GdaDataModel *model)
@@ -437,14 +435,14 @@ gda_data_model_get_notify (GdaDataModel *model)
/**
- * gda_data_model_get_access_flags:
+ * gda_data_model_get_access_flags: (virtual i_get_access_flags)
* @model: a #GdaDataModel object.
*
* Get the attributes of @model such as how to access the data it contains if it's modifiable, etc.
*
* Returns: (transfer none): an ORed value of #GdaDataModelAccessFlags flags
*
- * Virtual: i_get_access_flags
+ *
*/
GdaDataModelAccessFlags
gda_data_model_get_access_flags (GdaDataModel *model)
@@ -461,12 +459,11 @@ gda_data_model_get_access_flags (GdaDataModel *model)
}
/**
- * gda_data_model_get_n_rows:
+ * gda_data_model_get_n_rows: (virtual i_get_n_rows)
* @model: a #GdaDataModel object.
*
* Returns: the number of rows in the given data model, or -1 if the number of rows is not known
*
- * Virtual: i_get_n_rows
*/
gint
gda_data_model_get_n_rows (GdaDataModel *model)
@@ -480,12 +477,11 @@ gda_data_model_get_n_rows (GdaDataModel *model)
}
/**
- * gda_data_model_get_n_columns:
+ * gda_data_model_get_n_columns: (virtual i_get_n_columns)
* @model: a #GdaDataModel object.
*
* Returns: the number of columns in the given data model, or -1 if unknown.
*
- * Virtual: i_get_n_columns
*/
gint
gda_data_model_get_n_columns (GdaDataModel *model)
@@ -501,7 +497,7 @@ gda_data_model_get_n_columns (GdaDataModel *model)
}
/**
- * gda_data_model_describe_column:
+ * gda_data_model_describe_column: (virtual i_describe_column)
* @model: a #GdaDataModel object.
* @col: column number.
*
@@ -513,9 +509,8 @@ 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.
*
- * Virtual: i_describe_column
*/
GdaColumn *
gda_data_model_describe_column (GdaDataModel *model, gint col)
@@ -656,7 +651,7 @@ gda_data_model_set_column_title (GdaDataModel *model, gint col, const gchar *tit
}
/**
- * gda_data_model_get_value_at:
+ * gda_data_model_get_value_at: (virtual i_get_value_at)
* @model: a #GdaDataModel object.
* @col: a valid column number.
* @row: a valid row number.
@@ -686,10 +681,9 @@ 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).
*
- * Virtual: i_get_value_at
*
*/
const GValue *
@@ -728,7 +722,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 *
@@ -764,7 +758,7 @@ gda_data_model_get_typed_value_at (GdaDataModel *model, gint col, gint row, GTyp
}
/**
- * gda_data_model_get_attributes_at:
+ * gda_data_model_get_attributes_at: (virtual i_get_attributes_at)
* @model: a #GdaDataModel object
* @col: a valid column number
* @row: a valid row number, or -1
@@ -776,7 +770,6 @@ gda_data_model_get_typed_value_at (GdaDataModel *model, gint col, gint row, GTyp
*
* Returns: (transfer none): the attributes as an ORed value of #GdaValueAttribute
*
- * Virtual: i_get_attributes_at
*/
GdaValueAttribute
gda_data_model_get_attributes_at (GdaDataModel *model, gint col, gint row)
@@ -796,7 +789,7 @@ gda_data_model_get_attributes_at (GdaDataModel *model, gint col, gint row)
}
/**
- * gda_data_model_set_value_at:
+ * gda_data_model_set_value_at: (virtual i_set_value_at)
* @model: a #GdaDataModel object.
* @col: column number.
* @row: row number.
@@ -810,7 +803,6 @@ gda_data_model_get_attributes_at (GdaDataModel *model, gint col, gint row)
*
* Returns: TRUE if the value in the data model has been updated and no error occurred
*
- * Virtual: i_set_value_at
*/
gboolean
gda_data_model_set_value_at (GdaDataModel *model, gint col, gint row, const GValue *value, GError **error)
@@ -828,10 +820,10 @@ gda_data_model_set_value_at (GdaDataModel *model, gint col, gint row, const GVal
}
/**
- * gda_data_model_set_values:
+ * gda_data_model_set_values: (virtual i_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
@@ -845,7 +837,6 @@ gda_data_model_set_value_at (GdaDataModel *model, gint col, gint row, const GVal
*
* Returns: %TRUE if the value in the data model has been updated and no error occurred
*
- * Virtual: i_set_values
*/
gboolean
gda_data_model_set_values (GdaDataModel *model, gint row, GList *values, GError **error)
@@ -886,7 +877,7 @@ gda_data_model_set_values (GdaDataModel *model, gint row, GList *values, GError
}
/**
- * gda_data_model_create_iter:
+ * gda_data_model_create_iter: (virtual i_create_iter)
* @model: a #GdaDataModel object.
*
* Creates a new iterator object #GdaDataModelIter object which can be used to iterate through
@@ -915,7 +906,6 @@ gda_data_model_set_values (GdaDataModel *model, gint row, GList *values, GError
*
* Returns: (transfer full): a #GdaDataModelIter object, or %NULL if an error occurred
*
- * Virtual: i_create_iter
*/
GdaDataModelIter *
gda_data_model_create_iter (GdaDataModel *model)
@@ -930,7 +920,7 @@ gda_data_model_create_iter (GdaDataModel *model)
}
/**
- * gda_data_model_iter_at_row:
+ * gda_data_model_iter_at_row: (virtual i_iter_at_row)
* @model: a #GdaDataModel object.
* @iter: a #GdaDataModelIter object.
* @row: a row to point to with @iter
@@ -939,7 +929,6 @@ gda_data_model_create_iter (GdaDataModel *model)
*
* Deprecated: 5.2: use gda_data_model_iter_move_to_row() instead
*
- * Virtual: i_iter_at_row
*/
gboolean
gda_data_model_iter_at_row (GdaDataModel *model, GdaDataModelIter *iter, gint row)
@@ -951,7 +940,7 @@ gda_data_model_iter_at_row (GdaDataModel *model, GdaDataModelIter *iter, gint ro
}
/**
- * gda_data_model_iter_next:
+ * gda_data_model_iter_next: ( virtual i_iter_next)
* @model: a #GdaDataModel object.
* @iter: a #GdaDataModelIter object.
*
@@ -959,7 +948,6 @@ gda_data_model_iter_at_row (GdaDataModel *model, GdaDataModelIter *iter, gint ro
*
* Deprecated: 5.2: use gda_data_model_iter_move_next() instead
*
- * Virtual: i_iter_next
*/
gboolean
gda_data_model_iter_next (GdaDataModel *model, GdaDataModelIter *iter)
@@ -971,7 +959,7 @@ gda_data_model_iter_next (GdaDataModel *model, GdaDataModelIter *iter)
}
/**
- * gda_data_model_iter_prev:
+ * gda_data_model_iter_prev: (virtual i_iter_prev)
* @model: a #GdaDataModel object.
* @iter: a #GdaDataModelIter object.
*
@@ -979,7 +967,6 @@ gda_data_model_iter_next (GdaDataModel *model, GdaDataModelIter *iter)
*
* Deprecated: 5.2: use gda_data_model_iter_move_prev() instead
*
- * Virtual: i_iter_prev
*/
gboolean
gda_data_model_iter_prev (GdaDataModel *model, GdaDataModelIter *iter)
@@ -992,7 +979,7 @@ gda_data_model_iter_prev (GdaDataModel *model, GdaDataModelIter *iter)
/**
- * gda_data_model_iter_set_value:
+ * gda_data_model_iter_set_value: (virtual i_iter_set_value)
* @model: a #GdaDataModel object.
* @iter: a #GdaDataModelIter object.
* @col: the number of column to set value to
@@ -1003,7 +990,6 @@ gda_data_model_iter_prev (GdaDataModel *model, GdaDataModelIter *iter)
*
* Deprecated: 5.2: use gda_data_model_iter_set_value_at() instead
*
- * Virtual: i_iter_set_value
*/
gboolean
gda_data_model_iter_set_value (GdaDataModel *model, GdaDataModelIter *iter, gint col,
@@ -1017,9 +1003,9 @@ gda_data_model_iter_set_value (GdaDataModel *model, GdaDataModelIter *iter, gint
/**
- * gda_data_model_append_values:
+ * gda_data_model_append_values: (virtual i_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
@@ -1032,7 +1018,6 @@ gda_data_model_iter_set_value (GdaDataModel *model, GdaDataModelIter *iter, gint
*
* Returns: the number of the added row, or -1 if an error occurred
*
- * Virtual: i_append_values
*/
gint
gda_data_model_append_values (GdaDataModel *model, const GList *values, GError **error)
@@ -1050,7 +1035,7 @@ gda_data_model_append_values (GdaDataModel *model, const GList *values, GError *
}
/**
- * gda_data_model_append_row:
+ * gda_data_model_append_row: (virtual i_append_row)
* @model: a #GdaDataModel object.
* @error: a place to store errors, or %NULL
*
@@ -1062,7 +1047,6 @@ gda_data_model_append_values (GdaDataModel *model, const GList *values, GError *
*
* Returns: the number of the added row, or -1 if an error occurred
*
- * Virtual: i_append_row
*/
gint
gda_data_model_append_row (GdaDataModel *model, GError **error)
@@ -1087,7 +1071,7 @@ gda_data_model_append_row (GdaDataModel *model, GError **error)
/**
- * gda_data_model_remove_row:
+ * gda_data_model_remove_row: (virtual i_remove_row)
* @model: a #GdaDataModel object.
* @row: the row number to be removed.
* @error: a place to store errors, or %NULL
@@ -1099,7 +1083,6 @@ gda_data_model_append_row (GdaDataModel *model, GError **error)
*
* Returns: %TRUE if successful, %FALSE otherwise.
*
- * Virtual: i_remove_row
*/
gboolean
gda_data_model_remove_row (GdaDataModel *model, gint row, GError **error)
@@ -1123,7 +1106,7 @@ gda_data_model_remove_row (GdaDataModel *model, gint row, GError **error)
}
/**
- * gda_data_model_get_row_from_values:
+ * gda_data_model_get_row_from_values: (virtual i_find_row)
* @model: a #GdaDataModel object.
* @values: (element-type GObject.Value): a list of #GValue values (no %NULL is allowed)
* @cols_index: (array): an array of #gint containing the column number to match each value of @values
@@ -1135,7 +1118,6 @@ gda_data_model_remove_row (GdaDataModel *model, gint row, GError **error)
*
* Returns: the requested row number, of -1 if not found
*
- * Virtual: i_find_row
*/
gint
gda_data_model_get_row_from_values (GdaDataModel *model, GSList *values, gint *cols_index)
@@ -1197,15 +1179,14 @@ gda_data_model_get_row_from_values (GdaDataModel *model, GSList *values, gint *c
}
/**
- * gda_data_model_send_hint:
+ * gda_data_model_send_hint: (virtual i_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
*
- * Virtual: i_send_hint
*/
void
gda_data_model_send_hint (GdaDataModel *model, GdaDataModelHint hint, const GValue *hint_value)
@@ -1217,7 +1198,7 @@ gda_data_model_send_hint (GdaDataModel *model, GdaDataModelHint hint, const GVal
}
/**
- * gda_data_model_get_exceptions:
+ * gda_data_model_get_exceptions: (virtual i_get_exceptions)
* @model: a #GdaDataModel
*
* Get the global data model exception(s) that occurred when using @model.
@@ -1229,7 +1210,6 @@ gda_data_model_send_hint (GdaDataModel *model, GdaDataModelHint hint, const GVal
*
* Since: 4.2.6
*
- * Virtual: i_get_exceptions
*/
GError **
gda_data_model_get_exceptions (GdaDataModel *model)
@@ -1252,9 +1232,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
*
@@ -1565,9 +1545,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
@@ -1783,11 +1763,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).
*
@@ -2074,7 +2054,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
@@ -2338,7 +2318,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
*
@@ -2373,7 +2353,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-proxy.c b/libgda/gda-data-proxy.c
index f1ae6393b..9e52de8b0 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -1445,7 +1445,7 @@ find_or_create_row_modif (GdaDataProxy *proxy, gint proxy_row, gint col, RowValu
* gda_data_proxy_get_values:
* @proxy: a #GdaDataProxy object
* @proxy_row: a proxy row
- * @cols_index: (array) (array length=n_cols): array containing the columns for which the values are
requested
+ * @cols_index: (array length=n_cols): array containing the columns for which the values are requested
* @n_cols: size of @cols_index
*
* Retrieve a whole list of values from the @proxy data model. This function
@@ -3185,7 +3185,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-holder.c b/libgda/gda-holder.c
index 133f61b4d..e1e6f58fc 100644
--- a/libgda/gda-holder.c
+++ b/libgda/gda-holder.c
@@ -372,7 +372,7 @@ gda_holder_init (GdaHolder *holder)
/**
* gda_holder_new:
- * @type: (transfer none): the #GType requested
+ * @type: the #GType requested
*
* Creates a new holder of type @type
*
@@ -745,14 +745,6 @@ gda_holder_get_property (GObject *object,
}
}
-/**
- * gda_holder_get_g_type:
- * @holder: a #GdaHolder object
- *
- * Get @holder's type
- *
- * Returns: (transfer none): the data type
- */
GType
gda_holder_get_g_type (GdaHolder *holder)
{
diff --git a/libgda/gda-meta-store.c b/libgda/gda-meta-store.c
index dabded251..a09e4b10f 100644
--- a/libgda/gda-meta-store.c
+++ b/libgda/gda-meta-store.c
@@ -184,7 +184,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
@@ -214,7 +214,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.
@@ -261,7 +261,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.
*
@@ -862,7 +862,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.
*
@@ -1076,7 +1076,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.
@@ -2707,7 +2707,7 @@ gda_meta_store_sql_identifier_quote (const gchar *id, GdaConnection *cnc)
* gda_meta_store_extract: (skip)
* @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.
*
@@ -2821,10 +2821,10 @@ gda_meta_store_extract (GdaMetaStore *store, const gchar *select_sql, GError **e
}
/**
- * gda_meta_store_extract_v:
+ * 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
@@ -2841,7 +2841,6 @@ gda_meta_store_extract (GdaMetaStore *store, const gchar *select_sql, GError **e
*
* Since: 4.2.6
*
- * Rename to: gda_meta_store_extract
*/
GdaDataModel *
gda_meta_store_extract_v (GdaMetaStore *store, const gchar *select_sql, GHashTable *vars, GError **error)
@@ -2948,10 +2947,10 @@ static gint find_row_in_model (GdaDataModel *find_in, GdaDataModel *data, gint r
* gda_meta_store_modify: (skip)
* @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.
*
@@ -3015,7 +3014,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
*
@@ -3062,16 +3061,16 @@ gda_meta_store_modify_with_context (GdaMetaStore *store, GdaMetaContext *context
/*#define DEBUG_STORE_MODIFY*/
/**
- * gda_meta_store_modify_v:
+ * 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.
@@ -3080,7 +3079,6 @@ gda_meta_store_modify_with_context (GdaMetaStore *store, GdaMetaContext *context
*
* Since: 4.2.6
*
- * Rename to: gda_meta_store_modify
*/
gboolean
gda_meta_store_modify_v (GdaMetaStore *store, const gchar *table_name,
@@ -3653,7 +3651,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"
@@ -3697,7 +3695,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.
*
@@ -3729,7 +3727,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.
*
@@ -3914,7 +3912,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.
*
@@ -4028,7 +4026,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()
@@ -4099,8 +4097,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.
@@ -4184,7 +4182,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.
@@ -4440,7 +4438,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.
*
@@ -4782,18 +4780,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.
@@ -5015,15 +5013,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-mutex.c b/libgda/gda-mutex.c
index d735b1090..1ca4103e9 100644
--- a/libgda/gda-mutex.c
+++ b/libgda/gda-mutex.c
@@ -21,7 +21,7 @@
#include <libgda/gda-mutex.h>
/**
- * gda_mutex_new: (skip)
+ * gda_mutex_new:
*
* Creates a new #GdaMutex.
*
diff --git a/libgda/gda-server-operation.c b/libgda/gda-server-operation.c
index 0a67b6cfa..f990a0a55 100644
--- a/libgda/gda-server-operation.c
+++ b/libgda/gda-server-operation.c
@@ -1091,7 +1091,7 @@ gda_server_operation_new (GdaServerOperationType op_type, const gchar *xml_file)
* Get information about the node identified by @path. The returned #GdaServerOperationNode structure can be
* copied but not modified; it may change or cease to exist if @op changes
*
- * Returns: (transfer none) (allow-none): a #GdaServerOperationNode structure, or %NULL if the node was not
found
+ * Returns: (transfer none) (nullable): a #GdaServerOperationNode structure, or %NULL if the node was not
found
*/
GdaServerOperationNode *
gda_server_operation_get_node_info (GdaServerOperation *op, const gchar *path_format, ...)
@@ -1326,7 +1326,7 @@ static gboolean node_save (GdaServerOperation *op, Node *opnode, xmlNodePtr pare
/**
* gda_server_operation_save_data_to_xml: (skip)
* @op: a #GdaServerOperation object
- * @error: (allow-none): a place to store errors or %NULL
+ * @error: (nullable): a place to store errors or %NULL
*
* Creates a new #xmlNodePtr tree which can be used to save the #op object. This
* XML structure can then be saved to disk if necessary. Use xmlFreeNode to free
@@ -1448,7 +1448,7 @@ node_save (GdaServerOperation *op, Node *opnode, xmlNodePtr parent)
* gda_server_operation_load_data_from_xml:
* @op: a #GdaServerOperation object
* @node: a #xmlNodePtr
- * @error: (allow-none): a place to store errors or %NULL
+ * @error: (nullable): a place to store errors or %NULL
*
* Loads the contents of @node into @op. The XML tree passed through the @node
* argument must correspond to an XML tree saved using gda_server_operation_save_data_to_xml().
@@ -1643,7 +1643,7 @@ gda_server_operation_get_root_nodes (GdaServerOperation *op)
* gda_server_operation_get_node_type:
* @op: a #GdaServerOperation object
* @path: a complete path to a node (starting with "/")
- * @status: (allow-none): a place to store the status of the node, or %NULL
+ * @status: (nullable): a place to store the status of the node, or %NULL
*
* Convenience function to get the type of a node.
*
@@ -1992,17 +1992,16 @@ gda_server_operation_del_item_from_sequence (GdaServerOperation *op, const gchar
}
/**
- * gda_server_operation_get_value_at_path:
+ * gda_server_operation_get_value_at_path: (rename-to gda_server_operation_get_value_at)
* @op: a #GdaServerOperation object
* @path: a complete path to a node (starting with "/")
*
* Get the value for the node at the @path path
*
- * Returns: (transfer none) (allow-none): a constant #GValue if a value has been defined, or %NULL if the
value is undefined or if the @path is not defined or @path does not hold any value.
+ * Returns: (transfer none) (nullable): a constant #GValue if a value has been defined, or %NULL if the
value is undefined or if the @path is not defined or @path does not hold any value.
*
* Since: 4.2.6
*
- * Rename to: gda_server_operation_get_value_at
*/
const GValue *
gda_server_operation_get_value_at_path (GdaServerOperation *op, const gchar *path)
@@ -2094,8 +2093,8 @@ gda_server_operation_get_value_at (GdaServerOperation *op, const gchar *path_for
/**
* gda_server_operation_get_sql_identifier_at: (skip)
* @op: a #GdaServerOperation object
- * @cnc: (allow-none): a #GdaConnection, or %NULL
- * @prov: (allow-none): a #GdaServerProvider, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
+ * @prov: (nullable): a #GdaServerProvider, or %NULL
* @path_format: a complete path to a node (starting with "/")
* @...: arguments to use with @path_format to make a complete path
*
@@ -2131,10 +2130,10 @@ gda_server_operation_get_sql_identifier_at (GdaServerOperation *op, GdaConnectio
}
/**
- * gda_server_operation_get_sql_identifier_at_path:
+ * gda_server_operation_get_sql_identifier_at_path: (rename-to gda_server_operation_get_sql_identifier_at)
* @op: a #GdaServerOperation object
- * @cnc: (allow-none): a #GdaConnection, or %NULL
- * @prov: (allow-none): a #GdaServerProvider, or %NULL
+ * @cnc: (nullable): a #GdaConnection, or %NULL
+ * @prov: (nullable): a #GdaServerProvider, or %NULL
* @path: a complete path to a node (starting with "/")
*
* This method is similar to gda_server_operation_get_value_at(), but for SQL identifiers: a new string
@@ -2148,7 +2147,6 @@ gda_server_operation_get_sql_identifier_at (GdaServerOperation *op, GdaConnectio
*
* Since: 4.2.6
*
- * Rename to: gda_server_operation_get_sql_identifier_at
*/
gchar *
gda_server_operation_get_sql_identifier_at_path (GdaServerOperation *op, GdaConnection *cnc,
GdaServerProvider *prov,
@@ -2172,9 +2170,9 @@ gda_server_operation_get_sql_identifier_at_path (GdaServerOperation *op, GdaConn
}
/**
- * gda_server_operation_set_value_at_path:
+ * gda_server_operation_set_value_at_path: (rename-to gda_server_operation_set_value_at)
* @op: a #GdaServerOperation object
- * @value: (allow-none): a string
+ * @value: (nullable): a string
* @path: a complete path to a node (starting with "/")
* @error: a place to store errors or %NULL
*
@@ -2212,7 +2210,6 @@ gda_server_operation_get_sql_identifier_at_path (GdaServerOperation *op, GdaConn
*
* Since: 4.2.6
*
- * Rename to: gda_server_operation_set_value_at
*/
gboolean
gda_server_operation_set_value_at_path (GdaServerOperation *op, const gchar *value,
@@ -2358,7 +2355,7 @@ gda_server_operation_set_value_at_path (GdaServerOperation *op, const gchar *val
/**
* gda_server_operation_set_value_at: (skip)
* @op: a #GdaServerOperation object
- * @value: (allow-none): a string
+ * @value: (nullable): a string
* @error: a place to store errors or %NULL
* @path_format: a complete path to a node (starting with "/")
* @...: arguments to use with @path_format to make a complete path
@@ -2420,7 +2417,7 @@ gda_server_operation_set_value_at (GdaServerOperation *op, const gchar *value, G
/**
* gda_server_operation_is_valid:
* @op: a #GdaServerOperation widget
- * @xml_file: (allow-none): an XML specification file (see gda_server_operation_new()) or %NULL
+ * @xml_file: (nullable): an XML specification file (see gda_server_operation_new()) or %NULL
* @error: a place to store an error, or %NULL
*
* Tells if all the required values in @op have been defined.
@@ -2495,7 +2492,7 @@ gda_server_operation_is_valid (GdaServerOperation *op, const gchar *xml_file, GE
/**
* gda_server_operation_prepare_create_database:
* @provider: the database provider to use
- * @db_name: (allow-none): the name of the database to create, or %NULL
+ * @db_name: (nullable): the name of the database to create, or %NULL
* @error: a place to store errors, or %NULL
*
* Creates a new #GdaServerOperation object which contains the specifications required
@@ -2505,7 +2502,7 @@ gda_server_operation_is_valid (GdaServerOperation *op, const gchar *xml_file, GE
* If @db_name is left %NULL, then the name of the database to create will have to be set in the
* returned #GdaServerOperation using gda_server_operation_set_value_at().
*
- * Returns: (transfer full) (allow-none): new #GdaServerOperation object, or %NULL if the provider does not
support database
+ * Returns: (transfer full) (nullable): new #GdaServerOperation object, or %NULL if the provider does not
support database
* creation
*
* Since: 4.2.3
@@ -2535,7 +2532,7 @@ gda_server_operation_prepare_create_database (const gchar *provider, const gchar
/**
* gda_server_operation_perform_create_database:
- * @provider: (allow-none): the database provider to use, or %NULL if @op has been created using
gda_server_operation_prepare_create_database()
+ * @provider: (nullable): the database provider to use, or %NULL if @op has been created using
gda_server_operation_prepare_create_database()
* @op: a #GdaServerOperation object obtained using gda_server_operation_prepare_create_database()
* @error: a place to store en error, or %NULL
*
@@ -2568,7 +2565,7 @@ gda_server_operation_perform_create_database (GdaServerOperation *op, const gcha
/**
* gda_server_operation_prepare_drop_database:
* @provider: the database provider to use
- * @db_name: (allow-none): the name of the database to drop, or %NULL
+ * @db_name: (nullable): the name of the database to drop, or %NULL
* @error: a place to store errors, or %NULL
*
* Creates a new #GdaServerOperation object which contains the specifications required
@@ -2578,7 +2575,7 @@ gda_server_operation_perform_create_database (GdaServerOperation *op, const gcha
* If @db_name is left %NULL, then the name of the database to drop will have to be set in the
* returned #GdaServerOperation using gda_server_operation_set_value_at().
*
- * Returns: (transfer full) (allow-none): new #GdaServerOperation object, or %NULL if the provider does not
support database
+ * Returns: (transfer full) (nullable): new #GdaServerOperation object, or %NULL if the provider does not
support database
* destruction
*
* Since: 4.2.3
@@ -2608,7 +2605,7 @@ gda_server_operation_prepare_drop_database (const gchar *provider, const gchar *
/**
* gda_server_operation_perform_drop_database:
- * @provider: (allow-none): the database provider to use, or %NULL if @op has been created using
gda_server_operation_prepare_drop_database()
+ * @provider: (nullable): the database provider to use, or %NULL if @op has been created using
gda_server_operation_prepare_drop_database()
* @op: a #GdaServerOperation object obtained using gda_server_operation_prepare_drop_database()
* @error: a place to store en error, or %NULL
*
@@ -2669,7 +2666,7 @@ gda_server_operation_perform_drop_database (GdaServerOperation *op, const gchar
* or #gda_server_provider_perform_operation
* in order to execute the operation.
*
- * Returns: (transfer full) (allow-none): a #GdaServerOperation if no errors; NULL and set @error otherwise
+ * Returns: (transfer full) (nullable): a #GdaServerOperation if no errors; NULL and set @error otherwise
*
* Since: 4.2.3
*/
@@ -2877,7 +2874,7 @@ gda_server_operation_perform_create_table (GdaServerOperation *op, GError **erro
* This is just a convenient function to create a #GdaServerOperation to drop a
* table in an opened connection.
*
- * Returns: (transfer full) (allow-none): a new #GdaServerOperation or %NULL if couldn't create the
opereration.
+ * Returns: (transfer full) (nullable): a new #GdaServerOperation or %NULL if couldn't create the
opereration.
*
* Since: 4.2.3
*/
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index cf65d7c10..d93fed49a 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -328,7 +328,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.
*
@@ -360,7 +360,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
*/
@@ -483,8 +483,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.
*
@@ -651,7 +651,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.
*
@@ -799,8 +799,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.
*
@@ -842,7 +842,7 @@ gda_sql_builder_add_expr_value (GdaSqlBuilder *builder, G_GNUC_UNUSED GdaDataHan
/**
* gda_sql_builder_add_expr: (skip)
* @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
*
@@ -950,7 +950,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,
@@ -1139,7 +1139,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
@@ -1224,7 +1224,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
*
@@ -1364,8 +1364,6 @@ gda_sql_builder_select_join_targets (GdaSqlBuilder *builder,
* Alter a join in a SELECT statement to make its condition use equal field
* values in the fields named @field_name in both tables, via the USING keyword.
*
- * Returns: the ID of the new join, or %0 if there was an error
- *
* Since: 4.2
*/
void
@@ -1409,7 +1407,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.
*
@@ -1671,7 +1669,7 @@ gda_sql_builder_add_function (GdaSqlBuilder *builder, const gchar *func_name, ..
}
/**
- * gda_sql_builder_add_function_v:
+ * gda_sql_builder_add_function_v: (rename-to gda_sql_builder_add_function)
* @builder: a #GdaSqlBuilder object
* @func_name: the functions's name
* @args: (array length=args_size): an array of IDs representing the function's arguments
@@ -1681,8 +1679,6 @@ gda_sql_builder_add_function (GdaSqlBuilder *builder, const gchar *func_name, ..
*
* Returns: the ID of the new expression, or %0 if there was an error
*
- * Rename to: gda_sql_builder_add_function
- *
* Since: 4.2
*/
GdaSqlBuilderId
@@ -1911,7 +1907,7 @@ gda_sql_builder_add_case (GdaSqlBuilder *builder,
}
/**
- * gda_sql_builder_add_case_v:
+ * gda_sql_builder_add_case_v: (rename-to gda_sql_builder_add_case)
* @builder: a #GdaSqlBuilder object
* @test_expr: the expression ID representing the test of the CASE, or %0
* @else_expr: the expression ID representing the ELSE expression, or %0
@@ -1927,7 +1923,6 @@ gda_sql_builder_add_case (GdaSqlBuilder *builder,
*
* Since: 4.2
*
- * Rename to: gda_sql_builder_add_case
*/
GdaSqlBuilderId
gda_sql_builder_add_case_v (GdaSqlBuilder *builder,
diff --git a/libgda/gda-statement.c b/libgda/gda-statement.c
index 1b1220065..60920510b 100644
--- a/libgda/gda-statement.c
+++ b/libgda/gda-statement.c
@@ -132,9 +132,8 @@ gda_statement_class_init (GdaStatementClass * klass)
/**
* GdaStatement::reset:
- * @stmt: the #GdaStatement object
*
- * Gets emitted whenever the @stmt has changed
+ * Gets emitted whenever the statement has changed
*/
gda_statement_signals[RESET] =
g_signal_new ("reset",
@@ -146,10 +145,9 @@ gda_statement_class_init (GdaStatementClass * klass)
0);
/**
* GdaStatement::checked:
- * @stmt: the #GdaStatement object
*
* Gets emitted whenever the structure and contents
- * of @stmt have been verified (emitted after gda_statement_check_validity()).
+ * of the statement have been verified (emitted after gda_statement_check_validity()).
*/
gda_statement_signals[CHECKED] =
g_signal_new ("checked",
diff --git a/libgda/gda-util.c b/libgda/gda-util.c
index a1919f49d..6e5488dcf 100644
--- a/libgda/gda-util.c
+++ b/libgda/gda-util.c
@@ -300,7 +300,7 @@ gda_default_unescape_string (const gchar *string)
}
/**
- * gda_utility_check_data_model_v:
+ * gda_utility_check_data_model_v: (rename-to gda_utility_check_data_model)
* @model: a #GdaDataModel object
* @nbcols: the minimum requested number of columns
* @types: (array length=nbcols): array with @nbcols length of type GType or null (if any data type is
accepted)
@@ -311,7 +311,6 @@ gda_default_unescape_string (const gchar *string)
*
* Since: 4.2.6
*
- * Rename to: gda_utility_check_data_model
*/
gboolean
gda_utility_check_data_model_v (GdaDataModel *model, gint nbcols, GType* types)
@@ -351,10 +350,10 @@ gda_utility_check_data_model_v (GdaDataModel *model, gint nbcols, GType* types)
/**
- * gda_utility_check_data_model: (skip)
+ * gda_utility_check_data_model:
* @model: a #GdaDataModel object
* @nbcols: the minimum requested number of columns
- * @Varargs: @nbcols arguments of type GType or -1 (if any data type is accepted)
+ * @...: @nbcols arguments of type GType or -1 (if any data type is accepted)
*
* Check the column types of a GdaDataModel.
*
@@ -410,9 +409,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
*
@@ -915,7 +914,7 @@ dml_statements_check_select_structure (GdaConnection *cnc, GdaSqlStatement *sel_
/**
* gda_compute_unique_table_row_condition_with_cnc: (skip)
- * @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
@@ -1121,10 +1120,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
@@ -1520,7 +1519,7 @@ null_param_unknown_foreach_func (GdaSqlAnyPart *part, NullData *data, GError **e
* gda_rewrite_sql_statement_for_null_parameters: (skip)
* @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
@@ -1608,7 +1607,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
@@ -2102,7 +2101,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)
@@ -2364,7 +2363,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)
@@ -2394,8 +2393,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
*
@@ -2906,7 +2905,7 @@ gda_dsn_split (const gchar *string, gchar **out_dsn, gchar **out_username, gchar
* @out_cnc_params: a place to store the new string containing the <connection_params> part
* @out_provider: a place to store the new string containing the <provider> part
* @out_username: a place to store the new string containing the <username> part
- * @out_password: (allow-none): a place to store the new string containing the <password> part, or
%NULL
+ * @out_password: (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 eb7869602..795a11ef4 100644
--- a/libgda/gda-value.c
+++ b/libgda/gda-value.c
@@ -56,7 +56,7 @@
# ifdef GSEAL_ENABLE
/**
- * GdaNumeric:
+ * GdaNumeric: (set-value-func gda_value_set_numeric) (get-value-func gda_value_get_numeric)
* @number: a string representing a number
* @precision: precision to use when @number is converted (not implemented jet)
* @width: not implemented jet
@@ -66,8 +66,6 @@
* This struct must be considered as opaque. Any access to its members must use its
* accessors added since version 5.0.2.
*
- * Set value func: gda_value_set_numeric()
- * Get value func: gda_value_get_numeric()
*/
struct _GdaNumeric {
gchar* number; /* stored in the "C" locale, never NULL */
@@ -603,7 +601,7 @@ gda_blob_free (gpointer boxed)
/**
* 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
*/
@@ -1038,7 +1036,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
*/
@@ -1527,7 +1525,7 @@ gda_value_new_null (void)
/**
* gda_value_new_default: (skip)
- * @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.
*
@@ -1813,7 +1811,7 @@ gda_value_new_from_xml (const xmlNodePtr node)
/**
* gda_value_free: (skip)
- * @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.
*/
@@ -3058,7 +3056,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/sql-parser/gda-statement-struct-decl.h b/libgda/sql-parser/gda-statement-struct-decl.h
index 91c945df3..fb52aafd3 100644
--- a/libgda/sql-parser/gda-statement-struct-decl.h
+++ b/libgda/sql-parser/gda-statement-struct-decl.h
@@ -44,7 +44,7 @@ typedef enum {
GDA_SQL_VALIDATION_ERROR
} GdaSqlError;
/*
- * GdaSqlErrorType: (skip)
+ * GdaSqlErrorType:
*
**/
typedef GdaSqlError GdaSqlErrorType;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
