From 7e74236477e674b19de25016f4aaef0f86f1a0d6 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Wed, 11 Apr 2012 10:09:26 +0200 Subject: [PATCH] Move QVectorPath::polygonFlags to its own class. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/painting/qpaintengineex_p.h | 10 ---------- src/gui/painting/qvectorpath_p.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 8a65e6cf0b..71a2ec344f 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -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 diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h index 2ee7d86b97..fc2661fb68 100644 --- a/src/gui/painting/qvectorpath_p.h +++ b/src/gui/painting/qvectorpath_p.h @@ -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;