diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-11-21 16:04:38 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-11-21 16:04:38 +1100 |
| commit | 91f9f45a38514051b0599725bb5afd86c41fe9d6 (patch) | |
| tree | effbc56cc1fa666a2cf9b4e3e7297bea6d8a9bb5 | |
| parent | 273f2486599617aac4343998bf15dc03f170dbcf (diff) | |
| download | scintilla-mirror-91f9f45a38514051b0599725bb5afd86c41fe9d6.tar.gz | |
Update marshalling of signals from Scintilla, changing deprecated NONE to VOID.
Has no effect on clients as NONE was an alias for VOID.
| -rw-r--r-- | gtk/scintilla-marshal.c | 33 | ||||
| -rw-r--r-- | gtk/scintilla-marshal.h | 44 | ||||
| -rw-r--r-- | gtk/scintilla-marshal.list | 4 |
3 files changed, 39 insertions, 42 deletions
diff --git a/gtk/scintilla-marshal.c b/gtk/scintilla-marshal.c index c91bd0bcd..ea013eb93 100644 --- a/gtk/scintilla-marshal.c +++ b/gtk/scintilla-marshal.c @@ -1,6 +1,4 @@ - -#include <glib-object.h> - +#include <glib-object.h> #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) @@ -48,8 +46,7 @@ #define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ - -/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ +/* VOID:INT,OBJECT (scintilla-marshal.list:1) */ void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -58,13 +55,13 @@ scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, - gint arg_1, - gpointer arg_2, - gpointer data2); - GMarshalFunc_VOID__INT_OBJECT callback; - GCClosure *cc = (GCClosure*) closure; + typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, + gint arg1, + gpointer arg2, + gpointer data2); + GCClosure *cc = (GCClosure *) closure; gpointer data1, data2; + GMarshalFunc_VOID__INT_OBJECT callback; g_return_if_fail (n_param_values == 3); @@ -86,7 +83,7 @@ scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, data2); } -/* NONE:INT,BOXED (scintilla-marshal.list:2) */ +/* VOID:INT,BOXED (scintilla-marshal.list:2) */ void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -95,13 +92,13 @@ scintilla_marshal_VOID__INT_BOXED (GClosure *closure, gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, - gint arg_1, - gpointer arg_2, - gpointer data2); - GMarshalFunc_VOID__INT_BOXED callback; - GCClosure *cc = (GCClosure*) closure; + typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, + gint arg1, + gpointer arg2, + gpointer data2); + GCClosure *cc = (GCClosure *) closure; gpointer data1, data2; + GMarshalFunc_VOID__INT_BOXED callback; g_return_if_fail (n_param_values == 3); diff --git a/gtk/scintilla-marshal.h b/gtk/scintilla-marshal.h index 7d5e17bba..cac17ad67 100644 --- a/gtk/scintilla-marshal.h +++ b/gtk/scintilla-marshal.h @@ -1,30 +1,30 @@ +/* This file is generated, all changes will be lost */ +#ifndef __SCINTILLA_MARSHAL_MARSHAL_H__ +#define __SCINTILLA_MARSHAL_MARSHAL_H__ -#ifndef __scintilla_marshal_MARSHAL_H__ -#define __scintilla_marshal_MARSHAL_H__ - -#include <glib-object.h> +#include <glib-object.h> G_BEGIN_DECLS -/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ -extern void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define scintilla_marshal_NONE__INT_OBJECT scintilla_marshal_VOID__INT_OBJECT +/* VOID:INT,OBJECT (scintilla-marshal.list:1) */ +extern +void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + +/* VOID:INT,BOXED (scintilla-marshal.list:2) */ +extern +void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); -/* NONE:INT,BOXED (scintilla-marshal.list:2) */ -extern void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define scintilla_marshal_NONE__INT_BOXED scintilla_marshal_VOID__INT_BOXED G_END_DECLS -#endif /* __scintilla_marshal_MARSHAL_H__ */ - +#endif /* __SCINTILLA_MARSHAL_MARSHAL_H__ */ diff --git a/gtk/scintilla-marshal.list b/gtk/scintilla-marshal.list index ddc8ae87e..b2e2a2123 100644 --- a/gtk/scintilla-marshal.list +++ b/gtk/scintilla-marshal.list @@ -1,2 +1,2 @@ -NONE:INT,OBJECT -NONE:INT,BOXED +VOID:INT,OBJECT +VOID:INT,BOXED |