Replace CONST_* with *::CONST

gtk-rs · Nov 4, 2021 · 50f3384 · 50f3384
1 parent a1c9efe
commit 50f3384
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/examples/clipboard/main.rs b/examples/clipboard/main.rs
@@ -64,7 +64,7 @@ fn build_ui(application: &gtk::Application) {
 
     let paste_btn = gtk::Button::with_label("Paste");
     paste_btn.connect_clicked(clone!(@weak clipboard, @weak into_entry => move |_btn| {
-        clipboard.read_text_async(gio::NONE_CANCELLABLE, clone!(@weak into_entry => move|res| {
+        clipboard.read_text_async(gio::Cancellable::NONE, clone!(@weak into_entry => move|res| {
             if let Ok(Some(text)) = res {
                 into_entry.set_text(&text);
             }
@@ -115,7 +115,7 @@ fn build_ui(application: &gtk::Application) {
         .valign(gtk::Align::Center)
         .build();
     paste_texture_btn.connect_clicked(clone!(@weak clipboard => move |_btn| {
-        clipboard.read_texture_async(gio::NONE_CANCELLABLE, clone!(@weak image_into => move |res| {
+        clipboard.read_texture_async(gio::Cancellable::NONE, clone!(@weak image_into => move |res| {
             if let Ok(Some(texture)) = res {
                 image_into.set_paintable(Some(&texture));
             }

diff --git a/examples/video_player/video_player_window/imp.rs b/examples/video_player/video_player_window/imp.rs
@@ -19,7 +19,7 @@ impl ObjectSubclass for VideoPlayerWindow {
     fn new() -> Self {
         let dialog = gtk::FileChooserNative::new(
             Some("Open File"),
-            gtk::NONE_WINDOW,
+            gtk::Window::NONE,
             gtk::FileChooserAction::Open,
             Some("Open"),
             Some("Cancel"),

diff --git a/gdk4/src/event.rs b/gdk4/src/event.rs
@@ -19,8 +19,6 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_EVENT: Option<&Event> = None;
-
 impl StaticType for Event {
     #[doc(alias = "gdk_event_get_type")]
     fn static_type() -> Type {
@@ -29,6 +27,8 @@ impl StaticType for Event {
 }
 
 impl Event {
+    pub const NONE: Option<&'static Event> = None;
+
     pub fn downcast<T: EventKind>(self) -> Result<T, Event> {
         unsafe {
             if T::event_types().contains(&self.event_type()) {

diff --git a/gdk4/src/lib.rs b/gdk4/src/lib.rs
@@ -107,7 +107,7 @@ pub use crossing_event::CrossingEvent;
 pub use delete_event::DeleteEvent;
 pub use display::Backend;
 pub use dnd_event::DNDEvent;
-pub use event::{Event, EventKind, NONE_EVENT};
+pub use event::{Event, EventKind};
 pub use focus_event::FocusEvent;
 pub use grab_broken_event::GrabBrokenEvent;
 pub use key_event::KeyEvent;

diff --git a/gsk4/src/lib.rs b/gsk4/src/lib.rs
@@ -93,7 +93,7 @@ pub use opacity_node::OpacityNode;
 pub use outset_shadow_node::OutsetShadowNode;
 pub use parse_location::ParseLocation;
 pub use radial_gradient_node::RadialGradientNode;
-pub use render_node::{IsRenderNode, RenderNode, NONE_RENDER_NODE};
+pub use render_node::{IsRenderNode, RenderNode};
 pub use repeat_node::RepeatNode;
 pub use repeating_linear_gradient_node::RepeatingLinearGradientNode;
 pub use repeating_radial_gradient_node::RepeatingRadialGradientNode;

diff --git a/gsk4/src/render_node.rs b/gsk4/src/render_node.rs
@@ -27,6 +27,8 @@ impl StaticType for RenderNode {
 }
 
 impl RenderNode {
+    pub const NONE: Option<&'static RenderNode> = None;
+
     #[doc(alias = "gsk_render_node_deserialize")]
     pub fn deserialize(bytes: &glib::Bytes) -> Option<Self> {
         assert_initialized_main_thread!();
@@ -154,8 +156,6 @@ pub unsafe trait IsRenderNode:
     fn upcast_ref(&self) -> &RenderNode;
 }
 
-pub const NONE_RENDER_NODE: Option<&RenderNode> = None;
-
 impl fmt::Display for RenderNode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.write_str("RenderNode")

diff --git a/gtk4/src/expression.rs b/gtk4/src/expression.rs
@@ -30,8 +30,6 @@ impl AsRef<Expression> for Expression {
     }
 }
 
-pub const NONE_EXPRESSION: Option<&Expression> = None;
-
 // rustdoc-stripper-ignore-next
 /// A common trait implemented by the various [`gtk::Expression`] types.
 ///
@@ -44,6 +42,8 @@ pub unsafe trait IsExpression:
 }
 
 impl Expression {
+    pub const NONE: Option<&'static Expression> = None;
+
     pub fn downcast<E: IsExpression>(self) -> Result<E, Expression> {
         unsafe {
             if self.type_() == E::static_type() {

diff --git a/gtk4/src/lib.rs b/gtk4/src/lib.rs
@@ -200,7 +200,7 @@ pub use closure_expression::ClosureExpression;
 pub use constant_expression::ConstantExpression;
 pub use css_location::CssLocation;
 pub use directory_list::DirectoryListBuilder;
-pub use expression::{Expression, NONE_EXPRESSION};
+pub use expression::Expression;
 pub use expression_watch::ExpressionWatch;
 pub use functions::*;
 pub use glib::signal::Inhibit;

diff --git a/gtk4/src/property_expression.rs b/gtk4/src/property_expression.rs
@@ -76,15 +76,15 @@ impl PropertyExpression {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{test_synced, NONE_EXPRESSION};
+    use crate::test_synced;
     use glib::StaticType;
 
     #[test]
     fn test_property_expression() {
         test_synced(move || {
             let _prop_expr = PropertyExpression::new(
                 crate::StringObject::static_type(),
-                NONE_EXPRESSION,
+                crate::Expression::NONE,
                 "string",
             );
         });