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

Rebased qgis fixes #516

Merged
merged 14 commits into from
Oct 14, 2023
Merged

Rebased qgis fixes #516

merged 14 commits into from
Oct 14, 2023

Conversation

luis-pereira
Copy link
Member

A rebase of #499 PR

ptitjano and others added 12 commits September 15, 2023 17:28
@ptitjano @luis-pereira
plugins/qtermwidget: Use Qt::ImCursorRectangle instead of deprecated …
19d676b 
…Qt::ImMicroFocus

Qt::ImMicroFocus has been deprecated in QT 5.14 and has been removed from
Qt6. Use its replacement, Qt::ImCursorRectangle instead.
@troopa81 @luis-pereira
constify methods
6dc6b85
@rouault @luis-pereira
fix deprecation warnings
bb9d487
@rouault @luis-pereira
mark assignment operator as deleted due to existence of copy constructor
3d38ba3
@rouault @luis-pereira
qtermwidget/BlockArray.h: remove useless sizeof() to avoid cppcheck w…
43b689f 
…arning about suspicious division by sizeof() in a later memset() call
@rouault @luis-pereira
qtermwidget: silence false positive cppcheck warning about assert wit…
f61af9c 
…h side effect
@rouault @luis-pereira
qtermwidget: declare deleted assignment operator as the class has poi…
5720294 
…nter member variables
@rouault @luis-pereira
qtermwidget: add missing initialization of member variables
d5ada03
@rouault @luis-pereira
Fix cppcheck warnings about uninitialized member variables
cac0ef0
@m-kuhn @luis-pereira
Remove unrequired ;
7c762a9 
and make clang-tidy a bit more smiley
@3nids @luis-pereira
replace old-style cast with static_cast
7873146
@luis-pereira
Remove extra empty line
eb50821 
Introduced by commit 5720294.
@luis-pereira luis-pereira mentioned this pull request Sep 29, 2023
Closed
@yan12125
Copy link
Member

yan12125 commented Oct 9, 2023

Looks good overall. Just curious - is it possible to get rid of assertWithSideEffect by changing some member functions to const?

@luis-pereira
Copy link
Member Author

Looks good overall. Just curious - is it possible to get rid of assertWithSideEffect by changing some member functions to const?

Sorry for the long delay.
It's possible and done with commit 634e66e.

@yan12125 yan12125 merged commit 7f501f5 into master Oct 14, 2023
2 checks passed
@yan12125 yan12125 deleted the rebased_qgis_fixes branch October 14, 2023 08:48
@yan12125
Copy link
Member

Thank you! I merge this without squashing as those changes are kind of independent, and thus squashing may make git blame harder.

Sorry for the long delay.

A few days is short for me :)

@luis-pereira
Copy link
Member Author

Thank you! I merge this without squashing as those changes are kind of independent, and thus squashing may make git blame harder.

It would make history a lot harder to understand.

@yan12125
Copy link
Member

In my opinion, this is a good trade-off - easier debugging (ex: via git bisect) is more important than simpler history.

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

@yan12125 yan12125 Awaiting requested review from yan12125

Assignees

@yan12125 yan12125

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@luis-pereira @yan12125 @ptitjano @troopa81 @rouault @m-kuhn @3nids