attempt to bring song_model into song_editor.rs

This commit is contained in:
Chris Cochrun 2023-10-23 09:48:10 -05:00
parent e608f44c75
commit b8626cd54f

View file

@ -16,8 +16,8 @@ pub mod song_editor {
type QStringList = cxx_qt_lib::QStringList; type QStringList = cxx_qt_lib::QStringList;
include!("cxx-qt-lib/qlist.h"); include!("cxx-qt-lib/qlist.h");
type QList_QString = cxx_qt_lib::QList<QString>; type QList_QString = cxx_qt_lib::QList<QString>;
// #[cxx_name = "SongModel"] #[cxx_name = "SongModel"]
// type CxxSongs = crate::songs::song_model::qobject::SongModel; type CxxSongs = crate::songs::song_model::qobject::SongModel;
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -49,8 +49,8 @@ pub mod song_editor {
font: QString, font: QString,
#[qproperty] #[qproperty]
font_size: i32, font_size: i32,
// #[qproperty] #[qproperty]
// song_model: *mut CxxSongs, song_model: *mut CxxSongs,
} }
impl Default for SongEditor { impl Default for SongEditor {
@ -69,7 +69,7 @@ pub mod song_editor {
vertical_text_alignment: QString::default(), vertical_text_alignment: QString::default(),
font: QString::default(), font: QString::default(),
font_size: 50, font_size: 50,
// song_model: std::ptr::null_mut(), song_model: std::ptr::null_mut(),
} }
} }
} }