marrub
/
rust-qt-binding-generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update generated interface.rs files

master
Jos van den Oever 2018-06-30 20:25:39 +02:00
parent 7f2f4b71a4
commit 233cab0bfc
8 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
demo/rust/src/interface.rs
View File

@ -54,6 +54,7 @@ pub enum QByteArray {}
#[repr(C)] #[repr(C)]
#[derive(PartialEq, Eq, Debug)]
pub enum SortOrder { pub enum SortOrder {
Ascending = 0, Ascending = 0,
Descending = 1, Descending = 1,
@ -121,8 +122,8 @@ pub trait DemoTrait {
pub extern "C" fn demo_new( pub extern "C" fn demo_new(
demo: *mut DemoQObject, demo: *mut DemoQObject,
fibonacci: *mut FibonacciQObject, fibonacci: *mut FibonacciQObject,
input_changed: fn(*const FibonacciQObject), fibonacci_input_changed: fn(*const FibonacciQObject),
result_changed: fn(*const FibonacciQObject), fibonacci_result_changed: fn(*const FibonacciQObject),
fibonacci_list: *mut FibonacciListQObject, fibonacci_list: *mut FibonacciListQObject,
fibonacci_list_new_data_ready: fn(*const FibonacciListQObject), fibonacci_list_new_data_ready: fn(*const FibonacciListQObject),
fibonacci_list_data_changed: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_data_changed: fn(*const FibonacciListQObject, usize, usize),
@ -133,7 +134,7 @@ pub extern "C" fn demo_new(
fibonacci_list_begin_remove_rows: fn(*const FibonacciListQObject, usize, usize), fibonacci_list_begin_remove_rows: fn(*const FibonacciListQObject, usize, usize),
fibonacci_list_end_remove_rows: fn(*const FibonacciListQObject), fibonacci_list_end_remove_rows: fn(*const FibonacciListQObject),
file_system_tree: *mut FileSystemTreeQObject, file_system_tree: *mut FileSystemTreeQObject,
path_changed: fn(*const FileSystemTreeQObject), file_system_tree_path_changed: fn(*const FileSystemTreeQObject),
file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, index: usize, valid: bool), file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, index: usize, valid: bool),
file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize), file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize),
file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject),
@ -143,7 +144,7 @@ pub extern "C" fn demo_new(
file_system_tree_begin_remove_rows: fn(*const FileSystemTreeQObject, index: usize, valid: bool, usize, usize), file_system_tree_begin_remove_rows: fn(*const FileSystemTreeQObject, index: usize, valid: bool, usize, usize),
file_system_tree_end_remove_rows: fn(*const FileSystemTreeQObject), file_system_tree_end_remove_rows: fn(*const FileSystemTreeQObject),
processes: *mut ProcessesQObject, processes: *mut ProcessesQObject,
active_changed: fn(*const ProcessesQObject), processes_active_changed: fn(*const ProcessesQObject),
processes_new_data_ready: fn(*const ProcessesQObject, index: usize, valid: bool), processes_new_data_ready: fn(*const ProcessesQObject, index: usize, valid: bool),
processes_data_changed: fn(*const ProcessesQObject, usize, usize), processes_data_changed: fn(*const ProcessesQObject, usize, usize),
processes_begin_reset_model: fn(*const ProcessesQObject), processes_begin_reset_model: fn(*const ProcessesQObject),
@ -164,8 +165,8 @@ pub extern "C" fn demo_new(
) -> *mut Demo { ) -> *mut Demo {
let fibonacci_emit = FibonacciEmitter { let fibonacci_emit = FibonacciEmitter {
qobject: Arc::new(Mutex::new(fibonacci)), qobject: Arc::new(Mutex::new(fibonacci)),
input_changed: input_changed, input_changed: fibonacci_input_changed,
result_changed: result_changed, result_changed: fibonacci_result_changed,
}; };
let d_fibonacci = Fibonacci::new(fibonacci_emit); let d_fibonacci = Fibonacci::new(fibonacci_emit);
let fibonacci_list_emit = FibonacciListEmitter { let fibonacci_list_emit = FibonacciListEmitter {
@ -185,7 +186,7 @@ pub extern "C" fn demo_new(
let d_fibonacci_list = FibonacciList::new(fibonacci_list_emit, model); let d_fibonacci_list = FibonacciList::new(fibonacci_list_emit, model);
let file_system_tree_emit = FileSystemTreeEmitter { let file_system_tree_emit = FileSystemTreeEmitter {
qobject: Arc::new(Mutex::new(file_system_tree)), qobject: Arc::new(Mutex::new(file_system_tree)),
path_changed: path_changed, path_changed: file_system_tree_path_changed,
new_data_ready: file_system_tree_new_data_ready, new_data_ready: file_system_tree_new_data_ready,
}; };
let model = FileSystemTreeTree { let model = FileSystemTreeTree {
@ -201,7 +202,7 @@ pub extern "C" fn demo_new(
let d_file_system_tree = FileSystemTree::new(file_system_tree_emit, model); let d_file_system_tree = FileSystemTree::new(file_system_tree_emit, model);
let processes_emit = ProcessesEmitter { let processes_emit = ProcessesEmitter {
qobject: Arc::new(Mutex::new(processes)), qobject: Arc::new(Mutex::new(processes)),
active_changed: active_changed, active_changed: processes_active_changed,
new_data_ready: processes_new_data_ready, new_data_ready: processes_new_data_ready,
}; };
let model = ProcessesTree { let model = ProcessesTree {
@ -312,13 +313,13 @@ pub trait FibonacciTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn fibonacci_new( pub extern "C" fn fibonacci_new(
fibonacci: *mut FibonacciQObject, fibonacci: *mut FibonacciQObject,
input_changed: fn(*const FibonacciQObject), fibonacci_input_changed: fn(*const FibonacciQObject),
result_changed: fn(*const FibonacciQObject), fibonacci_result_changed: fn(*const FibonacciQObject),
) -> *mut Fibonacci { ) -> *mut Fibonacci {
let fibonacci_emit = FibonacciEmitter { let fibonacci_emit = FibonacciEmitter {
qobject: Arc::new(Mutex::new(fibonacci)), qobject: Arc::new(Mutex::new(fibonacci)),
input_changed: input_changed, input_changed: fibonacci_input_changed,
result_changed: result_changed, result_changed: fibonacci_result_changed,
}; };
let d_fibonacci = Fibonacci::new(fibonacci_emit); let d_fibonacci = Fibonacci::new(fibonacci_emit);
Box::into_raw(Box::new(d_fibonacci)) Box::into_raw(Box::new(d_fibonacci))
@ -581,7 +582,7 @@ pub trait FileSystemTreeTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn file_system_tree_new( pub extern "C" fn file_system_tree_new(
file_system_tree: *mut FileSystemTreeQObject, file_system_tree: *mut FileSystemTreeQObject,
path_changed: fn(*const FileSystemTreeQObject), file_system_tree_path_changed: fn(*const FileSystemTreeQObject),
file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, index: usize, valid: bool), file_system_tree_new_data_ready: fn(*const FileSystemTreeQObject, index: usize, valid: bool),
file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize), file_system_tree_data_changed: fn(*const FileSystemTreeQObject, usize, usize),
file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject), file_system_tree_begin_reset_model: fn(*const FileSystemTreeQObject),
@ -593,7 +594,7 @@ pub extern "C" fn file_system_tree_new(
) -> *mut FileSystemTree { ) -> *mut FileSystemTree {
let file_system_tree_emit = FileSystemTreeEmitter { let file_system_tree_emit = FileSystemTreeEmitter {
qobject: Arc::new(Mutex::new(file_system_tree)), qobject: Arc::new(Mutex::new(file_system_tree)),
path_changed: path_changed, path_changed: file_system_tree_path_changed,
new_data_ready: file_system_tree_new_data_ready, new_data_ready: file_system_tree_new_data_ready,
}; };
let model = FileSystemTreeTree { let model = FileSystemTreeTree {
@ -861,7 +862,7 @@ pub trait ProcessesTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn processes_new( pub extern "C" fn processes_new(
processes: *mut ProcessesQObject, processes: *mut ProcessesQObject,
active_changed: fn(*const ProcessesQObject), processes_active_changed: fn(*const ProcessesQObject),
processes_new_data_ready: fn(*const ProcessesQObject, index: usize, valid: bool), processes_new_data_ready: fn(*const ProcessesQObject, index: usize, valid: bool),
processes_data_changed: fn(*const ProcessesQObject, usize, usize), processes_data_changed: fn(*const ProcessesQObject, usize, usize),
processes_begin_reset_model: fn(*const ProcessesQObject), processes_begin_reset_model: fn(*const ProcessesQObject),
@ -873,7 +874,7 @@ pub extern "C" fn processes_new(
) -> *mut Processes { ) -> *mut Processes {
let processes_emit = ProcessesEmitter { let processes_emit = ProcessesEmitter {
qobject: Arc::new(Mutex::new(processes)), qobject: Arc::new(Mutex::new(processes)),
active_changed: active_changed, active_changed: processes_active_changed,
new_data_ready: processes_new_data_ready, new_data_ready: processes_new_data_ready,
}; };
let model = ProcessesTree { let model = ProcessesTree {

4
tests/rust_functions/src/interface.rs
View File

@ -78,11 +78,11 @@ pub trait PersonTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn person_new( pub extern "C" fn person_new(
person: *mut PersonQObject, person: *mut PersonQObject,
user_name_changed: fn(*const PersonQObject), person_user_name_changed: fn(*const PersonQObject),
) -> *mut Person { ) -> *mut Person {
let person_emit = PersonEmitter { let person_emit = PersonEmitter {
qobject: Arc::new(Mutex::new(person)), qobject: Arc::new(Mutex::new(person)),
user_name_changed: user_name_changed, user_name_changed: person_user_name_changed,
}; };
let d_person = Person::new(person_emit); let d_person = Person::new(person_emit);
Box::into_raw(Box::new(d_person)) Box::into_raw(Box::new(d_person))

1
tests/rust_list/src/interface.rs
View File

@ -51,6 +51,7 @@ fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) {
#[repr(C)] #[repr(C)]
#[derive(PartialEq, Eq, Debug)]
pub enum SortOrder { pub enum SortOrder {
Ascending = 0, Ascending = 0,
Descending = 1, Descending = 1,

1
tests/rust_list_types/src/interface.rs
View File

@ -54,6 +54,7 @@ pub enum QByteArray {}
#[repr(C)] #[repr(C)]
#[derive(PartialEq, Eq, Debug)]
pub enum SortOrder { pub enum SortOrder {
Ascending = 0, Ascending = 0,
Descending = 1, Descending = 1,

4
tests/rust_object/src/interface.rs
View File

@ -72,11 +72,11 @@ pub trait PersonTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn person_new( pub extern "C" fn person_new(
person: *mut PersonQObject, person: *mut PersonQObject,
user_name_changed: fn(*const PersonQObject), person_user_name_changed: fn(*const PersonQObject),
) -> *mut Person { ) -> *mut Person {
let person_emit = PersonEmitter { let person_emit = PersonEmitter {
qobject: Arc::new(Mutex::new(person)), qobject: Arc::new(Mutex::new(person)),
user_name_changed: user_name_changed, user_name_changed: person_user_name_changed,
}; };
let d_person = Person::new(person_emit); let d_person = Person::new(person_emit);
Box::into_raw(Box::new(d_person)) Box::into_raw(Box::new(d_person))

68
tests/rust_object_types/src/interface.rs
View File

@ -245,43 +245,43 @@ pub trait ObjectTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn object_new( pub extern "C" fn object_new(
object: *mut ObjectQObject, object: *mut ObjectQObject,
boolean_changed: fn(*const ObjectQObject), object_boolean_changed: fn(*const ObjectQObject),
bytearray_changed: fn(*const ObjectQObject), object_bytearray_changed: fn(*const ObjectQObject),
f32_changed: fn(*const ObjectQObject), object_f32_changed: fn(*const ObjectQObject),
f64_changed: fn(*const ObjectQObject), object_f64_changed: fn(*const ObjectQObject),
i16_changed: fn(*const ObjectQObject), object_i16_changed: fn(*const ObjectQObject),
i32_changed: fn(*const ObjectQObject), object_i32_changed: fn(*const ObjectQObject),
i64_changed: fn(*const ObjectQObject), object_i64_changed: fn(*const ObjectQObject),
i8_changed: fn(*const ObjectQObject), object_i8_changed: fn(*const ObjectQObject),
optional_boolean_changed: fn(*const ObjectQObject), object_optional_boolean_changed: fn(*const ObjectQObject),
optional_bytearray_changed: fn(*const ObjectQObject), object_optional_bytearray_changed: fn(*const ObjectQObject),
optional_string_changed: fn(*const ObjectQObject), object_optional_string_changed: fn(*const ObjectQObject),
optional_u64_changed: fn(*const ObjectQObject), object_optional_u64_changed: fn(*const ObjectQObject),
string_changed: fn(*const ObjectQObject), object_string_changed: fn(*const ObjectQObject),
u16_changed: fn(*const ObjectQObject), object_u16_changed: fn(*const ObjectQObject),
u32_changed: fn(*const ObjectQObject), object_u32_changed: fn(*const ObjectQObject),
u64_changed: fn(*const ObjectQObject), object_u64_changed: fn(*const ObjectQObject),
u8_changed: fn(*const ObjectQObject), object_u8_changed: fn(*const ObjectQObject),
) -> *mut Object { ) -> *mut Object {
let object_emit = ObjectEmitter { let object_emit = ObjectEmitter {
qobject: Arc::new(Mutex::new(object)), qobject: Arc::new(Mutex::new(object)),
boolean_changed: boolean_changed, boolean_changed: object_boolean_changed,
bytearray_changed: bytearray_changed, bytearray_changed: object_bytearray_changed,
f32_changed: f32_changed, f32_changed: object_f32_changed,
f64_changed: f64_changed, f64_changed: object_f64_changed,
i16_changed: i16_changed, i16_changed: object_i16_changed,
i32_changed: i32_changed, i32_changed: object_i32_changed,
i64_changed: i64_changed, i64_changed: object_i64_changed,
i8_changed: i8_changed, i8_changed: object_i8_changed,
optional_boolean_changed: optional_boolean_changed, optional_boolean_changed: object_optional_boolean_changed,
optional_bytearray_changed: optional_bytearray_changed, optional_bytearray_changed: object_optional_bytearray_changed,
optional_string_changed: optional_string_changed, optional_string_changed: object_optional_string_changed,
optional_u64_changed: optional_u64_changed, optional_u64_changed: object_optional_u64_changed,
string_changed: string_changed, string_changed: object_string_changed,
u16_changed: u16_changed, u16_changed: object_u16_changed,
u32_changed: u32_changed, u32_changed: object_u32_changed,
u64_changed: u64_changed, u64_changed: object_u64_changed,
u8_changed: u8_changed, u8_changed: object_u8_changed,
}; };
let d_object = Object::new(object_emit); let d_object = Object::new(object_emit);
Box::into_raw(Box::new(d_object)) Box::into_raw(Box::new(d_object))

12
tests/rust_objects/src/interface.rs
View File

@ -68,11 +68,11 @@ pub extern "C" fn group_new(
group: *mut GroupQObject, group: *mut GroupQObject,
person: *mut PersonQObject, person: *mut PersonQObject,
object: *mut InnerObjectQObject, object: *mut InnerObjectQObject,
description_changed: fn(*const InnerObjectQObject), object_description_changed: fn(*const InnerObjectQObject),
) -> *mut Group { ) -> *mut Group {
let object_emit = InnerObjectEmitter { let object_emit = InnerObjectEmitter {
qobject: Arc::new(Mutex::new(object)), qobject: Arc::new(Mutex::new(object)),
description_changed: description_changed, description_changed: object_description_changed,
}; };
let d_object = InnerObject::new(object_emit); let d_object = InnerObject::new(object_emit);
let person_emit = PersonEmitter { let person_emit = PersonEmitter {
@ -130,11 +130,11 @@ pub trait InnerObjectTrait {
#[no_mangle] #[no_mangle]
pub extern "C" fn inner_object_new( pub extern "C" fn inner_object_new(
inner_object: *mut InnerObjectQObject, inner_object: *mut InnerObjectQObject,
description_changed: fn(*const InnerObjectQObject), inner_object_description_changed: fn(*const InnerObjectQObject),
) -> *mut InnerObject { ) -> *mut InnerObject {
let inner_object_emit = InnerObjectEmitter { let inner_object_emit = InnerObjectEmitter {
qobject: Arc::new(Mutex::new(inner_object)), qobject: Arc::new(Mutex::new(inner_object)),
description_changed: description_changed, description_changed: inner_object_description_changed,
}; };
let d_inner_object = InnerObject::new(inner_object_emit); let d_inner_object = InnerObject::new(inner_object_emit);
Box::into_raw(Box::new(d_inner_object)) Box::into_raw(Box::new(d_inner_object))
@ -192,11 +192,11 @@ pub trait PersonTrait {
pub extern "C" fn person_new( pub extern "C" fn person_new(
person: *mut PersonQObject, person: *mut PersonQObject,
object: *mut InnerObjectQObject, object: *mut InnerObjectQObject,
description_changed: fn(*const InnerObjectQObject), object_description_changed: fn(*const InnerObjectQObject),
) -> *mut Person { ) -> *mut Person {
let object_emit = InnerObjectEmitter { let object_emit = InnerObjectEmitter {
qobject: Arc::new(Mutex::new(object)), qobject: Arc::new(Mutex::new(object)),
description_changed: description_changed, description_changed: object_description_changed,
}; };
let d_object = InnerObject::new(object_emit); let d_object = InnerObject::new(object_emit);
let person_emit = PersonEmitter { let person_emit = PersonEmitter {

1
tests/rust_tree/src/interface.rs
View File

@ -51,6 +51,7 @@ fn set_string_from_utf16(s: &mut String, str: *const c_ushort, len: c_int) {
#[repr(C)] #[repr(C)]
#[derive(PartialEq, Eq, Debug)]
pub enum SortOrder { pub enum SortOrder {
Ascending = 0, Ascending = 0,
Descending = 1, Descending = 1,