Skip to content

Commit c7b875d

Browse files
Be-ingahayzen-kdab
authored andcommitted
meta_project: don't double invoke increment methods
The `increment` methods of the subobjects are invoked from QML, so don't also invoke them from Rust. This also makes the behavior of the application clearer: Main counts by 1, Sub1 counts by 2, Sub2 counts by 3.
1 parent 0fe3f57 commit c7b875d

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

examples/meta_project/rust/main/src/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@
44
// SPDX-License-Identifier: MIT OR Apache-2.0
55

66
mod main_object;
7+
8+
// Ensure the symbols from the rlib dependencies end up
9+
// in the staticlib (if you use Rust symbols from these
10+
// crates in this crate, you can skip these `pub use` statements).
11+
pub use sub1;
12+
pub use sub2;

examples/meta_project/rust/main/src/main_object.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ pub struct MainObjectRust {
3434

3535
impl qobject::MainObject {
3636
pub fn increment(mut self: Pin<&mut Self>) {
37-
let counter = self.rust().counter;
38-
let counter = sub1::increment(counter);
39-
let counter = sub2::increment(counter);
40-
self.as_mut().rust_mut().counter = counter;
37+
self.as_mut().rust_mut().counter = self.rust().counter + 1;
4138

4239
let new_string = QString::from(&self.rust().counter.to_string());
4340
self.as_mut().set_string(new_string);

examples/meta_project/rust/sub1/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
mod sub1_object;
1010

1111
pub fn increment(number: u32) -> u32 {
12-
number + 1
12+
number + 2
1313
}

examples/meta_project/rust/sub2/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
mod sub2_object;
1010

1111
pub fn increment(number: u32) -> u32 {
12-
number + 2
12+
number + 3
1313
}

0 commit comments

Comments
 (0)