whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inlining order of functions in qpathclipper_p.h. 

When compiling tst_qpathclipper with MinGW:

In file included from QtGui/private/qpathclipper_p.h:1:0,
                 from tst_qpathclipper.cpp:33:
src/gui/painting/qpathclipper_p.h:469:29: warning: 'static QPathEdge::Traversal QWingedEdge::flip(QPathEdge::Traversal)' redeclared without dllimport attribute after being referenced with dll linkage
inline QPathEdge::Traversal QWingedEdge::flip(QPathEdge::Traversal traversal)
                             ^
qpathclipper_p.h:474:29: warning: 'static QPathEdge::Direction QWingedEdge::flip(QPathEdge::Direction)' redeclared without dllimport attribute after being referenced with dll linkage
inline QPathEdge::Direction QWingedEdge::flip(QPathEdge::Direction direction)

Change-Id: I38feb07d693768285c1d405b3fc92a58c3309547
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
bb10
Friedemann Kleint 2015-01-15 14:45:46 +01:00 committed by Friedemann Kleint
parent 63ca2846e1
commit 241d32bfe3
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/painting/qpathclipper_p.h
View File

@ -414,22 +414,6 @@ inline void QPathSegments::addIntersection(int index, const Intersection &inters
}
}
inline void QWingedEdge::TraversalStatus::flipDirection()
{
direction = QWingedEdge::flip(direction);
}
inline void QWingedEdge::TraversalStatus::flipTraversal()
{
traversal = QWingedEdge::flip(traversal);
}
inline void QWingedEdge::TraversalStatus::flip()
{
flipDirection();
flipTraversal();
}
inline int QWingedEdge::edgeCount() const
{
return m_edges.size();
@ -471,11 +455,27 @@ inline QPathEdge::Traversal QWingedEdge::flip(QPathEdge::Traversal traversal)
return traversal == QPathEdge::RightTraversal ? QPathEdge::LeftTraversal : QPathEdge::RightTraversal;
}
inline void QWingedEdge::TraversalStatus::flipTraversal()
{
traversal = QWingedEdge::flip(traversal);
}
inline QPathEdge::Direction QWingedEdge::flip(QPathEdge::Direction direction)
{
return direction == QPathEdge::Forward ? QPathEdge::Backward : QPathEdge::Forward;
}
inline void QWingedEdge::TraversalStatus::flipDirection()
{
direction = QWingedEdge::flip(direction);
}
inline void QWingedEdge::TraversalStatus::flip()
{
flipDirection();
flipTraversal();
}
QT_END_NAMESPACE
#endif // QPATHCLIPPER_P_H