From 06959dfc86b3fb7b663ddc4ac6717c66cbf40d9a Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 5 Dec 2019 10:08:11 +0100 Subject: [PATCH] not using Q_GADGET to avoid having a moc file, that needs to be included in the standalone mode of svg2qvg --- src/graphic/QskGraphic.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/graphic/QskGraphic.h b/src/graphic/QskGraphic.h index d4e427ea..91cdf89d 100644 --- a/src/graphic/QskGraphic.h +++ b/src/graphic/QskGraphic.h @@ -9,6 +9,7 @@ #include "QskGlobal.h" #include +#include #include #include @@ -20,19 +21,17 @@ class QPixmap; class QPainterPath; class QPaintEngine; class QPaintEngineState; +class QTransform; class QSK_EXPORT QskGraphic : public QPaintDevice { - Q_GADGET - public: enum RenderHint { RenderPensUnscaled = 0x1 }; - Q_ENUM( RenderHint ) - Q_DECLARE_FLAGS( RenderHints, RenderHint ) + typedef QFlags< RenderHint > RenderHints; enum CommandType { @@ -41,8 +40,7 @@ class QSK_EXPORT QskGraphic : public QPaintDevice Transformation = 1 << 2 }; - Q_ENUM( CommandType ) - Q_DECLARE_FLAGS( CommandTypes, CommandType ) + typedef QFlags< CommandType > CommandTypes; QskGraphic(); QskGraphic( const QskGraphic& ); @@ -64,7 +62,7 @@ class QSK_EXPORT QskGraphic : public QPaintDevice CommandTypes commandTypes() const; void render( QPainter* ) const; - void render( QPainter*, const QskColorFilter& filter, + void render( QPainter*, const QskColorFilter&, QTransform* initialTransform = nullptr ) const; void render( QPainter*, const QSizeF&,