Merge pull request #715 from sdroege/no-more-from-instance

Replace `Foo::from_instance(foo)` with `foo.imp()`

Author: sdroege

examples/basic_subclass/simple_application/imp.rs

@@ -29,8 +29,8 @@ impl ApplicationImpl for SimpleApplication {
     /// aksed to present itself.
     fn activate(&self, app: &Self::Type) {
         let app = app.downcast_ref::<super::SimpleApplication>().unwrap();
-        let priv_ = SimpleApplication::from_instance(app);
-        let window = priv_
+        let imp = app.imp();
+        let window = imp
             .window
             .get()
             .expect("Should always be initiliazed in gio_application_startup");
@@ -49,10 +49,9 @@ impl ApplicationImpl for SimpleApplication {
         self.parent_startup(app);
 
         let app = app.downcast_ref::<super::SimpleApplication>().unwrap();
-        let priv_ = SimpleApplication::from_instance(app);
+        let imp = app.imp();
         let window = SimpleWindow::new(app);
-        priv_
-            .window
+        imp.window
             .set(window)
             .expect("Failed to initialize application window");
     }

examples/basic_subclass/simple_window/imp.rs

@@ -41,8 +41,8 @@ impl ObjectImpl for SimpleWindow {
         // Connect our method `on_increment_clicked` to be called
         // when the increment button is clicked.
         increment.connect_clicked(clone!(@weak obj => move |_| {
-            let priv_ = SimpleWindow::from_instance(&obj);
-            priv_.on_increment_clicked();
+            let imp = obj.imp();
+            imp.on_increment_clicked();
         }));
 
         obj.add(&label);

examples/composite_template/example_application_window/mod.rs

@@ -18,9 +18,8 @@ impl ExampleApplicationWindow {
     fn init_label(&self) {
         // To access fields such as template children, you must get
         // the private struct.
-        let self_ = imp::ExampleApplicationWindow::from_instance(self);
-        self_
-            .subtitle
+        let imp = self.imp();
+        imp.subtitle
             .set_text("This is an example window made using composite templates");
     }
 }

examples/list_box_model/model/mod.rs

@@ -19,12 +19,12 @@ impl Model {
     }
 
     pub fn append(&self, obj: &RowData) {
-        let self_ = imp::Model::from_instance(self);
+        let imp = self.imp();
         let index = {
             // Borrow the data only once and ensure the borrow guard is dropped
             // before we emit the items_changed signal because the view
             // could call get_item / get_n_item from the signal handler to update its state
-            let mut data = self_.0.borrow_mut();
+            let mut data = imp.0.borrow_mut();
             data.push(obj.clone());
             data.len() - 1
         };
@@ -33,8 +33,8 @@ impl Model {
     }
 
     pub fn remove(&self, index: u32) {
-        let self_ = imp::Model::from_instance(self);
-        self_.0.borrow_mut().remove(index as usize);
+        let imp = self.imp();
+        imp.0.borrow_mut().remove(index as usize);
         // Emits a signal that 1 item was removed, 0 added at the position index
         self.items_changed(index, 1, 0);
     }