Make ClassExt traits names consistent

With the naming used by GStreamer bindings

Author: bilelmoussaoui

gtk4-macros/src/composite_template_derive.rs

@@ -33,20 +33,20 @@ fn gen_set_template(source: &TemplateSource, crate_ident: &proc_macro2::Ident) -
             };
 
             quote! {
-                #crate_ident::subclass::widget::WidgetClassSubclassExt::set_template_static(
+                #crate_ident::subclass::widget::WidgetClassExt::set_template_static(
                         klass,
                         #template,
                 );
             }
         }
         TemplateSource::Resource(resource) => quote! {
-            #crate_ident::subclass::widget::WidgetClassSubclassExt::set_template_from_resource(
+            #crate_ident::subclass::widget::WidgetClassExt::set_template_from_resource(
                 klass,
                 &#resource,
             );
         },
         TemplateSource::Xml(template) => quote! {
-            #crate_ident::subclass::widget::WidgetClassSubclassExt::set_template_static(
+            #crate_ident::subclass::widget::WidgetClassExt::set_template_static(
                 klass,
                 #template.as_bytes(),
             );
@@ -57,7 +57,7 @@ fn gen_set_template(source: &TemplateSource, crate_ident: &proc_macro2::Ident) -
                 compile_blueprint(blueprint.as_bytes()).expect("can't compile blueprint");
 
             quote! {
-                #crate_ident::subclass::widget::WidgetClassSubclassExt::set_template_static(
+                #crate_ident::subclass::widget::WidgetClassExt::set_template_static(
                     klass,
                     #template.as_bytes(),
                 );

gtk4/src/subclass/cell_area.rs

@@ -1009,7 +1009,7 @@ unsafe extern "C" fn cell_area_foreach_alloc<T: CellAreaImpl>(
 }
 
 #[allow(clippy::missing_safety_doc)]
-pub unsafe trait CellAreaClassSubclassExt: ClassStruct {
+pub unsafe trait CellAreaClassExt: ClassStruct {
     #[doc(alias = "gtk_cell_area_class_find_cell_property")]
     fn find_cell_property(&self, property_name: &str) -> Option<ParamSpec> {
         unsafe {
@@ -1035,4 +1035,4 @@ pub unsafe trait CellAreaClassSubclassExt: ClassStruct {
     }
 }
 
-unsafe impl<T: ClassStruct> CellAreaClassSubclassExt for T where T::Type: CellAreaImpl {}
+unsafe impl<T: ClassStruct> CellAreaClassExt for T where T::Type: CellAreaImpl {}

gtk4/src/subclass/mod.rs

@@ -110,7 +110,7 @@ pub mod prelude {
     pub use super::buildable::{BuildableImpl, BuildableImplExt};
     pub use super::builder_scope::{BuilderCScopeImpl, BuilderScopeImpl, BuilderScopeImplExt};
     pub use super::button::{ButtonImpl, ButtonImplExt};
-    pub use super::cell_area::{CellAreaClassSubclassExt, CellAreaImpl, CellAreaImplExt};
+    pub use super::cell_area::{CellAreaClassExt, CellAreaImpl, CellAreaImplExt};
     pub use super::cell_area_context::{CellAreaContextImpl, CellAreaContextImplExt};
     pub use super::cell_editable::{CellEditableImpl, CellEditableImplExt};
     pub use super::cell_layout::{CellLayoutImpl, CellLayoutImplExt};
@@ -170,7 +170,7 @@ pub mod prelude {
     pub use super::widget::CompositeTemplateClass;
     pub use super::widget::CompositeTemplateInstanceCallbacksClass;
     pub use super::widget::TemplateChild;
-    pub use super::widget::WidgetClassSubclassExt;
+    pub use super::widget::WidgetClassExt;
     pub use super::widget::{
         CompositeTemplateDisposeExt, CompositeTemplateInitializingExt, WidgetImpl, WidgetImplExt,
     };

gtk4/src/subclass/widget.rs

@@ -879,7 +879,7 @@ unsafe extern "C" fn widget_unroot<T: WidgetImpl>(ptr: *mut ffi::GtkWidget) {
 }
 
 #[allow(clippy::missing_safety_doc)]
-pub unsafe trait WidgetClassSubclassExt: ClassStruct {
+pub unsafe trait WidgetClassExt: ClassStruct {
     #[doc(alias = "gtk_widget_class_set_template")]
     fn set_template_bytes(&mut self, template: &glib::Bytes) {
         unsafe {
@@ -1232,7 +1232,7 @@ pub unsafe trait WidgetClassSubclassExt: ClassStruct {
     }
 }
 
-unsafe impl<T: ClassStruct> WidgetClassSubclassExt for T where T::Type: WidgetImpl {}
+unsafe impl<T: ClassStruct> WidgetClassExt for T where T::Type: WidgetImpl {}
 
 #[derive(Debug, PartialEq, Eq)]
 #[repr(transparent)]
@@ -1345,13 +1345,13 @@ pub trait CompositeTemplateCallbacks {
 
     // rustdoc-stripper-ignore-next
     /// Binds the template callbacks from this type into the default template scope for `klass`.
-    fn bind_template_callbacks<T: WidgetClassSubclassExt>(klass: &mut T) {
+    fn bind_template_callbacks<T: WidgetClassExt>(klass: &mut T) {
         Self::add_callbacks_to_scope(&klass.rust_template_scope());
     }
     // rustdoc-stripper-ignore-next
     /// Binds the template callbacks from this type into the default template scope for `klass`,
     /// prepending `prefix` to each callback name.
-    fn bind_template_callbacks_prefixed<T: WidgetClassSubclassExt>(klass: &mut T, prefix: &str) {
+    fn bind_template_callbacks_prefixed<T: WidgetClassExt>(klass: &mut T, prefix: &str) {
         Self::add_callbacks_to_scope_prefixed(&klass.rust_template_scope(), prefix);
     }
     // rustdoc-stripper-ignore-next
@@ -1383,7 +1383,7 @@ pub trait CompositeTemplateCallbacksClass {
 
 impl<T, U> CompositeTemplateCallbacksClass for T
 where
-    T: ClassStruct<Type = U> + WidgetClassSubclassExt,
+    T: ClassStruct<Type = U> + WidgetClassExt,
     U: ObjectSubclass<Class = T> + CompositeTemplateCallbacks,
 {
     fn bind_template_callbacks(&mut self) {
@@ -1403,7 +1403,7 @@ pub trait CompositeTemplateInstanceCallbacksClass {
 
 impl<T, U, V> CompositeTemplateInstanceCallbacksClass for T
 where
-    T: ClassStruct<Type = U> + WidgetClassSubclassExt,
+    T: ClassStruct<Type = U> + WidgetClassExt,
     U: ObjectSubclass<Class = T, Type = V>,
     V: CompositeTemplateCallbacks,
 {