examples: Prefer using Default trait when possible

bilelmoussaoui · bilelmoussaoui · commit e262bd9a18b7 · 2023-10-16T22:26:03.000+02:00
Otherwise clippy complains and we have to have a separate constructor for nothing useful
diff --git a/examples/column_view_datagrid/grid_cell/mod.rs b/examples/column_view_datagrid/grid_cell/mod.rs
@@ -1,26 +1,22 @@
 mod imp;
 use gtk::{glib, subclass::prelude::*};
 
+pub struct Entry {
+    pub name: String,
+}
+
 glib::wrapper! {
     pub struct GridCell(ObjectSubclass<imp::GridCell>)
         @extends gtk::Widget;
 }
 
 impl Default for GridCell {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
-pub struct Entry {
-    pub name: String,
-}
-
 impl GridCell {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-
     pub fn set_entry(&self, entry: &Entry) {
         self.imp().name.set_text(Some(&entry.name));
     }
diff --git a/examples/column_view_datagrid/main.rs b/examples/column_view_datagrid/main.rs
@@ -46,7 +46,7 @@ fn build_ui(application: &gtk::Application) {
     let col2factory = gtk::SignalListItemFactory::new();
     col1factory.connect_setup(move |_factory, item| {
         let item = item.downcast_ref::<gtk::ListItem>().unwrap();
-        let row = GridCell::new();
+        let row = GridCell::default();
         item.set_child(Some(&row));
     });
 
@@ -62,7 +62,7 @@ fn build_ui(application: &gtk::Application) {
     });
     col2factory.connect_setup(move |_factory, item| {
         let item = item.downcast_ref::<gtk::ListItem>().unwrap();
-        let row = GridCell::new();
+        let row = GridCell::default();
         item.set_child(Some(&row));
     });
 
diff --git a/examples/confetti_snapshot_animation/confetti_widget/mod.rs b/examples/confetti_snapshot_animation/confetti_widget/mod.rs
@@ -14,14 +14,11 @@ glib::wrapper! {
 
 impl Default for ConfettiWidget {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
 impl ConfettiWidget {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
     pub fn explode(&self, params: ExplosionParameters, duration: f64) -> AnimatedExplosion {
         let exp = AnimatedExplosion::new(params);
 
diff --git a/examples/confetti_snapshot_animation/main.rs b/examples/confetti_snapshot_animation/main.rs
@@ -22,7 +22,7 @@ fn build_ui(application: &gtk::Application) {
     window.set_title(Some("Confetti"));
     window.set_default_size(640, 360);
 
-    let confetti = ConfettiWidget::new();
+    let confetti = ConfettiWidget::default();
     window.set_child(Some(&confetti));
 
     // To listen to click events, we need to add a `GestureClick` controller to our
diff --git a/examples/content_provider/content_provider/mod.rs b/examples/content_provider/content_provider/mod.rs
@@ -7,14 +7,8 @@ glib::wrapper! {
         @extends gdk::ContentProvider;
 }
 
-impl ContentProvider {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-}
-
 impl Default for ContentProvider {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
diff --git a/examples/content_provider/main.rs b/examples/content_provider/main.rs
@@ -18,7 +18,7 @@ fn on_activate(application: &gtk::Application) {
     let display = WidgetExt::display(&window);
 
     window.connect_realize(glib::clone!(@weak display, @weak application => move |_| {
-        let provider = ContentProvider::new();
+        let provider = ContentProvider::default();
         display.clipboard().set_content(Some(&provider)).unwrap();
         glib::MainContext::default().spawn_local(glib::clone!(@weak display, @weak application => async move {
             let text = display.clipboard().read_text_future().await.unwrap().unwrap();
diff --git a/examples/custom_application/ex_application/mod.rs b/examples/custom_application/ex_application/mod.rs
@@ -10,12 +10,6 @@ glib::wrapper! {
 
 impl Default for ExApplication {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ExApplication {
-    pub fn new() -> Self {
         glib::Object::builder()
             .property("application-id", "org.gtk_rs.application-subclass")
             .build()
diff --git a/examples/custom_application/main.rs b/examples/custom_application/main.rs
@@ -4,6 +4,6 @@ use ex_application::ExApplication;
 use gtk::{glib, prelude::*};
 
 fn main() -> glib::ExitCode {
-    let app = ExApplication::new();
+    let app = ExApplication::default();
     app.run()
 }
diff --git a/examples/custom_editable/custom_editable/mod.rs b/examples/custom_editable/custom_editable/mod.rs
@@ -12,15 +12,11 @@ glib::wrapper! {
 
 impl Default for CustomEditable {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
 impl CustomEditable {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-
     pub fn add_tag(&self, tag: &CustomTag) {
         tag.set_parent(self);
     }
diff --git a/examples/custom_editable/main.rs b/examples/custom_editable/main.rs
@@ -38,7 +38,7 @@ fn build_ui(application: &gtk::Application) {
     container.set_valign(gtk::Align::Center);
     container.set_halign(gtk::Align::Center);
 
-    let editable = CustomEditable::new();
+    let editable = CustomEditable::default();
     editable.set_halign(gtk::Align::Fill);
 
     container.append(&editable);
diff --git a/examples/custom_layout_manager/custom_layout/mod.rs b/examples/custom_layout_manager/custom_layout/mod.rs
@@ -9,17 +9,7 @@ glib::wrapper! {
         @extends gtk::LayoutManager;
 }
 
-impl Default for CustomLayout {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl CustomLayout {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-
     pub fn set_position(&self, position: f64) {
         self.imp().position.set(position);
     }
diff --git a/examples/custom_layout_manager/main.rs b/examples/custom_layout_manager/main.rs
@@ -38,7 +38,7 @@ fn main() -> glib::ExitCode {
             .title("Custom Layout Manager")
             .build();
 
-        let widget = simple_widget::SimpleWidget::new();
+        let widget = simple_widget::SimpleWidget::default();
         for color in &COLORS {
             let rgba = gdk::RGBA::from_str(color).unwrap();
             let child = custom_layout_child::CustomLayoutChild::new(rgba);
diff --git a/examples/custom_layout_manager/simple_widget/mod.rs b/examples/custom_layout_manager/simple_widget/mod.rs
@@ -15,15 +15,11 @@ glib::wrapper! {
 
 impl Default for SimpleWidget {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
 impl SimpleWidget {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-
     pub fn add_child<W: IsA<gtk::Widget>>(&self, widget: &W) {
         widget.set_parent(self);
     }
diff --git a/examples/custom_orientable/custom_orientable/mod.rs b/examples/custom_orientable/custom_orientable/mod.rs
@@ -10,12 +10,6 @@ glib::wrapper! {
 
 impl Default for CustomOrientable {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CustomOrientable {
-    pub fn new() -> Self {
         glib::Object::new()
     }
 }
diff --git a/examples/custom_orientable/main.rs b/examples/custom_orientable/main.rs
@@ -10,7 +10,7 @@ fn main() -> glib::ExitCode {
     application.connect_activate(|app| {
         let window = gtk::ApplicationWindow::new(app);
         let bx = gtk::Box::new(gtk::Orientation::Vertical, 6);
-        let orientable = CustomOrientable::new();
+        let orientable = CustomOrientable::default();
         let button = gtk::Button::with_label("Switch orientation");
 
         button.connect_clicked(glib::clone!(@weak orientable => move |_| {
diff --git a/examples/custom_paintable/custom_paintable/mod.rs b/examples/custom_paintable/custom_paintable/mod.rs
@@ -8,12 +8,6 @@ glib::wrapper! {
 
 impl Default for CustomPaintable {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CustomPaintable {
-    pub fn new() -> Self {
         glib::Object::new()
     }
 }
diff --git a/examples/custom_paintable/main.rs b/examples/custom_paintable/main.rs
@@ -16,7 +16,7 @@ fn build_ui(application: &gtk::Application) {
     window.set_title(Some("Custom Paintable"));
     window.set_default_size(500, 500);
 
-    let paintable = CustomPaintable::new();
+    let paintable = CustomPaintable::default();
 
     let picture = gtk::Picture::new();
     picture.set_halign(gtk::Align::Center);
diff --git a/examples/custom_widget/ex_button/mod.rs b/examples/custom_widget/ex_button/mod.rs
@@ -10,12 +10,6 @@ glib::wrapper! {
 
 impl Default for ExButton {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ExButton {
-    pub fn new() -> Self {
         glib::Object::new()
     }
 }
diff --git a/examples/custom_widget/main.rs b/examples/custom_widget/main.rs
@@ -9,7 +9,7 @@ fn main() -> glib::ExitCode {
         .build();
     application.connect_activate(|app| {
         let window = gtk::ApplicationWindow::new(app);
-        let button = ExButton::new();
+        let button = ExButton::default();
         button.set_margin_top(18);
         button.set_margin_bottom(18);
         button.set_margin_start(18);
diff --git a/examples/expressions/main.rs b/examples/expressions/main.rs
@@ -83,8 +83,7 @@ fn data() -> gio::ListStore {
     let mut vector: Vec<Note> = Vec::new();
 
     for i in 0..=100 {
-        let metadata = Metadata::new();
-        metadata.set_property("title", format!("Note ({i})"));
+        let metadata = Metadata::new(&format!("Note ({i})"));
 
         let note = Note::new(&metadata);
         vector.push(note);
diff --git a/examples/expressions/metadata/mod.rs b/examples/expressions/metadata/mod.rs
@@ -8,12 +8,12 @@ glib::wrapper! {
 
 impl Default for Metadata {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
 impl Metadata {
-    pub fn new() -> Self {
-        glib::Object::new()
+    pub fn new(title: &str) -> Self {
+        glib::Object::builder().property("title", title).build()
     }
 }
diff --git a/examples/fill_and_stroke/main.rs b/examples/fill_and_stroke/main.rs
@@ -16,7 +16,7 @@ fn main() -> glib::ExitCode {
         let picture = gtk::Picture::builder()
             .content_fit(gtk::ContentFit::ScaleDown)
             .build();
-        let paintable = paintable::CustomPaintable::new();
+        let paintable = paintable::CustomPaintable::default();
         picture.set_paintable(Some(&paintable));
         win.set_child(Some(&picture));
 
diff --git a/examples/fill_and_stroke/paintable/mod.rs b/examples/fill_and_stroke/paintable/mod.rs
@@ -8,12 +8,6 @@ glib::wrapper! {
 
 impl Default for CustomPaintable {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CustomPaintable {
-    pub fn new() -> Self {
         glib::Object::new()
     }
 }
diff --git a/examples/gif_paintable/gif_paintable/mod.rs b/examples/gif_paintable/gif_paintable/mod.rs
@@ -11,11 +11,13 @@ glib::wrapper! {
     pub struct GifPaintable(ObjectSubclass<imp::GifPaintable>) @implements gdk::Paintable;
 }
 
-impl GifPaintable {
-    pub fn new() -> Self {
+impl Default for GifPaintable {
+    fn default() -> Self {
         glib::Object::new()
     }
+}
 
+impl GifPaintable {
     /// Loads the bytes of a GIF into the paintable.
     ///
     /// The loading consists of decoding the gif with a GIFDecoder, then storing
@@ -95,9 +97,3 @@ impl GifPaintable {
         imp.current_idx.set(new_idx);
     }
 }
-
-impl Default for GifPaintable {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/examples/gif_paintable/gif_paintable_window/mod.rs b/examples/gif_paintable/gif_paintable_window/mod.rs
@@ -16,7 +16,7 @@ impl GifPaintableWindow {
     }
 
     fn set_file(&self, file: gio::File) -> Result<(), Box<dyn std::error::Error>> {
-        let paintable = GifPaintable::new();
+        let paintable = GifPaintable::default();
         let (bytes, _) = file.load_contents(gio::Cancellable::NONE)?;
         paintable.load_from_bytes(&bytes)?;
         self.imp().picture.set_paintable(Some(&paintable));
diff --git a/examples/glium_gl_area/glium_gl_area/mod.rs b/examples/glium_gl_area/glium_gl_area/mod.rs
@@ -9,12 +9,6 @@ glib::wrapper! {
 
 impl Default for GliumGLArea {
     fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl GliumGLArea {
-    pub fn new() -> Self {
         glib::Object::new()
     }
 }
diff --git a/examples/glium_gl_area/main.rs b/examples/glium_gl_area/main.rs
@@ -35,7 +35,7 @@ fn build_ui(application: &gtk::Application) {
     let window = gtk::ApplicationWindow::new(application);
     window.set_title(Some("Glium in GLArea"));
 
-    let widget = GliumGLArea::new();
+    let widget = GliumGLArea::default();
     window.set_child(Some(&widget));
 
     window.present();
diff --git a/examples/list_view_apps_launcher/application_row/mod.rs b/examples/list_view_apps_launcher/application_row/mod.rs
@@ -9,15 +9,11 @@ glib::wrapper! {
 
 impl Default for ApplicationRow {
     fn default() -> Self {
-        Self::new()
+        glib::Object::new()
     }
 }
 
 impl ApplicationRow {
-    pub fn new() -> Self {
-        glib::Object::new()
-    }
-
     pub fn set_app_info(&self, app_info: &gio::AppInfo) {
         let imp = self.imp();
         imp.name.set_text(&app_info.name());
diff --git a/examples/list_view_apps_launcher/main.rs b/examples/list_view_apps_launcher/main.rs
@@ -33,7 +33,7 @@ fn build_ui(app: &gtk::Application) {
         // generic for potentially future new APIs, it was switched to taking a GObject
         // in 4.8
         let item = item.downcast_ref::<gtk::ListItem>().unwrap();
-        let row = ApplicationRow::new();
+        let row = ApplicationRow::default();
         item.set_child(Some(&row));
     });
 
diff --git a/examples/rotation_bin/main.rs b/examples/rotation_bin/main.rs
@@ -31,7 +31,7 @@ fn build_ui(application: &gtk::Application) {
         .halign(gtk::Align::Center)
         .valign(gtk::Align::Center)
         .build();
-    let rotation_bin = RotationBin::new();
+    let rotation_bin = RotationBin::default();
     let img = gtk::Image::builder()
         .pixel_size(128)
         .icon_name("audio-x-generic")
diff --git a/examples/rotation_bin/rotation_bin/mod.rs b/examples/rotation_bin/rotation_bin/mod.rs
diff --git a/examples/scale_bin/main.rs b/examples/scale_bin/main.rs
diff --git a/examples/scale_bin/scale_bin/mod.rs b/examples/scale_bin/scale_bin/mod.rs
diff --git a/examples/squares/main.rs b/examples/squares/main.rs
diff --git a/examples/squares/squares_widget/mod.rs b/examples/squares/squares_widget/mod.rs
diff --git a/examples/squeezer_bin/main.rs b/examples/squeezer_bin/main.rs
diff --git a/examples/squeezer_bin/squeezer_bin/mod.rs b/examples/squeezer_bin/squeezer_bin/mod.rs
diff --git a/examples/virtual_methods/base_button/mod.rs b/examples/virtual_methods/base_button/mod.rs
diff --git a/examples/virtual_methods/derived_button/mod.rs b/examples/virtual_methods/derived_button/mod.rs
diff --git a/examples/virtual_methods/main.rs b/examples/virtual_methods/main.rs

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,11 @@ glib::wrapper! {`
`14`	`14`
`15`	`15`	`impl Default for ConfettiWidget {`
`16`	`16`	`fn default() -> Self {`
`17`		`- Self::new()`
	`17`	`+ glib::Object::new()`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`impl ConfettiWidget {`
`22`		`- pub fn new() -> Self {`
`23`		`- glib::Object::new()`
`24`		`- }`
`25`	`22`	`pub fn explode(&self, params: ExplosionParameters, duration: f64) -> AnimatedExplosion {`
`26`	`23`	`let exp = AnimatedExplosion::new(params);`
`27`	`24`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,8 @@ glib::wrapper! {`
`7`	`7`	`@extends gdk::ContentProvider;`
`8`	`8`	`}`
`9`	`9`
`10`		`-impl ContentProvider {`
`11`		`- pub fn new() -> Self {`
`12`		`- glib::Object::new()`
`13`		`- }`
`14`		`-}`
`15`		`-`
`16`	`10`	`impl Default for ContentProvider {`
`17`	`11`	`fn default() -> Self {`
`18`		`- Self::new()`
	`12`	`+ glib::Object::new()`
`19`	`13`	`}`
`20`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ use ex_application::ExApplication;`
`4`	`4`	`use gtk::{glib, prelude::*};`
`5`	`5`
`6`	`6`	`fn main() -> glib::ExitCode {`
`7`		`- let app = ExApplication::new();`
	`7`	`+ let app = ExApplication::default();`
`8`	`8`	`app.run()`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,11 @@ glib::wrapper! {`
`12`	`12`
`13`	`13`	`impl Default for CustomEditable {`
`14`	`14`	`fn default() -> Self {`
`15`		`- Self::new()`
	`15`	`+ glib::Object::new()`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`impl CustomEditable {`
`20`		`- pub fn new() -> Self {`
`21`		`- glib::Object::new()`
`22`		`- }`
`23`		`-`
`24`	`20`	`pub fn add_tag(&self, tag: &CustomTag) {`
`25`	`21`	`tag.set_parent(self);`
`26`	`22`	`}`