From 88b9e2639dc5b94d22e00f814e37e9c0e94255e5 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 3 Jan 2024 08:40:22 +0100 Subject: [PATCH] Regenerate with latest gir --- gdk4-wayland/src/auto/versions.txt | 2 +- gdk4-wayland/src/auto/wayland_toplevel.rs | 4 +- gdk4-wayland/sys/src/lib.rs | 10 +- gdk4-wayland/sys/versions.txt | 2 +- gdk4-win32/src/auto/versions.txt | 2 +- gdk4-win32/sys/src/lib.rs | 16 +- gdk4-win32/sys/versions.txt | 2 +- gdk4-x11/src/auto/versions.txt | 2 +- gdk4-x11/sys/src/lib.rs | 18 +-- gdk4-x11/sys/versions.txt | 2 +- gdk4/src/auto/versions.txt | 2 +- gdk4/sys/src/lib.rs | 30 ++-- gdk4/sys/versions.txt | 2 +- gsk4/src/auto/versions.txt | 2 +- gsk4/sys/src/lib.rs | 10 +- gsk4/sys/versions.txt | 2 +- gtk4/src/auto/alias.rs | 1 + gtk4/src/auto/assistant.rs | 4 +- gtk4/src/auto/callback_action.rs | 4 +- gtk4/src/auto/cell_area.rs | 8 +- gtk4/src/auto/cell_layout.rs | 4 +- gtk4/src/auto/combo_box.rs | 4 +- gtk4/src/auto/entry_completion.rs | 4 +- gtk4/src/auto/expression.rs | 4 +- gtk4/src/auto/flow_box.rs | 12 +- gtk4/src/auto/font_chooser.rs | 4 +- gtk4/src/auto/functions.rs | 6 +- gtk4/src/auto/icon_view.rs | 4 +- gtk4/src/auto/list_box.rs | 16 +- gtk4/src/auto/map_list_model.rs | 8 +- gtk4/src/auto/menu_button.rs | 4 +- gtk4/src/auto/print_settings.rs | 4 +- gtk4/src/auto/scale.rs | 4 +- gtk4/src/auto/text_iter.rs | 8 +- gtk4/src/auto/text_tag_table.rs | 4 +- gtk4/src/auto/tree_list_model.rs | 4 +- gtk4/src/auto/tree_model.rs | 4 +- gtk4/src/auto/tree_model_filter.rs | 4 +- gtk4/src/auto/tree_selection.rs | 8 +- gtk4/src/auto/tree_view.rs | 26 ++-- gtk4/src/auto/tree_view_column.rs | 4 +- gtk4/src/auto/versions.txt | 2 +- gtk4/sys/src/lib.rs | 174 +++++++++++----------- gtk4/sys/versions.txt | 2 +- 44 files changed, 222 insertions(+), 221 deletions(-) diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-wayland/src/auto/versions.txt +++ b/gdk4-wayland/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4-wayland/src/auto/wayland_toplevel.rs b/gdk4-wayland/src/auto/wayland_toplevel.rs index fa18fa50b50f..0b08293aa0d3 100644 --- a/gdk4-wayland/src/auto/wayland_toplevel.rs +++ b/gdk4-wayland/src/auto/wayland_toplevel.rs @@ -39,14 +39,14 @@ impl WaylandToplevel { ) { let toplevel = from_glib_borrow(toplevel); let handle: Borrowed = from_glib_borrow(handle); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&toplevel, handle.as_str()) } let callback = Some(callback_func::

as _); unsafe extern "C" fn destroy_func_func( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func_func::

as _); let super_callback0: Box_

= callback_data; diff --git a/gdk4-wayland/sys/src/lib.rs b/gdk4-wayland/sys/src/lib.rs index 0a42c02a7606..b3e7dd738db4 100644 --- a/gdk4-wayland/sys/src/lib.rs +++ b/gdk4-wayland/sys/src/lib.rs @@ -31,7 +31,7 @@ pub struct _GdkWaylandDeviceClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWaylandDeviceClass = *mut _GdkWaylandDeviceClass; +pub type GdkWaylandDeviceClass = _GdkWaylandDeviceClass; #[repr(C)] pub struct _GdkWaylandDisplayClass { @@ -39,7 +39,7 @@ pub struct _GdkWaylandDisplayClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWaylandDisplayClass = *mut _GdkWaylandDisplayClass; +pub type GdkWaylandDisplayClass = _GdkWaylandDisplayClass; #[repr(C)] pub struct _GdkWaylandGLContextClass { @@ -47,7 +47,7 @@ pub struct _GdkWaylandGLContextClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWaylandGLContextClass = *mut _GdkWaylandGLContextClass; +pub type GdkWaylandGLContextClass = _GdkWaylandGLContextClass; #[repr(C)] pub struct _GdkWaylandMonitorClass { @@ -55,7 +55,7 @@ pub struct _GdkWaylandMonitorClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWaylandMonitorClass = *mut _GdkWaylandMonitorClass; +pub type GdkWaylandMonitorClass = _GdkWaylandMonitorClass; #[repr(C)] pub struct _GdkWaylandSeatClass { @@ -63,7 +63,7 @@ pub struct _GdkWaylandSeatClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWaylandSeatClass = *mut _GdkWaylandSeatClass; +pub type GdkWaylandSeatClass = _GdkWaylandSeatClass; // Classes #[repr(C)] diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-wayland/sys/versions.txt +++ b/gdk4-wayland/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-win32/src/auto/versions.txt +++ b/gdk4-win32/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4-win32/sys/src/lib.rs b/gdk4-win32/sys/src/lib.rs index 49a8cb3bdfbb..32b4d81d7392 100644 --- a/gdk4-win32/sys/src/lib.rs +++ b/gdk4-win32/sys/src/lib.rs @@ -42,7 +42,7 @@ pub struct _GdkWin32DisplayClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32DisplayClass = *mut _GdkWin32DisplayClass; +pub type GdkWin32DisplayClass = _GdkWin32DisplayClass; #[repr(C)] pub struct _GdkWin32DisplayManagerClass { @@ -50,7 +50,7 @@ pub struct _GdkWin32DisplayManagerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32DisplayManagerClass = *mut _GdkWin32DisplayManagerClass; +pub type GdkWin32DisplayManagerClass = _GdkWin32DisplayManagerClass; #[repr(C)] pub struct _GdkWin32DragClass { @@ -58,7 +58,7 @@ pub struct _GdkWin32DragClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32DragClass = *mut _GdkWin32DragClass; +pub type GdkWin32DragClass = _GdkWin32DragClass; #[repr(C)] pub struct _GdkWin32GLContextClass { @@ -66,7 +66,7 @@ pub struct _GdkWin32GLContextClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32GLContextClass = *mut _GdkWin32GLContextClass; +pub type GdkWin32GLContextClass = _GdkWin32GLContextClass; #[repr(C)] pub struct _GdkWin32HCursorClass { @@ -74,7 +74,7 @@ pub struct _GdkWin32HCursorClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32HCursorClass = *mut _GdkWin32HCursorClass; +pub type GdkWin32HCursorClass = _GdkWin32HCursorClass; #[repr(C)] pub struct _GdkWin32MonitorClass { @@ -82,7 +82,7 @@ pub struct _GdkWin32MonitorClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32MonitorClass = *mut _GdkWin32MonitorClass; +pub type GdkWin32MonitorClass = _GdkWin32MonitorClass; #[repr(C)] pub struct _GdkWin32ScreenClass { @@ -90,7 +90,7 @@ pub struct _GdkWin32ScreenClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32ScreenClass = *mut _GdkWin32ScreenClass; +pub type GdkWin32ScreenClass = _GdkWin32ScreenClass; #[repr(C)] pub struct _GdkWin32SurfaceClass { @@ -98,7 +98,7 @@ pub struct _GdkWin32SurfaceClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkWin32SurfaceClass = *mut _GdkWin32SurfaceClass; +pub type GdkWin32SurfaceClass = _GdkWin32SurfaceClass; // Classes #[repr(C)] diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-win32/sys/versions.txt +++ b/gdk4-win32/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-x11/src/auto/versions.txt +++ b/gdk4-x11/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4-x11/sys/src/lib.rs b/gdk4-x11/sys/src/lib.rs index 0f5ae0b30b7f..f2a56c090627 100644 --- a/gdk4-x11/sys/src/lib.rs +++ b/gdk4-x11/sys/src/lib.rs @@ -33,7 +33,7 @@ pub struct _GdkX11AppLaunchContextClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11AppLaunchContextClass = *mut _GdkX11AppLaunchContextClass; +pub type GdkX11AppLaunchContextClass = _GdkX11AppLaunchContextClass; #[repr(C)] pub struct _GdkX11DeviceManagerXI2Class { @@ -41,7 +41,7 @@ pub struct _GdkX11DeviceManagerXI2Class { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11DeviceManagerXI2Class = *mut _GdkX11DeviceManagerXI2Class; +pub type GdkX11DeviceManagerXI2Class = _GdkX11DeviceManagerXI2Class; #[repr(C)] pub struct _GdkX11DeviceXI2Class { @@ -49,7 +49,7 @@ pub struct _GdkX11DeviceXI2Class { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11DeviceXI2Class = *mut _GdkX11DeviceXI2Class; +pub type GdkX11DeviceXI2Class = _GdkX11DeviceXI2Class; #[repr(C)] pub struct _GdkX11DisplayClass { @@ -57,7 +57,7 @@ pub struct _GdkX11DisplayClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11DisplayClass = *mut _GdkX11DisplayClass; +pub type GdkX11DisplayClass = _GdkX11DisplayClass; #[repr(C)] pub struct _GdkX11DragClass { @@ -65,7 +65,7 @@ pub struct _GdkX11DragClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11DragClass = *mut _GdkX11DragClass; +pub type GdkX11DragClass = _GdkX11DragClass; #[repr(C)] pub struct _GdkX11GLContextClass { @@ -73,7 +73,7 @@ pub struct _GdkX11GLContextClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11GLContextClass = *mut _GdkX11GLContextClass; +pub type GdkX11GLContextClass = _GdkX11GLContextClass; #[repr(C)] pub struct _GdkX11MonitorClass { @@ -81,7 +81,7 @@ pub struct _GdkX11MonitorClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11MonitorClass = *mut _GdkX11MonitorClass; +pub type GdkX11MonitorClass = _GdkX11MonitorClass; #[repr(C)] pub struct _GdkX11ScreenClass { @@ -89,7 +89,7 @@ pub struct _GdkX11ScreenClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11ScreenClass = *mut _GdkX11ScreenClass; +pub type GdkX11ScreenClass = _GdkX11ScreenClass; #[repr(C)] pub struct _GdkX11SurfaceClass { @@ -97,7 +97,7 @@ pub struct _GdkX11SurfaceClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkX11SurfaceClass = *mut _GdkX11SurfaceClass; +pub type GdkX11SurfaceClass = _GdkX11SurfaceClass; // Classes #[repr(C)] diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4-x11/sys/versions.txt +++ b/gdk4-x11/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4/src/auto/versions.txt +++ b/gdk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gdk4/sys/src/lib.rs b/gdk4/sys/src/lib.rs index 9ebd07689fe3..d105fcc35232 100644 --- a/gdk4/sys/src/lib.rs +++ b/gdk4/sys/src/lib.rs @@ -2698,7 +2698,7 @@ pub struct _GdkDevicePadInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkDevicePadInterface = *mut _GdkDevicePadInterface; +pub type GdkDevicePadInterface = _GdkDevicePadInterface; #[repr(C)] pub struct _GdkDragSurfaceInterface { @@ -2706,7 +2706,7 @@ pub struct _GdkDragSurfaceInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkDragSurfaceInterface = *mut _GdkDragSurfaceInterface; +pub type GdkDragSurfaceInterface = _GdkDragSurfaceInterface; #[repr(C)] pub struct _GdkDragSurfaceSize { @@ -2714,7 +2714,7 @@ pub struct _GdkDragSurfaceSize { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkDragSurfaceSize = *mut _GdkDragSurfaceSize; +pub type GdkDragSurfaceSize = _GdkDragSurfaceSize; #[repr(C)] pub struct GdkEventSequence { @@ -2747,7 +2747,7 @@ pub struct _GdkFrameClockClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkFrameClockClass = *mut _GdkFrameClockClass; +pub type GdkFrameClockClass = _GdkFrameClockClass; #[repr(C)] pub struct _GdkFrameClockPrivate { @@ -2755,7 +2755,7 @@ pub struct _GdkFrameClockPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkFrameClockPrivate = *mut _GdkFrameClockPrivate; +pub type GdkFrameClockPrivate = _GdkFrameClockPrivate; #[repr(C)] pub struct GdkFrameTimings { @@ -2776,7 +2776,7 @@ pub struct _GdkGLTextureBuilderClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkGLTextureBuilderClass = *mut _GdkGLTextureBuilderClass; +pub type GdkGLTextureBuilderClass = _GdkGLTextureBuilderClass; #[repr(C)] pub struct _GdkGLTextureClass { @@ -2784,7 +2784,7 @@ pub struct _GdkGLTextureClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkGLTextureClass = *mut _GdkGLTextureClass; +pub type GdkGLTextureClass = _GdkGLTextureClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2810,7 +2810,7 @@ pub struct _GdkMemoryTextureClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkMemoryTextureClass = *mut _GdkMemoryTextureClass; +pub type GdkMemoryTextureClass = _GdkMemoryTextureClass; #[repr(C)] pub struct _GdkMonitorClass { @@ -2818,7 +2818,7 @@ pub struct _GdkMonitorClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkMonitorClass = *mut _GdkMonitorClass; +pub type GdkMonitorClass = _GdkMonitorClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2855,7 +2855,7 @@ pub struct _GdkPopupInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkPopupInterface = *mut _GdkPopupInterface; +pub type GdkPopupInterface = _GdkPopupInterface; #[repr(C)] pub struct GdkPopupLayout { @@ -2916,7 +2916,7 @@ pub struct _GdkSnapshotClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkSnapshotClass = *mut _GdkSnapshotClass; +pub type GdkSnapshotClass = _GdkSnapshotClass; #[repr(C)] pub struct _GdkSurfaceClass { @@ -2924,7 +2924,7 @@ pub struct _GdkSurfaceClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkSurfaceClass = *mut _GdkSurfaceClass; +pub type GdkSurfaceClass = _GdkSurfaceClass; #[repr(C)] pub struct _GdkTextureClass { @@ -2932,7 +2932,7 @@ pub struct _GdkTextureClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkTextureClass = *mut _GdkTextureClass; +pub type GdkTextureClass = _GdkTextureClass; #[repr(C)] pub struct GdkTextureDownloader { @@ -2971,7 +2971,7 @@ pub struct _GdkToplevelInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkToplevelInterface = *mut _GdkToplevelInterface; +pub type GdkToplevelInterface = _GdkToplevelInterface; #[repr(C)] pub struct GdkToplevelLayout { @@ -2992,7 +2992,7 @@ pub struct _GdkToplevelSize { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GdkToplevelSize = *mut _GdkToplevelSize; +pub type GdkToplevelSize = _GdkToplevelSize; // Classes #[repr(C)] diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gdk4/sys/versions.txt +++ b/gdk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gsk4/src/auto/versions.txt +++ b/gsk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gsk4/sys/src/lib.rs b/gsk4/sys/src/lib.rs index 4c72f5a2b051..779092338069 100644 --- a/gsk4/sys/src/lib.rs +++ b/gsk4/sys/src/lib.rs @@ -196,7 +196,7 @@ pub struct _GskBroadwayRendererClass { #[cfg(feature = "broadway")] #[cfg_attr(docsrs, doc(cfg(feature = "broadway")))] -pub type GskBroadwayRendererClass = *mut _GskBroadwayRendererClass; +pub type GskBroadwayRendererClass = _GskBroadwayRendererClass; #[repr(C)] pub struct _GskCairoRendererClass { @@ -204,7 +204,7 @@ pub struct _GskCairoRendererClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GskCairoRendererClass = *mut _GskCairoRendererClass; +pub type GskCairoRendererClass = _GskCairoRendererClass; #[derive(Copy, Clone)] #[repr(C)] @@ -228,7 +228,7 @@ pub struct _GskGLRendererClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GskGLRendererClass = *mut _GskGLRendererClass; +pub type GskGLRendererClass = _GskGLRendererClass; #[derive(Copy, Clone)] #[repr(C)] @@ -342,7 +342,7 @@ pub struct _GskRendererClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GskRendererClass = *mut _GskRendererClass; +pub type GskRendererClass = _GskRendererClass; #[derive(Copy, Clone)] #[repr(C)] @@ -427,7 +427,7 @@ pub struct _GskVulkanRendererClass { #[cfg(feature = "vulkan")] #[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))] -pub type GskVulkanRendererClass = *mut _GskVulkanRendererClass; +pub type GskVulkanRendererClass = _GskVulkanRendererClass; // Classes #[repr(C)] diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gsk4/sys/versions.txt +++ b/gsk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gtk4/src/auto/alias.rs b/gtk4/src/auto/alias.rs index a5c890f54d15..cc190c454c33 100644 --- a/gtk4/src/auto/alias.rs +++ b/gtk4/src/auto/alias.rs @@ -5,4 +5,5 @@ #[allow(unused_imports)] use crate::auto::*; +#[doc(alias = "GtkAllocation")] pub type Allocation = gdk::Rectangle; diff --git a/gtk4/src/auto/assistant.rs b/gtk4/src/auto/assistant.rs index 57c6f790cf83..0e513c31a5ee 100644 --- a/gtk4/src/auto/assistant.rs +++ b/gtk4/src/auto/assistant.rs @@ -238,12 +238,12 @@ impl Assistant { current_page: libc::c_int, data: glib::ffi::gpointer, ) -> libc::c_int { - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(current_page) } let page_func = Some(page_func_func::

as _); unsafe extern "C" fn destroy_func i32 + 'static>(data: glib::ffi::gpointer) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= page_func_data; diff --git a/gtk4/src/auto/callback_action.rs b/gtk4/src/auto/callback_action.rs index 9cc0db732ed9..6deaf782c0d7 100644 --- a/gtk4/src/auto/callback_action.rs +++ b/gtk4/src/auto/callback_action.rs @@ -31,7 +31,7 @@ impl CallbackAction { ) -> glib::ffi::gboolean { let widget = from_glib_borrow(widget); let args: Borrowed> = from_glib_borrow(args); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&widget, args.as_ref().as_ref()).into_glib() } let callback = Some(callback_func::

as _); @@ -40,7 +40,7 @@ impl CallbackAction { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call2 = Some(destroy_func::

as _); let super_callback0: Box_

= callback_data; diff --git a/gtk4/src/auto/cell_area.rs b/gtk4/src/auto/cell_area.rs index a50d2ad490a7..5aa9b4f7b519 100644 --- a/gtk4/src/auto/cell_area.rs +++ b/gtk4/src/auto/cell_area.rs @@ -237,7 +237,7 @@ pub trait CellAreaExt: IsA + sealed::Sealed + 'static { data: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let renderer = from_glib_borrow(renderer); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&renderer).into_glib() } let callback = Some(callback_func::

as _); @@ -246,7 +246,7 @@ pub trait CellAreaExt: IsA + sealed::Sealed + 'static { ffi::gtk_cell_area_foreach( self.as_ref().to_glib_none().0, callback, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } @@ -272,7 +272,7 @@ pub trait CellAreaExt: IsA + sealed::Sealed + 'static { let renderer = from_glib_borrow(renderer); let cell_area = from_glib_borrow(cell_area); let cell_background = from_glib_borrow(cell_background); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&renderer, &cell_area, &cell_background).into_glib() } let callback = Some(callback_func::

as _); @@ -285,7 +285,7 @@ pub trait CellAreaExt: IsA + sealed::Sealed + 'static { cell_area.to_glib_none().0, background_area.to_glib_none().0, callback, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } diff --git a/gtk4/src/auto/cell_layout.rs b/gtk4/src/auto/cell_layout.rs index 5be3330ffa00..be4cc7faf3c1 100644 --- a/gtk4/src/auto/cell_layout.rs +++ b/gtk4/src/auto/cell_layout.rs @@ -146,7 +146,7 @@ pub trait CellLayoutExt: IsA + sealed::Sealed + 'static { let cell = from_glib_borrow(cell); let tree_model = from_glib_borrow(tree_model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&cell_layout, &cell, &tree_model, &iter) } let func = Some(func_func::

as _); @@ -155,7 +155,7 @@ pub trait CellLayoutExt: IsA + sealed::Sealed + 'static { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call4 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/combo_box.rs b/gtk4/src/auto/combo_box.rs index 617409d6d44c..30f8e0f20985 100644 --- a/gtk4/src/auto/combo_box.rs +++ b/gtk4/src/auto/combo_box.rs @@ -603,14 +603,14 @@ pub trait ComboBoxExt: IsA + sealed::Sealed + 'static { ) -> glib::ffi::gboolean { let model = from_glib_borrow(model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&model, &iter).into_glib() } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_func bool + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/entry_completion.rs b/gtk4/src/auto/entry_completion.rs index e2b6056f7176..dca0d98dce38 100644 --- a/gtk4/src/auto/entry_completion.rs +++ b/gtk4/src/auto/entry_completion.rs @@ -219,7 +219,7 @@ impl EntryCompletion { let completion = from_glib_borrow(completion); let key: Borrowed = from_glib_borrow(key); let iter = from_glib_borrow(iter); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&completion, key.as_str(), &iter).into_glib() } let func = Some(func_func::

as _); @@ -228,7 +228,7 @@ impl EntryCompletion { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(func_notify_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/expression.rs b/gtk4/src/auto/expression.rs index ea033d1fc36a..423d7dd4318a 100644 --- a/gtk4/src/auto/expression.rs +++ b/gtk4/src/auto/expression.rs @@ -69,12 +69,12 @@ impl Expression { ) -> ExpressionWatch { let notify_data: Box_

= Box_::new(notify); unsafe extern "C" fn notify_func(user_data: glib::ffi::gpointer) { - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)() } let notify = Some(notify_func::

as _); unsafe extern "C" fn user_destroy_func(data: glib::ffi::gpointer) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call4 = Some(user_destroy_func::

as _); let super_callback0: Box_

= notify_data; diff --git a/gtk4/src/auto/flow_box.rs b/gtk4/src/auto/flow_box.rs index f53a90240a2a..04b972f89f2e 100644 --- a/gtk4/src/auto/flow_box.rs +++ b/gtk4/src/auto/flow_box.rs @@ -58,14 +58,14 @@ impl FlowBox { user_data: glib::ffi::gpointer, ) -> *mut ffi::GtkWidget { let item = from_glib_borrow(item); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&item).to_glib_full() } let create_widget_func = Some(create_widget_func_func::

as _); unsafe extern "C" fn user_data_free_func_func Widget + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call4 = Some(user_data_free_func_func::

as _); let super_callback0: Box_

= create_widget_func_data; @@ -233,7 +233,7 @@ impl FlowBox { ) { let box_ = from_glib_borrow(box_); let child = from_glib_borrow(child); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(&box_, &child) } let func = Some(func_func::

as _); @@ -242,7 +242,7 @@ impl FlowBox { ffi::gtk_flow_box_selected_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } @@ -272,14 +272,14 @@ impl FlowBox { user_data: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let child = from_glib_borrow(child); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&child).into_glib() } let filter_func = Some(filter_func_func::

as _); unsafe extern "C" fn destroy_func bool + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= filter_func_data; diff --git a/gtk4/src/auto/font_chooser.rs b/gtk4/src/auto/font_chooser.rs index 064dff47ff1f..84c93534d8e1 100644 --- a/gtk4/src/auto/font_chooser.rs +++ b/gtk4/src/auto/font_chooser.rs @@ -175,7 +175,7 @@ pub trait FontChooserExt: IsA + sealed::Sealed + 'static { ) -> glib::ffi::gboolean { let family = from_glib_borrow(family); let face = from_glib_borrow(face); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&family, &face).into_glib() } let filter = Some(filter_func::

as _); @@ -184,7 +184,7 @@ pub trait FontChooserExt: IsA + sealed::Sealed + 'static { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= filter_data; diff --git a/gtk4/src/auto/functions.rs b/gtk4/src/auto/functions.rs index 8a6defe4626f..4537b48c5015 100644 --- a/gtk4/src/auto/functions.rs +++ b/gtk4/src/auto/functions.rs @@ -59,14 +59,14 @@ pub fn enumerate_printers bool + Send + Sync + 'static>(func: data: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let printer = from_glib_borrow(printer); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&printer).into_glib() } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_func bool + Send + Sync + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call2 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; @@ -178,7 +178,7 @@ pub fn print_run_page_setup_dialog_async = Box_::from_raw(data as *mut _); + let callback = Box_::from_raw(data as *mut P); (*callback)(&page_setup) } let done_cb = Some(done_cb_func::

as _); diff --git a/gtk4/src/auto/icon_view.rs b/gtk4/src/auto/icon_view.rs index 69d8e0271745..3daa534cab55 100644 --- a/gtk4/src/auto/icon_view.rs +++ b/gtk4/src/auto/icon_view.rs @@ -538,7 +538,7 @@ impl IconView { ) { let icon_view = from_glib_borrow(icon_view); let path = from_glib_borrow(path); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&icon_view, &path) } let func = Some(func_func::

as _); @@ -547,7 +547,7 @@ impl IconView { ffi::gtk_icon_view_selected_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } diff --git a/gtk4/src/auto/list_box.rs b/gtk4/src/auto/list_box.rs index 8a36b1aa7572..65baf53aa4e4 100644 --- a/gtk4/src/auto/list_box.rs +++ b/gtk4/src/auto/list_box.rs @@ -56,14 +56,14 @@ impl ListBox { user_data: glib::ffi::gpointer, ) -> *mut ffi::GtkWidget { let item = from_glib_borrow(item); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&item).to_glib_full() } let create_widget_func = Some(create_widget_func_func::

as _); unsafe extern "C" fn user_data_free_func_func Widget + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call4 = Some(user_data_free_func_func::

as _); let super_callback0: Box_

= create_widget_func_data; @@ -238,7 +238,7 @@ impl ListBox { ) { let box_ = from_glib_borrow(box_); let row = from_glib_borrow(row); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(&box_, &row) } let func = Some(func_func::

as _); @@ -247,7 +247,7 @@ impl ListBox { ffi::gtk_list_box_selected_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } @@ -280,14 +280,14 @@ impl ListBox { user_data: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let row = from_glib_borrow(row); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&row).into_glib() } let filter_func = Some(filter_func_func::

as _); unsafe extern "C" fn destroy_func bool + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= filter_func_data; @@ -316,14 +316,14 @@ impl ListBox { ) { let row = from_glib_borrow(row); let before: Borrowed> = from_glib_borrow(before); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&row, before.as_ref().as_ref()) } let update_header = Some(update_header_func::

as _); unsafe extern "C" fn destroy_func) + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= update_header_data; diff --git a/gtk4/src/auto/map_list_model.rs b/gtk4/src/auto/map_list_model.rs index 509f691eafae..e7348f127e66 100644 --- a/gtk4/src/auto/map_list_model.rs +++ b/gtk4/src/auto/map_list_model.rs @@ -46,14 +46,14 @@ impl MapListModel { user_data: glib::ffi::gpointer, ) -> *mut glib::gobject_ffi::GObject { let item = from_glib_full(item); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&item).to_glib_full() } let map_func = Some(map_func_func::

as _); unsafe extern "C" fn user_destroy_func glib::Object + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(user_destroy_func::

as _); let super_callback0: Box_

= map_func_data; @@ -86,14 +86,14 @@ impl MapListModel { user_data: glib::ffi::gpointer, ) -> *mut glib::gobject_ffi::GObject { let item = from_glib_full(item); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&item).to_glib_full() } let map_func = Some(map_func_func::

as _); unsafe extern "C" fn user_destroy_func glib::Object + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(user_destroy_func::

as _); let super_callback0: Box_

= map_func_data; diff --git a/gtk4/src/auto/menu_button.rs b/gtk4/src/auto/menu_button.rs index 0a38459b9bb1..438d6ea8186f 100644 --- a/gtk4/src/auto/menu_button.rs +++ b/gtk4/src/auto/menu_button.rs @@ -191,14 +191,14 @@ impl MenuButton { user_data: glib::ffi::gpointer, ) { let menu_button = from_glib_borrow(menu_button); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&menu_button) } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_notify_func( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_notify_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/print_settings.rs b/gtk4/src/auto/print_settings.rs index d3a57f61f03d..eab0d0117e09 100644 --- a/gtk4/src/auto/print_settings.rs +++ b/gtk4/src/auto/print_settings.rs @@ -91,7 +91,7 @@ impl PrintSettings { ) { let key: Borrowed = from_glib_borrow(key); let value: Borrowed = from_glib_borrow(value); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(key.as_str(), value.as_str()) } let func = Some(func_func::

as _); @@ -100,7 +100,7 @@ impl PrintSettings { ffi::gtk_print_settings_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } diff --git a/gtk4/src/auto/scale.rs b/gtk4/src/auto/scale.rs index c541d0aaa8b6..f935d7abf30f 100644 --- a/gtk4/src/auto/scale.rs +++ b/gtk4/src/auto/scale.rs @@ -461,14 +461,14 @@ pub trait ScaleExt: IsA + sealed::Sealed + 'static { user_data: glib::ffi::gpointer, ) -> *mut libc::c_char { let scale = from_glib_borrow(scale); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&scale, value).to_glib_full() } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_notify_func String + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_notify_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/text_iter.rs b/gtk4/src/auto/text_iter.rs index 19ea64d8ce9d..3ce9a5ddcff9 100644 --- a/gtk4/src/auto/text_iter.rs +++ b/gtk4/src/auto/text_iter.rs @@ -71,7 +71,7 @@ impl TextIter { ) -> glib::ffi::gboolean { let ch = std::convert::TryFrom::try_from(ch) .expect("conversion from an invalid Unicode value attempted"); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(ch).into_glib() } let pred = Some(pred_func::

as _); @@ -80,7 +80,7 @@ impl TextIter { from_glib(ffi::gtk_text_iter_backward_find_char( self.to_glib_none_mut().0, pred, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, limit.to_glib_none().0, )) } @@ -339,7 +339,7 @@ impl TextIter { ) -> glib::ffi::gboolean { let ch = std::convert::TryFrom::try_from(ch) .expect("conversion from an invalid Unicode value attempted"); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(ch).into_glib() } let pred = Some(pred_func::

as _); @@ -348,7 +348,7 @@ impl TextIter { from_glib(ffi::gtk_text_iter_forward_find_char( self.to_glib_none_mut().0, pred, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, limit.to_glib_none().0, )) } diff --git a/gtk4/src/auto/text_tag_table.rs b/gtk4/src/auto/text_tag_table.rs index a1f71bac0c19..15ca5d82dc71 100644 --- a/gtk4/src/auto/text_tag_table.rs +++ b/gtk4/src/auto/text_tag_table.rs @@ -44,7 +44,7 @@ impl TextTagTable { data: glib::ffi::gpointer, ) { let tag = from_glib_borrow(tag); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&tag) } let func = Some(func_func::

as _); @@ -53,7 +53,7 @@ impl TextTagTable { ffi::gtk_text_tag_table_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } diff --git a/gtk4/src/auto/tree_list_model.rs b/gtk4/src/auto/tree_list_model.rs index a757fd58ce02..a21e9ba82f98 100644 --- a/gtk4/src/auto/tree_list_model.rs +++ b/gtk4/src/auto/tree_list_model.rs @@ -36,7 +36,7 @@ impl TreeListModel { user_data: glib::ffi::gpointer, ) -> *mut gio::ffi::GListModel { let item = from_glib_borrow(item); - let callback: &P = &*(user_data as *mut _); + let callback = &*(user_data as *mut P); (*callback)(&item).to_glib_full() } let create_func = Some(create_func_func::

as _); @@ -45,7 +45,7 @@ impl TreeListModel { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call5 = Some(user_destroy_func::

as _); let super_callback0: Box_

= create_func_data; diff --git a/gtk4/src/auto/tree_model.rs b/gtk4/src/auto/tree_model.rs index fcb5b62eb9ea..e56228d5a22d 100644 --- a/gtk4/src/auto/tree_model.rs +++ b/gtk4/src/auto/tree_model.rs @@ -44,7 +44,7 @@ pub trait TreeModelExt: IsA + sealed::Sealed + 'static { let model = from_glib_borrow(model); let path = from_glib_borrow(path); let iter = from_glib_borrow(iter); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&model, &path, &iter).into_glib() } let func = Some(func_func::

as _); @@ -53,7 +53,7 @@ pub trait TreeModelExt: IsA + sealed::Sealed + 'static { ffi::gtk_tree_model_foreach( self.as_ref().to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } diff --git a/gtk4/src/auto/tree_model_filter.rs b/gtk4/src/auto/tree_model_filter.rs index f2cefebb741f..04328b72d529 100644 --- a/gtk4/src/auto/tree_model_filter.rs +++ b/gtk4/src/auto/tree_model_filter.rs @@ -135,14 +135,14 @@ pub trait TreeModelFilterExt: IsA + sealed::Sealed + 'static { ) -> glib::ffi::gboolean { let model = from_glib_borrow(model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&model, &iter).into_glib() } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_func bool + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/tree_selection.rs b/gtk4/src/auto/tree_selection.rs index 61146a8d56ab..5a12cd47a661 100644 --- a/gtk4/src/auto/tree_selection.rs +++ b/gtk4/src/auto/tree_selection.rs @@ -163,7 +163,7 @@ impl TreeSelection { let model = from_glib_borrow(model); let path = from_glib_borrow(path); let iter = from_glib_borrow(iter); - let callback: *mut P = data as *const _ as usize as *mut P; + let callback = data as *mut P; (*callback)(&model, &path, &iter) } let func = Some(func_func::

as _); @@ -172,7 +172,7 @@ impl TreeSelection { ffi::gtk_tree_selection_selected_foreach( self.to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } @@ -209,7 +209,7 @@ impl TreeSelection { let model = from_glib_borrow(model); let path = from_glib_borrow(path); let path_currently_selected = from_glib(path_currently_selected); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&selection, &model, &path, path_currently_selected).into_glib() } let func = Some(func_func::

as _); @@ -218,7 +218,7 @@ impl TreeSelection { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/tree_view.rs b/gtk4/src/auto/tree_view.rs index e18dbd60df81..8c3a96ff5124 100644 --- a/gtk4/src/auto/tree_view.rs +++ b/gtk4/src/auto/tree_view.rs @@ -1141,7 +1141,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { let cell = from_glib_borrow(cell); let tree_model = from_glib_borrow(tree_model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&tree_column, &cell, &tree_model, &iter) } let func = Some(func_func::

as _); @@ -1150,7 +1150,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call6 = Some(dnotify_func::

as _); let super_callback0: Box_

= func_data; @@ -1225,7 +1225,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { ) { let tree_view = from_glib_borrow(tree_view); let path = from_glib_borrow(path); - let callback: *mut P = user_data as *const _ as usize as *mut P; + let callback = user_data as *mut P; (*callback)(&tree_view, &path) } let func = Some(func_func::

as _); @@ -1234,7 +1234,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { ffi::gtk_tree_view_map_expanded_rows( self.as_ref().to_glib_none().0, func, - super_callback0 as *const _ as usize as *mut _, + super_callback0 as *const _ as *mut _, ); } } @@ -1364,12 +1364,12 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { let column = from_glib_borrow(column); let prev_column = from_glib_borrow(prev_column); let next_column = from_glib_borrow(next_column); - let callback: &Option< + let callback = &*(data as *mut Option< Box_< dyn Fn(&TreeView, &TreeViewColumn, &TreeViewColumn, &TreeViewColumn) -> bool + 'static, >, - > = &*(data as *mut _); + >); if let Some(ref callback) = *callback { callback(&tree_view, &column, &prev_column, &next_column) } else { @@ -1383,14 +1383,14 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { None }; unsafe extern "C" fn destroy_func(data: glib::ffi::gpointer) { - let _callback: Box_< - Option< + let _callback = Box_::from_raw( + data as *mut Option< Box_< dyn Fn(&TreeView, &TreeViewColumn, &TreeViewColumn, &TreeViewColumn) -> bool + 'static, >, >, - > = Box_::from_raw(data as *mut _); + ); } let destroy_call3 = Some(destroy_func as _); let super_callback0: Box_< @@ -1614,14 +1614,14 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { ) -> glib::ffi::gboolean { let model = from_glib_borrow(model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&model, &iter).into_glib() } let func = Some(func_func::

as _); unsafe extern "C" fn destroy_func bool + 'static>( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; @@ -1688,7 +1688,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { let model = from_glib_borrow(model); let key: Borrowed = from_glib_borrow(key); let iter = from_glib_borrow(iter); - let callback: &P = &*(search_data as *mut _); + let callback = &*(search_data as *mut P); (*callback)(&model, column, key.as_str(), &iter).into_glib() } let search_equal_func = Some(search_equal_func_func::

as _); @@ -1697,7 +1697,7 @@ pub trait TreeViewExt: IsA + sealed::Sealed + 'static { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call3 = Some(search_destroy_func::

as _); let super_callback0: Box_

= search_equal_func_data; diff --git a/gtk4/src/auto/tree_view_column.rs b/gtk4/src/auto/tree_view_column.rs index d605ae89597c..db29cc05de12 100644 --- a/gtk4/src/auto/tree_view_column.rs +++ b/gtk4/src/auto/tree_view_column.rs @@ -444,7 +444,7 @@ impl TreeViewColumn { let cell = from_glib_borrow(cell); let tree_model = from_glib_borrow(tree_model); let iter = from_glib_borrow(iter); - let callback: &P = &*(data as *mut _); + let callback = &*(data as *mut P); (*callback)(&tree_column, &cell, &tree_model, &iter) } let func = Some(func_func::

as _); @@ -453,7 +453,7 @@ impl TreeViewColumn { >( data: glib::ffi::gpointer, ) { - let _callback: Box_

= Box_::from_raw(data as *mut _); + let _callback = Box_::from_raw(data as *mut P); } let destroy_call4 = Some(destroy_func::

as _); let super_callback0: Box_

= func_data; diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gtk4/src/auto/versions.txt +++ b/gtk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40) diff --git a/gtk4/sys/src/lib.rs b/gtk4/sys/src/lib.rs index 3fe7126e429f..f53e8b0e3003 100644 --- a/gtk4/sys/src/lib.rs +++ b/gtk4/sys/src/lib.rs @@ -1208,7 +1208,7 @@ pub struct _GtkATContextClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkATContextClass = *mut _GtkATContextClass; +pub type GtkATContextClass = _GtkATContextClass; #[derive(Copy, Clone)] #[repr(C)] @@ -1300,7 +1300,7 @@ pub struct _GtkActivateActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkActivateActionClass = *mut _GtkActivateActionClass; +pub type GtkActivateActionClass = _GtkActivateActionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -1348,7 +1348,7 @@ pub struct _GtkAlternativeTriggerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkAlternativeTriggerClass = *mut _GtkAlternativeTriggerClass; +pub type GtkAlternativeTriggerClass = _GtkAlternativeTriggerClass; #[repr(C)] pub struct _GtkAnyFilterClass { @@ -1356,7 +1356,7 @@ pub struct _GtkAnyFilterClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkAnyFilterClass = *mut _GtkAnyFilterClass; +pub type GtkAnyFilterClass = _GtkAnyFilterClass; #[derive(Copy, Clone)] #[repr(C)] @@ -1599,7 +1599,7 @@ pub struct _GtkBuildableParseContext { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkBuildableParseContext = *mut _GtkBuildableParseContext; +pub type GtkBuildableParseContext = _GtkBuildableParseContext; #[derive(Copy, Clone)] #[repr(C)] @@ -1667,7 +1667,7 @@ pub struct _GtkBuilderClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkBuilderClass = *mut _GtkBuilderClass; +pub type GtkBuilderClass = _GtkBuilderClass; #[repr(C)] pub struct _GtkBuilderListItemFactoryClass { @@ -1675,7 +1675,7 @@ pub struct _GtkBuilderListItemFactoryClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkBuilderListItemFactoryClass = *mut _GtkBuilderListItemFactoryClass; +pub type GtkBuilderListItemFactoryClass = _GtkBuilderListItemFactoryClass; #[derive(Copy, Clone)] #[repr(C)] @@ -1732,7 +1732,7 @@ pub struct _GtkButtonPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkButtonPrivate = *mut _GtkButtonPrivate; +pub type GtkButtonPrivate = _GtkButtonPrivate; #[repr(C)] pub struct _GtkCallbackActionClass { @@ -1740,7 +1740,7 @@ pub struct _GtkCallbackActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCallbackActionClass = *mut _GtkCallbackActionClass; +pub type GtkCallbackActionClass = _GtkCallbackActionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -1935,7 +1935,7 @@ pub struct _GtkCellAreaContextPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCellAreaContextPrivate = *mut _GtkCellAreaContextPrivate; +pub type GtkCellAreaContextPrivate = _GtkCellAreaContextPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -2090,7 +2090,7 @@ pub struct _GtkCellRendererClassPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCellRendererClassPrivate = *mut _GtkCellRendererClassPrivate; +pub type GtkCellRendererClassPrivate = _GtkCellRendererClassPrivate; #[repr(C)] pub struct _GtkCellRendererPrivate { @@ -2098,7 +2098,7 @@ pub struct _GtkCellRendererPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCellRendererPrivate = *mut _GtkCellRendererPrivate; +pub type GtkCellRendererPrivate = _GtkCellRendererPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -2124,7 +2124,7 @@ pub struct _GtkCenterBoxClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCenterBoxClass = *mut _GtkCenterBoxClass; +pub type GtkCenterBoxClass = _GtkCenterBoxClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2218,7 +2218,7 @@ pub struct _GtkColumnViewCellClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkColumnViewCellClass = *mut _GtkColumnViewCellClass; +pub type GtkColumnViewCellClass = _GtkColumnViewCellClass; #[repr(C)] pub struct _GtkColumnViewClass { @@ -2226,7 +2226,7 @@ pub struct _GtkColumnViewClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkColumnViewClass = *mut _GtkColumnViewClass; +pub type GtkColumnViewClass = _GtkColumnViewClass; #[repr(C)] pub struct _GtkColumnViewColumnClass { @@ -2234,7 +2234,7 @@ pub struct _GtkColumnViewColumnClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkColumnViewColumnClass = *mut _GtkColumnViewColumnClass; +pub type GtkColumnViewColumnClass = _GtkColumnViewColumnClass; #[repr(C)] pub struct _GtkColumnViewRowClass { @@ -2242,7 +2242,7 @@ pub struct _GtkColumnViewRowClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkColumnViewRowClass = *mut _GtkColumnViewRowClass; +pub type GtkColumnViewRowClass = _GtkColumnViewRowClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2342,7 +2342,7 @@ pub struct _GtkConstraintTargetInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkConstraintTargetInterface = *mut _GtkConstraintTargetInterface; +pub type GtkConstraintTargetInterface = _GtkConstraintTargetInterface; #[derive(Copy, Clone)] #[repr(C)] @@ -2372,7 +2372,7 @@ pub struct _GtkCssProviderClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCssProviderClass = *mut _GtkCssProviderClass; +pub type GtkCssProviderClass = _GtkCssProviderClass; #[repr(C)] pub struct _GtkCssProviderPrivate { @@ -2380,7 +2380,7 @@ pub struct _GtkCssProviderPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCssProviderPrivate = *mut _GtkCssProviderPrivate; +pub type GtkCssProviderPrivate = _GtkCssProviderPrivate; #[repr(C)] pub struct GtkCssSection { @@ -2401,7 +2401,7 @@ pub struct _GtkCssStyleChange { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkCssStyleChange = *mut _GtkCssStyleChange; +pub type GtkCssStyleChange = _GtkCssStyleChange; #[derive(Copy, Clone)] #[repr(C)] @@ -2498,7 +2498,7 @@ pub struct _GtkDragSourceClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkDragSourceClass = *mut _GtkDragSourceClass; +pub type GtkDragSourceClass = _GtkDragSourceClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2523,7 +2523,7 @@ pub struct _GtkDropControllerMotionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkDropControllerMotionClass = *mut _GtkDropControllerMotionClass; +pub type GtkDropControllerMotionClass = _GtkDropControllerMotionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2545,7 +2545,7 @@ pub struct _GtkDropTargetAsyncClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkDropTargetAsyncClass = *mut _GtkDropTargetAsyncClass; +pub type GtkDropTargetAsyncClass = _GtkDropTargetAsyncClass; #[repr(C)] pub struct _GtkDropTargetClass { @@ -2553,7 +2553,7 @@ pub struct _GtkDropTargetClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkDropTargetClass = *mut _GtkDropTargetClass; +pub type GtkDropTargetClass = _GtkDropTargetClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2610,7 +2610,7 @@ pub struct _GtkEmojiChooserClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEmojiChooserClass = *mut _GtkEmojiChooserClass; +pub type GtkEmojiChooserClass = _GtkEmojiChooserClass; #[derive(Copy, Clone)] #[repr(C)] @@ -2679,7 +2679,7 @@ pub struct _GtkEventControllerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerClass = *mut _GtkEventControllerClass; +pub type GtkEventControllerClass = _GtkEventControllerClass; #[repr(C)] pub struct _GtkEventControllerFocusClass { @@ -2687,7 +2687,7 @@ pub struct _GtkEventControllerFocusClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerFocusClass = *mut _GtkEventControllerFocusClass; +pub type GtkEventControllerFocusClass = _GtkEventControllerFocusClass; #[repr(C)] pub struct _GtkEventControllerKeyClass { @@ -2695,7 +2695,7 @@ pub struct _GtkEventControllerKeyClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerKeyClass = *mut _GtkEventControllerKeyClass; +pub type GtkEventControllerKeyClass = _GtkEventControllerKeyClass; #[repr(C)] pub struct _GtkEventControllerLegacyClass { @@ -2703,7 +2703,7 @@ pub struct _GtkEventControllerLegacyClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerLegacyClass = *mut _GtkEventControllerLegacyClass; +pub type GtkEventControllerLegacyClass = _GtkEventControllerLegacyClass; #[repr(C)] pub struct _GtkEventControllerMotionClass { @@ -2711,7 +2711,7 @@ pub struct _GtkEventControllerMotionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerMotionClass = *mut _GtkEventControllerMotionClass; +pub type GtkEventControllerMotionClass = _GtkEventControllerMotionClass; #[repr(C)] pub struct _GtkEventControllerScrollClass { @@ -2719,7 +2719,7 @@ pub struct _GtkEventControllerScrollClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEventControllerScrollClass = *mut _GtkEventControllerScrollClass; +pub type GtkEventControllerScrollClass = _GtkEventControllerScrollClass; #[repr(C)] pub struct _GtkEveryFilterClass { @@ -2727,7 +2727,7 @@ pub struct _GtkEveryFilterClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkEveryFilterClass = *mut _GtkEveryFilterClass; +pub type GtkEveryFilterClass = _GtkEveryFilterClass; #[repr(C)] pub struct GtkExpressionWatch { @@ -3014,7 +3014,7 @@ pub struct _GtkGestureClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureClass = *mut _GtkGestureClass; +pub type GtkGestureClass = _GtkGestureClass; #[repr(C)] pub struct _GtkGestureClickClass { @@ -3022,7 +3022,7 @@ pub struct _GtkGestureClickClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureClickClass = *mut _GtkGestureClickClass; +pub type GtkGestureClickClass = _GtkGestureClickClass; #[repr(C)] pub struct _GtkGestureDragClass { @@ -3030,7 +3030,7 @@ pub struct _GtkGestureDragClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureDragClass = *mut _GtkGestureDragClass; +pub type GtkGestureDragClass = _GtkGestureDragClass; #[repr(C)] pub struct _GtkGestureLongPressClass { @@ -3038,7 +3038,7 @@ pub struct _GtkGestureLongPressClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureLongPressClass = *mut _GtkGestureLongPressClass; +pub type GtkGestureLongPressClass = _GtkGestureLongPressClass; #[repr(C)] pub struct _GtkGesturePanClass { @@ -3046,7 +3046,7 @@ pub struct _GtkGesturePanClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGesturePanClass = *mut _GtkGesturePanClass; +pub type GtkGesturePanClass = _GtkGesturePanClass; #[repr(C)] pub struct _GtkGestureRotateClass { @@ -3054,7 +3054,7 @@ pub struct _GtkGestureRotateClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureRotateClass = *mut _GtkGestureRotateClass; +pub type GtkGestureRotateClass = _GtkGestureRotateClass; #[repr(C)] pub struct _GtkGestureSingleClass { @@ -3062,7 +3062,7 @@ pub struct _GtkGestureSingleClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureSingleClass = *mut _GtkGestureSingleClass; +pub type GtkGestureSingleClass = _GtkGestureSingleClass; #[repr(C)] pub struct _GtkGestureStylusClass { @@ -3070,7 +3070,7 @@ pub struct _GtkGestureStylusClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureStylusClass = *mut _GtkGestureStylusClass; +pub type GtkGestureStylusClass = _GtkGestureStylusClass; #[repr(C)] pub struct _GtkGestureSwipeClass { @@ -3078,7 +3078,7 @@ pub struct _GtkGestureSwipeClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureSwipeClass = *mut _GtkGestureSwipeClass; +pub type GtkGestureSwipeClass = _GtkGestureSwipeClass; #[repr(C)] pub struct _GtkGestureZoomClass { @@ -3086,7 +3086,7 @@ pub struct _GtkGestureZoomClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGestureZoomClass = *mut _GtkGestureZoomClass; +pub type GtkGestureZoomClass = _GtkGestureZoomClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3137,7 +3137,7 @@ pub struct _GtkGridViewClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkGridViewClass = *mut _GtkGridViewClass; +pub type GtkGridViewClass = _GtkGridViewClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3244,7 +3244,7 @@ pub struct _GtkIMContextSimplePrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkIMContextSimplePrivate = *mut _GtkIMContextSimplePrivate; +pub type GtkIMContextSimplePrivate = _GtkIMContextSimplePrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -3274,7 +3274,7 @@ pub struct _GtkIMMulticontextPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkIMMulticontextPrivate = *mut _GtkIMMulticontextPrivate; +pub type GtkIMMulticontextPrivate = _GtkIMMulticontextPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -3296,7 +3296,7 @@ pub struct _GtkKeyvalTriggerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkKeyvalTriggerClass = *mut _GtkKeyvalTriggerClass; +pub type GtkKeyvalTriggerClass = _GtkKeyvalTriggerClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3364,7 +3364,7 @@ pub struct _GtkListBaseClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListBaseClass = *mut _GtkListBaseClass; +pub type GtkListBaseClass = _GtkListBaseClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3389,7 +3389,7 @@ pub struct _GtkListHeaderClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListHeaderClass = *mut _GtkListHeaderClass; +pub type GtkListHeaderClass = _GtkListHeaderClass; #[repr(C)] pub struct _GtkListItemClass { @@ -3397,7 +3397,7 @@ pub struct _GtkListItemClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListItemClass = *mut _GtkListItemClass; +pub type GtkListItemClass = _GtkListItemClass; #[repr(C)] pub struct _GtkListItemFactoryClass { @@ -3405,7 +3405,7 @@ pub struct _GtkListItemFactoryClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListItemFactoryClass = *mut _GtkListItemFactoryClass; +pub type GtkListItemFactoryClass = _GtkListItemFactoryClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3428,7 +3428,7 @@ pub struct _GtkListStorePrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListStorePrivate = *mut _GtkListStorePrivate; +pub type GtkListStorePrivate = _GtkListStorePrivate; #[repr(C)] pub struct _GtkListViewClass { @@ -3436,7 +3436,7 @@ pub struct _GtkListViewClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkListViewClass = *mut _GtkListViewClass; +pub type GtkListViewClass = _GtkListViewClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3540,7 +3540,7 @@ pub struct _GtkMessageDialogClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkMessageDialogClass = *mut _GtkMessageDialogClass; +pub type GtkMessageDialogClass = _GtkMessageDialogClass; #[repr(C)] pub struct _GtkMnemonicActionClass { @@ -3548,7 +3548,7 @@ pub struct _GtkMnemonicActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkMnemonicActionClass = *mut _GtkMnemonicActionClass; +pub type GtkMnemonicActionClass = _GtkMnemonicActionClass; #[repr(C)] pub struct _GtkMnemonicTriggerClass { @@ -3556,7 +3556,7 @@ pub struct _GtkMnemonicTriggerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkMnemonicTriggerClass = *mut _GtkMnemonicTriggerClass; +pub type GtkMnemonicTriggerClass = _GtkMnemonicTriggerClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3586,7 +3586,7 @@ pub struct _GtkMountOperationPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkMountOperationPrivate = *mut _GtkMountOperationPrivate; +pub type GtkMountOperationPrivate = _GtkMountOperationPrivate; #[repr(C)] pub struct _GtkMultiFilterClass { @@ -3594,7 +3594,7 @@ pub struct _GtkMultiFilterClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkMultiFilterClass = *mut _GtkMultiFilterClass; +pub type GtkMultiFilterClass = _GtkMultiFilterClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3630,7 +3630,7 @@ pub struct _GtkNamedActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkNamedActionClass = *mut _GtkNamedActionClass; +pub type GtkNamedActionClass = _GtkNamedActionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3665,7 +3665,7 @@ pub struct _GtkNativeInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkNativeInterface = *mut _GtkNativeInterface; +pub type GtkNativeInterface = _GtkNativeInterface; #[repr(C)] pub struct _GtkNeverTriggerClass { @@ -3673,7 +3673,7 @@ pub struct _GtkNeverTriggerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkNeverTriggerClass = *mut _GtkNeverTriggerClass; +pub type GtkNeverTriggerClass = _GtkNeverTriggerClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3695,7 +3695,7 @@ pub struct _GtkNothingActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkNothingActionClass = *mut _GtkNothingActionClass; +pub type GtkNothingActionClass = _GtkNothingActionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3781,7 +3781,7 @@ pub struct _GtkPadControllerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkPadControllerClass = *mut _GtkPadControllerClass; +pub type GtkPadControllerClass = _GtkPadControllerClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3831,7 +3831,7 @@ pub struct _GtkPasswordEntryClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkPasswordEntryClass = *mut _GtkPasswordEntryClass; +pub type GtkPasswordEntryClass = _GtkPasswordEntryClass; #[derive(Copy, Clone)] #[repr(C)] @@ -3872,7 +3872,7 @@ pub struct _GtkPrintBackend { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkPrintBackend = *mut _GtkPrintBackend; +pub type GtkPrintBackend = _GtkPrintBackend; #[derive(Copy, Clone)] #[repr(C)] @@ -3987,7 +3987,7 @@ pub struct _GtkPrintOperationPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkPrintOperationPrivate = *mut _GtkPrintOperationPrivate; +pub type GtkPrintOperationPrivate = _GtkPrintOperationPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -4083,7 +4083,7 @@ pub struct _GtkRecentManagerPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkRecentManagerPrivate = *mut _GtkRecentManagerPrivate; +pub type GtkRecentManagerPrivate = _GtkRecentManagerPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -4125,7 +4125,7 @@ pub struct _GtkRootInterface { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkRootInterface = *mut _GtkRootInterface; +pub type GtkRootInterface = _GtkRootInterface; #[derive(Copy, Clone)] #[repr(C)] @@ -4263,7 +4263,7 @@ pub struct _GtkShortcutActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutActionClass = *mut _GtkShortcutActionClass; +pub type GtkShortcutActionClass = _GtkShortcutActionClass; #[derive(Copy, Clone)] #[repr(C)] @@ -4285,7 +4285,7 @@ pub struct _GtkShortcutControllerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutControllerClass = *mut _GtkShortcutControllerClass; +pub type GtkShortcutControllerClass = _GtkShortcutControllerClass; #[repr(C)] pub struct _GtkShortcutLabelClass { @@ -4293,7 +4293,7 @@ pub struct _GtkShortcutLabelClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutLabelClass = *mut _GtkShortcutLabelClass; +pub type GtkShortcutLabelClass = _GtkShortcutLabelClass; #[derive(Copy, Clone)] #[repr(C)] @@ -4320,7 +4320,7 @@ pub struct _GtkShortcutTriggerClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutTriggerClass = *mut _GtkShortcutTriggerClass; +pub type GtkShortcutTriggerClass = _GtkShortcutTriggerClass; #[repr(C)] pub struct _GtkShortcutsGroupClass { @@ -4328,7 +4328,7 @@ pub struct _GtkShortcutsGroupClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutsGroupClass = *mut _GtkShortcutsGroupClass; +pub type GtkShortcutsGroupClass = _GtkShortcutsGroupClass; #[repr(C)] pub struct _GtkShortcutsSectionClass { @@ -4336,7 +4336,7 @@ pub struct _GtkShortcutsSectionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutsSectionClass = *mut _GtkShortcutsSectionClass; +pub type GtkShortcutsSectionClass = _GtkShortcutsSectionClass; #[repr(C)] pub struct _GtkShortcutsShortcutClass { @@ -4344,7 +4344,7 @@ pub struct _GtkShortcutsShortcutClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkShortcutsShortcutClass = *mut _GtkShortcutsShortcutClass; +pub type GtkShortcutsShortcutClass = _GtkShortcutsShortcutClass; #[repr(C)] pub struct _GtkSignalActionClass { @@ -4352,7 +4352,7 @@ pub struct _GtkSignalActionClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkSignalActionClass = *mut _GtkSignalActionClass; +pub type GtkSignalActionClass = _GtkSignalActionClass; #[repr(C)] pub struct _GtkSignalListItemFactoryClass { @@ -4360,7 +4360,7 @@ pub struct _GtkSignalListItemFactoryClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkSignalListItemFactoryClass = *mut _GtkSignalListItemFactoryClass; +pub type GtkSignalListItemFactoryClass = _GtkSignalListItemFactoryClass; #[derive(Copy, Clone)] #[repr(C)] @@ -4396,7 +4396,7 @@ pub struct _GtkSnapshotClass { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkSnapshotClass = *mut _GtkSnapshotClass; +pub type GtkSnapshotClass = _GtkSnapshotClass; #[derive(Copy, Clone)] #[repr(C)] @@ -4633,7 +4633,7 @@ pub struct _GtkTextBufferPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTextBufferPrivate = *mut _GtkTextBufferPrivate; +pub type GtkTextBufferPrivate = _GtkTextBufferPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -4718,7 +4718,7 @@ pub struct _GtkTextTagPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTextTagPrivate = *mut _GtkTextTagPrivate; +pub type GtkTextTagPrivate = _GtkTextTagPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -4777,7 +4777,7 @@ pub struct _GtkTextViewPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTextViewPrivate = *mut _GtkTextViewPrivate; +pub type GtkTextViewPrivate = _GtkTextViewPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -4966,7 +4966,7 @@ pub struct _GtkTreeModelFilterPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTreeModelFilterPrivate = *mut _GtkTreeModelFilterPrivate; +pub type GtkTreeModelFilterPrivate = _GtkTreeModelFilterPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -5065,7 +5065,7 @@ pub struct _GtkTreeModelSortPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTreeModelSortPrivate = *mut _GtkTreeModelSortPrivate; +pub type GtkTreeModelSortPrivate = _GtkTreeModelSortPrivate; #[repr(C)] pub struct GtkTreePath { @@ -5155,7 +5155,7 @@ pub struct _GtkTreeStorePrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkTreeStorePrivate = *mut _GtkTreeStorePrivate; +pub type GtkTreeStorePrivate = _GtkTreeStorePrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -5333,7 +5333,7 @@ pub struct _GtkWidgetClassPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkWidgetClassPrivate = *mut _GtkWidgetClassPrivate; +pub type GtkWidgetClassPrivate = _GtkWidgetClassPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -5355,7 +5355,7 @@ pub struct _GtkWidgetPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkWidgetPrivate = *mut _GtkWidgetPrivate; +pub type GtkWidgetPrivate = _GtkWidgetPrivate; #[derive(Copy, Clone)] #[repr(C)] @@ -5424,7 +5424,7 @@ pub struct _GtkWindowGroupPrivate { _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>, } -pub type GtkWindowGroupPrivate = *mut _GtkWindowGroupPrivate; +pub type GtkWindowGroupPrivate = _GtkWindowGroupPrivate; #[derive(Copy, Clone)] #[repr(C)] diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt index c535a58894ca..353dddc62000 100644 --- a/gtk4/sys/versions.txt +++ b/gtk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b) +Generated by gir (https://github.com/gtk-rs/gir @ 20a5b17f6da9) from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)