docs: fix gtk-doc warnings and update version infos

Move things around and rename things until gtk-doc is happy.

This also moves the "Since" annotations to the next stable releases and
adds version added info for g_callable_info_get_instance_ownership_transfer()
and g_struct_info_find_field().
This commit is contained in:
Christoph Reiter 2018-12-09 18:04:49 +01:00
parent 4b32b6e116
commit 722518e5bc
22 changed files with 55 additions and 48 deletions

View File

@ -41,7 +41,7 @@
* <refsect1 id="gi-giarginfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIArgInfo
* </synopsis>
* </refsect1>
@ -179,7 +179,7 @@ g_arg_info_may_be_null (GIArgInfo *info)
* Obtain if an argument is only useful in C.
*
* Returns: %TRUE if argument is only useful in C.
* Since: 1.29.0
* Since: 1.30
*/
gboolean
g_arg_info_is_skip (GIArgInfo *info)

View File

@ -33,23 +33,6 @@
G_BEGIN_DECLS
/**
* GIBaseInfoStub:
*
* TODO
*/
struct _GIBaseInfoStub {
/* <private> */
gint32 dummy1;
gint32 dummy2;
gpointer dummy3;
gpointer dummy4;
gpointer dummy5;
guint32 dummy6;
guint32 dummy7;
gpointer padding[4];
};
/**
* GIAttributeIter:
*

View File

@ -48,7 +48,7 @@
* <refsect1 id="gi-gicallableinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GICallableInfo
* +----<link linkend="gi-GIFunctionInfo">GIFunctionInfo</link>
* +----<link linkend="gi-GISignalInfo">GISignalInfo</link>
@ -297,6 +297,7 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
* Obtains the ownership transfer for the instance argument.
* #GITransfer contains a list of possible transfer values.
*
* Since: 1.42
* Returns: the transfer mode of the instance argument
*/
GITransfer

View File

@ -41,7 +41,7 @@
* <refsect1 id="gi-giconstantinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIConstantInfo
* </synopsis>
* </refsect1>
@ -78,7 +78,7 @@ g_constant_info_get_type (GIConstantInfo *info)
*
* Free the value returned from g_constant_info_get_value().
*
* Since: 1.30.1
* Since: 1.32
*/
void
g_constant_info_free_value (GIConstantInfo *info,

View File

@ -40,7 +40,7 @@
* <refsect1 id="gi-gienuminfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
* +----GIEnumInfo
* </synopsis>
@ -78,7 +78,7 @@ g_enum_info_get_n_values (GIEnumInfo *info)
*
* Returns: (transfer none): the string form of the error domain associated
* with this enum, or %NULL.
* Since: 1.29.17
* Since: 1.30
*/
const gchar *
g_enum_info_get_error_domain (GIEnumInfo *info)
@ -132,7 +132,7 @@ g_enum_info_get_value (GIEnumInfo *info,
* Obtain the number of methods that this enum type has.
*
* Returns: number of methods
* Since: 1.29.17
* Since: 1.30
*/
gint
g_enum_info_get_n_methods (GIEnumInfo *info)
@ -157,7 +157,7 @@ g_enum_info_get_n_methods (GIEnumInfo *info)
*
* Returns: (transfer full): the #GIFunctionInfo. Free the struct by calling
* g_base_info_unref() when done.
* Since: 1.29.17
* Since: 1.30
*/
GIFunctionInfo *
g_enum_info_get_method (GIEnumInfo *info,

View File

@ -44,7 +44,7 @@
* <refsect1 id="gi-gifieldinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIFieldInfo
* </synopsis>
* </refsect1>

View File

@ -45,7 +45,7 @@
* <refsect1 id="gi-gifunctioninfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GICallableInfo">GICallableInfo</link>
* +----GIFunctionInfo
* +----<link linkend="gi-GISignalInfo">GISignalInfo</link>

View File

@ -41,7 +41,7 @@
* <refsect1 id="gi-giinterfaceinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
* +----GIInterfaceInfo
* </synopsis>

View File

@ -42,7 +42,7 @@
* <refsect1 id="gi-giobjectinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
* +----GIObjectInfo
* </synopsis>

View File

@ -39,7 +39,7 @@
* <refsect1 id="gi-gipropertyinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIPropertyInfo
* </synopsis>
* </refsect1>

View File

@ -47,7 +47,7 @@
* <refsect1 id="gi-giregisteredtypeinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIRegisteredTypeInfo
* +----<link linkend="gi-GIEnumInfo">GIEnumInfo</link>
* +----<link linkend="gi-GIInterfaceInfo">GIInterfaceInfo</link>

View File

@ -220,7 +220,7 @@ g_irepository_prepend_search_path (const char *directory)
* g_irepository_get_search_path:
*
* Returns the current search path #GIRepository will use when loading
* typelib files. The list is internal to #GIRespository and should not
* typelib files. The list is internal to #GIRepository and should not
* be freed, nor should its string elements.
*
* Returns: (element-type filename) (transfer none): #GSList of strings
@ -900,7 +900,7 @@ find_by_error_domain_foreach (gpointer key,
*
* Returns: (transfer full): #GIEnumInfo representing metadata about @domain's
* enum type, or %NULL
* Since: 1.29.17
* Since: 1.30
*/
GIEnumInfo *
g_irepository_find_by_error_domain (GIRepository *repository,

View File

@ -42,7 +42,7 @@
* <refsect1 id="gi-gisignalinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GICallableInfo">GICallableInfo</link>
* +----<link linkend="gi-GIFunctionInfo">GIFunctionInfo</link>
* +----GISignalInfo

View File

@ -42,7 +42,7 @@
* <refsect1 id="gi-giobjectinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
* +----GIStructInfo
* </synopsis>
@ -123,6 +123,7 @@ g_struct_info_get_field (GIStructInfo *info,
*
* Obtain the type information for field named @name.
*
* Since: 1.46
* Returns: (transfer full): the #GIFieldInfo or %NULL if not found,
* free it with g_base_info_unref() when done.
*/

View File

@ -48,7 +48,7 @@ GI_AVAILABLE_IN_ALL
GIFieldInfo * g_struct_info_get_field (GIStructInfo *info,
gint n);
GI_AVAILABLE_IN_ALL
GI_AVAILABLE_IN_1_46
GIFieldInfo * g_struct_info_find_field (GIStructInfo *info,
const gchar *name);

View File

@ -46,7 +46,7 @@
* <refsect1 id="gi-gitypeinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GITypeInfo
* </synopsis>
* </refsect1>

View File

@ -528,7 +528,7 @@ typedef struct {
* @constructor: The function acts as a constructor for the object it is
* contained in.
* @wraps_vfunc: The function is a simple wrapper for a virtual function.
* @throws: (deprecated): This is now additionally stored in the #SignatureBlob.
* @throws: This is now additionally stored in the #SignatureBlob. (deprecated)
* @index: Index of the property that this function is a setter or getter of
* in the array of properties of the containing interface, or index
* of the virtual function that this function wraps.
@ -996,7 +996,7 @@ typedef struct {
* virtual function.
* @class_closure: Set if this virtual function is the class closure of a
* signal.
* @throws: (deprecated): This is now additionally stored in the #SignatureBlob.
* @throws: This is now additionally stored in the #SignatureBlob. (deprecated)
* @reserved: Reserved for future use.
* @signal: The index of the signal in the list of signals of the object or
* interface to which this virtual function belongs.

View File

@ -2235,7 +2235,7 @@ static GSList *library_paths;
* path (ie. LD_LIBRARY_PATH and DT_RPATH in ELF systems).
* See the documentation of your dynamic linker for full details.
*
* Since: 1.35.8
* Since: 1.36
*/
void
g_irepository_prepend_library_path (const char *directory)

View File

@ -31,9 +31,17 @@
G_BEGIN_DECLS
#ifndef __GTK_DOC_IGNORE__
typedef struct _GIBaseInfoStub GIBaseInfo;
#endif
typedef struct _GIBaseInfoStub {
/* <private> */
gint32 dummy1;
gint32 dummy2;
gpointer dummy3;
gpointer dummy4;
gpointer dummy5;
guint32 dummy6;
guint32 dummy7;
gpointer padding[4];
} GIBaseInfo;
/**
* GICallableInfo:
@ -60,7 +68,7 @@ typedef GIBaseInfo GIFunctionInfo;
* <refsect1 id="gi-gicallbackinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GICallableInfo">GICallableInfo</link>
* +----GIFunctionInfo
* +----<link linkend="gi-GISignalInfo">GISignalInfo</link>
@ -135,7 +143,7 @@ typedef GIBaseInfo GIConstantInfo;
* <refsect1 id="gi-givalueinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----GIValueInfo
* </synopsis>
* </refsect1>

View File

@ -42,7 +42,7 @@
* <refsect1 id="gi-giobjectinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
* +----GIUnionInfo
* </synopsis>

View File

@ -139,4 +139,18 @@
# define GI_AVAILABLE_IN_1_44 _GI_EXTERN
#endif
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_46
# define GI_DEPRECATED_IN_1_46 GLIB_DEPRECATED
# define GI_DEPRECATED_IN_1_46_FOR(f) GLIB_DEPRECATED_FOR(f)
#else
# define GI_DEPRECATED_IN_1_46 _GI_EXTERN
# define GI_DEPRECATED_IN_1_46_FOR(f) _GI_EXTERN
#endif
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_46
# define GI_AVAILABLE_IN_1_46 GLIB_UNAVAILABLE(2, 46)
#else
# define GI_AVAILABLE_IN_1_46 _GI_EXTERN
#endif
#endif /* __GIVERSIONMACROS_H__ */

View File

@ -41,7 +41,7 @@
* <refsect1 id="gi-givfuncinfo.struct-hierarchy" role="struct_hierarchy">
* <title role="struct_hierarchy.title">Struct hierarchy</title>
* <synopsis>
* <link linkend="gi-GIBaseInfo">GIBaseInfo</link>
* <link linkend="GIBaseInfo">GIBaseInfo</link>
* +----<link linkend="gi-GICallableInfo">GICallableInfo</link>
* +----<link linkend="gi-GIFunctionInfo">GIFunctionInfo</link>
* +----<link linkend="gi-GISignalInfo">GISignalInfo</link>