refactor: prefer using iter over into_iter for ListModel

SeaDve · Feb 16, 2024 · 315c5ca · 315c5ca
1 parent bf42a5b
commit 315c5ca
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/src/preferences_dialog.rs b/src/preferences_dialog.rs
@@ -241,18 +241,13 @@ impl PreferencesDialog {
         let settings = self.settings();
         let active_profile = settings.profile();
 
-        let position = imp
-            .profile_row
-            .model()
-            .unwrap()
-            .into_iter()
-            .position(
-                |item| match (profile_from_obj(&item.unwrap()), &active_profile) {
-                    (Some(profile), Some(active_profile)) => profile.id() == active_profile.id(),
-                    (None, None) => true,
-                    _ => false,
-                },
-            );
+        let position = imp.profile_row.model().unwrap().iter().position(|item| {
+            match (profile_from_obj(&item.unwrap()), &active_profile) {
+                (Some(profile), Some(active_profile)) => profile.id() == active_profile.id(),
+                (None, None) => true,
+                _ => false,
+            }
+        });
         if let Some(position) = position {
             imp.profile_row.set_selected(position as u32);
         } else {
@@ -273,13 +268,10 @@ impl PreferencesDialog {
             .framerate_row
             .model()
             .unwrap()
-            .into_iter()
+            .iter::<BoxedAnyObject>()
             .position(|item| {
                 let item = item.unwrap();
-                let o = item
-                    .downcast_ref::<BoxedAnyObject>()
-                    .unwrap()
-                    .borrow::<FramerateOption>();
+                let o = item.borrow::<FramerateOption>();
                 *o == framerate_option
             });
         if let Some(position) = position {