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 f6964cf06a
commit aa0eeaaeed
13 changed files with 49 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rust/service_item_model.rs
View file

@ -1,5 +1,5 @@
#[cxx_qt::bridge]
mod service_item_model {
mod qobject {
unsafe extern "C++" {
include!(< QAbstractListModel >);
include!("cxx-qt-lib/qhash.h");
@ -291,7 +291,7 @@ mod service_item_model {
}
use crate::obs::Obs;
use crate::service_item_model::service_item_model::QList_QString;
use crate::service_item_model::qobject::QList_QString;
use cxx_qt::{CxxQtType, Threading};
use cxx_qt_lib::{
QByteArray, QModelIndex, QString, QStringList, QUrl, QVariant,
@ -307,12 +307,12 @@ use std::{fs, println};
use tar::{Archive, Builder};
use tracing::{debug, error};
use zstd::{Decoder, Encoder};
use self::service_item_model::{
use self::qobject::{
QHash_i32_QByteArray, QMap_QString_QVariant, QVector_i32,
ServiceRoles,
};
use super::service_item_model::service_item_model::ServiceItemModel;
use super::service_item_model::qobject::ServiceItemModel;
#[derive(Clone, Debug)]
pub struct ServiceItem {
@ -396,7 +396,7 @@ impl Default for ServiceItemModelRust {
}
}
impl service_item_model::ServiceItemModel {
impl qobject::ServiceItemModel {
pub fn setup(mut self: Pin<&mut Self>) {
todo!()
}
@ -1378,7 +1378,7 @@ impl service_item_model::ServiceItemModel {
}
// QAbstractListModel implementation
impl service_item_model::ServiceItemModel {
impl qobject::ServiceItemModel {
fn data(&self, index: &QModelIndex, role: i32) -> QVariant {
let role = ServiceRoles { repr: role };
if let Some(service_item) =