chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename all cxx_qt::bridge modules to qobject for clarity

Browse source
This commit is contained in:
Chris Cochrun 2024-06-24 16:40:37 -05:00
parent 8ae9911ee3
commit b4ce082891
11 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rust/songs/song_model.rs
View file

@ -1,5 +1,5 @@
#[cxx_qt::bridge]
pub mod song_model {
pub mod qobject {
unsafe extern "C++" {
include!(< QAbstractListModel >);
include!("cxx-qt-lib/qhash.h");
@ -242,7 +242,7 @@ pub mod song_model {
use crate::models::*;
use crate::schema::songs::dsl::*;
use crate::songs::song_editor::song_editor::QList_QString;
use crate::songs::song_editor::qobject::QList_QString;
use cxx_qt::CxxQtType;
use cxx_qt_lib::{
QByteArray, QModelIndex, QString, QStringList, QVariant,
@ -254,7 +254,7 @@ use std::pin::Pin;
use std::slice::Iter;
use tracing::{debug, debug_span, error, info, instrument};
use self::song_model::{
use self::qobject::{
QHash_i32_QByteArray, QMap_QString_QVariant, QVector_i32,
SongRoles,
};
@ -296,7 +296,7 @@ pub struct SongModelRust {
inner_songs: Vec<Song>,
}
impl song_model::SongModel {
impl qobject::SongModel {
pub fn clear(mut self: Pin<&mut Self>) {
unsafe {
self.as_mut().begin_reset_model();
@ -1098,7 +1098,7 @@ impl song_model::SongModel {
}
// QAbstractListModel implementation
impl song_model::SongModel {
impl qobject::SongModel {
fn data(&self, index: &QModelIndex, role: i32) -> QVariant {
let role = SongRoles { repr: role };
if let Some(song) = self.songs.get(index.row() as usize) {