Update kefia example to current version of qmetaobject-rs

Author: iovxw

examples/kefia/0002-Port-to-qmetaobject-rs.patch

@@ -1,13 +1,14 @@
-From 57c46195bbfdabd2aef759b73d914f7ec1d0e45a Mon Sep 17 00:00:00 2001
+From 5c2c980b83a571523206e494313b8c6d6b306aaf Mon Sep 17 00:00:00 2001
 From: Olivier Goffart <[email protected]>
 Date: Mon, 4 Jun 2018 18:00:30 +0200
 Subject: [PATCH 2/2] Port to qmetaobject-rs
 
 ---
- Cargo.toml  |   2 +-
- src/main.rs |   3 +-
- src/view.rs | 180 +++++++++++++++++++++++++++-------------------------
- 3 files changed, 95 insertions(+), 90 deletions(-)
+ Cargo.toml   |   2 +-
+ src/main.rs  |   2 +-
+ src/view.qml |   2 +-
+ src/view.rs  | 163 +++++++++++++++++++++++----------------------------
+ 4 files changed, 77 insertions(+), 92 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
 index 63740d2..7a03132 100644
@@ -20,21 +21,33 @@ index 63740d2..7a03132 100644
 -qml = "0.0.9"
 +qmetaobject = { path = "../qmetaobject-rs/qmetaobject/"}
 diff --git a/src/main.rs b/src/main.rs
-index d540594..c58c7e1 100644
+index d540594..e32654f 100644
 --- a/src/main.rs
 +++ b/src/main.rs
-@@ -1,7 +1,8 @@
+@@ -1,7 +1,7 @@
  extern crate regex;
  #[macro_use]
 -extern crate qml;
  extern crate lazysort;
-+#[macro_use]
 +extern crate qmetaobject;
 
  use lazysort::*;
 
+diff --git a/src/view.qml b/src/view.qml
+index 94202a4..74be2e6 100644
+--- a/src/view.qml
++++ b/src/view.qml
+@@ -121,7 +121,7 @@ ApplicationWindow {
+         Layout.row: 2
+         ListView {
+           id: mainList
+-          model: packages
++          model: qpkgs.list
+           delegate:
+             Rectangle {
+               width: mainList.width
 diff --git a/src/view.rs b/src/view.rs
-index 162d6ab..5a53c18 100644
+index 162d6ab..c0ad025 100644
 --- a/src/view.rs
 +++ b/src/view.rs
 @@ -1,14 +1,15 @@
@@ -48,8 +61,9 @@ index 162d6ab..5a53c18 100644
 
  pub fn show(gathered: Vec<Package>) {
      let mut engine = QmlEngine::new();
-     let list = form_list(&gathered);
+-    let list = form_list(&gathered);
 -    let qvar: QVariant = list.get_qvar();
++    let list = std::cell::RefCell::new(form_list(&gathered));
 
 -    let mut repos = gathered.iter().map(|p| p.group.clone()).collect::<Vec<_>>();
 +    let mut repos = gathered.iter().map(|p| p.group.clone().into()).collect::<Vec<String>>();
@@ -76,26 +90,22 @@ index 162d6ab..5a53c18 100644
 +        .collect::<QVariantList>();
 
 -    let qpckgs = QPackages::new(Packages {
-+    let mut qpckgs = Packages {
++    let qpckgs = QObjectBox::new(Packages {
          vec: gathered,
          list: list,
          repos: repos,
-@@ -35,42 +36,50 @@ pub fn show(gathered: Vec<Package>) {
+@@ -35,42 +36,31 @@ pub fn show(gathered: Vec<Package>) {
          chosen_repo: -1,
          chosen_group: -1,
          selected: SelectedPackages::new(),
--    });
++        ..Default::default()
+     });
 -    engine.set_property("packages", &qvar);
 -    engine.set_and_store_property("qpkgs", qpckgs.get_qobj());
 -    engine.set_and_store_property("repos", qrepos);
 -    engine.set_and_store_property("groups", qgroups);
 -    engine.load_data(include_str!("view.qml"));
-+        ..Default::default()
-+    };
-+    unsafe {
-+        engine.set_object_property("packages".into(), &mut qpckgs.list);
-+        engine.set_object_property("qpkgs".into(), &mut qpckgs);
-+    }
++    engine.set_object_property("qpkgs".into(), qpckgs.pinned());
 +    engine.set_property("repos".into(), qrepos.into());
 +    engine.set_property("groups".into(), qgroups.into());
 +    engine.load_data(include_str!("view.qml").into());
@@ -111,33 +121,21 @@ index 162d6ab..5a53c18 100644
 -        group: String,
 -        selected: bool
 -    }
-+#[derive(Default, Clone)]
++#[derive(Default, Clone, SimpleListItem)]
 +pub struct QPackage {
-+    name: QString,
-+    version: QString,
-+    repo: QString,
-+    group: QString,
-+    selected: bool
++    pub name: QString,
++    pub version: QString,
++    pub repo: QString,
++    pub group: QString,
++    pub selected: bool
  }
 
 -fn form_list(gathered: &[Package]) -> QPackageList {
 -    let mut qalm = QPackageList::new();
 -    qalm.set_data(filter_for_qml(gathered, &|_| true, None));
 -    qalm
-+impl qmetaobject::listmodel::SimpleListItem for QPackage {
-+    fn get(&self, idx : i32) -> QVariant {
-+        match idx {
-+            0 => self.name.clone().into(),
-+            1 => self.version.clone().into(),
-+            2 => self.repo.clone().into(),
-+            3 => self.group.clone().into(),
-+            4 => self.selected.into(),
-+            _ => QVariant::default()
-+        }
-+    }
-+    fn names() -> Vec<QByteArray> {
-+        vec![ "name".into(), "version".into(), "repo".into(), "group".into(), "selected".into() ]
-+    }
++fn form_list(gathered: &[Package]) -> qmetaobject::listmodel::SimpleListModel<QPackage> {
++    filter_for_qml(gathered, &|_| true, None).iter().collect()
  }
 
 -pub struct Packages {
@@ -148,16 +146,13 @@ index 162d6ab..5a53c18 100644
 -    chosen_repo: i32,
 -    chosen_group: i32,
 -    selected: SelectedPackages,
-+fn form_list(gathered: &[Package]) -> qmetaobject::listmodel::SimpleListModel<QPackage> {
-+    filter_for_qml(gathered, &|_| true, None).iter().collect()
- }
+-}
 
-+
 +#[derive(Default)]
  pub struct SelectedPackages {
      vec: Vec<Package>,
  }
-@@ -78,7 +87,7 @@ pub struct SelectedPackages {
+@@ -78,7 +68,7 @@ pub struct SelectedPackages {
  fn filter_for_qml(vec: &[Package],
                    filter: &Fn(&&Package) -> bool,
                    selecteds: Option<&SelectedPackages>)
@@ -166,7 +161,7 @@ index 162d6ab..5a53c18 100644
      vec.into_iter()
          .filter(filter)
          .map(|pkg| {
-@@ -91,36 +100,60 @@ fn filter_for_qml(vec: &[Package],
+@@ -91,36 +81,60 @@ fn filter_for_qml(vec: &[Package],
              } else {
                  false
              };
@@ -197,7 +192,6 @@ index 162d6ab..5a53c18 100644
 +#[derive(Default, QObject)]
 +pub struct Packages {
 +    vec: Vec<Package>,
-+    list: qmetaobject::listmodel::SimpleListModel<QPackage>,
 +    repos: Vec<String>,
 +    groups: Vec<String>,
 +    chosen_repo: i32,
@@ -208,6 +202,7 @@ index 162d6ab..5a53c18 100644
 -    fn request_update_repo(&mut self, r: i32) -> Option<&QVariant> {
 +
 +    base: qt_base_class!(trait QObject),
++    list: qt_property!(std::cell::RefCell<qmetaobject::listmodel::SimpleListModel<QPackage>>; CONST),
 +    notify_packages_changed: qt_signal!(text: QString),
 +    request_update_repo: qt_method!( fn request_update_repo(&mut self, r: i32)  {
          self.chosen_repo = r;
@@ -224,20 +219,20 @@ index 162d6ab..5a53c18 100644
 -    }
 +    }),
 +    add_package: qt_method!(fn add_package(&mut self, index: i32) {
-+        let mut pkg_in_list = self.list[index as usize].clone();
++        let mut pkg_in_list = self.list.borrow()[index as usize].clone();
 +        let pkg = self.vec.iter().find(|pkg| pkg_in_list.name.to_string() == pkg.name).unwrap().clone();
 +        self.selected.add_package(pkg);
 +        pkg_in_list.selected = true;
-+        self.list.change_line(index as usize, pkg_in_list);
++        self.list.borrow_mut().change_line(index as usize, pkg_in_list);
 +        let c = self.selected.get_text();
 +        self.notify_packages_changed(c);
 +    }),
 +    remove_package: qt_method!(fn remove_package(&mut self, index: i32) {
-+        let mut pkg_in_list = self.list[index as usize].clone();
++        let mut pkg_in_list = self.list.borrow()[index as usize].clone();
 +        let pkg = self.vec.iter().find(|pkg| pkg_in_list.name.to_string() == pkg.name).unwrap().clone();
 +        self.selected.remove_package(pkg);
 +        pkg_in_list.selected = false;
-+        self.list.change_line(index as usize, pkg_in_list);
++        self.list.borrow_mut().change_line(index as usize, pkg_in_list);
 +        let c = self.selected.get_text();
 +        self.notify_packages_changed(c);
 +    }),
@@ -248,7 +243,7 @@ index 162d6ab..5a53c18 100644
 
      fn decide_and_update(&mut self) {
          let data = {
-@@ -139,38 +172,9 @@ impl QPackages {
+@@ -139,38 +153,9 @@ impl QPackages {
              let selected = Some(&self.selected);
              filter_for_qml(&self.vec, closure.as_ref(), selected)
          };
@@ -268,7 +263,7 @@ index 162d6ab..5a53c18 100644
 -        self.selected.add_package(pkg);
 -        self.notify_packages_changed(self.selected.get_text());
 -        None
-+        self.list.reset_data(data);
++        self.list.borrow_mut().reset_data(data);
      }
 
 -    fn remove_package(&mut self, index: i32) -> Option<&QVariant> {
@@ -288,7 +283,7 @@ index 162d6ab..5a53c18 100644
  }
 
  impl SelectedPackages {
-@@ -186,7 +190,7 @@ impl SelectedPackages {
+@@ -186,7 +171,7 @@ impl SelectedPackages {
          self.vec.retain(|p| p.name != package.name);
      }
 
@@ -299,5 +294,5 @@ index 162d6ab..5a53c18 100644
      }
  }
 -- 
-2.17.1
+2.21.0