Renovate usages of QLineF intersections #719
Conversation
Engine/RotoContext.cpp
Outdated
| @@ -4476,7 +4476,11 @@ RotoContextPrivate::bezulate(double time, | |||
| QPointF intersectionPoint; | |||
| for (; cur != polygon.end(); ++cur, ++last_pt) { | |||
| QLineF polygonSegment( QPointF(last_pt->x, last_pt->y), QPointF(cur->x, cur->y) ); | |||
| #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) | |||
| if (line.intersects(polygonSegment, &intersectionPoint) == QLineF::BoundedIntersection) { | |||
There was a problem hiding this comment.
I'm not a fan of having two open curly braces for one close brace in the code. Does clang-format handle this correctly?
There was a problem hiding this comment.
Instead, maybe add at the beginning of each of these 4 files:
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
// https://doc.qt.io/qt-5/qlinef-obsolete.html
#define intersects intersect
#define IntersectionType IntersectType
#endif
I know this is kinda dangerous if "intersects" is used in the code but this seems ok to me
There was a problem hiding this comment.
clang-format can handle this indeed. As for the defines is better to use usings, although I prefer to not use them altogether.
There was a problem hiding this comment.
actually I don't think "using" is possible, since it's inside a class, not a namespace
YakoYakoYokuYoku
force-pushed
the
qlinef-intersect-renov
branch
2 times, most recently
from
4017d92
to
8d2dc81
Compare
|
note that you can use |
|
I think that could be done in another PR, as many other parts of the codebase do this too. |
Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:
PR Description
What type of PR is this? (Check one of the boxes below)
What does this pull request do?
Both
QLineF::intersectplusQLineF::IntersectTypewere deprecated in Qt 5.14 andQLineF::intersectsplusQLineF::IntersectionTypeare recommended to be used instead.Show a few screenshots (if this is a visual change)
N/A.
Have you tested your changes (if applicable)? If so, how?
Built Natron and used the node graph editor.
Futher details of this pull request
N/A.