book: Use Object::builder() instead of Object::new()

Hofer-Julian · Hofer-Julian · commit 02b24e116c8b · 2022-10-30T09:39:24.000+01:00
diff --git a/book/listings/actions/5/window/mod.rs b/book/listings/actions/5/window/mod.rs
@@ -17,7 +17,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     fn setup_actions(&self) {
diff --git a/book/listings/actions/6/window/mod.rs b/book/listings/actions/6/window/mod.rs
@@ -16,7 +16,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     // ANCHOR: setup_actions
diff --git a/book/listings/actions/7/window/mod.rs b/book/listings/actions/7/window/mod.rs
@@ -18,7 +18,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     // ANCHOR: settings
diff --git a/book/listings/composite_templates/1/window/mod.rs b/book/listings/composite_templates/1/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/composite_templates/2/custom_button/mod.rs b/book/listings/composite_templates/2/custom_button/mod.rs
@@ -14,7 +14,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/composite_templates/2/window/mod.rs b/book/listings/composite_templates/2/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/composite_templates/3/custom_button/mod.rs b/book/listings/composite_templates/3/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/composite_templates/3/window/mod.rs b/book/listings/composite_templates/3/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/composite_templates/4/custom_button/mod.rs b/book/listings/composite_templates/4/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/composite_templates/4/window/mod.rs b/book/listings/composite_templates/4/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/composite_templates/5/custom_button/mod.rs b/book/listings/composite_templates/5/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/composite_templates/5/window/mod.rs b/book/listings/composite_templates/5/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/composite_templates/6/custom_button/mod.rs b/book/listings/composite_templates/6/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/composite_templates/6/window/mod.rs b/book/listings/composite_templates/6/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/css/6/window/mod.rs b/book/listings/css/6/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/css/7/window/mod.rs b/book/listings/css/7/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/css/8/window/mod.rs b/book/listings/css/8/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/css/9/window/mod.rs b/book/listings/css/9/window/mod.rs
@@ -13,6 +13,6 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 }
diff --git a/book/listings/g_object_properties/4/custom_button/mod.rs b/book/listings/g_object_properties/4/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/g_object_signals/2/custom_button/mod.rs b/book/listings/g_object_signals/2/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/g_object_subclassing/1/custom_button/mod.rs b/book/listings/g_object_subclassing/1/custom_button/mod.rs
@@ -12,11 +12,11 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     pub fn with_label(label: &str) -> Self {
-        Object::new(&[("label", &label)])
+        Object::builder().property("label", label).build()
     }
 }
 // ANCHOR_END: mod
diff --git a/book/listings/g_object_subclassing/2/custom_button/mod.rs b/book/listings/g_object_subclassing/2/custom_button/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 
 impl CustomButton {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 }
 
diff --git a/book/listings/list_widgets/2/integer_object/mod.rs b/book/listings/list_widgets/2/integer_object/mod.rs
@@ -10,7 +10,7 @@ glib::wrapper! {
 
 impl IntegerObject {
     pub fn new(number: i32) -> Self {
-        Object::new(&[("number", &number)])
+        Object::builder().property("number", number).build()
     }
 }
 // ANCHOR_END: integer_object
diff --git a/book/listings/list_widgets/3/integer_object/mod.rs b/book/listings/list_widgets/3/integer_object/mod.rs
@@ -11,7 +11,7 @@ glib::wrapper! {
 // ANCHOR: integer_object
 impl IntegerObject {
     pub fn new(number: i32) -> Self {
-        Object::new(&[("number", &number)])
+        Object::builder().property("number", number).build()
     }
 
     pub fn increase_number(self) {
diff --git a/book/listings/list_widgets/4/integer_object/mod.rs b/book/listings/list_widgets/4/integer_object/mod.rs
@@ -10,7 +10,7 @@ glib::wrapper! {
 
 impl IntegerObject {
     pub fn new(number: i32) -> Self {
-        Object::new(&[("number", &number)])
+        Object::builder().property("number", number).build()
     }
 
     pub fn increase_number(self) {
diff --git a/book/listings/list_widgets/5/integer_object/mod.rs b/book/listings/list_widgets/5/integer_object/mod.rs
@@ -10,7 +10,7 @@ glib::wrapper! {
 
 impl IntegerObject {
     pub fn new(number: i32) -> Self {
-        Object::new(&[("number", &number)])
+        Object::builder().property("number", number).build()
     }
 
     pub fn increase_number(self) {
diff --git a/book/listings/saving_window_state/1/custom_window/mod.rs b/book/listings/saving_window_state/1/custom_window/mod.rs
@@ -19,7 +19,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     fn setup_settings(&self) {
diff --git a/book/listings/todo/1/task_object/mod.rs b/book/listings/todo/1/task_object/mod.rs
@@ -10,7 +10,10 @@ glib::wrapper! {
 
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 }
 // ANCHOR_END: glib_wrapper_and_new
diff --git a/book/listings/todo/1/task_row/mod.rs b/book/listings/todo/1/task_row/mod.rs
@@ -24,7 +24,7 @@ impl Default for TaskRow {
 
 impl TaskRow {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     // ANCHOR: bind
diff --git a/book/listings/todo/1/window/mod.rs b/book/listings/todo/1/window/mod.rs
@@ -20,7 +20,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     // ANCHOR: tasks
diff --git a/book/listings/todo/2/task_object/mod.rs b/book/listings/todo/2/task_object/mod.rs
@@ -12,7 +12,10 @@ glib::wrapper! {
 // ANCHOR: impl
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 
     pub fn is_completed(&self) -> bool {
diff --git a/book/listings/todo/2/task_row/mod.rs b/book/listings/todo/2/task_row/mod.rs
@@ -22,7 +22,7 @@ impl Default for TaskRow {
 
 impl TaskRow {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     pub fn bind(&self, task_object: &TaskObject) {
diff --git a/book/listings/todo/2/window/mod.rs b/book/listings/todo/2/window/mod.rs
@@ -26,7 +26,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     // ANCHOR: settings
diff --git a/book/listings/todo/3/task_object/mod.rs b/book/listings/todo/3/task_object/mod.rs
@@ -11,7 +11,10 @@ glib::wrapper! {
 
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 
     pub fn is_completed(&self) -> bool {
diff --git a/book/listings/todo/3/task_row/mod.rs b/book/listings/todo/3/task_row/mod.rs
@@ -22,7 +22,7 @@ impl Default for TaskRow {
 
 impl TaskRow {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     pub fn bind(&self, task_object: &TaskObject) {
diff --git a/book/listings/todo/3/window/mod.rs b/book/listings/todo/3/window/mod.rs
@@ -26,7 +26,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     fn setup_settings(&self) {
diff --git a/book/listings/todo/4/task_object/mod.rs b/book/listings/todo/4/task_object/mod.rs
@@ -11,7 +11,10 @@ glib::wrapper! {
 
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 
     pub fn is_completed(&self) -> bool {
diff --git a/book/listings/todo/4/task_row/mod.rs b/book/listings/todo/4/task_row/mod.rs
@@ -22,7 +22,7 @@ impl Default for TaskRow {
 
 impl TaskRow {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     pub fn bind(&self, task_object: &TaskObject) {
diff --git a/book/listings/todo/4/window/mod.rs b/book/listings/todo/4/window/mod.rs
@@ -26,7 +26,7 @@ glib::wrapper! {
 impl Window {
     pub fn new(app: &Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
 
     fn setup_settings(&self) {
diff --git a/book/listings/todo/5/task_object/mod.rs b/book/listings/todo/5/task_object/mod.rs
@@ -11,7 +11,10 @@ glib::wrapper! {
 
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 
     pub fn is_completed(&self) -> bool {
diff --git a/book/listings/todo/5/task_row/mod.rs b/book/listings/todo/5/task_row/mod.rs
@@ -22,7 +22,7 @@ impl Default for TaskRow {
 
 impl TaskRow {
     pub fn new() -> Self {
-        Object::new(&[])
+        Object::builder().build()
     }
 
     pub fn bind(&self, task_object: &TaskObject) {
diff --git a/book/listings/todo/5/window/mod.rs b/book/listings/todo/5/window/mod.rs
@@ -26,7 +26,7 @@ impl Window {
     // ANCHOR: new
     pub fn new(app: &adw::Application) -> Self {
         // Create new window
-        Object::new(&[("application", app)])
+        Object::builder().property("application", app).build()
     }
     // ANCHOR_END: new
 
diff --git a/book/listings/todo/6/task_object/mod.rs b/book/listings/todo/6/task_object/mod.rs
@@ -11,7 +11,10 @@ glib::wrapper! {
 
 impl TaskObject {
     pub fn new(completed: bool, content: String) -> Self {
-        Object::new(&[("completed", &completed), ("content", &content)])
+        Object::builder()
+            .property("completed", completed)
+            .property("content", content)
+            .build()
     }
 
     pub fn is_completed(&self) -> bool {
diff --git a/book/listings/todo/6/window/mod.rs b/book/listings/todo/6/window/mod.rs
diff --git a/book/listings/todo/7/task_object/mod.rs b/book/listings/todo/7/task_object/mod.rs
diff --git a/book/listings/todo/7/window/mod.rs b/book/listings/todo/7/window/mod.rs
diff --git a/book/listings/todo/8/collection_object/mod.rs b/book/listings/todo/8/collection_object/mod.rs
diff --git a/book/listings/todo/8/task_object/mod.rs b/book/listings/todo/8/task_object/mod.rs
diff --git a/book/listings/todo/8/window/mod.rs b/book/listings/todo/8/window/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ glib::wrapper! {`
`17`	`17`	`impl Window {`
`18`	`18`	`pub fn new(app: &Application) -> Self {`
`19`	`19`	`// Create new window`
`20`		`- Object::new(&[("application", app)])`
	`20`	`+ Object::builder().property("application", app).build()`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`fn setup_actions(&self) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ glib::wrapper! {`
`16`	`16`	`impl Window {`
`17`	`17`	`pub fn new(app: &Application) -> Self {`
`18`	`18`	`// Create new window`
`19`		`- Object::new(&[("application", app)])`
	`19`	`+ Object::builder().property("application", app).build()`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// ANCHOR: setup_actions`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ glib::wrapper! {`
`18`	`18`	`impl Window {`
`19`	`19`	`pub fn new(app: &Application) -> Self {`
`20`	`20`	`// Create new window`
`21`		`- Object::new(&[("application", app)])`
	`21`	`+ Object::builder().property("application", app).build()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// ANCHOR: settings`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ glib::wrapper! {`
`13`	`13`	`impl Window {`
`14`	`14`	`pub fn new(app: &Application) -> Self {`
`15`	`15`	`// Create new window`
`16`		`- Object::new(&[("application", app)])`
	`16`	`+ Object::builder().property("application", app).build()`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ glib::wrapper! {`
`14`	`14`
`15`	`15`	`impl CustomButton {`
`16`	`16`	`pub fn new() -> Self {`
`17`		`- Object::new(&[])`
	`17`	`+ Object::builder().build()`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ glib::wrapper! {`
`11`	`11`
`12`	`12`	`impl CustomButton {`
`13`	`13`	`pub fn new() -> Self {`
`14`		`- Object::new(&[])`
	`14`	`+ Object::builder().build()`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ glib::wrapper! {`
`12`	`12`
`13`	`13`	`impl CustomButton {`
`14`	`14`	`pub fn new() -> Self {`
`15`		`- Object::new(&[])`
	`15`	`+ Object::builder().build()`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`pub fn with_label(label: &str) -> Self {`
`19`		`- Object::new(&[("label", &label)])`
	`19`	`+ Object::builder().property("label", label).build()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`// ANCHOR_END: mod`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ glib::wrapper! {`
`10`	`10`
`11`	`11`	`impl IntegerObject {`
`12`	`12`	`pub fn new(number: i32) -> Self {`
`13`		`- Object::new(&[("number", &number)])`
	`13`	`+ Object::builder().property("number", number).build()`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`// ANCHOR_END: integer_object`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ glib::wrapper! {`
`19`	`19`	`impl Window {`
`20`	`20`	`pub fn new(app: &Application) -> Self {`
`21`	`21`	`// Create new window`
`22`		`- Object::new(&[("application", app)])`
	`22`	`+ Object::builder().property("application", app).build()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`fn setup_settings(&self) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,10 @@ glib::wrapper! {`
`10`	`10`
`11`	`11`	`impl TaskObject {`
`12`	`12`	`pub fn new(completed: bool, content: String) -> Self {`
`13`		`- Object::new(&[("completed", &completed), ("content", &content)])`
	`13`	`+ Object::builder()`
	`14`	`+ .property("completed", completed)`
	`15`	`+ .property("content", content)`
	`16`	`+ .build()`
`14`	`17`	`}`
`15`	`18`	`}`
`16`	`19`	`// ANCHOR_END: glib_wrapper_and_new`