From 0cac11cb89f69d305ae02c4a31b36c8fd5d16a7e Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 17 Sep 2024 06:23:03 -0500 Subject: [PATCH] remove some unnecessary use and type statements --- src/rust/file_helper.rs | 4 ++-- src/rust/image_model.rs | 8 ++++---- src/rust/presentation_model.rs | 8 ++++---- src/rust/slide_model.rs | 7 +++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/rust/file_helper.rs b/src/rust/file_helper.rs index dca7f44..c1ea190 100644 --- a/src/rust/file_helper.rs +++ b/src/rust/file_helper.rs @@ -7,8 +7,8 @@ mod file_helper { type QString = cxx_qt_lib::QString; include!("cxx-qt-lib/qurl.h"); type QUrl = cxx_qt_lib::QUrl; - include!("cxx-qt-lib/qvariant.h"); - type QVariant = cxx_qt_lib::QVariant; + // include!("cxx-qt-lib/qvariant.h"); + // type QVariant = cxx_qt_lib::QVariant; } unsafe extern "RustQt" { #[qobject] diff --git a/src/rust/image_model.rs b/src/rust/image_model.rs index 039eef0..12ef903 100644 --- a/src/rust/image_model.rs +++ b/src/rust/image_model.rs @@ -18,10 +18,10 @@ mod image_model { type QModelIndex = cxx_qt_lib::QModelIndex; include!("cxx-qt-lib/qvector.h"); type QVector_i32 = cxx_qt_lib::QVector; - include!("cxx-qt-lib/qstringlist.h"); - type QStringList = cxx_qt_lib::QStringList; - include!("cxx-qt-lib/qlist.h"); - type QList_QString = cxx_qt_lib::QList; + // include!("cxx-qt-lib/qstringlist.h"); + // type QStringList = cxx_qt_lib::QStringList; + // include!("cxx-qt-lib/qlist.h"); + // type QList_QString = cxx_qt_lib::QList; } #[qenum(ImageModel)] diff --git a/src/rust/presentation_model.rs b/src/rust/presentation_model.rs index db477d6..7c3708f 100644 --- a/src/rust/presentation_model.rs +++ b/src/rust/presentation_model.rs @@ -18,10 +18,10 @@ mod presentation_model { type QModelIndex = cxx_qt_lib::QModelIndex; include!("cxx-qt-lib/qvector.h"); type QVector_i32 = cxx_qt_lib::QVector; - include!("cxx-qt-lib/qstringlist.h"); - type QStringList = cxx_qt_lib::QStringList; - include!("cxx-qt-lib/qlist.h"); - type QList_QString = cxx_qt_lib::QList; + // include!("cxx-qt-lib/qstringlist.h"); + // type QStringList = cxx_qt_lib::QStringList; + // include!("cxx-qt-lib/qlist.h"); + // type QList_QString = cxx_qt_lib::QList; } #[qenum(PresentationModel)] diff --git a/src/rust/slide_model.rs b/src/rust/slide_model.rs index 1ecff49..1ac771f 100644 --- a/src/rust/slide_model.rs +++ b/src/rust/slide_model.rs @@ -16,8 +16,8 @@ mod slide_model { type QModelIndex = cxx_qt_lib::QModelIndex; include!("cxx-qt-lib/qvector.h"); type QVector_i32 = cxx_qt_lib::QVector; - include!("cxx-qt-lib/qstringlist.h"); - type QStringList = cxx_qt_lib::QStringList; + // include!("cxx-qt-lib/qstringlist.h"); + // type QStringList = cxx_qt_lib::QStringList; include!("cxx-qt-lib/qlist.h"); type QList_QString = cxx_qt_lib::QList; // #[cxx_name = "Slidey"] @@ -219,9 +219,8 @@ use crate::obs::Obs; use crate::slide_model::slide_model::QList_QString; use cxx_qt::{CxxQtType, Threading}; use cxx_qt_lib::{ - CaseSensitivity, QByteArray, QMap, QModelIndex, QString, QStringList, QVariant + CaseSensitivity, QByteArray, QModelIndex, QString, QStringList, QVariant }; -use std::any::Any; use std::thread; use std::{path::PathBuf, pin::Pin}; use tracing::{debug, error};