From 268bccd25c78721e3cb06bf9aec7f560d16f03a9 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Tue, 24 Nov 2020 21:51:19 +0100
Subject: [PATCH] gtk: nullability trust part 3

---
 gtk4/Gir.toml                     | 184 ++++++++++++++++++++++--------
 gtk4/src/auto/recent_info.rs      |  18 +--
 gtk4/src/auto/recent_manager.rs   |   2 +-
 gtk4/src/auto/scale_button.rs     |  12 +-
 gtk4/src/auto/search_bar.rs       |   2 +-
 gtk4/src/auto/search_entry.rs     |   2 +-
 gtk4/src/auto/selection_model.rs  |   8 +-
 gtk4/src/auto/settings.rs         |   2 +-
 gtk4/src/auto/shortcut_trigger.rs |   4 +-
 gtk4/src/auto/signal_action.rs    |   2 +-
 gtk4/src/auto/single_selection.rs |   4 +-
 gtk4/src/auto/stack.rs            |   8 +-
 gtk4/src/auto/stack_page.rs       |   2 +-
 gtk4/src/auto/string_filter.rs    |   4 +-
 gtk4/src/auto/style_context.rs    |   4 +-
 gtk4/src/auto/text_iter.rs        |   2 +-
 gtk4/src/auto/text_view.rs        |   4 +-
 gtk4/src/auto/tree_model.rs       |   4 +-
 gtk4/src/auto/tree_view.rs        |   8 +-
 gtk4/src/auto/widget.rs           |  32 +++---
 gtk4/src/auto/window.rs           |   6 +-
 21 files changed, 202 insertions(+), 112 deletions(-)

diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml
index 9c38061af201..f214cf998732 100644
--- a/gtk4/Gir.toml
+++ b/gtk4/Gir.toml
@@ -1608,13 +1608,11 @@ generate_builder = true
 [[object]]
 name = "Gtk.RecentInfo"
 status = "generate"
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.RecentManager"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.Revealer"
@@ -1630,7 +1628,6 @@ generate_builder = true
 name = "Gtk.ScaleButton"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
     [[object.function]]
     name = "get_adjustment"
         [object.function.return]
@@ -1645,25 +1642,46 @@ trust_return_value_nullability = false
 name = "Gtk.Scrollbar"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_adjustment"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.ScrolledWindow"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_hadjustment"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_vadjustment"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_hscrollbar"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_vscrollbar"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.SearchBar"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.SearchEntry"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.SelectionFilterModel"
@@ -1673,7 +1691,6 @@ generate_builder = true
 [[object]]
 name = "Gtk.SelectionModel"
 status = "generate"
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.Separator"
@@ -1684,13 +1701,21 @@ generate_builder = true
 name = "Gtk.Settings"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.Shortcut"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_action"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_trigger"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.ShortcutController"
@@ -1729,7 +1754,6 @@ generate_builder = true
 [[object]]
 name = "Gtk.ShortcutTrigger"
 status = "generate"
-trust_return_value_nullability = false
 manual_traits = ["ShortcutTriggerExtManual"]
     [[object.function]]
     name = "equal"
@@ -1746,13 +1770,11 @@ manual_traits = ["ShortcutTriggerExtManual"]
 name = "Gtk.SignalAction"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.SingleSelection"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.SizeGroup"
@@ -1795,10 +1817,6 @@ name = "Gtk.SpinButton"
 status = "generate"
 generate_builder = true
 manual_traits = ["SpinButtonExtManual"]
-    [[object.function]]
-    name = "get_adjustment"
-        [object.function.return]
-        nullable = false
     [[object.signal]]
     name = "output"
     inhibit = true
@@ -1812,13 +1830,15 @@ generate_builder = true
 name = "Gtk.Stack"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    [[object.function]]
+    name = "get_page"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.StackPage"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.StackSidebar"
@@ -1839,20 +1859,24 @@ generate_builder = true
 name = "Gtk.StringFilter"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_search"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.StringList"
 status = "generate"
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_string"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.StringObject"
 status = "generate"
-    [[object.function]]
-    name = "get_string"
-        [object.function.return]
-        nullable = false
 
 [[object]]
 name = "Gtk.StringSorter"
@@ -1863,7 +1887,6 @@ generate_builder = true
 name = "Gtk.StyleContext"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 
 [[object]]
 name = "Gtk.Switch"
@@ -1877,7 +1900,22 @@ generate_builder = true
 name = "Gtk.Text"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_buffer"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_extra_menu"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_placeholder_text"
+        [object.function.return]
+        nullable = true
+
     [[object.signal]]
     pattern = ".+"
     #manual
@@ -1909,9 +1947,43 @@ manual_traits = ["TextBufferExtManual"]
 [[object]]
 name = "Gtk.TextIter"
 status = "generate"
-trust_return_value_nullability = false
 init_function_expression = "|_ptr| ()"
 clear_function_expression = "|_ptr| ()"
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_buffer"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_slice"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_text"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_visible_slice"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_paintable"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_child_anchor"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_visible_text"
+        [object.function.return]
+        nullable = true
 
 [[object]]
 name = "Gtk.TextMark"
@@ -1944,7 +2016,11 @@ generate_builder = true
 name = "Gtk.TextView"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_extra_menu"
+        [object.function.return]
+        nullable = true
     [[object.function]]
     name = "im_context_filter_keypress"
         [[object.function.parameter]]
@@ -1994,7 +2070,11 @@ generate_builder = true
 [[object]]
 name = "Gtk.TreeModel"
 status = "generate"
-trust_return_value_nullability = false
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_string_from_iter"
+        [object.function.return]
+        nullable = true
     [[object.function]]
     pattern = ".+"
         [[object.function.parameter]]
@@ -2103,10 +2183,6 @@ generate_builder = true
         [[object.function.parameter]]
         name = "iter"
         const = true
-    [[object.function]]
-    name = "get_model"
-        [object.function.return]
-        nullable = false
 
 [[object]]
 name = "Gtk.TreePath"
@@ -2163,8 +2239,6 @@ status = "generate"
         [[object.function.parameter]]
         name = "reference"
         const = true
-        [object.function.return]
-        nullable = false
     [[object.function]]
     name = "get_path"
         [[object.function.parameter]]
@@ -2280,16 +2354,26 @@ manual_traits = ["TreeStoreExtManual"]
 name = "Gtk.TreeView"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
     [[object.function]]
     pattern = ".+"
         [[object.function.parameter]]
         name = "path"
         const = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
     [[object.function]]
-    name = "get_selection"
+    name = "get_expander_column"
         [object.function.return]
-        nullable = false
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "create_row_drag_icon"
+        [object.function.return]
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_search_entry"
+        [object.function.return]
+        nullable = true
     [[object.signal]]
     pattern = ".+"
         [[object.signal.parameter]]
@@ -2331,7 +2415,6 @@ generate_builder = true
 [[object]]
 name = "Gtk.Widget"
 status = "generate"
-trust_return_value_nullability = false
 manual_traits = ["WidgetExtManual"]
     [[object.function]]
     name = "add_tick_callback"
@@ -2341,18 +2424,21 @@ manual_traits = ["WidgetExtManual"]
     name = "remove_tick_callback"
     ignore = true
     doc_trait_name = "WidgetExtManual"
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
     [[object.function]]
-    name = "get_clipboard"
+    name = "get_css_name"
         [object.function.return]
-        nullable = false
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
     [[object.function]]
-    name = "get_path"
+    name = "get_name"
         [object.function.return]
-        nullable = false
+        nullable = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
     [[object.function]]
-    name = "get_style_context"
+    name = "get_template_child"
         [object.function.return]
-        nullable = false
+        nullable = true
     [[object.function]]
     name = "input_shape_combine_region"
         [[object.function.parameter]]
@@ -2388,7 +2474,6 @@ generate_builder = true
 name = "Gtk.Window"
 status = "generate"
 generate_builder = true
-trust_return_value_nullability = false
 trait_name = "GtkWindowExt"
 manual_traits = ["GtkWindowExtManual"]
     [[object.function]]
@@ -2396,6 +2481,11 @@ manual_traits = ["GtkWindowExtManual"]
         [[object.function.parameter]]
         name = "event"
         const = true
+    # remove after https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2887
+    [[object.function]]
+    name = "get_default_icon_name"
+        [object.function.return]
+        nullable = true
     [[object.function]]
     name = "propagate_key_event"
         [[object.function.parameter]]
diff --git a/gtk4/src/auto/recent_info.rs b/gtk4/src/auto/recent_info.rs
index 2662ddfc8670..ee364693f3f9 100644
--- a/gtk4/src/auto/recent_info.rs
+++ b/gtk4/src/auto/recent_info.rs
@@ -41,7 +41,7 @@ impl RecentInfo {
         unsafe { from_glib(ffi::gtk_recent_info_exists(self.to_glib_none().0)) }
     }
 
-    pub fn get_added(&self) -> Option<glib::DateTime> {
+    pub fn get_added(&self) -> glib::DateTime {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_added(self.to_glib_none().0)) }
     }
 
@@ -84,11 +84,11 @@ impl RecentInfo {
         }
     }
 
-    pub fn get_description(&self) -> Option<glib::GString> {
+    pub fn get_description(&self) -> glib::GString {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_description(self.to_glib_none().0)) }
     }
 
-    pub fn get_display_name(&self) -> Option<glib::GString> {
+    pub fn get_display_name(&self) -> glib::GString {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_display_name(self.to_glib_none().0)) }
     }
 
@@ -107,11 +107,11 @@ impl RecentInfo {
         }
     }
 
-    pub fn get_mime_type(&self) -> Option<glib::GString> {
+    pub fn get_mime_type(&self) -> glib::GString {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_mime_type(self.to_glib_none().0)) }
     }
 
-    pub fn get_modified(&self) -> Option<glib::DateTime> {
+    pub fn get_modified(&self) -> glib::DateTime {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_modified(self.to_glib_none().0)) }
     }
 
@@ -119,11 +119,11 @@ impl RecentInfo {
         unsafe { from_glib(ffi::gtk_recent_info_get_private_hint(self.to_glib_none().0)) }
     }
 
-    pub fn get_short_name(&self) -> Option<glib::GString> {
+    pub fn get_short_name(&self) -> glib::GString {
         unsafe { from_glib_full(ffi::gtk_recent_info_get_short_name(self.to_glib_none().0)) }
     }
 
-    pub fn get_uri(&self) -> Option<glib::GString> {
+    pub fn get_uri(&self) -> glib::GString {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_uri(self.to_glib_none().0)) }
     }
 
@@ -131,7 +131,7 @@ impl RecentInfo {
         unsafe { from_glib_full(ffi::gtk_recent_info_get_uri_display(self.to_glib_none().0)) }
     }
 
-    pub fn get_visited(&self) -> Option<glib::DateTime> {
+    pub fn get_visited(&self) -> glib::DateTime {
         unsafe { from_glib_none(ffi::gtk_recent_info_get_visited(self.to_glib_none().0)) }
     }
 
@@ -157,7 +157,7 @@ impl RecentInfo {
         unsafe { from_glib(ffi::gtk_recent_info_is_local(self.to_glib_none().0)) }
     }
 
-    pub fn last_application(&self) -> Option<glib::GString> {
+    pub fn last_application(&self) -> glib::GString {
         unsafe { from_glib_full(ffi::gtk_recent_info_last_application(self.to_glib_none().0)) }
     }
 
diff --git a/gtk4/src/auto/recent_manager.rs b/gtk4/src/auto/recent_manager.rs
index dd3d34a5fa60..e0b79f15dc39 100644
--- a/gtk4/src/auto/recent_manager.rs
+++ b/gtk4/src/auto/recent_manager.rs
@@ -31,7 +31,7 @@ impl RecentManager {
         unsafe { from_glib_full(ffi::gtk_recent_manager_new()) }
     }
 
-    pub fn get_default() -> Option<RecentManager> {
+    pub fn get_default() -> RecentManager {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gtk_recent_manager_get_default()) }
     }
diff --git a/gtk4/src/auto/scale_button.rs b/gtk4/src/auto/scale_button.rs
index c85e1208ec3d..522001ab6df4 100644
--- a/gtk4/src/auto/scale_button.rs
+++ b/gtk4/src/auto/scale_button.rs
@@ -380,11 +380,11 @@ pub const NONE_SCALE_BUTTON: Option<&ScaleButton> = None;
 pub trait ScaleButtonExt: 'static {
     fn get_adjustment(&self) -> Adjustment;
 
-    fn get_minus_button(&self) -> Option<Button>;
+    fn get_minus_button(&self) -> Button;
 
-    fn get_plus_button(&self) -> Option<Button>;
+    fn get_plus_button(&self) -> Button;
 
-    fn get_popup(&self) -> Option<Widget>;
+    fn get_popup(&self) -> Widget;
 
     fn get_value(&self) -> f64;
 
@@ -422,7 +422,7 @@ impl<O: IsA<ScaleButton>> ScaleButtonExt for O {
         }
     }
 
-    fn get_minus_button(&self) -> Option<Button> {
+    fn get_minus_button(&self) -> Button {
         unsafe {
             from_glib_none(ffi::gtk_scale_button_get_minus_button(
                 self.as_ref().to_glib_none().0,
@@ -430,7 +430,7 @@ impl<O: IsA<ScaleButton>> ScaleButtonExt for O {
         }
     }
 
-    fn get_plus_button(&self) -> Option<Button> {
+    fn get_plus_button(&self) -> Button {
         unsafe {
             from_glib_none(ffi::gtk_scale_button_get_plus_button(
                 self.as_ref().to_glib_none().0,
@@ -438,7 +438,7 @@ impl<O: IsA<ScaleButton>> ScaleButtonExt for O {
         }
     }
 
-    fn get_popup(&self) -> Option<Widget> {
+    fn get_popup(&self) -> Widget {
         unsafe {
             from_glib_none(ffi::gtk_scale_button_get_popup(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/search_bar.rs b/gtk4/src/auto/search_bar.rs
index cf55945435c2..e42e51ea8316 100644
--- a/gtk4/src/auto/search_bar.rs
+++ b/gtk4/src/auto/search_bar.rs
@@ -51,7 +51,7 @@ impl SearchBar {
         unsafe { from_glib_none(ffi::gtk_search_bar_get_child(self.to_glib_none().0)) }
     }
 
-    pub fn get_key_capture_widget(&self) -> Option<Widget> {
+    pub fn get_key_capture_widget(&self) -> Widget {
         unsafe {
             from_glib_none(ffi::gtk_search_bar_get_key_capture_widget(
                 self.to_glib_none().0,
diff --git a/gtk4/src/auto/search_entry.rs b/gtk4/src/auto/search_entry.rs
index 14865bf4a74b..cf075f6c3c2b 100644
--- a/gtk4/src/auto/search_entry.rs
+++ b/gtk4/src/auto/search_entry.rs
@@ -39,7 +39,7 @@ impl SearchEntry {
         unsafe { Widget::from_glib_none(ffi::gtk_search_entry_new()).unsafe_cast() }
     }
 
-    pub fn get_key_capture_widget(&self) -> Option<Widget> {
+    pub fn get_key_capture_widget(&self) -> Widget {
         unsafe {
             from_glib_none(ffi::gtk_search_entry_get_key_capture_widget(
                 self.to_glib_none().0,
diff --git a/gtk4/src/auto/selection_model.rs b/gtk4/src/auto/selection_model.rs
index 3703d45677b3..1b0b8af7c6e4 100644
--- a/gtk4/src/auto/selection_model.rs
+++ b/gtk4/src/auto/selection_model.rs
@@ -23,9 +23,9 @@ glib::glib_wrapper! {
 pub const NONE_SELECTION_MODEL: Option<&SelectionModel> = None;
 
 pub trait SelectionModelExt: 'static {
-    fn get_selection(&self) -> Option<Bitset>;
+    fn get_selection(&self) -> Bitset;
 
-    fn get_selection_in_range(&self, position: u32, n_items: u32) -> Option<Bitset>;
+    fn get_selection_in_range(&self, position: u32, n_items: u32) -> Bitset;
 
     fn is_selected(&self, position: u32) -> bool;
 
@@ -49,7 +49,7 @@ pub trait SelectionModelExt: 'static {
 }
 
 impl<O: IsA<SelectionModel>> SelectionModelExt for O {
-    fn get_selection(&self) -> Option<Bitset> {
+    fn get_selection(&self) -> Bitset {
         unsafe {
             from_glib_full(ffi::gtk_selection_model_get_selection(
                 self.as_ref().to_glib_none().0,
@@ -57,7 +57,7 @@ impl<O: IsA<SelectionModel>> SelectionModelExt for O {
         }
     }
 
-    fn get_selection_in_range(&self, position: u32, n_items: u32) -> Option<Bitset> {
+    fn get_selection_in_range(&self, position: u32, n_items: u32) -> Bitset {
         unsafe {
             from_glib_full(ffi::gtk_selection_model_get_selection_in_range(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/settings.rs b/gtk4/src/auto/settings.rs
index 5e4b36ac2095..97552282ca0d 100644
--- a/gtk4/src/auto/settings.rs
+++ b/gtk4/src/auto/settings.rs
@@ -1266,7 +1266,7 @@ impl Settings {
         unsafe { from_glib_none(ffi::gtk_settings_get_default()) }
     }
 
-    pub fn get_for_display(display: &gdk::Display) -> Option<Settings> {
+    pub fn get_for_display(display: &gdk::Display) -> Settings {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gtk_settings_get_for_display(display.to_glib_none().0)) }
     }
diff --git a/gtk4/src/auto/shortcut_trigger.rs b/gtk4/src/auto/shortcut_trigger.rs
index bc561465467e..2edaaff5fdbd 100644
--- a/gtk4/src/auto/shortcut_trigger.rs
+++ b/gtk4/src/auto/shortcut_trigger.rs
@@ -32,7 +32,7 @@ pub trait ShortcutTriggerExt: 'static {
 
     fn print_label(&self, display: &gdk::Display, string: &mut glib::String) -> bool;
 
-    fn to_label(&self, display: &gdk::Display) -> Option<glib::GString>;
+    fn to_label(&self, display: &gdk::Display) -> glib::GString;
 
     fn to_string(&self) -> glib::GString;
 
@@ -59,7 +59,7 @@ impl<O: IsA<ShortcutTrigger>> ShortcutTriggerExt for O {
         }
     }
 
-    fn to_label(&self, display: &gdk::Display) -> Option<glib::GString> {
+    fn to_label(&self, display: &gdk::Display) -> glib::GString {
         unsafe {
             from_glib_full(ffi::gtk_shortcut_trigger_to_label(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/signal_action.rs b/gtk4/src/auto/signal_action.rs
index 42233e428fd1..260d85856ed3 100644
--- a/gtk4/src/auto/signal_action.rs
+++ b/gtk4/src/auto/signal_action.rs
@@ -23,7 +23,7 @@ impl SignalAction {
         unsafe { from_glib_full(ffi::gtk_signal_action_new(signal_name.to_glib_none().0)) }
     }
 
-    pub fn get_signal_name(&self) -> Option<glib::GString> {
+    pub fn get_signal_name(&self) -> glib::GString {
         unsafe {
             from_glib_none(ffi::gtk_signal_action_get_signal_name(
                 self.to_glib_none().0,
diff --git a/gtk4/src/auto/single_selection.rs b/gtk4/src/auto/single_selection.rs
index 6102df01e1a5..6dd9d722e4e4 100644
--- a/gtk4/src/auto/single_selection.rs
+++ b/gtk4/src/auto/single_selection.rs
@@ -95,7 +95,7 @@ pub trait SingleSelectionExt: 'static {
 
     fn get_can_unselect(&self) -> bool;
 
-    fn get_model(&self) -> Option<gio::ListModel>;
+    fn get_model(&self) -> gio::ListModel;
 
     fn get_selected(&self) -> u32;
 
@@ -141,7 +141,7 @@ impl<O: IsA<SingleSelection>> SingleSelectionExt for O {
         }
     }
 
-    fn get_model(&self) -> Option<gio::ListModel> {
+    fn get_model(&self) -> gio::ListModel {
         unsafe {
             from_glib_none(ffi::gtk_single_selection_get_model(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/stack.rs b/gtk4/src/auto/stack.rs
index b87093cdf3cd..38dcc0c5a5bd 100644
--- a/gtk4/src/auto/stack.rs
+++ b/gtk4/src/auto/stack.rs
@@ -39,7 +39,7 @@ impl Stack {
         unsafe { Widget::from_glib_none(ffi::gtk_stack_new()).unsafe_cast() }
     }
 
-    pub fn add_child<P: IsA<Widget>>(&self, child: &P) -> Option<StackPage> {
+    pub fn add_child<P: IsA<Widget>>(&self, child: &P) -> StackPage {
         unsafe {
             from_glib_none(ffi::gtk_stack_add_child(
                 self.to_glib_none().0,
@@ -48,7 +48,7 @@ impl Stack {
         }
     }
 
-    pub fn add_named<P: IsA<Widget>>(&self, child: &P, name: Option<&str>) -> Option<StackPage> {
+    pub fn add_named<P: IsA<Widget>>(&self, child: &P, name: Option<&str>) -> StackPage {
         unsafe {
             from_glib_none(ffi::gtk_stack_add_named(
                 self.to_glib_none().0,
@@ -63,7 +63,7 @@ impl Stack {
         child: &P,
         name: Option<&str>,
         title: &str,
-    ) -> Option<StackPage> {
+    ) -> StackPage {
         unsafe {
             from_glib_none(ffi::gtk_stack_add_titled(
                 self.to_glib_none().0,
@@ -100,7 +100,7 @@ impl Stack {
         }
     }
 
-    pub fn get_pages(&self) -> Option<SelectionModel> {
+    pub fn get_pages(&self) -> SelectionModel {
         unsafe { from_glib_full(ffi::gtk_stack_get_pages(self.to_glib_none().0)) }
     }
 
diff --git a/gtk4/src/auto/stack_page.rs b/gtk4/src/auto/stack_page.rs
index a11284fd1064..c0d3800c7707 100644
--- a/gtk4/src/auto/stack_page.rs
+++ b/gtk4/src/auto/stack_page.rs
@@ -26,7 +26,7 @@ glib::glib_wrapper! {
 }
 
 impl StackPage {
-    pub fn get_child(&self) -> Option<Widget> {
+    pub fn get_child(&self) -> Widget {
         unsafe { from_glib_none(ffi::gtk_stack_page_get_child(self.to_glib_none().0)) }
     }
 
diff --git a/gtk4/src/auto/string_filter.rs b/gtk4/src/auto/string_filter.rs
index 56e6f4b0cdb2..b4b6eb557691 100644
--- a/gtk4/src/auto/string_filter.rs
+++ b/gtk4/src/auto/string_filter.rs
@@ -79,7 +79,7 @@ impl StringFilterBuilder {
 pub const NONE_STRING_FILTER: Option<&StringFilter> = None;
 
 pub trait StringFilterExt: 'static {
-    //fn get_expression(&self) -> /*Ignored*/Option<Expression>;
+    //fn get_expression(&self) -> /*Ignored*/Expression;
 
     fn get_ignore_case(&self) -> bool;
 
@@ -105,7 +105,7 @@ pub trait StringFilterExt: 'static {
 }
 
 impl<O: IsA<StringFilter>> StringFilterExt for O {
-    //fn get_expression(&self) -> /*Ignored*/Option<Expression> {
+    //fn get_expression(&self) -> /*Ignored*/Expression {
     //    unsafe { TODO: call ffi:gtk_string_filter_get_expression() }
     //}
 
diff --git a/gtk4/src/auto/style_context.rs b/gtk4/src/auto/style_context.rs
index db2c16e940fb..7fa22c33ffb7 100644
--- a/gtk4/src/auto/style_context.rs
+++ b/gtk4/src/auto/style_context.rs
@@ -94,7 +94,7 @@ pub trait StyleContextExt: 'static {
 
     fn get_color(&self) -> gdk::RGBA;
 
-    fn get_display(&self) -> Option<gdk::Display>;
+    fn get_display(&self) -> gdk::Display;
 
     fn get_margin(&self) -> Border;
 
@@ -169,7 +169,7 @@ impl<O: IsA<StyleContext>> StyleContextExt for O {
         }
     }
 
-    fn get_display(&self) -> Option<gdk::Display> {
+    fn get_display(&self) -> gdk::Display {
         unsafe {
             from_glib_none(ffi::gtk_style_context_get_display(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/text_iter.rs b/gtk4/src/auto/text_iter.rs
index db3e587b1577..888740df7087 100644
--- a/gtk4/src/auto/text_iter.rs
+++ b/gtk4/src/auto/text_iter.rs
@@ -500,7 +500,7 @@ impl TextIter {
         unsafe { from_glib_none(ffi::gtk_text_iter_get_child_anchor(self.to_glib_none().0)) }
     }
 
-    pub fn get_language(&self) -> Option<pango::Language> {
+    pub fn get_language(&self) -> pango::Language {
         unsafe { from_glib_full(ffi::gtk_text_iter_get_language(self.to_glib_none().0)) }
     }
 
diff --git a/gtk4/src/auto/text_view.rs b/gtk4/src/auto/text_view.rs
index 3f517b442704..2fa30c49560a 100644
--- a/gtk4/src/auto/text_view.rs
+++ b/gtk4/src/auto/text_view.rs
@@ -611,7 +611,7 @@ pub trait TextViewExt: 'static {
 
     fn get_bottom_margin(&self) -> i32;
 
-    fn get_buffer(&self) -> Option<TextBuffer>;
+    fn get_buffer(&self) -> TextBuffer;
 
     fn get_cursor_locations(&self, iter: Option<&TextIter>) -> (gdk::Rectangle, gdk::Rectangle);
 
@@ -985,7 +985,7 @@ impl<O: IsA<TextView>> TextViewExt for O {
         unsafe { ffi::gtk_text_view_get_bottom_margin(self.as_ref().to_glib_none().0) }
     }
 
-    fn get_buffer(&self) -> Option<TextBuffer> {
+    fn get_buffer(&self) -> TextBuffer {
         unsafe {
             from_glib_none(ffi::gtk_text_view_get_buffer(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/tree_model.rs b/gtk4/src/auto/tree_model.rs
index b3bce5e53358..d5b2238a3930 100644
--- a/gtk4/src/auto/tree_model.rs
+++ b/gtk4/src/auto/tree_model.rs
@@ -41,7 +41,7 @@ pub trait TreeModelExt: 'static {
 
     fn get_n_columns(&self) -> i32;
 
-    fn get_path(&self, iter: &TreeIter) -> Option<TreePath>;
+    fn get_path(&self, iter: &TreeIter) -> TreePath;
 
     fn get_string_from_iter(&self, iter: &TreeIter) -> Option<glib::GString>;
 
@@ -190,7 +190,7 @@ impl<O: IsA<TreeModel>> TreeModelExt for O {
         unsafe { ffi::gtk_tree_model_get_n_columns(self.as_ref().to_glib_none().0) }
     }
 
-    fn get_path(&self, iter: &TreeIter) -> Option<TreePath> {
+    fn get_path(&self, iter: &TreeIter) -> TreePath {
         unsafe {
             from_glib_full(ffi::gtk_tree_model_get_path(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/tree_view.rs b/gtk4/src/auto/tree_view.rs
index b8078cf43510..5dcd6d661f77 100644
--- a/gtk4/src/auto/tree_view.rs
+++ b/gtk4/src/auto/tree_view.rs
@@ -648,7 +648,7 @@ pub trait TreeViewExt: 'static {
 
     fn get_reorderable(&self) -> bool;
 
-    //fn get_row_separator_func(&self) -> Option<Box_<dyn Fn(&TreeModel, &TreeIter) -> bool + 'static>>;
+    //fn get_row_separator_func(&self) -> Fn(&TreeModel, &TreeIter) -> bool + 'static;
 
     fn get_rubber_banding(&self) -> bool;
 
@@ -656,7 +656,7 @@ pub trait TreeViewExt: 'static {
 
     fn get_search_entry(&self) -> Option<Editable>;
 
-    //fn get_search_equal_func(&self) -> Option<Box_<dyn Fn(&TreeModel, i32, &str, &TreeIter) -> bool + 'static>>;
+    //fn get_search_equal_func(&self) -> Fn(&TreeModel, i32, &str, &TreeIter) -> bool + 'static;
 
     fn get_selection(&self) -> TreeSelection;
 
@@ -1398,7 +1398,7 @@ impl<O: IsA<TreeView>> TreeViewExt for O {
         }
     }
 
-    //fn get_row_separator_func(&self) -> Option<Box_<dyn Fn(&TreeModel, &TreeIter) -> bool + 'static>> {
+    //fn get_row_separator_func(&self) -> Fn(&TreeModel, &TreeIter) -> bool + 'static {
     //    unsafe { TODO: call ffi:gtk_tree_view_get_row_separator_func() }
     //}
 
@@ -1422,7 +1422,7 @@ impl<O: IsA<TreeView>> TreeViewExt for O {
         }
     }
 
-    //fn get_search_equal_func(&self) -> Option<Box_<dyn Fn(&TreeModel, i32, &str, &TreeIter) -> bool + 'static>> {
+    //fn get_search_equal_func(&self) -> Fn(&TreeModel, i32, &str, &TreeIter) -> bool + 'static {
     //    unsafe { TODO: call ffi:gtk_tree_view_get_search_equal_func() }
     //}
 
diff --git a/gtk4/src/auto/widget.rs b/gtk4/src/auto/widget.rs
index 737a2f25254f..8d2662528543 100644
--- a/gtk4/src/auto/widget.rs
+++ b/gtk4/src/auto/widget.rs
@@ -95,9 +95,9 @@ pub trait WidgetExt: 'static {
 
     fn contains(&self, x: f64, y: f64) -> bool;
 
-    fn create_pango_context(&self) -> Option<pango::Context>;
+    fn create_pango_context(&self) -> pango::Context;
 
-    fn create_pango_layout(&self, text: Option<&str>) -> Option<pango::Layout>;
+    fn create_pango_layout(&self, text: Option<&str>) -> pango::Layout;
 
     fn drag_check_threshold(
         &self,
@@ -135,7 +135,7 @@ pub trait WidgetExt: 'static {
 
     fn get_direction(&self) -> TextDirection;
 
-    fn get_display(&self) -> Option<gdk::Display>;
+    fn get_display(&self) -> gdk::Display;
 
     fn get_first_child(&self) -> Option<Widget>;
 
@@ -185,7 +185,7 @@ pub trait WidgetExt: 'static {
 
     fn get_overflow(&self) -> Overflow;
 
-    fn get_pango_context(&self) -> Option<pango::Context>;
+    fn get_pango_context(&self) -> pango::Context;
 
     fn get_parent(&self) -> Option<Widget>;
 
@@ -193,7 +193,7 @@ pub trait WidgetExt: 'static {
 
     fn get_prev_sibling(&self) -> Option<Widget>;
 
-    fn get_primary_clipboard(&self) -> Option<gdk::Clipboard>;
+    fn get_primary_clipboard(&self) -> gdk::Clipboard;
 
     fn get_realized(&self) -> bool;
 
@@ -207,7 +207,7 @@ pub trait WidgetExt: 'static {
 
     fn get_sensitive(&self) -> bool;
 
-    fn get_settings(&self) -> Option<Settings>;
+    fn get_settings(&self) -> Settings;
 
     fn get_size(&self, orientation: Orientation) -> i32;
 
@@ -283,9 +283,9 @@ pub trait WidgetExt: 'static {
 
     fn mnemonic_activate(&self, group_cycling: bool) -> bool;
 
-    fn observe_children(&self) -> Option<gio::ListModel>;
+    fn observe_children(&self) -> gio::ListModel;
 
-    fn observe_controllers(&self) -> Option<gio::ListModel>;
+    fn observe_controllers(&self) -> gio::ListModel;
 
     fn pick(&self, x: f64, y: f64, flags: PickFlags) -> Option<Widget>;
 
@@ -699,7 +699,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn create_pango_context(&self) -> Option<pango::Context> {
+    fn create_pango_context(&self) -> pango::Context {
         unsafe {
             from_glib_full(ffi::gtk_widget_create_pango_context(
                 self.as_ref().to_glib_none().0,
@@ -707,7 +707,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn create_pango_layout(&self, text: Option<&str>) -> Option<pango::Layout> {
+    fn create_pango_layout(&self, text: Option<&str>) -> pango::Layout {
         unsafe {
             from_glib_full(ffi::gtk_widget_create_pango_layout(
                 self.as_ref().to_glib_none().0,
@@ -828,7 +828,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn get_display(&self) -> Option<gdk::Display> {
+    fn get_display(&self) -> gdk::Display {
         unsafe { from_glib_none(ffi::gtk_widget_get_display(self.as_ref().to_glib_none().0)) }
     }
 
@@ -972,7 +972,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         unsafe { from_glib(ffi::gtk_widget_get_overflow(self.as_ref().to_glib_none().0)) }
     }
 
-    fn get_pango_context(&self) -> Option<pango::Context> {
+    fn get_pango_context(&self) -> pango::Context {
         unsafe {
             from_glib_none(ffi::gtk_widget_get_pango_context(
                 self.as_ref().to_glib_none().0,
@@ -1005,7 +1005,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn get_primary_clipboard(&self) -> Option<gdk::Clipboard> {
+    fn get_primary_clipboard(&self) -> gdk::Clipboard {
         unsafe {
             from_glib_none(ffi::gtk_widget_get_primary_clipboard(
                 self.as_ref().to_glib_none().0,
@@ -1049,7 +1049,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn get_settings(&self) -> Option<Settings> {
+    fn get_settings(&self) -> Settings {
         unsafe { from_glib_none(ffi::gtk_widget_get_settings(self.as_ref().to_glib_none().0)) }
     }
 
@@ -1305,7 +1305,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn observe_children(&self) -> Option<gio::ListModel> {
+    fn observe_children(&self) -> gio::ListModel {
         unsafe {
             from_glib_full(ffi::gtk_widget_observe_children(
                 self.as_ref().to_glib_none().0,
@@ -1313,7 +1313,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn observe_controllers(&self) -> Option<gio::ListModel> {
+    fn observe_controllers(&self) -> gio::ListModel {
         unsafe {
             from_glib_full(ffi::gtk_widget_observe_controllers(
                 self.as_ref().to_glib_none().0,
diff --git a/gtk4/src/auto/window.rs b/gtk4/src/auto/window.rs
index eef54443ad8d..cd8336d33d39 100644
--- a/gtk4/src/auto/window.rs
+++ b/gtk4/src/auto/window.rs
@@ -48,7 +48,7 @@ impl Window {
         unsafe { from_glib_none(ffi::gtk_window_get_default_icon_name()) }
     }
 
-    pub fn get_toplevels() -> Option<gio::ListModel> {
+    pub fn get_toplevels() -> gio::ListModel {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gtk_window_get_toplevels()) }
     }
@@ -573,7 +573,7 @@ pub trait GtkWindowExt: 'static {
 
     fn get_focus_visible(&self) -> bool;
 
-    fn get_group(&self) -> Option<WindowGroup>;
+    fn get_group(&self) -> WindowGroup;
 
     fn get_hide_on_close(&self) -> bool;
 
@@ -853,7 +853,7 @@ impl<O: IsA<Window>> GtkWindowExt for O {
         }
     }
 
-    fn get_group(&self) -> Option<WindowGroup> {
+    fn get_group(&self) -> WindowGroup {
         unsafe { from_glib_none(ffi::gtk_window_get_group(self.as_ref().to_glib_none().0)) }
     }