Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move QObject type & property into extern "RustQt" #559

Closed
2 tasks done
LeonMatthesKDAB opened this issue May 29, 2023 · 5 comments
Closed
2 tasks done

Move QObject type & property into extern "RustQt" #559

LeonMatthesKDAB opened this issue May 29, 2023 · 5 comments
Assignees
@ahayzen-kdab
Labels
👷 refactor Something needs to change 🥳🎉 1.0 This issue is part of stabilization for 1.0 release

Comments

@LeonMatthesKDAB
Copy link
Collaborator

LeonMatthesKDAB commented May 29, 2023 •
edited by ahayzen-kdab
Loading

As discussed in #555

  • Move the struct definition outside the bridge
  • Use a declaration inside the extern "RustQt" block.
@LeonMatthesKDAB LeonMatthesKDAB added 🥳🎉 1.0 This issue is part of stabilization for 1.0 release 👷 refactor Something needs to change labels May 29, 2023
@ahayzen-kdab ahayzen-kdab mentioned this issue Jun 7, 2023
Open
4 tasks
@ahayzen-kdab
Copy link
Collaborator

Note that once there is a type MyObjectQt = super::MyObject; or whatever syntax that ends up with.

The ForeignItemFn in extern "RustQt" can be just passed through in the generator rust phase to the inner extern "Rust" block, as the self type is then correct. We don't need to store the self type and rebuild the function.

@ahayzen-kdab
Copy link
Collaborator

Although note we still have the wrapper fun coming from C++ -> Rust, so maybe this can't be removed for invokables.

For inherit and signals going the other way though this should be possible.

@ahayzen-kdab ahayzen-kdab self-assigned this Jun 12, 2023
@ahayzen-kdab
Copy link
Collaborator

First step is to move the qproperty attribute from the fields onto the struct.

Then once that is done, we can move the struct outside the bridge and type alias with the qproperty attribute inside.

ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 12, 2023
@ahayzen-kdab
cxx-qt-gen: do not generate getter/setter for fields anymore
4e3b5d7 
As we move qproperty to an attribute we need to disable generating
helpers for fields as we won't be able to find them when the struct
is outside the bridge.

There are three options going forwards
- let the developer create their own getters/setters (this commit)
- add a #[field(T, NAME)] as an attribute to the qobject later
- remove the (un)safe for qproperty with notify so that rust_mut is safe

Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jun 12, 2023
Closed
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 12, 2023
@ahayzen-kdab
cxx-qt-gen: use #[qproperty] on the struct instead of field
ff52fc0 
This is a stepping stone to moving qproperty to be defined
on the type in the extern "RustQt" block.

Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jun 12, 2023
Merged
@ahayzen-kdab
Copy link
Collaborator

We might be able to turn the parser phase here into something more like a continuous ParseStream, but would be a larger refactor.

ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: do not generate getter/setter for fields anymore
1ffe974 
As we move qproperty to an attribute we need to disable generating
helpers for fields as we won't be able to find them when the struct
is outside the bridge.

There are three options going forwards
- let the developer create their own getters/setters (this commit)
- add a #[field(T, NAME)] as an attribute to the qobject later
- remove the (un)safe for qproperty with notify so that rust_mut is safe

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: do not generate getter/setter for fields anymore
1e1fd8d 
As we move qproperty to an attribute we need to disable generating
helpers for fields as we won't be able to find them when the struct
is outside the bridge.

There are three options going forwards
- let the developer create their own getters/setters (this commit)
- add a #[field(T, NAME)] as an attribute to the qobject later
- remove the (un)safe for qproperty with notify so that rust_mut is safe

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: use #[qproperty] on the struct instead of field
ba49a21 
This is a stepping stone to moving qproperty to be defined
on the type in the extern "RustQt" block.

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: do not generate getter/setter for fields anymore
ce135e9 
As we move qproperty to an attribute we need to disable generating
helpers for fields as we won't be able to find them when the struct
is outside the bridge.

There are three options going forwards
- let the developer create their own getters/setters (this commit)
- add a #[field(T, NAME)] as an attribute to the qobject later
- remove the (un)safe for qproperty with notify so that rust_mut is safe

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: use #[qproperty] on the struct instead of field
4d1782f 
This is a stepping stone to moving qproperty to be defined
on the type in the extern "RustQt" block.

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: change rust_mut to be safe to call
23b4b9a 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
book: update docs now that getters and setters are gone for fields
01e48ae 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: remove field parsing stage as it's not used anymore
d018985 
Closes KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jun 13, 2023
Merged
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: change rust_mut to be safe to call
f26d0ef 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
book: update docs now that getters and setters are gone for fields
f1e238d 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: remove field parsing stage as it's not used anymore
10c80e1 
Closes KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 13, 2023
@ahayzen-kdab
cxx-qt-gen: remove mutable getter for properties
6611f4f 
As rust_mut is now safe.

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 21, 2023
@ahayzen-kdab
cxx-qt-gen: use #[qproperty] on the struct instead of field
f3cef01 
This is a stepping stone to moving qproperty to be defined
on the type in the extern "RustQt" block.

Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 21, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
0ac92f0 
Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jun 21, 2023
Merged
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jun 21, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
b8c2ed9 
Related to KDAB#559
ahayzen-kdab added a commit that referenced this issue Jun 21, 2023
@ahayzen-kdab
cxx-qt-gen: do not generate getter/setter for fields anymore
87b989a 
As we move qproperty to an attribute we need to disable generating
helpers for fields as we won't be able to find them when the struct
is outside the bridge.

There are three options going forwards
- let the developer create their own getters/setters (this commit)
- add a #[field(T, NAME)] as an attribute to the qobject later
- remove the (un)safe for qproperty with notify so that rust_mut is safe

Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 17, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
12b7956 
Related to KDAB#559
Be-ing pushed a commit that referenced this issue Jul 17, 2023
@ahayzen-kdab @Be-ing
cxx-qt-gen: use #[qproperty] on the struct instead of field
f05b4a3 
This is a stepping stone to moving qproperty to be defined
on the type in the extern "RustQt" block.

Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 17, 2023
@ahayzen-kdab
cxx-qt-gen: remove generated qobject module and use bridge mod instead
da28d6f 
Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jul 17, 2023
Merged
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 17, 2023
@ahayzen-kdab
cxx-qt-gen: remove generated qobject module and use bridge mod instead
3779f2b 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 17, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
fa089eb 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
2cf2367 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
75743e3 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
6948bd8 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
6bbe473 
Related to KDAB#559
Be-ing pushed a commit that referenced this issue Jul 18, 2023
@ahayzen-kdab @Be-ing
cxx-qt-gen: move QObject struct outside the bridge and use a type alias
0414d25 
Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: remove generated qobject module and use bridge mod instead
82299c6 
Related to KDAB#559
Be-ing pushed a commit that referenced this issue Jul 18, 2023
@ahayzen-kdab @Be-ing
cxx-qt-gen: remove generated qobject module and use bridge mod instead
11d6dcf 
Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
38b4158 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
74c4d9b 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from impl a trait for a qobject in a bridge
8d2abcb 
Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jul 18, 2023
Merged
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from parameters in methods in a bridge
654af1d 
Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jul 18, 2023
Merged
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from parameters in methods in a bridge
bdf7387 
Related to KDAB#559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
WIP: cxx-qt-gen: pass through signals directly
ce5fef9 
Although not sure it's worth the gain as we still
need to generate the other methods from the same info.

Related to KDAB#559
@ahayzen-kdab ahayzen-kdab mentioned this issue Jul 18, 2023
Closed
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 18, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from parameters in methods in a bridge
31724c0 
Related to KDAB#559
Be-ing pushed a commit that referenced this issue Jul 18, 2023
@ahayzen-kdab @Be-ing
cxx-qt-gen: remove qobject:: from impl a trait for a qobject in a bridge
8652992 
Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 19, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from parameters in methods in a bridge
705b40b 
Related to KDAB#559
ahayzen-kdab added a commit that referenced this issue Jul 19, 2023
@ahayzen-kdab
cxx-qt-gen: remove qobject:: from parameters in methods in a bridge
7254978 
Related to #559
ahayzen-kdab added a commit to ahayzen-kdab/cxx-qt that referenced this issue Jul 19, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
79e009a 
Related to KDAB#559
ahayzen-kdab added a commit that referenced this issue Jul 19, 2023
@ahayzen-kdab
cxx-qt-gen: impl Deref for qobject::T to reach T easily
a9c1b4e 
Related to #559
@ahayzen-kdab
Copy link
Collaborator

This is done now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@ahayzen-kdab ahayzen-kdab

Labels
👷 refactor Something needs to change 🥳🎉 1.0 This issue is part of stabilization for 1.0 release
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@LeonMatthesKDAB @ahayzen-kdab