Add ObjectSubclass::Interfaces associated type for listing all interfaces the subclass should implement

Author: sdroege

examples/src/bin/basic_subclass.rs

@@ -40,6 +40,7 @@ mod imp_win {
         const NAME: &'static str = "SimpleWindow";
         type Type = super::SimpleWindow;
         type ParentType = gtk::ApplicationWindow;
+        type Interfaces = ();
         type Instance = subclass::simple::InstanceStruct<Self>;
         type Class = subclass::simple::ClassStruct<Self>;
 
@@ -128,6 +129,7 @@ mod imp_app {
         const NAME: &'static str = "SimpleApplication";
         type Type = super::SimpleApplication;
         type ParentType = gtk::Application;
+        type Interfaces = ();
         type Instance = subclass::simple::InstanceStruct<Self>;
         type Class = subclass::simple::ClassStruct<Self>;
 

examples/src/bin/composite_template.rs

@@ -29,6 +29,7 @@ mod imp {
         const NAME: &'static str = "ExApplicationWindow";
         type Type = super::ExApplicationWindow;
         type ParentType = gtk::ApplicationWindow;
+        type Interfaces = ();
         type Instance = subclass::simple::InstanceStruct<Self>;
         type Class = subclass::simple::ClassStruct<Self>;
 

examples/src/bin/gio_task.rs

@@ -27,6 +27,7 @@ mod imp {
         const NAME: &'static str = "FileSize";
         type ParentType = glib::Object;
         type Instance = subclass::simple::InstanceStruct<Self>;
+        type Interfaces = ();
         type Class = subclass::simple::ClassStruct<Self>;
         type Type = super::FileSize;
         glib::object_subclass!();

examples/src/bin/listbox_model.rs

@@ -34,17 +34,12 @@ mod model {
             const NAME: &'static str = "Model";
             type Type = super::Model;
             type ParentType = glib::Object;
+            type Interfaces = (gio::ListModel,);
             type Instance = subclass::simple::InstanceStruct<Self>;
             type Class = subclass::simple::ClassStruct<Self>;
 
             glib::object_subclass!();
 
-            // Called right before class_init and allows a GObject to specify
-            // which interfaces it implement, in this case gio::ListModel
-            fn type_init(type_: &mut subclass::InitializingType<Self>) {
-                type_.add_interface::<gio::ListModel>();
-            }
-
             // Called once at the very beginning of instantiation
             fn new() -> Self {
                 Self(RefCell::new(Vec::new()))
@@ -311,6 +306,7 @@ mod row_data {
             const NAME: &'static str = "RowData";
             type Type = super::RowData;
             type ParentType = glib::Object;
+            type Interfaces = ();
             type Instance = subclass::simple::InstanceStruct<Self>;
             type Class = subclass::simple::ClassStruct<Self>;
 

gio/src/read_input_stream.rs

@@ -25,6 +25,7 @@ mod imp {
         const NAME: &'static str = "ReadInputStream";
         type Type = super::ReadInputStream;
         type ParentType = InputStream;
+        type Interfaces = (crate::Seekable,);
         type Instance = subclass::simple::InstanceStruct<Self>;
         type Class = subclass::simple::ClassStruct<Self>;
 
@@ -35,10 +36,6 @@ mod imp {
                 read: RefCell::new(None),
             }
         }
-
-        fn type_init(type_: &mut subclass::InitializingType<Self>) {
-            type_.add_interface::<crate::Seekable>();
-        }
     }
 
     impl ObjectImpl for ReadInputStream {}

gio/src/subclass/application.rs

@@ -493,6 +493,7 @@ mod tests {
             const NAME: &'static str = "SimpleApplication";
             type Type = super::SimpleApplication;
             type ParentType = Application;
+            type Interfaces = ();
             type Instance = subclass::simple::InstanceStruct<Self>;
             type Class = subclass::simple::ClassStruct<Self>;
 

gio/src/subclass/input_stream.rs

@@ -269,6 +269,7 @@ mod tests {
             const NAME: &'static str = "SimpleInputStream";
             type Type = super::SimpleInputStream;
             type ParentType = InputStream;
+            type Interfaces = (crate::Seekable,);
             type Instance = subclass::simple::InstanceStruct<Self>;
             type Class = subclass::simple::ClassStruct<Self>;
 
@@ -279,10 +280,6 @@ mod tests {
                     pos: RefCell::new(0),
                 }
             }
-
-            fn type_init(type_: &mut subclass::InitializingType<Self>) {
-                type_.add_interface::<crate::Seekable>();
-            }
         }
 
         impl ObjectImpl for SimpleInputStream {}

gio/src/subclass/output_stream.rs

@@ -331,6 +331,7 @@ mod tests {
             const NAME: &'static str = "SimpleOutputStream";
             type Type = super::SimpleOutputStream;
             type ParentType = OutputStream;
+            type Interfaces = ();
             type Instance = subclass::simple::InstanceStruct<Self>;
             type Class = subclass::simple::ClassStruct<Self>;
 

gio/src/task.rs

@@ -129,6 +129,7 @@ mod test {
             const NAME: &'static str = "MySimpleObjectPrivate";
             type ParentType = glib::Object;
             type Instance = subclass::simple::InstanceStruct<Self>;
+            type Interfaces = ();
             type Class = subclass::simple::ClassStruct<Self>;
             type Type = MySimpleObject;
             glib::object_subclass!();

gio/src/write_output_stream.rs

@@ -27,6 +27,7 @@ mod imp {
         const NAME: &'static str = "WriteOutputStream";
         type Type = super::WriteOutputStream;
         type ParentType = OutputStream;
+        type Interfaces = (crate::Seekable,);
         type Instance = subclass::simple::InstanceStruct<Self>;
         type Class = subclass::simple::ClassStruct<Self>;
 
@@ -37,10 +38,6 @@ mod imp {
                 write: RefCell::new(None),
             }
         }
-
-        fn type_init(type_: &mut subclass::InitializingType<Self>) {
-            type_.add_interface::<crate::Seekable>();
-        }
     }
 
     impl ObjectImpl for WriteOutputStream {}