glib: Implement AsRef/AsMut<T::GlibClassType> for Class<T>

This makes it easier/safer to implement `IsSubclassable`.

Author: ids1024

gio/src/subclass/application.rs

@@ -307,7 +307,7 @@ unsafe impl<T: ApplicationImpl> IsSubclassable<T> for Application {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <glib::Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gio_sys::GApplicationClass);
+            let klass = &mut *(class.as_mut() as *mut gio_sys::GApplicationClass);
             klass.activate = Some(application_activate::<T>);
             klass.after_emit = Some(application_after_emit::<T>);
             klass.before_emit = Some(application_before_emit::<T>);

gio/src/subclass/input_stream.rs

@@ -155,7 +155,7 @@ unsafe impl<T: InputStreamImpl> IsSubclassable<T> for InputStream {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <glib::Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gio_sys::GInputStreamClass);
+            let klass = &mut *(class.as_mut() as *mut gio_sys::GInputStreamClass);
             klass.read_fn = Some(stream_read::<T>);
             klass.close_fn = Some(stream_close::<T>);
             klass.skip = Some(stream_skip::<T>);

gio/src/subclass/io_stream.rs

@@ -99,7 +99,7 @@ unsafe impl<T: IOStreamImpl> IsSubclassable<T> for IOStream {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <glib::Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gio_sys::GIOStreamClass);
+            let klass = &mut *(class.as_mut() as *mut gio_sys::GIOStreamClass);
             klass.get_input_stream = Some(stream_get_input_stream::<T>);
             klass.get_output_stream = Some(stream_get_output_stream::<T>);
             klass.close_fn = Some(stream_close::<T>);

gio/src/subclass/output_stream.rs

@@ -195,7 +195,7 @@ unsafe impl<T: OutputStreamImpl> IsSubclassable<T> for OutputStream {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <glib::Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gio_sys::GOutputStreamClass);
+            let klass = &mut *(class.as_mut() as *mut gio_sys::GOutputStreamClass);
             klass.write_fn = Some(stream_write::<T>);
             klass.close_fn = Some(stream_close::<T>);
             klass.flush = Some(stream_flush::<T>);

glib/src/object.rs

@@ -2518,6 +2518,18 @@ impl<T: ObjectType> Class<T> {
 unsafe impl<T: ObjectType> Send for Class<T> {}
 unsafe impl<T: ObjectType> Sync for Class<T> {}
 
+impl<T: ObjectType> AsRef<T::GlibClassType> for Class<T> {
+    fn as_ref(&self) -> &T::GlibClassType {
+        &self.0
+    }
+}
+
+impl<T: ObjectType> AsMut<T::GlibClassType> for Class<T> {
+    fn as_mut(&mut self) -> &mut T::GlibClassType {
+        &mut self.0
+    }
+}
+
 // This should require Self: IsA<Self::Super>, but that seems to cause a cycle error
 pub unsafe trait ParentClassIs: ObjectType {
     type Parent: ObjectType;

glib/src/subclass/object.rs

@@ -272,7 +272,7 @@ unsafe impl ObjectClassSubclassExt for ObjectClass {}
 unsafe impl<T: ObjectImpl> IsSubclassable<T> for Object {
     fn override_vfuncs(class: &mut ::object::Class<Self>) {
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gobject_sys::GObjectClass);
+            let klass = &mut *(class.as_mut() as *mut gobject_sys::GObjectClass);
             klass.set_property = Some(set_property::<T>);
             klass.get_property = Some(get_property::<T>);
             klass.constructed = Some(constructed::<T>);

gtk/src/subclass/application.rs

@@ -83,11 +83,11 @@ unsafe impl<T: GtkApplicationImpl> IsSubclassable<T> for Application {
 
         <gio::Application as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkApplicationClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkApplicationClass);
             klass.window_added = Some(application_window_added::<T>);
             klass.window_removed = Some(application_window_removed::<T>);
             // Chain our startup handler in here
-            let klass = &mut *(class as *mut _ as *mut gio_sys::GApplicationClass);
+            let klass = &mut *(class.as_mut() as *mut gio_sys::GApplicationClass);
             klass.startup = Some(application_startup::<T>);
         }
     }

gtk/src/subclass/cell_renderer.rs

@@ -439,7 +439,7 @@ unsafe impl<T: CellRendererImpl> IsSubclassable<T> for CellRenderer {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkCellRendererClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkCellRendererClass);
             klass.get_request_mode = Some(cell_renderer_get_request_mode::<T>);
             klass.get_preferred_width = Some(cell_renderer_get_preferred_width::<T>);
             klass.get_preferred_height_for_width =

gtk/src/subclass/cell_renderer_accel.rs

@@ -81,7 +81,7 @@ unsafe impl<T: CellRendererAccelImpl> IsSubclassable<T> for CellRendererAccel {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <CellRendererText as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkCellRendererAccelClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkCellRendererAccelClass);
             klass.accel_edited = Some(cell_renderer_accel_edited::<T>);
             klass.accel_cleared = Some(cell_renderer_accel_cleared::<T>);
         }

gtk/src/subclass/cell_renderer_text.rs

@@ -41,7 +41,7 @@ unsafe impl<T: CellRendererTextImpl> IsSubclassable<T> for CellRendererText {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <CellRenderer as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkCellRendererTextClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkCellRendererTextClass);
             klass.edited = Some(cell_renderer_text_edited::<T>);
         }
     }

gtk/src/subclass/cell_renderer_toggle.rs

@@ -37,7 +37,7 @@ unsafe impl<T: CellRendererToggleImpl> IsSubclassable<T> for CellRendererToggle
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <CellRenderer as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkCellRendererToggleClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkCellRendererToggleClass);
             klass.toggled = Some(cell_renderer_toggle_toggled::<T>);
         }
     }

gtk/src/subclass/container.rs

@@ -133,7 +133,7 @@ unsafe impl<T: ContainerImpl> IsSubclassable<T> for Container {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Widget as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkContainerClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkContainerClass);
             klass.add = Some(container_add::<T>);
             klass.remove = Some(container_remove::<T>);
             klass.check_resize = Some(container_check_resize::<T>);

gtk/src/subclass/dialog.rs

@@ -50,7 +50,7 @@ unsafe impl<T: DialogImpl> IsSubclassable<T> for Dialog {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Window as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkDialogClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkDialogClass);
             klass.response = Some(dialog_response::<T>);
             klass.close = Some(dialog_close::<T>);
         }

gtk/src/subclass/icon_view.rs

@@ -143,7 +143,7 @@ unsafe impl<T: IconViewImpl> IsSubclassable<T> for IconView {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Container as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkIconViewClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkIconViewClass);
             klass.item_activated = Some(icon_view_item_activated::<T>);
             klass.selection_changed = Some(icon_view_selection_changed::<T>);
             klass.select_all = Some(icon_view_select_all::<T>);

gtk/src/subclass/list_box.rs

@@ -149,7 +149,7 @@ unsafe impl<T: ListBoxImpl> IsSubclassable<T> for ListBox {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Container as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkListBoxClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkListBoxClass);
             klass.activate_cursor_row = Some(list_box_activate_cursor_row::<T>);
             klass.move_cursor = Some(list_box_move_cursor::<T>);
             klass.row_activated = Some(list_box_row_activated::<T>);

gtk/src/subclass/list_box_row.rs

@@ -24,7 +24,7 @@ unsafe impl<T: ListBoxRowImpl> IsSubclassable<T> for ListBoxRow {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Bin as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkListBoxRowClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkListBoxRowClass);
             klass.activate = Some(list_box_row_activate::<T>);
         }
     }

gtk/src/subclass/plug.rs

@@ -36,7 +36,7 @@ unsafe impl<T: PlugImpl> IsSubclassable<T> for Plug {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Window as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkPlugClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkPlugClass);
             klass.embedded = Some(plug_embedded::<T>);
         }
     }

gtk/src/subclass/socket.rs

@@ -54,7 +54,7 @@ unsafe impl<T: SocketImpl> IsSubclassable<T> for Socket {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Container as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkSocketClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkSocketClass);
             klass.plug_added = Some(socket_plug_added::<T>);
             klass.plug_removed = Some(socket_plug_removed::<T>);
         }

gtk/src/subclass/widget.rs

@@ -918,7 +918,7 @@ unsafe impl<T: WidgetImpl> IsSubclassable<T> for Widget {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Object as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkWidgetClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkWidgetClass);
             klass.adjust_baseline_allocation = Some(widget_adjust_baseline_allocation::<T>);
             klass.adjust_baseline_request = Some(widget_adjust_baseline_request::<T>);
             klass.adjust_size_allocation = Some(widget_adjust_size_allocation::<T>);

gtk/src/subclass/window.rs

@@ -97,7 +97,7 @@ unsafe impl<T: WindowImpl> IsSubclassable<T> for Window {
     fn override_vfuncs(class: &mut ::glib::object::Class<Self>) {
         <Bin as IsSubclassable<T>>::override_vfuncs(class);
         unsafe {
-            let klass = &mut *(class as *mut _ as *mut gtk_sys::GtkWindowClass);
+            let klass = &mut *(class.as_mut() as *mut gtk_sys::GtkWindowClass);
             klass.set_focus = Some(window_set_focus::<T>);
             klass.activate_focus = Some(window_activate_focus::<T>);
             klass.activate_default = Some(window_activate_default::<T>);