Skip to content

Commit 88224d9

Browse files
sdroegebilelmoussaoui
sdroege
authored and
bilelmoussaoui
committed
Move from imp.instance() to imp.obj()
It's doing the same thing and is shorter.
1 parent dd4d418 commit 88224d9

File tree

93 files changed

+410
-909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+410
-909
lines changed

‎book/listings/actions/5/window/imp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl ObjectImpl for Window {
3636
self.parent_constructed();
3737

3838
// Add actions
39-
self.instance().setup_actions();
39+
self.obj().setup_actions();
4040
}
4141
}
4242
// ANCHOR_END: object_impl

‎book/listings/actions/6/window/imp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl ObjectImpl for Window {
4040
self.parent_constructed();
4141

4242
// Add actions
43-
self.instance().setup_actions();
43+
self.obj().setup_actions();
4444
}
4545
}
4646
// ANCHOR_END: object_impl

‎book/listings/actions/7/window/imp.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ impl ObjectImpl for Window {
4545
self.parent_constructed();
4646

4747
// Setup
48-
let instance = self.instance();
49-
instance.setup_settings();
50-
instance.setup_actions();
51-
instance.bind_settings();
48+
let obj = self.obj();
49+
obj.setup_settings();
50+
obj.setup_actions();
51+
obj.bind_settings();
5252
}
5353
}
5454
// ANCHOR_END: object_impl

‎book/listings/g_object_properties/4/custom_button/imp.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ impl ObjectImpl for CustomButton {
5252

5353
// Bind label to number
5454
// `SYNC_CREATE` ensures that the label will be immediately set
55-
let instance = self.instance();
56-
instance
57-
.bind_property("number", &*instance, "label")
55+
let obj = self.obj();
56+
obj.bind_property("number", obj.as_ref(), "label")
5857
.flags(BindingFlags::SYNC_CREATE)
5958
.build();
6059
}
@@ -69,7 +68,7 @@ impl WidgetImpl for CustomButton {}
6968
impl ButtonImpl for CustomButton {
7069
fn clicked(&self) {
7170
let incremented_number = self.number.get() + 1;
72-
self.instance().set_property("number", &incremented_number);
71+
self.obj().set_property("number", &incremented_number);
7372
}
7473
}
7574
// ANCHOR_END: button_impl

‎book/listings/g_object_signals/2/custom_button/imp.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ impl ObjectImpl for CustomButton {
6363

6464
// Bind label to number
6565
// `SYNC_CREATE` ensures that the label will be immediately set
66-
let instance = self.instance();
67-
instance
68-
.bind_property("number", &*instance, "label")
66+
let obj = self.obj();
67+
obj.bind_property("number", obj.as_ref(), "label")
6968
.flags(BindingFlags::SYNC_CREATE)
7069
.build();
7170
}
@@ -81,14 +80,14 @@ static MAX_NUMBER: i32 = 8;
8180
impl ButtonImpl for CustomButton {
8281
fn clicked(&self) {
8382
let incremented_number = self.number.get() + 1;
84-
let instance = self.instance();
83+
let obj = self.obj();
8584
// If `number` reached `MAX_NUMBER`,
8685
// emit "max-number-reached" signal and set `number` back to 0
8786
if incremented_number == MAX_NUMBER {
88-
instance.emit_by_name::<()>("max-number-reached", &[&incremented_number]);
89-
instance.set_property("number", &0);
87+
obj.emit_by_name::<()>("max-number-reached", &[&incremented_number]);
88+
obj.set_property("number", &0);
9089
} else {
91-
instance.set_property("number", &incremented_number);
90+
obj.set_property("number", &incremented_number);
9291
}
9392
}
9493
}

‎book/listings/g_object_subclassing/2/custom_button/imp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl ObjectSubclass for CustomButton {
2222
impl ObjectImpl for CustomButton {
2323
fn constructed(&self) {
2424
self.parent_constructed();
25-
self.instance().set_label(&self.number.get().to_string());
25+
self.obj().set_label(&self.number.get().to_string());
2626
}
2727
}
2828

@@ -33,6 +33,6 @@ impl WidgetImpl for CustomButton {}
3333
impl ButtonImpl for CustomButton {
3434
fn clicked(&self) {
3535
self.number.set(self.number.get() + 1);
36-
self.instance().set_label(&self.number.get().to_string())
36+
self.obj().set_label(&self.number.get().to_string())
3737
}
3838
}

‎book/listings/saving_window_state/1/custom_window/imp.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ impl ObjectImpl for Window {
2020
fn constructed(&self) {
2121
self.parent_constructed();
2222
// Load latest window state
23-
let instance = self.instance();
24-
instance.setup_settings();
25-
instance.load_window_size();
23+
let obj = self.obj();
24+
obj.setup_settings();
25+
obj.load_window_size();
2626
}
2727
}
2828
impl WidgetImpl for Window {}
2929
impl WindowImpl for Window {
3030
// Save window state right before the window will be closed
3131
fn close_request(&self) -> Inhibit {
3232
// Save window size
33-
self.instance()
33+
self.obj()
3434
.save_window_size()
3535
.expect("Failed to save window state");
3636

‎book/listings/todo/1/window/imp.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ impl ObjectImpl for Window {
4343
self.parent_constructed();
4444

4545
// Setup
46-
let instance = self.instance();
47-
instance.setup_tasks();
48-
instance.setup_callbacks();
49-
instance.setup_factory();
46+
let obj = self.obj();
47+
obj.setup_tasks();
48+
obj.setup_callbacks();
49+
obj.setup_factory();
5050
}
5151
}
5252
// ANCHOR_END: constructed

‎book/listings/todo/2/window/imp.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ impl ObjectImpl for Window {
5252
self.parent_constructed();
5353

5454
// Setup
55-
let instance = self.instance();
56-
instance.setup_settings();
57-
instance.setup_tasks();
58-
instance.restore_data();
59-
instance.setup_callbacks();
60-
instance.setup_factory();
61-
instance.setup_actions();
55+
let obj = self.obj();
56+
obj.setup_settings();
57+
obj.setup_tasks();
58+
obj.restore_data();
59+
obj.setup_callbacks();
60+
obj.setup_factory();
61+
obj.setup_actions();
6262
}
6363
}
6464
// ANCHOR_END: object_impl
@@ -72,7 +72,7 @@ impl WindowImpl for Window {
7272
fn close_request(&self) -> Inhibit {
7373
// Store task data in vector
7474
let backup_data: Vec<TaskData> = self
75-
.instance()
75+
.obj()
7676
.tasks()
7777
.snapshot()
7878
.iter()

‎book/listings/todo/3/window/imp.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ impl ObjectImpl for Window {
4949
self.parent_constructed();
5050

5151
// Setup
52-
let instance = self.instance();
53-
instance.setup_settings();
54-
instance.setup_tasks();
55-
instance.restore_data();
56-
instance.setup_callbacks();
57-
instance.setup_factory();
58-
instance.setup_actions();
52+
let obj = self.obj();
53+
obj.setup_settings();
54+
obj.setup_tasks();
55+
obj.restore_data();
56+
obj.setup_callbacks();
57+
obj.setup_factory();
58+
obj.setup_actions();
5959
}
6060
}
6161

@@ -67,7 +67,7 @@ impl WindowImpl for Window {
6767
fn close_request(&self) -> Inhibit {
6868
// Store task data in vector
6969
let backup_data: Vec<TaskData> = self
70-
.instance()
70+
.obj()
7171
.tasks()
7272
.snapshot()
7373
.iter()

‎book/listings/todo/4/window/imp.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ impl ObjectImpl for Window {
4949
self.parent_constructed();
5050

5151
// Setup
52-
let instance = self.instance();
53-
instance.setup_settings();
54-
instance.setup_tasks();
55-
instance.restore_data();
56-
instance.setup_callbacks();
57-
instance.setup_factory();
58-
instance.setup_actions();
52+
let obj = self.obj();
53+
obj.setup_settings();
54+
obj.setup_tasks();
55+
obj.restore_data();
56+
obj.setup_callbacks();
57+
obj.setup_factory();
58+
obj.setup_actions();
5959
}
6060
}
6161

@@ -67,7 +67,7 @@ impl WindowImpl for Window {
6767
fn close_request(&self) -> Inhibit {
6868
// Store task data in vector
6969
let backup_data: Vec<TaskData> = self
70-
.instance()
70+
.obj()
7171
.tasks()
7272
.snapshot()
7373
.iter()

‎book/listings/todo/5/window/imp.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ impl ObjectImpl for Window {
4949
self.parent_constructed();
5050

5151
// Setup
52-
let instance = self.instance();
53-
instance.setup_settings();
54-
instance.setup_tasks();
55-
instance.restore_data();
56-
instance.setup_callbacks();
57-
instance.setup_factory();
58-
instance.setup_actions();
52+
let obj = self.obj();
53+
obj.setup_settings();
54+
obj.setup_tasks();
55+
obj.restore_data();
56+
obj.setup_callbacks();
57+
obj.setup_factory();
58+
obj.setup_actions();
5959
}
6060
}
6161

@@ -67,7 +67,7 @@ impl WindowImpl for Window {
6767
fn close_request(&self) -> Inhibit {
6868
// Store task data in vector
6969
let backup_data: Vec<TaskData> = self
70-
.instance()
70+
.obj()
7171
.tasks()
7272
.snapshot()
7373
.iter()

‎book/listings/todo/6/window/imp.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ impl ObjectImpl for Window {
5252
self.parent_constructed();
5353

5454
// Setup
55-
let instance = self.instance();
56-
instance.setup_settings();
57-
instance.setup_tasks();
58-
instance.restore_data();
59-
instance.setup_callbacks();
60-
instance.setup_actions();
55+
let obj = self.obj();
56+
obj.setup_settings();
57+
obj.setup_tasks();
58+
obj.restore_data();
59+
obj.setup_callbacks();
60+
obj.setup_actions();
6161
}
6262
}
6363

@@ -69,7 +69,7 @@ impl WindowImpl for Window {
6969
fn close_request(&self) -> Inhibit {
7070
// Store task data in vector
7171
let backup_data: Vec<TaskData> = self
72-
.instance()
72+
.obj()
7373
.tasks()
7474
.snapshot()
7575
.iter()

‎book/listings/todo/7/window/imp.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ impl ObjectImpl for Window {
5353
self.parent_constructed();
5454

5555
// Setup
56-
let instance = self.instance();
57-
instance.setup_settings();
58-
instance.setup_tasks();
59-
instance.restore_data();
60-
instance.setup_callbacks();
61-
instance.setup_actions();
56+
let obj = self.obj();
57+
obj.setup_settings();
58+
obj.setup_tasks();
59+
obj.restore_data();
60+
obj.setup_callbacks();
61+
obj.setup_actions();
6262
}
6363
}
6464

@@ -70,7 +70,7 @@ impl WindowImpl for Window {
7070
fn close_request(&self) -> Inhibit {
7171
// Store task data in vector
7272
let backup_data: Vec<TaskData> = self
73-
.instance()
73+
.obj()
7474
.tasks()
7575
.snapshot()
7676
.iter()

‎book/listings/todo/8/window/imp.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ impl ObjectImpl for Window {
6767
self.parent_constructed();
6868

6969
// Setup
70-
let instance = self.instance();
71-
instance.setup_settings();
72-
instance.setup_collections();
73-
instance.restore_data();
74-
instance.setup_callbacks();
75-
instance.setup_actions();
70+
let obj = self.obj();
71+
obj.setup_settings();
72+
obj.setup_collections();
73+
obj.restore_data();
74+
obj.setup_callbacks();
75+
obj.setup_actions();
7676
}
7777
}
7878
// ANCHOR_END: object_impl
@@ -86,7 +86,7 @@ impl WindowImpl for Window {
8686
fn close_request(&self) -> Inhibit {
8787
// Store task data in vector
8888
let backup_data: Vec<CollectionData> = self
89-
.instance()
89+
.obj()
9090
.collections()
9191
.snapshot()
9292
.iter()

‎examples/composite_template/ex_application_window/imp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl UtilityCallbacks {
7878

7979
impl ObjectImpl for ExApplicationWindow {
8080
fn constructed(&self) {
81-
self.instance().init_label();
81+
self.obj().init_label();
8282
self.parent_constructed();
8383
}
8484
}

‎examples/composite_template/ex_menu_button/imp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl ObjectImpl for ExMenuButton {
4646
// Here you need to unparent all direct children
4747
// of your template.
4848
fn dispose(&self) {
49-
while let Some(child) = self.instance().first_child() {
49+
while let Some(child) = self.obj().first_child() {
5050
child.unparent();
5151
}
5252
}

‎examples/custom_application/ex_application/imp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl ObjectImpl for ExApplication {}
1717
impl ApplicationImpl for ExApplication {
1818
fn activate(&self) {
1919
// We create our window at activation stage
20-
let window = gtk::ApplicationWindow::new(&*self.instance());
20+
let window = gtk::ApplicationWindow::new(&*self.obj());
2121
window.set_default_size(600, 350);
2222
window.set_title(Some("Application Subclass"));
2323

‎examples/custom_buildable/custom_buildable/imp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl ObjectImpl for CustomBuildable {
3737
// Here you need to unparent all direct children
3838
// of your template.
3939
fn dispose(&self) {
40-
while let Some(child) = self.instance().first_child() {
40+
while let Some(child) = self.obj().first_child() {
4141
child.unparent();
4242
}
4343
}
@@ -47,7 +47,7 @@ impl WidgetImpl for CustomBuildable {}
4747

4848
impl BuildableImpl for CustomBuildable {
4949
fn add_child(&self, builder: &gtk::Builder, child: &glib::Object, type_: Option<&str>) {
50-
let buildable = self.instance();
50+
let buildable = self.obj();
5151
// We first check if the main child `box_` has already been bound.
5252
if !self.box_.is_bound() {
5353
self.parent_add_child(builder, child, type_);

0 commit comments

Comments
 (0)