diff --git a/examples/listmodel_macro.rs b/examples/listmodel_macro.rs index 8e9825a6..41e6a684 100644 --- a/examples/listmodel_macro.rs +++ b/examples/listmodel_macro.rs @@ -7,7 +7,13 @@ use qml::*; Q_LISTMODEL!{ pub QTestModel { name: String, - number: i32, + number: i32 + } +} + +Q_LISTMODEL!{ + pub QOneMemberModel { + name: String } } diff --git a/src/macros.rs b/src/macros.rs index bd8fe72f..fc31a110 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -288,7 +288,7 @@ macro_rules! Q_OBJECT{ #[macro_export] macro_rules! Q_LISTMODEL{ (pub $wrapper:ident{ - $($rolename:ident : $roletype:ty,)* + $($rolename:ident : $roletype:ident),* }) => { pub struct $wrapper { qalm: Box>, @@ -322,9 +322,9 @@ macro_rules! Q_LISTMODEL{ /// Sets a specified data for this model #[allow(unused_mut)] - pub fn set_data(&mut self, vec: Vec<($($roletype),*)>) { + pub fn set_data(&mut self, vec: Vec<($($roletype,)*)>) { self.qalm.set_data(vec.into_iter() - .map(|($($rolename),*)| { + .map(|($($rolename,)*)| { let mut vec = Vec::new(); $( vec.push($rolename.into());