Merge branch 'gmarshal-cleanup' into 'master'

Clean up gmarshal.[ch]

See merge request GNOME/glib!703
This commit is contained in:
Sebastian Dröge 2019-03-04 13:00:27 +00:00
commit a092dba5f8
2 changed files with 887 additions and 857 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,25 @@
/* Note: This file is no longer generated. See the comment in gmarshal.list */ /* GObject - GLib Type, Object, Parameter and Signal Library
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __G_MARSHAL_H__ #ifndef __G_MARSHAL_H__
#define __G_MARSHAL_H__ #define __G_MARSHAL_H__
G_BEGIN_DECLS G_BEGIN_DECLS
/* VOID:VOID (./gmarshal.list:6) */ /* VOID:VOID */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VOID (GClosure *closure, void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -21,7 +36,7 @@ void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:BOOLEAN (./gmarshal.list:7) */ /* VOID:BOOLEAN */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure, void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -38,7 +53,7 @@ void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:CHAR (./gmarshal.list:8) */ /* VOID:CHAR */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__CHAR (GClosure *closure, void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -55,7 +70,7 @@ void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:UCHAR (./gmarshal.list:9) */ /* VOID:UCHAR */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UCHAR (GClosure *closure, void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -72,7 +87,7 @@ void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:INT (./gmarshal.list:10) */ /* VOID:INT */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__INT (GClosure *closure, void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -89,7 +104,7 @@ void g_cclosure_marshal_VOID__INTv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:UINT (./gmarshal.list:11) */ /* VOID:UINT */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINT (GClosure *closure, void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -106,7 +121,7 @@ void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:LONG (./gmarshal.list:12) */ /* VOID:LONG */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__LONG (GClosure *closure, void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -123,7 +138,7 @@ void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:ULONG (./gmarshal.list:13) */ /* VOID:ULONG */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ULONG (GClosure *closure, void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -140,7 +155,7 @@ void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:ENUM (./gmarshal.list:14) */ /* VOID:ENUM */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ENUM (GClosure *closure, void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -157,7 +172,7 @@ void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:FLAGS (./gmarshal.list:15) */ /* VOID:FLAGS */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLAGS (GClosure *closure, void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -174,7 +189,7 @@ void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:FLOAT (./gmarshal.list:16) */ /* VOID:FLOAT */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLOAT (GClosure *closure, void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -191,7 +206,7 @@ void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:DOUBLE (./gmarshal.list:17) */ /* VOID:DOUBLE */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure, void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -208,7 +223,7 @@ void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:STRING (./gmarshal.list:18) */ /* VOID:STRING */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__STRING (GClosure *closure, void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -225,7 +240,7 @@ void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:PARAM (./gmarshal.list:19) */ /* VOID:PARAM */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__PARAM (GClosure *closure, void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -242,7 +257,7 @@ void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:BOXED (./gmarshal.list:20) */ /* VOID:BOXED */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOXED (GClosure *closure, void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -259,7 +274,7 @@ void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:POINTER (./gmarshal.list:21) */ /* VOID:POINTER */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__POINTER (GClosure *closure, void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -276,7 +291,7 @@ void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:OBJECT (./gmarshal.list:22) */ /* VOID:OBJECT */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__OBJECT (GClosure *closure, void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -293,7 +308,7 @@ void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:VARIANT (./gmarshal.list:23) */ /* VOID:VARIANT */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VARIANT (GClosure *closure, void g_cclosure_marshal_VOID__VARIANT (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -310,7 +325,7 @@ void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* VOID:UINT,POINTER (./gmarshal.list:26) */ /* VOID:UINT,POINTER */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure, void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -327,7 +342,7 @@ void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* BOOL:FLAGS (./gmarshal.list:27) */ /* BOOL:FLAGS */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure, void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -343,9 +358,26 @@ void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
gpointer marshal_data, gpointer marshal_data,
int n_params, int n_params,
GType *param_types); GType *param_types);
/**
* g_cclosure_marshal_BOOL__FLAGS:
* @closure: A #GClosure.
* @return_value: A #GValue to store the return value. May be %NULL
* if the callback of closure doesn't return a value.
* @n_param_values: The length of the @param_values array.
* @param_values: An array of #GValues holding the arguments
* on which to invoke the callback of closure.
* @invocation_hint: The invocation hint given as the last argument to
* g_closure_invoke().
* @marshal_data: Additional data specified when registering the
* marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
*
* An old alias for g_cclosure_marshal_BOOLEAN__FLAGS().
*/
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS #define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
/* STRING:OBJECT,POINTER (./gmarshal.list:28) */ /* STRING:OBJECT,POINTER */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure, void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -362,7 +394,7 @@ void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
int n_params, int n_params,
GType *param_types); GType *param_types);
/* BOOL:BOXED,BOXED (./gmarshal.list:29) */ /* BOOL:BOXED,BOXED */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure, void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure,
GValue *return_value, GValue *return_value,
@ -378,6 +410,23 @@ void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
gpointer marshal_data, gpointer marshal_data,
int n_params, int n_params,
GType *param_types); GType *param_types);
/**
* g_cclosure_marshal_BOOL__BOXED_BOXED:
* @closure: A #GClosure.
* @return_value: A #GValue to store the return value. May be %NULL
* if the callback of closure doesn't return a value.
* @n_param_values: The length of the @param_values array.
* @param_values: An array of #GValues holding the arguments
* on which to invoke the callback of closure.
* @invocation_hint: The invocation hint given as the last argument to
* g_closure_invoke().
* @marshal_data: Additional data specified when registering the
* marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
*
* An old alias for g_cclosure_marshal_BOOLEAN__BOXED_BOXED().
*/
#define g_cclosure_marshal_BOOL__BOXED_BOXED g_cclosure_marshal_BOOLEAN__BOXED_BOXED #define g_cclosure_marshal_BOOL__BOXED_BOXED g_cclosure_marshal_BOOLEAN__BOXED_BOXED
G_END_DECLS G_END_DECLS