fix(qgsthreadingutils): format with clang to improve readability #62527
Conversation
🪟 Windows Qt6 buildsDownload Windows Qt6 builds of this PR for testing. 🍎 MacOS Qt6 buildsDownload MacOS Qt6 builds of this PR for testing. 🪟 Windows buildsDownload Windows builds of this PR for testing. |
|
@nyalldawson I had applied the formatting to qgslogger too. |
|
It is strange as sipify breaks the build after I formatted qgslogger. I had to remove the bad parts manually in the generated files. May be I should remove the modifications on qgslogger but I still do not understand what the issue here! @troopa81 a suggestion? |
|
Isn't that just your forget to run sipify ? because as far as I remember sip_check just run the sipify script and diff with the current pushed files. |
|
@troopa81 I have ran a sipify_all.sh to be sure and it failed at build time 😞 |
benoitdm-oslandia
force-pushed
the
fix/qgsthreadingutils
branch
from
31e2759 to
226541b
Compare
|
rebase from master and fixed bad sip file generation by adding |
src/core/qgsthreadingutils.h
Outdated
| @@ -23,8 +23,10 @@ | |||
|
|
|||
| #include "qgsfeedback.h" | |||
|
|
|||
| #ifndef SIP_RUN | |||
There was a problem hiding this comment.
Why do we need this if we have already SIP_NO_FILE ?
There was a problem hiding this comment.
because sipify.py still parsed the file and crashed due to the '\' at the end of lines. I remove the #define SIP_NO_FILE
There was a problem hiding this comment.
CI crashed ... both are needed!
There was a problem hiding this comment.
Can we not fix sip_include.sh so it doesn't include this file when it meets sip_no_file ? Is this complicated to fix ?
There was a problem hiding this comment.
I tried but I am not proud of what I have done. Can you check please?
scripts/sipify.py
Outdated
| @@ -3682,6 +3682,23 @@ def generate_python_output(): | |||
| ) | |||
| sys.exit(1) | |||
|
|
|||
| # early handle of SIP_NO_FILE directive to avoid useless sip generation | |||
There was a problem hiding this comment.
this is wrong -- we should be catching this earlier, in sip_include.sh, or in the pre-commit scripts themselves.
benoitdm-oslandia
force-pushed
the
fix/qgsthreadingutils
branch
from
725d793 to
5b4ac19
Compare
benoitdm-oslandia
force-pushed
the
fix/qgsthreadingutils
branch
from
5b4ac19 to
16a947a
Compare
The preview in github is pretty ugly... better look directly at the file: https://github.com/benoitdm-oslandia/QGIS/blob/fix/qgsthreadingutils/src/core/qgsthreadingutils.h