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

Move QVectorPath::polygonFlags to its own class. 

Who can say why it was put in QPaintEngineEx's header, but it certainly doesn't
belong there.

Change-Id: Ieb3b977affcf4b240f621d13b72bdc0e8f8138b9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
bb10
Robin Burchell 2012-04-11 10:09:26 +02:00 committed by Qt by Nokia
parent 517240096b
commit 7e74236477
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/painting/qpaintengineex_p.h
View File

@ -204,16 +204,6 @@ public:
QRect exDeviceRect;
};
inline uint QVectorPath::polygonFlags(QPaintEngine::PolygonDrawMode mode) {
switch (mode) {
case QPaintEngine::ConvexMode: return ConvexPolygonHint | ImplicitClose;
case QPaintEngine::OddEvenMode: return PolygonHint | OddEvenFill | ImplicitClose;
case QPaintEngine::WindingMode: return PolygonHint | WindingFill | ImplicitClose;
case QPaintEngine::PolylineMode: return PolygonHint;
default: return 0;
}
}
QT_END_NAMESPACE
QT_END_HEADER

11
src/gui/painting/qvectorpath_p.h
View File

@ -139,7 +139,16 @@ public:
inline int elementCount() const { return m_count; }
inline const QPainterPath convertToPainterPath() const;
static inline uint polygonFlags(QPaintEngine::PolygonDrawMode mode);
static inline uint polygonFlags(QPaintEngine::PolygonDrawMode mode)
{
switch (mode) {
case QPaintEngine::ConvexMode: return ConvexPolygonHint | ImplicitClose;
case QPaintEngine::OddEvenMode: return PolygonHint | OddEvenFill | ImplicitClose;
case QPaintEngine::WindingMode: return PolygonHint | WindingFill | ImplicitClose;
case QPaintEngine::PolylineMode: return PolygonHint;
default: return 0;
}
}
struct CacheEntry {
QPaintEngineEx *engine;