gtk: Fix missing version guards

bilelmoussaoui · bilelmoussaoui · commit ca946bc734eb · 2022-12-05T11:07:49.000+01:00
diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml
@@ -73,7 +73,6 @@ generate = [
     "Gtk.ColorDialogButton",
     "Gtk.ColumnView",
     "Gtk.ColumnViewColumn",
-    "Gtk.ColumnViewSorter",
     "Gtk.ComboBoxText",
     "Gtk.Constraint",
     "Gtk.ConstraintAttribute",
@@ -118,7 +117,6 @@ generate = [
     "Gtk.FontChooserDialog",
     "Gtk.FontChooserLevel",
     "Gtk.FontChooserWidget",
-    "Gtk.FontLevel",
     "Gtk.Frame",
     "Gtk.GestureDrag",
     "Gtk.GestureLongPress",
@@ -844,6 +842,11 @@ manual_traits = ["ColorChooserExtManual"]
     manual = true # array with size
     doc_trait_name = "ColorChooserExtManual"
 
+[[object]]
+name = "Gtk.ColumnViewSorter"
+status = "generate"
+version = "4.10"
+
 [[object]]
 name = "Gtk.ComboBox"
 status = "generate"
@@ -1264,6 +1267,11 @@ status = "generate"
         name = "language"
         const = true
 
+[[object]]
+name = "Gtk.FontLevel"
+status = "generate"
+version = "4.10"
+
 [[object]]
 name = "Gtk.Gesture"
 status = "generate"
diff --git a/gtk4/src/auto/column_view_sorter.rs b/gtk4/src/auto/column_view_sorter.rs
@@ -2,34 +2,16 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use crate::ColumnViewColumn;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use crate::SortType;
 use crate::Sorter;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use glib::object::ObjectType as ObjectType_;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use glib::signal::connect_raw;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use glib::signal::SignalHandlerId;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use glib::translate::*;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use std::boxed::Box as Box_;
 use std::fmt;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use std::mem;
-#[cfg(any(feature = "v4_10", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 use std::mem::transmute;
 
 glib::wrapper! {
@@ -42,16 +24,12 @@ glib::wrapper! {
 }
 
 impl ColumnViewSorter {
-    #[cfg(any(feature = "v4_10", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_column_view_sorter_get_n_sort_columns")]
     #[doc(alias = "get_n_sort_columns")]
     pub fn n_sort_columns(&self) -> u32 {
         unsafe { ffi::gtk_column_view_sorter_get_n_sort_columns(self.to_glib_none().0) }
     }
 
-    #[cfg(any(feature = "v4_10", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_column_view_sorter_get_nth_sort_column")]
     #[doc(alias = "get_nth_sort_column")]
     pub fn nth_sort_column(&self, position: u32) -> (Option<ColumnViewColumn>, SortType) {
@@ -66,8 +44,6 @@ impl ColumnViewSorter {
         }
     }
 
-    #[cfg(any(feature = "v4_10", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_column_view_sorter_get_primary_sort_column")]
     #[doc(alias = "get_primary_sort_column")]
     pub fn primary_sort_column(&self) -> Option<ColumnViewColumn> {
@@ -78,8 +54,6 @@ impl ColumnViewSorter {
         }
     }
 
-    #[cfg(any(feature = "v4_10", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_column_view_sorter_get_primary_sort_order")]
     #[doc(alias = "get_primary_sort_order")]
     pub fn primary_sort_order(&self) -> SortType {
diff --git a/gtk4/src/auto/enums.rs b/gtk4/src/auto/enums.rs
@@ -4500,6 +4500,8 @@ impl From<FilterMatch> for glib::Value {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GtkFontLevel")]
@@ -4516,6 +4518,8 @@ pub enum FontLevel {
     __Unknown(i32),
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 impl fmt::Display for FontLevel {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -4532,6 +4536,8 @@ impl fmt::Display for FontLevel {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 #[doc(hidden)]
 impl IntoGlib for FontLevel {
     type GlibType = ffi::GtkFontLevel;
@@ -4547,6 +4553,8 @@ impl IntoGlib for FontLevel {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 #[doc(hidden)]
 impl FromGlib<ffi::GtkFontLevel> for FontLevel {
     unsafe fn from_glib(value: ffi::GtkFontLevel) -> Self {
@@ -4561,16 +4569,22 @@ impl FromGlib<ffi::GtkFontLevel> for FontLevel {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 impl StaticType for FontLevel {
     fn static_type() -> Type {
         unsafe { from_glib(ffi::gtk_font_level_get_type()) }
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 impl glib::value::ValueType for FontLevel {
     type Type = Self;
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 unsafe impl<'a> FromValue<'a> for FontLevel {
     type Checker = glib::value::GenericValueTypeChecker<Self>;
 
@@ -4580,6 +4594,8 @@ unsafe impl<'a> FromValue<'a> for FontLevel {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 impl ToValue for FontLevel {
     fn to_value(&self) -> glib::Value {
         let mut value = glib::Value::for_value_type::<Self>();
@@ -4594,6 +4610,8 @@ impl ToValue for FontLevel {
     }
 }
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 impl From<FontLevel> for glib::Value {
     #[inline]
     fn from(v: FontLevel) -> Self {
diff --git a/gtk4/src/auto/mod.rs b/gtk4/src/auto/mod.rs
@@ -239,7 +239,11 @@ pub use self::column_view::ColumnView;
 mod column_view_column;
 pub use self::column_view_column::ColumnViewColumn;
 
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 mod column_view_sorter;
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 pub use self::column_view_sorter::ColumnViewSorter;
 
 #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -1061,6 +1065,8 @@ pub use self::enums::FileChooserAction;
 pub use self::enums::FileChooserError;
 pub use self::enums::FilterChange;
 pub use self::enums::FilterMatch;
+#[cfg(any(feature = "v4_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
 pub use self::enums::FontLevel;
 pub use self::enums::IconSize;
 pub use self::enums::IconThemeError;
diff --git a/gtk4/sys/Gir.toml b/gtk4/sys/Gir.toml
@@ -28,9 +28,24 @@ ignore = [
 gdk4 = "Gdk"
 gsk4 = "Gsk"
 
+[[object]]
+name = "Gtk.ColumnViewSorter"
+status = "generate"
+    [[object.function]]
+    name = "get_type"
+    version = "4.10"
+
 [[object]]
 name = "Gtk.ExpressionWatch"
 status = "generate"
     [[object.function]]
     name = "get_type"
     version = "4.2"
+
+[[object]]
+name = "Gtk.FontLevel"
+status = "generate"
+    [[object.function]]
+    name = "get_type"
+    version = "4.10"
+    
diff --git a/gtk4/sys/src/lib.rs b/gtk4/sys/src/lib.rs
@@ -9210,6 +9210,8 @@ extern "C" {
     //=========================================================================
     // GtkFontLevel
     //=========================================================================
+    #[cfg(any(feature = "v4_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     pub fn gtk_font_level_get_type() -> GType;
 
     //=========================================================================
@@ -11774,6 +11776,8 @@ extern "C" {
     //=========================================================================
     // GtkColumnViewSorter
     //=========================================================================
+    #[cfg(any(feature = "v4_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]
     pub fn gtk_column_view_sorter_get_type() -> GType;
     #[cfg(any(feature = "v4_10", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]

Original file line number	Diff line number	Diff line change
`@@ -4500,6 +4500,8 @@ impl From<FilterMatch> for glib::Value {`
`4500`	`4500`	`}`
`4501`	`4501`	`}`
`4502`	`4502`
	`4503`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4504`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4503`	`4505`	`#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]`
`4504`	`4506`	`#[non_exhaustive]`
`4505`	`4507`	`#[doc(alias = "GtkFontLevel")]`
`@@ -4516,6 +4518,8 @@ pub enum FontLevel {`
`4516`	`4518`	`__Unknown(i32),`
`4517`	`4519`	`}`
`4518`	`4520`
	`4521`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4522`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4519`	`4523`	`impl fmt::Display for FontLevel {`
`4520`	`4524`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`4521`	`4525`	`write!(`
`@@ -4532,6 +4536,8 @@ impl fmt::Display for FontLevel {`
`4532`	`4536`	`}`
`4533`	`4537`	`}`
`4534`	`4538`
	`4539`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4540`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4535`	`4541`	`#[doc(hidden)]`
`4536`	`4542`	`impl IntoGlib for FontLevel {`
`4537`	`4543`	`type GlibType = ffi::GtkFontLevel;`
`@@ -4547,6 +4553,8 @@ impl IntoGlib for FontLevel {`
`4547`	`4553`	`}`
`4548`	`4554`	`}`
`4549`	`4555`
	`4556`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4557`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4550`	`4558`	`#[doc(hidden)]`
`4551`	`4559`	`impl FromGlib<ffi::GtkFontLevel> for FontLevel {`
`4552`	`4560`	`unsafe fn from_glib(value: ffi::GtkFontLevel) -> Self {`
`@@ -4561,16 +4569,22 @@ impl FromGlib<ffi::GtkFontLevel> for FontLevel {`
`4561`	`4569`	`}`
`4562`	`4570`	`}`
`4563`	`4571`
	`4572`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4573`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4564`	`4574`	`impl StaticType for FontLevel {`
`4565`	`4575`	`fn static_type() -> Type {`
`4566`	`4576`	`unsafe { from_glib(ffi::gtk_font_level_get_type()) }`
`4567`	`4577`	`}`
`4568`	`4578`	`}`
`4569`	`4579`
	`4580`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4581`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4570`	`4582`	`impl glib::value::ValueType for FontLevel {`
`4571`	`4583`	`type Type = Self;`
`4572`	`4584`	`}`
`4573`	`4585`
	`4586`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4587`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4574`	`4588`	`unsafe impl<'a> FromValue<'a> for FontLevel {`
`4575`	`4589`	`type Checker = glib::value::GenericValueTypeChecker<Self>;`
`4576`	`4590`
`@@ -4580,6 +4594,8 @@ unsafe impl<'a> FromValue<'a> for FontLevel {`
`4580`	`4594`	`}`
`4581`	`4595`	`}`
`4582`	`4596`
	`4597`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4598`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4583`	`4599`	`impl ToValue for FontLevel {`
`4584`	`4600`	`fn to_value(&self) -> glib::Value {`
`4585`	`4601`	`let mut value = glib::Value::for_value_type::<Self>();`
`@@ -4594,6 +4610,8 @@ impl ToValue for FontLevel {`
`4594`	`4610`	`}`
`4595`	`4611`	`}`
`4596`	`4612`
	`4613`	`+#[cfg(any(feature = "v4_10", feature = "dox"))]`
	`4614`	`+#[cfg_attr(feature = "dox", doc(cfg(feature = "v4_10")))]`
`4597`	`4615`	`impl From<FontLevel> for glib::Value {`
`4598`	`4616`	`#[inline]`
`4599`	`4617`	`fn from(v: FontLevel) -> Self {`