Remove unused LineCount.
This commit is contained in:
parent
094ac92fe4
commit
0f055603a2
3
build.rs
3
build.rs
@ -10,8 +10,7 @@ fn main() {
|
|||||||
.qt_module("Network")
|
.qt_module("Network")
|
||||||
.qml_module(QmlModule {
|
.qml_module(QmlModule {
|
||||||
uri: "clide.module",
|
uri: "clide.module",
|
||||||
rust_files: &["src/line_count.rs",
|
rust_files: &["src/colors.rs"],
|
||||||
"src/colors.rs"],
|
|
||||||
qml_files: &["qml/main.qml",
|
qml_files: &["qml/main.qml",
|
||||||
"qml/ClideProjectView.qml",
|
"qml/ClideProjectView.qml",
|
||||||
"qml/ClideEditor.qml",
|
"qml/ClideEditor.qml",
|
||||||
|
|||||||
@ -1,103 +0,0 @@
|
|||||||
// TODO: Header
|
|
||||||
|
|
||||||
#[cxx_qt::bridge]
|
|
||||||
pub mod qobject {
|
|
||||||
unsafe extern "C++" {
|
|
||||||
include!("cxx-qt-lib/qvariant.h");
|
|
||||||
type QVariant = cxx_qt_lib::QVariant;
|
|
||||||
include!(<QtCore/QAbstractListModel>);
|
|
||||||
type QModelIndex = cxx_qt_lib::QModelIndex;
|
|
||||||
type QAbstractListModel;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe extern "RustQt" {
|
|
||||||
#[qobject]
|
|
||||||
#[base = QAbstractListModel]
|
|
||||||
type AbstractListModel = super::AbstractListModelRust;
|
|
||||||
|
|
||||||
#[qobject]
|
|
||||||
#[base = AbstractListModel]
|
|
||||||
#[qml_element]
|
|
||||||
#[qproperty(i32, count)]
|
|
||||||
type LineCount = super::LineCountRust;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsafe extern "RustQt" {
|
|
||||||
#[cxx_name = "beginInsertRows"]
|
|
||||||
#[inherit]
|
|
||||||
fn beginInsertRows(self: Pin<&mut LineCount>, parent: &QModelIndex, first: i32, last: i32);
|
|
||||||
|
|
||||||
#[cxx_name = "endInsertRows"]
|
|
||||||
#[inherit]
|
|
||||||
fn endInsertRows(self: Pin<&mut LineCount>);
|
|
||||||
|
|
||||||
#[cxx_name = "beginRemoveRows"]
|
|
||||||
#[inherit]
|
|
||||||
fn beginRemoveRows(self: Pin<&mut LineCount>, parent: &QModelIndex, first: i32, last: i32);
|
|
||||||
|
|
||||||
#[cxx_name = "endRemoveRows"]
|
|
||||||
#[inherit]
|
|
||||||
fn endRemoveRows(self: Pin<&mut LineCount>);
|
|
||||||
|
|
||||||
#[qinvokable]
|
|
||||||
fn set_line_count(self: Pin<&mut LineCount>, line_count: i32);
|
|
||||||
|
|
||||||
#[qinvokable]
|
|
||||||
#[cxx_override]
|
|
||||||
fn data(self: &LineCount, index: &QModelIndex, role: i32) -> QVariant;
|
|
||||||
|
|
||||||
#[qinvokable]
|
|
||||||
#[cxx_override]
|
|
||||||
#[cxx_name = "rowCount"]
|
|
||||||
fn row_count(self: &LineCount, _parent: &QModelIndex) -> i32;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
use cxx_qt::CxxQtType;
|
|
||||||
use cxx_qt_lib::{QModelIndex, QVariant};
|
|
||||||
|
|
||||||
impl qobject::LineCount {
|
|
||||||
pub fn set_line_count(mut self: std::pin::Pin<&mut Self>, line_count: i32) {
|
|
||||||
let current_count = self.as_mut().rust_mut().count;
|
|
||||||
if line_count < 0 || current_count == line_count {
|
|
||||||
log::warn!(
|
|
||||||
"Can't set line count: {}; Current count: {}",
|
|
||||||
line_count,
|
|
||||||
current_count
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if current_count < line_count {
|
|
||||||
self.as_mut()
|
|
||||||
.beginInsertRows(&QModelIndex::default(), current_count, line_count - 1);
|
|
||||||
self.as_mut().endInsertRows();
|
|
||||||
} else if current_count > line_count {
|
|
||||||
self.as_mut()
|
|
||||||
.beginRemoveRows(&QModelIndex::default(), line_count, current_count - 1);
|
|
||||||
self.as_mut().endRemoveRows();
|
|
||||||
}
|
|
||||||
self.as_mut().rust_mut().count = line_count;
|
|
||||||
log::warn!(
|
|
||||||
"Line count changed from {} to {}",
|
|
||||||
current_count,
|
|
||||||
line_count
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn row_count(self: &Self, _parent: &QModelIndex) -> i32 {
|
|
||||||
*self.count()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn data(self: &Self, _index: &QModelIndex, _role: i32) -> QVariant {
|
|
||||||
QVariant::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A struct which inherits from QAbstractListModel
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct AbstractListModelRust {}
|
|
||||||
|
|
||||||
#[derive(Default)]
|
|
||||||
pub struct LineCountRust {
|
|
||||||
pub count: i32,
|
|
||||||
}
|
|
||||||
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
use cxx_qt_lib::QString;
|
use cxx_qt_lib::QString;
|
||||||
|
|
||||||
pub mod line_count;
|
|
||||||
pub mod colors;
|
pub mod colors;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user