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/slide_model.rs
View file

@ -1,5 +1,5 @@
#[cxx_qt::bridge]
mod slide_model {
mod qobject {
unsafe extern "C++" {
include!(< QAbstractListModel >);
include!("cxx-qt-lib/qhash.h");
@ -216,7 +216,7 @@ mod slide_model {
use crate::ffmpeg;
use crate::obs::Obs;
use crate::slide_model::slide_model::QList_QString;
use crate::slide_model::qobject::QList_QString;
use cxx_qt::{CxxQtType, Threading};
use cxx_qt_lib::{
CaseSensitivity, QByteArray, QMap, QModelIndex, QString, QStringList, QVariant
@ -226,7 +226,7 @@ use std::thread;
use std::{path::PathBuf, pin::Pin};
use tracing::{debug, error};
use self::slide_model::{
use self::qobject::{
QHash_i32_QByteArray, QMap_QString_QVariant, QVector_i32,
SlideRoles,
};
@ -311,7 +311,7 @@ impl Default for SlideModelRust {
}
}
impl slide_model::SlideModel {
impl qobject::SlideModel {
pub fn add_video_thumbnail(
mut self: Pin<&mut Self>,
index: i32,
@ -1236,7 +1236,7 @@ impl slide_model::SlideModel {
}
// QAbstractListModel implementation
impl slide_model::SlideModel {
impl qobject::SlideModel {
pub fn data(&self, index: &QModelIndex, role: i32) -> QVariant {
let role = SlideRoles { repr: role };
if let Some(slide) = self.slides.get(index.row() as usize) {