gio: Add type parameter to ListModel and ListStore

gtk-rs · Mar 14, 2022 · 2ca49d5 · 2ca49d5
1 parent 3c41d6d
commit 2ca49d5
Show file tree

Hide file tree

Showing 9 changed files with 455 additions and 356 deletions.
diff --git a/gio/Gir.toml b/gio/Gir.toml
@@ -788,36 +788,6 @@ manual_traits = ["IOStreamExtManual"]
     #readonly
     manual = true
 
-[[object]]
-name = "Gio.ListModel"
-status = "generate"
-manual_traits = ["ListModelExtManual"]
-    # Can get removed when gir shadow annotations are implemented (gtk-rs/gir#1112)
-    [[object.function]]
-    name = "get_item"
-    ignore = true
-    [[object.function]]
-    name = "get_object"
-    rename = "item"
-
-[[object]]
-name = "Gio.ListStore"
-status = "generate"
-generate_builder = true
-    [[object.function]]
-    name = "insert_sorted"
-    manual = true
-    [[object.function]]
-    name = "sort"
-    manual = true
-    [[object.function]]
-    name = "splice"
-    # More generic arguments
-    manual = true
-    [[object.function]]
-    name = "find_with_equal_func"
-    ignore = true # See https://gitlab.gnome.org/GNOME/glib/-/issues/2447
-
 [[object]]
 name = "Gio.MemoryInputStream"
 status = "generate"

diff --git a/gio/src/auto/list_model.rs b/gio/src/auto/list_model.rs
diff --git a/gio/src/auto/list_store.rs b/gio/src/auto/list_store.rs
diff --git a/gio/src/auto/mod.rs b/gio/src/auto/mod.rs
@@ -179,12 +179,6 @@ pub use self::initable::Initable;
 mod input_stream;
 pub use self::input_stream::InputStream;
 
-mod list_model;
-pub use self::list_model::ListModel;
-
-mod list_store;
-pub use self::list_store::ListStore;
-
 mod loadable_icon;
 pub use self::loadable_icon::LoadableIcon;
 
@@ -723,7 +717,6 @@ pub mod traits {
     pub use super::initable::InitableExt;
     pub use super::input_stream::InputStreamExt;
     pub use super::io_stream::IOStreamExt;
-    pub use super::list_model::ListModelExt;
     pub use super::loadable_icon::LoadableIconExt;
     pub use super::memory_input_stream::MemoryInputStreamExt;
     #[cfg(any(feature = "v2_64", feature = "dox"))]
@@ -799,5 +792,4 @@ pub mod builders {
     pub use super::converter_output_stream::ConverterOutputStreamBuilder;
     pub use super::data_input_stream::DataInputStreamBuilder;
     pub use super::data_output_stream::DataOutputStreamBuilder;
-    pub use super::list_store::ListStoreBuilder;
 }
diff --git a/gio/src/lib.rs b/gio/src/lib.rs
@@ -50,7 +50,9 @@ mod initable;
 mod input_stream;
 pub use crate::input_stream::{InputStreamAsyncBufRead, InputStreamRead};
 mod list_model;
+pub use list_model::ListModel;
 mod list_store;
+pub use list_store::ListStore;
 #[cfg(test)]
 mod memory_input_stream;
 #[cfg(test)]