From b8626cd54fc840072eac1b34a688a77f94950912 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 23 Oct 2023 09:48:10 -0500 Subject: [PATCH] attempt to bring song_model into song_editor.rs --- src/rust/songs/song_editor.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rust/songs/song_editor.rs b/src/rust/songs/song_editor.rs index 9b721ca..2dd42b7 100644 --- a/src/rust/songs/song_editor.rs +++ b/src/rust/songs/song_editor.rs @@ -16,8 +16,8 @@ pub mod song_editor { type QStringList = cxx_qt_lib::QStringList; include!("cxx-qt-lib/qlist.h"); type QList_QString = cxx_qt_lib::QList; - // #[cxx_name = "SongModel"] - // type CxxSongs = crate::songs::song_model::qobject::SongModel; + #[cxx_name = "SongModel"] + type CxxSongs = crate::songs::song_model::qobject::SongModel; } #[derive(Clone, Debug)] @@ -49,8 +49,8 @@ pub mod song_editor { font: QString, #[qproperty] font_size: i32, - // #[qproperty] - // song_model: *mut CxxSongs, + #[qproperty] + song_model: *mut CxxSongs, } impl Default for SongEditor { @@ -69,7 +69,7 @@ pub mod song_editor { vertical_text_alignment: QString::default(), font: QString::default(), font_size: 50, - // song_model: std::ptr::null_mut(), + song_model: std::ptr::null_mut(), } } }