diff options
author | Jiří Techet <techet@gmail.com> | 2019-02-21 01:34:04 +0100 |
---|---|---|
committer | Jiří Techet <techet@gmail.com> | 2019-02-21 01:34:04 +0100 |
commit | e6d4583a2d28b7b00b252b1785890579b34eeb6c (patch) | |
tree | a541889dda11910f87c5762b1d6764545e9c7816 | |
parent | e985d5f81111e66f66eda8d8df1d67f6218c4b6e (diff) | |
download | libchamplain-e6d4583a2d28b7b00b252b1785890579b34eeb6c.tar.gz |
Use generic marshaller for signals and drop use of glib-genmarshal
-rw-r--r-- | champlain-gtk/Makefile.am | 11 | ||||
-rw-r--r-- | champlain-gtk/champlain-gtk-marshal.list | 0 | ||||
-rw-r--r-- | champlain-gtk/meson.build | 14 | ||||
-rw-r--r-- | champlain/Makefile.am | 11 | ||||
-rw-r--r-- | champlain/champlain-adjustment.c | 3 | ||||
-rw-r--r-- | champlain/champlain-coordinate.c | 1 | ||||
-rw-r--r-- | champlain/champlain-custom-marker.c | 1 | ||||
-rw-r--r-- | champlain/champlain-kinetic-scroll-view.c | 3 | ||||
-rw-r--r-- | champlain/champlain-label.c | 1 | ||||
-rw-r--r-- | champlain/champlain-license.c | 1 | ||||
-rw-r--r-- | champlain/champlain-map-source-factory.c | 1 | ||||
-rw-r--r-- | champlain/champlain-marker.c | 9 | ||||
-rw-r--r-- | champlain/champlain-marshal.list | 4 | ||||
-rw-r--r-- | champlain/champlain-network-tile-source.c | 1 | ||||
-rw-r--r-- | champlain/champlain-point.c | 1 | ||||
-rw-r--r-- | champlain/champlain-scale.c | 1 | ||||
-rw-r--r-- | champlain/champlain-tile.c | 3 | ||||
-rw-r--r-- | champlain/champlain-view.c | 5 | ||||
-rw-r--r-- | champlain/champlain-viewport.c | 2 | ||||
-rw-r--r-- | champlain/meson.build | 14 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
-rw-r--r-- | docs/reference/meson.build | 2 |
22 files changed, 14 insertions, 77 deletions
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am index 707d3b3..9e5d82f 100644 --- a/champlain-gtk/Makefile.am +++ b/champlain-gtk/Makefile.am @@ -12,11 +12,6 @@ libchamplain_gtk_sources = \ gtk-champlain-embed.c -# glib-genmarshal rules -glib_marshal_list = champlain-gtk-marshal.list -glib_marshal_prefix = _champlain_gtk_marshal -include $(top_srcdir)/build/Makefile.am.marshal - # glib-mkenums rules glib_enum_h = champlain-gtk-enum-types.h glib_enum_c = champlain-gtk-enum-types.c @@ -24,12 +19,10 @@ glib_enum_headers = $(libchamplain_gtk_headers_public) include $(top_srcdir)/build/Makefile.am.enums libchamplain_gtk_headers_built = \ - champlain-gtk-enum-types.h \ - champlain-gtk-marshal.h + champlain-gtk-enum-types.h libchamplain_gtk_sources_built = \ - champlain-gtk-enum-types.c \ - champlain-gtk-marshal.c + champlain-gtk-enum-types.c libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_SOURCES = \ diff --git a/champlain-gtk/champlain-gtk-marshal.list b/champlain-gtk/champlain-gtk-marshal.list deleted file mode 100644 index e69de29..0000000 --- a/champlain-gtk/champlain-gtk-marshal.list +++ /dev/null diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build index 8137bc7..7fb4fdf 100644 --- a/champlain-gtk/meson.build +++ b/champlain-gtk/meson.build @@ -26,17 +26,6 @@ libchamplain_gtk_c_args = [ libchamplain_gtk_link_args = [ ] -libchamplain_gtk_marshals = gnome.genmarshal( - 'champlain-gtk-marshal', - sources: 'champlain-gtk-marshal.list', - prefix: '_champlain_gtk_marshal', - install_header: true, - install_dir: join_paths( - pkgincludedir, - 'champlain-gtk', - ) -) - libchamplain_gtk_enums = gnome.mkenums( 'champlain-gtk-enum-types', sources: libchamplain_gtk_public_h, @@ -49,11 +38,9 @@ libchamplain_gtk_enums = gnome.mkenums( ) ) -libchamplain_gtk_marshals_h = libchamplain_gtk_marshals.get(1) libchamplain_gtk_enums_h = libchamplain_gtk_enums.get(1) libchamplain_gtk_sources += [ - libchamplain_gtk_marshals, libchamplain_gtk_enums, ] @@ -79,7 +66,6 @@ libchamplain_gtk_sha = library( libchamplain_gtk_dep_sources = [ libchamplain_gtk_enums_h, - libchamplain_gtk_marshals_h, ] if generate_gir diff --git a/champlain/Makefile.am b/champlain/Makefile.am index 7381cd6..625a4f9 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -102,11 +102,6 @@ champlain-features.h: $(top_builddir)/config.status BUILT_SOURCES += champlain-features.h CLEANFILES += champlain-features.h -# glib-genmarshal rules -glib_marshal_list = champlain-marshal.list -glib_marshal_prefix = _champlain_marshal -include $(top_srcdir)/build/Makefile.am.marshal - # glib-mkenums rules glib_enum_h = champlain-enum-types.h glib_enum_c = champlain-enum-types.c @@ -115,12 +110,10 @@ include $(top_srcdir)/build/Makefile.am.enums libchamplain_headers_built = \ champlain-features.h \ - champlain-enum-types.h \ - champlain-marshal.h + champlain-enum-types.h libchamplain_sources_built = \ - champlain-enum-types.c \ - champlain-marshal.c + champlain-enum-types.c libchamplain_@CHAMPLAIN_API_VERSION@_la_SOURCES = \ diff --git a/champlain/champlain-adjustment.c b/champlain/champlain-adjustment.c index 0105529..341b4c2 100644 --- a/champlain/champlain-adjustment.c +++ b/champlain/champlain-adjustment.c @@ -26,7 +26,6 @@ #include <clutter/clutter.h> #include "champlain-adjustment.h" -#include "champlain-marshal.h" #include "champlain-private.h" struct _ChamplainAdjustmentPrivate @@ -219,7 +218,7 @@ champlain_adjustment_class_init (ChamplainAdjustmentClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ChamplainAdjustmentClass, changed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); } diff --git a/champlain/champlain-coordinate.c b/champlain/champlain-coordinate.c index 4e419c8..8a730c9 100644 --- a/champlain/champlain-coordinate.c +++ b/champlain/champlain-coordinate.c @@ -26,7 +26,6 @@ #include "champlain-coordinate.h" #include "config.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-location.h" diff --git a/champlain/champlain-custom-marker.c b/champlain/champlain-custom-marker.c index d5afb5f..174974d 100644 --- a/champlain/champlain-custom-marker.c +++ b/champlain/champlain-custom-marker.c @@ -30,7 +30,6 @@ #include "champlain.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include <clutter/clutter.h> diff --git a/champlain/champlain-kinetic-scroll-view.c b/champlain/champlain-kinetic-scroll-view.c index 1f0ddac..69e4555 100644 --- a/champlain/champlain-kinetic-scroll-view.c +++ b/champlain/champlain-kinetic-scroll-view.c @@ -23,7 +23,6 @@ #include "champlain-kinetic-scroll-view.h" #include "champlain-enum-types.h" -#include "champlain-marshal.h" #include "champlain-adjustment.h" #include "champlain-viewport.h" #include <clutter/clutter.h> @@ -210,7 +209,7 @@ champlain_kinetic_scroll_view_class_init (ChamplainKineticScrollViewClass *klass G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + NULL, G_TYPE_NONE, 0); } diff --git a/champlain/champlain-label.c b/champlain/champlain-label.c index 1947fe4..6beddde 100644 --- a/champlain/champlain-label.c +++ b/champlain/champlain-label.c @@ -39,7 +39,6 @@ #include "champlain.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-tile.h" diff --git a/champlain/champlain-license.c b/champlain/champlain-license.c index 6b35a80..e3eba11 100644 --- a/champlain/champlain-license.c +++ b/champlain/champlain-license.c @@ -27,7 +27,6 @@ #include "champlain-license.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-enum-types.h" #include "champlain-view.h" diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c index 74b7b0d..ebd8ca5 100644 --- a/champlain/champlain-map-source-factory.c +++ b/champlain/champlain-map-source-factory.c @@ -47,7 +47,6 @@ #include "champlain-defines.h" #include "champlain-enum-types.h" #include "champlain-map-source.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-network-tile-source.h" #include "champlain-map-source-chain.h" diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c index f2cd4ce..ce70eba 100644 --- a/champlain/champlain-marker.c +++ b/champlain/champlain-marker.c @@ -40,7 +40,6 @@ #include "champlain.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-tile.h" @@ -389,7 +388,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + NULL, G_TYPE_NONE, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -408,7 +407,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + NULL, G_TYPE_NONE, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -430,7 +429,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _champlain_marshal_VOID__DOUBLE_DOUBLE_BOXED, + NULL, G_TYPE_NONE, 3, G_TYPE_DOUBLE, G_TYPE_DOUBLE, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); @@ -450,7 +449,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + NULL, G_TYPE_NONE, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); diff --git a/champlain/champlain-marshal.list b/champlain/champlain-marshal.list deleted file mode 100644 index e0ad580..0000000 --- a/champlain/champlain-marshal.list +++ /dev/null @@ -1,4 +0,0 @@ -VOID:DOUBLE,DOUBLE,BOXED -VOID:POINTER,UINT,BOOLEAN -VOID:UINT,UINT -VOID:OBJECT,OBJECT diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c index fa1ce81..873a39d 100644 --- a/champlain/champlain-network-tile-source.c +++ b/champlain/champlain-network-tile-source.c @@ -42,7 +42,6 @@ #include "champlain-defines.h" #include "champlain-enum-types.h" #include "champlain-map-source.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include <errno.h> diff --git a/champlain/champlain-point.c b/champlain/champlain-point.c index 4ad61c6..f1529e9 100644 --- a/champlain/champlain-point.c +++ b/champlain/champlain-point.c @@ -29,7 +29,6 @@ #include "champlain.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-tile.h" diff --git a/champlain/champlain-scale.c b/champlain/champlain-scale.c index f3b2c72..9707320 100644 --- a/champlain/champlain-scale.c +++ b/champlain/champlain-scale.c @@ -27,7 +27,6 @@ #include "champlain-scale.h" #include "champlain-defines.h" -#include "champlain-marshal.h" #include "champlain-private.h" #include "champlain-enum-types.h" #include "champlain-view.h" diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c index cace7d3..a218857 100644 --- a/champlain/champlain-tile.c +++ b/champlain/champlain-tile.c @@ -27,7 +27,6 @@ #include "champlain-enum-types.h" #include "champlain-private.h" -#include "champlain-marshal.h" #include <math.h> #include <errno.h> @@ -385,7 +384,7 @@ champlain_tile_class_init (ChamplainTileClass *klass) 0, NULL, NULL, - _champlain_marshal_VOID__POINTER_UINT_BOOLEAN, + NULL, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_BOOLEAN); diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c index 42ac2c9..7332c55 100644 --- a/champlain/champlain-view.c +++ b/champlain/champlain-view.c @@ -56,7 +56,6 @@ #include "champlain.h" #include "champlain-defines.h" #include "champlain-enum-types.h" -#include "champlain-marshal.h" #include "champlain-map-source.h" #include "champlain-map-source-factory.h" #include "champlain-private.h" @@ -1218,7 +1217,7 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, G_TYPE_NONE, 0); @@ -1237,7 +1236,7 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); } diff --git a/champlain/champlain-viewport.c b/champlain/champlain-viewport.c index 780df3f..5326ebc 100644 --- a/champlain/champlain-viewport.c +++ b/champlain/champlain-viewport.c @@ -227,7 +227,7 @@ champlain_viewport_class_init (ChamplainViewportClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); } diff --git a/champlain/meson.build b/champlain/meson.build index b31f2d0..badb863 100644 --- a/champlain/meson.build +++ b/champlain/meson.build @@ -148,17 +148,6 @@ libchamplain_public_h += [ libchamplain_version_h, ] -libchamplain_marshals = gnome.genmarshal( - 'champlain-marshal', - sources: 'champlain-marshal.list', - prefix: '_champlain_marshal', - install_header: true, - install_dir: join_paths( - pkgincludedir, - 'champlain', - ) -) - libchamplain_enums = gnome.mkenums( 'champlain-enum-types', sources: libchamplain_public_h, @@ -171,11 +160,9 @@ libchamplain_enums = gnome.mkenums( ) ) -libchamplain_marshals_h = libchamplain_marshals.get(1) libchamplain_enums_h = libchamplain_enums.get(1) libchamplain_sources += [ - libchamplain_marshals, libchamplain_enums, ] @@ -202,7 +189,6 @@ libchamplain_sha = library( libchamplain_dep_sources = [ libchamplain_enums_h, libchamplain_features_h, - libchamplain_marshals_h, libchamplain_version_h, ] diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 6f59df8..8886217 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -62,7 +62,6 @@ endif # Header files to ignore when scanning. Use base file name, no paths # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES=\ - champlain-gtk-marshal.h \ champlain-gtk-enum-types.h \ champlain-gtk.h \ $(memphis_headers) \ @@ -70,7 +69,6 @@ IGNORE_HFILES=\ champlain-enum-types.h \ champlain-private.h \ champlain.h \ - champlain-marshal.h \ champlain-defines.h \ champlain-features.h \ champlain-adjustment.h \ diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 299dc74..0e56db0 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -12,7 +12,6 @@ gtk_docpath = join_paths(gtk_prefix, 'share', 'gtk-doc', 'html', 'gtk3') libchamplain_reference_ignored_h = [ 'champlain-gtk-enum-types.h', - 'champlain-gtk-marshal.h', 'champlain-gtk.h', 'champlain-adjustment.h', 'champlain-debug.h', @@ -20,7 +19,6 @@ libchamplain_reference_ignored_h = [ 'champlain-enum-types.h', 'champlain-features.h', 'champlain-kinetic-scroll-view.h', - 'champlain-marshal.h', 'champlain-private.h', 'champlain-viewport.h', 'champlain.h', |