Skip to content

Commit 9c206dd

Browse files
sdroegesdroege
committed
Stop usage of deprecated constructor functions
1 parent 8a983b0 commit 9c206dd

File tree

9 files changed

+69
-73
lines changed

9 files changed

+69
-73
lines changed

‎gio/src/subclass/application.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,10 @@ mod tests {
462462

463463
#[test]
464464
fn test_simple_application() {
465-
let app = glib::Object::new::<SimpleApplication>(&[
466-
("application-id", &"org.gtk-rs.SimpleApplication"),
467-
("flags", &crate::ApplicationFlags::empty()),
468-
])
469-
.upcast::<crate::Application>();
465+
let app = glib::Object::builder::<SimpleApplication>()
466+
.property("application-id", "org.gtk-rs.SimpleApplication")
467+
.property("flags", crate::ApplicationFlags::empty())
468+
.build();
470469

471470
app.set_inactivity_timeout(10000);
472471

‎gio/src/subclass/async_initable.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ mod tests {
227227
#[allow(clippy::new_without_default)]
228228
impl AsyncInitableTestType {
229229
pub async fn new() -> Self {
230-
AsyncInitable::new_future(&[], glib::PRIORITY_DEFAULT)
230+
AsyncInitable::new_default_future(glib::PRIORITY_DEFAULT)
231231
.await
232232
.expect("Failed creation/initialization of AsyncInitableTestType object")
233233
}
@@ -276,21 +276,19 @@ mod tests {
276276
fn test_async_initable_new_failure() {
277277
glib::MainContext::new().block_on(async {
278278
let value: u32 = 2;
279-
let _ = AsyncInitable::new_future::<AsyncInitableTestType>(
280-
&[("invalid-property", &value)],
281-
glib::PRIORITY_DEFAULT,
282-
)
283-
.await;
279+
let _ = AsyncInitable::builder::<AsyncInitableTestType>()
280+
.property("invalid-property", value)
281+
.build_future(glib::PRIORITY_DEFAULT)
282+
.await;
284283
unreachable!();
285284
});
286285
}
287286

288287
#[test]
289288
fn test_async_initable_with_initable_with_type() {
290289
glib::MainContext::new().block_on(async {
291-
let test = AsyncInitable::with_type_future(
290+
let test = AsyncInitable::new_default_with_type_future(
292291
AsyncInitableTestType::static_type(),
293-
&[],
294292
glib::PRIORITY_DEFAULT,
295293
)
296294
.await
@@ -304,9 +302,8 @@ mod tests {
304302
#[test]
305303
fn test_async_initable_with_async_initable_with_values() {
306304
glib::MainContext::new().block_on(async {
307-
let test = AsyncInitable::with_values_future(
305+
let test = AsyncInitable::new_default_with_type_future(
308306
AsyncInitableTestType::static_type(),
309-
&[],
310307
glib::PRIORITY_DEFAULT,
311308
)
312309
.await

‎gio/src/subclass/initable.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ mod tests {
124124
#[allow(clippy::new_without_default)]
125125
impl InitableTestType {
126126
pub fn new() -> Self {
127-
Initable::new(&[], Option::<&Cancellable>::None)
127+
Initable::new_default(Option::<&Cancellable>::None)
128128
.expect("Failed creation/initialization of InitableTestType object")
129129
}
130130

@@ -175,9 +175,8 @@ mod tests {
175175

176176
#[test]
177177
fn test_initable_with_initable_with_type() {
178-
let test = Initable::with_type(
178+
let test = Initable::new_default_with_type(
179179
InitableTestType::static_type(),
180-
&[],
181180
Option::<&Cancellable>::None,
182181
)
183182
.expect("Failed creation/initialization of InitableTestType object from type")
@@ -188,9 +187,8 @@ mod tests {
188187

189188
#[test]
190189
fn test_initable_with_initable_with_values() {
191-
let test = Initable::with_values(
190+
let test = Initable::new_default_with_type(
192191
InitableTestType::static_type(),
193-
&[],
194192
Option::<&Cancellable>::None,
195193
)
196194
.expect("Failed creation/initialization of InitableTestType object from values")

‎gio/src/subclass/input_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ mod tests {
313313

314314
#[test]
315315
fn test_simple_stream() {
316-
let stream = glib::Object::new::<SimpleInputStream>(&[]);
316+
let stream = glib::Object::new_default::<SimpleInputStream>();
317317

318318
let mut buf = [0; 16];
319319
assert_eq!(stream.read(&mut buf, crate::Cancellable::NONE), Ok(16));

‎gio/src/subclass/output_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ mod tests {
338338

339339
#[test]
340340
fn test_simple_stream() {
341-
let stream = glib::Object::new::<SimpleOutputStream>(&[]);
341+
let stream = glib::Object::new_default::<SimpleOutputStream>();
342342

343343
assert_eq!(*stream.imp().sum.borrow(), 0);
344344
assert_eq!(

‎glib-macros/tests/test.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ fn closure() {
517517
assert_eq!(concat_str.invoke::<String>(&[&"Hello"]), "Hello World");
518518

519519
let weak_test = {
520-
let obj = glib::Object::new::<glib::Object>(&[]);
520+
let obj = glib::Object::new_default::<glib::Object>();
521521

522522
assert_eq!(obj.ref_count(), 1);
523523
let weak_test = glib::closure_local!(@watch obj => move || obj.ref_count());
@@ -541,7 +541,7 @@ fn closure() {
541541
}
542542
}
543543

544-
let obj = glib::Object::new::<glib::Object>(&[]);
544+
let obj = glib::Object::new_default::<glib::Object>();
545545
assert_eq!(obj.ref_count_in_closure(), 2);
546546
}
547547

@@ -559,13 +559,13 @@ fn closure() {
559559
}
560560

561561
let a = A {
562-
obj: glib::Object::new::<glib::Object>(&[]),
562+
obj: glib::Object::new_default::<glib::Object>(),
563563
};
564564
assert_eq!(a.ref_count_in_closure(), 2);
565565
}
566566

567567
let strong_test = {
568-
let obj = glib::Object::new::<glib::Object>(&[]);
568+
let obj = glib::Object::new_default::<glib::Object>();
569569

570570
let strong_test = glib::closure_local!(@strong obj => move || obj.ref_count());
571571
assert_eq!(strong_test.invoke::<u32>(&[]), 2);
@@ -575,7 +575,7 @@ fn closure() {
575575
assert_eq!(strong_test.invoke::<u32>(&[]), 1);
576576

577577
let weak_none_test = {
578-
let obj = glib::Object::new::<glib::Object>(&[]);
578+
let obj = glib::Object::new_default::<glib::Object>();
579579

580580
let weak_none_test = glib::closure_local!(@weak-allow-none obj => move || {
581581
obj.map(|o| o.ref_count()).unwrap_or_default()
@@ -587,8 +587,8 @@ fn closure() {
587587
assert_eq!(weak_none_test.invoke::<u32>(&[]), 0);
588588

589589
{
590-
let obj1 = glib::Object::new::<glib::Object>(&[]);
591-
let obj2 = glib::Object::new::<glib::Object>(&[]);
590+
let obj1 = glib::Object::new_default::<glib::Object>();
591+
let obj2 = glib::Object::new_default::<glib::Object>();
592592

593593
let obj_arg_test =
594594
glib::closure!(|a: glib::Object, b: glib::Object| { a.ref_count() + b.ref_count() });
@@ -606,7 +606,7 @@ fn closure() {
606606
a: glib::Object,
607607
}
608608

609-
let a = glib::Object::new::<glib::Object>(&[]);
609+
let a = glib::Object::new_default::<glib::Object>();
610610
let a_struct = A { a };
611611
let struct_test = glib::closure_local!(@strong a_struct.a as a => move || {
612612
a.ref_count()
@@ -639,7 +639,7 @@ fn closure() {
639639
}
640640

641641
let cast_test = {
642-
let f = glib::Object::new::<Foo>(&[]);
642+
let f = glib::Object::new_default::<Foo>();
643643

644644
assert_eq!(f.my_ref_count(), 1);
645645
let cast_test = glib::closure_local!(@watch f => move || f.my_ref_count());
@@ -684,7 +684,7 @@ fn closure() {
684684
}
685685

686686
let inc_by = {
687-
let obj = glib::Object::new::<SendObject>(&[]);
687+
let obj = glib::Object::new_default::<SendObject>();
688688
let inc_by = glib::closure!(@watch obj => move |x: i32| {
689689
let old = obj.value();
690690
obj.set_value(x + old);

‎glib/src/gobject/signal_group.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ mod tests {
170170
fn group_emit() {
171171
let group = SignalGroup::new(SignalObject::static_type());
172172

173-
let obj = Object::new::<SignalObject>(&[]);
173+
let obj = Object::new_default::<SignalObject>();
174174
let store = Rc::new(RefCell::new(String::new()));
175175
group.connect_closure(
176176
"sig-with-args",

‎glib/src/subclass/object.rs

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ mod test {
394394
#[test]
395395
fn test_create() {
396396
let type_ = SimpleObject::static_type();
397-
let obj = Object::with_type(type_, &[]);
397+
let obj = Object::new_default_with_type(type_);
398398

399399
assert!(obj.type_().is_a(Dummy::static_type()));
400400

@@ -417,7 +417,7 @@ mod test {
417417
#[test]
418418
fn test_properties() {
419419
let type_ = SimpleObject::static_type();
420-
let obj = Object::with_type(type_, &[]);
420+
let obj = Object::new_default_with_type(type_);
421421

422422
assert!(obj.type_().is_a(Dummy::static_type()));
423423

@@ -453,10 +453,10 @@ mod test {
453453

454454
#[test]
455455
fn test_set_property() {
456-
let obj = Object::with_type(
457-
SimpleObject::static_type(),
458-
&[("construct-name", &"meh"), ("name", &"initial")],
459-
);
456+
let obj = Object::builder::<SimpleObject>()
457+
.property("construct-name", "meh")
458+
.property("name", "initial")
459+
.build();
460460

461461
assert_eq!(
462462
obj.property::<String>("construct-name"),
@@ -472,74 +472,74 @@ mod test {
472472
obj.set_property("name", &"test");
473473
assert_eq!(obj.property::<String>("name"), String::from("test"));
474474

475-
let child = Object::with_type(ChildObject::static_type(), &[]);
475+
let child = Object::new_default_with_type(ChildObject::static_type());
476476
obj.set_property("child", &child);
477477
}
478478

479479
#[test]
480480
#[should_panic = "property 'construct-name' of type 'SimpleObject' is not writable"]
481481
fn test_set_property_non_writable() {
482-
let obj = Object::with_type(
483-
SimpleObject::static_type(),
484-
&[("construct-name", &"meh"), ("name", &"initial")],
485-
);
482+
let obj = Object::builder::<SimpleObject>()
483+
.property("construct-name", "meh")
484+
.property("name", "initial")
485+
.build();
486486

487487
obj.set_property("construct-name", &"test");
488488
}
489489

490490
#[test]
491491
#[should_panic = "property 'test' of type 'SimpleObject' not found"]
492492
fn test_set_property_not_found() {
493-
let obj = Object::with_type(
494-
SimpleObject::static_type(),
495-
&[("construct-name", &"meh"), ("name", &"initial")],
496-
);
493+
let obj = Object::builder::<SimpleObject>()
494+
.property("construct-name", "meh")
495+
.property("name", "initial")
496+
.build();
497497

498498
obj.set_property("test", &true);
499499
}
500500

501501
#[test]
502502
#[should_panic = "property 'constructed' of type 'SimpleObject' is not writable"]
503503
fn test_set_property_not_writable() {
504-
let obj = Object::with_type(
505-
SimpleObject::static_type(),
506-
&[("construct-name", &"meh"), ("name", &"initial")],
507-
);
504+
let obj = Object::builder::<SimpleObject>()
505+
.property("construct-name", "meh")
506+
.property("name", "initial")
507+
.build();
508508

509509
obj.set_property("constructed", &false);
510510
}
511511

512512
#[test]
513513
#[should_panic = "property 'name' of type 'SimpleObject' can't be set from the given type (expected: 'gchararray', got: 'gboolean')"]
514514
fn test_set_property_wrong_type() {
515-
let obj = Object::with_type(
516-
SimpleObject::static_type(),
517-
&[("construct-name", &"meh"), ("name", &"initial")],
518-
);
515+
let obj = Object::builder::<SimpleObject>()
516+
.property("construct-name", "meh")
517+
.property("name", "initial")
518+
.build();
519519

520520
obj.set_property("name", &false);
521521
}
522522

523523
#[test]
524524
#[should_panic = "property 'child' of type 'SimpleObject' can't be set from the given type (expected: 'ChildObject', got: 'SimpleObject')"]
525525
fn test_set_property_wrong_type_2() {
526-
let obj = Object::with_type(
527-
SimpleObject::static_type(),
528-
&[("construct-name", &"meh"), ("name", &"initial")],
529-
);
526+
let obj = Object::builder::<SimpleObject>()
527+
.property("construct-name", "meh")
528+
.property("name", "initial")
529+
.build();
530530

531-
let other_obj = Object::with_type(SimpleObject::static_type(), &[]);
531+
let other_obj = Object::new_default_with_type(SimpleObject::static_type());
532532

533533
obj.set_property("child", &other_obj);
534534
}
535535

536536
#[test]
537537
#[should_panic = "Can't set construct property 'construct-name' for type 'SimpleObject' twice"]
538538
fn test_construct_property_set_twice() {
539-
Object::with_type(
540-
SimpleObject::static_type(),
541-
&[("construct-name", &"meh"), ("construct-name", &"meh2")],
542-
);
539+
let _obj = Object::builder::<SimpleObject>()
540+
.property("construct-name", "meh")
541+
.property("construct-name", "meh2")
542+
.build();
543543
}
544544

545545
#[test]
@@ -549,8 +549,9 @@ mod test {
549549
Arc,
550550
};
551551

552-
let type_ = SimpleObject::static_type();
553-
let obj = Object::with_type(type_, &[("name", &"old-name")]);
552+
let obj = Object::builder::<SimpleObject>()
553+
.property("name", "old-name")
554+
.build();
554555

555556
let name_changed_triggered = Arc::new(AtomicBool::new(false));
556557
let name_changed_clone = name_changed_triggered.clone();
@@ -576,7 +577,7 @@ mod test {
576577

577578
#[test]
578579
fn test_signal_return_expected_type() {
579-
let obj = Object::with_type(SimpleObject::static_type(), &[]);
580+
let obj = Object::new_default_with_type(SimpleObject::static_type());
580581

581582
obj.connect("create-string", false, move |_args| {
582583
Some("return value".to_value())
@@ -595,8 +596,9 @@ mod test {
595596
Arc,
596597
};
597598

598-
let type_ = SimpleObject::static_type();
599-
let obj = Object::with_type(type_, &[("name", &"old-name")]);
599+
let obj = Object::builder::<SimpleObject>()
600+
.property("name", "old-name")
601+
.build();
600602

601603
let name_changed_triggered = Arc::new(AtomicBool::new(false));
602604
let name_changed_clone = name_changed_triggered.clone();
@@ -613,10 +615,10 @@ mod test {
613615

614616
#[test]
615617
fn test_signal_return_expected_object_type() {
616-
let obj = Object::with_type(SimpleObject::static_type(), &[]);
618+
let obj = Object::new_default_with_type(SimpleObject::static_type());
617619

618620
obj.connect("create-child-object", false, move |_args| {
619-
Some(Object::with_type(ChildObject::static_type(), &[]).to_value())
621+
Some(Object::new_default_with_type(ChildObject::static_type()).to_value())
620622
});
621623
let value: glib::Object = obj.emit_by_name("create-child-object", &[]);
622624
assert!(value.type_().is_a(ChildObject::static_type()));

‎glib/tests/subclass_compiletest/03-object-no-auto-send-sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
fn check<T: Send + Sync>(_obj: &T) {}
33

4-
let obj = glib::Object::new::<glib::Object>(&[]);
4+
let obj = glib::Object::new_default::<glib::Object>();
55
check(&obj);
66
}

0 commit comments

Comments
 (0)