Refactor QSvgFillStyleProperty for Pattern work

Change-Id: I08f72294e1be707b24ca9a0358558bde87ddabea
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>

8 files changed, 57 insertions, 57 deletions

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index cdc55e3..f92be2c 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1043,11 +1043,11 @@ static void parseBrush(QSvgNode *node,
                 QSvgStyleProperty *style = styleFromUrl(node, value);
                 if (style) {
                     if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT)
-                        prop->setFillStyle(reinterpret_cast<QSvgFillStyleProperty *>(style));
+                        prop->setFillStyle(reinterpret_cast<QSvgPaintStyleProperty *>(style));
                 } else {
                     QString id = idFromUrl(value);
-                    prop->setGradientId(id);
-                    prop->setGradientResolved(false);
+                    prop->setPaintStyleId(id);
+                    prop->setPaintStyleResolved(false);
                 }
             } else if (attributes.fill != QLatin1String("none")) {
                 QColor color;
@@ -1212,11 +1212,11 @@ static void parsePen(QSvgNode *node,
                     QSvgStyleProperty *style = styleFromUrl(node, value);
                     if (style) {
                         if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT)
-                            prop->setStyle(reinterpret_cast<QSvgFillStyleProperty *>(style));
+                            prop->setStyle(reinterpret_cast<QSvgPaintStyleProperty *>(style));
                     } else {
                         QString id = idFromUrl(value);
-                        prop->setGradientId(id);
-                        prop->setGradientResolved(false);
+                        prop->setPaintStyleId(id);
+                        prop->setPaintStyleResolved(false);
                     }
             } else if (attributes.stroke != QLatin1String("none")) {
                 QColor color;
@@ -4093,7 +4093,7 @@ void QSvgHandler::parse()
             break;
         }
     }
-    resolveGradients(m_doc);
+    resolvePaintServers(m_doc);
     resolveNodes();
     if (detectCycles(m_doc)) {
         qCWarning(lcSvgHandler, "Cycles detected in SVG, document discarded.");
@@ -4294,7 +4294,7 @@ bool QSvgHandler::endElement(const QStringView localName)
     return true;
 }
 
-void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth)
+void QSvgHandler::resolvePaintServers(QSvgNode *node, int nestedDepth)
 {
     if (!node || (node->type() != QSvgNode::Doc && node->type() != QSvgNode::Group
         && node->type() != QSvgNode::Defs && node->type() != QSvgNode::Switch)) {
@@ -4306,9 +4306,9 @@ void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth)
     const QList<QSvgNode *> ren = structureNode->renderers();
     for (auto it = ren.begin(); it != ren.end(); ++it) {
         QSvgFillStyle *fill = static_cast<QSvgFillStyle *>((*it)->styleProperty(QSvgStyleProperty::FILL));
-        if (fill && !fill->isGradientResolved()) {
-            QString id = fill->gradientId();
-            QSvgFillStyleProperty *style = structureNode->styleProperty(id);
+        if (fill && !fill->isPaintStyleResolved()) {
+            QString id = fill->paintStyleId();
+            QSvgPaintStyleProperty *style = structureNode->styleProperty(id);
             if (style) {
                 fill->setFillStyle(style);
             } else {
@@ -4318,9 +4318,9 @@ void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth)
         }
 
         QSvgStrokeStyle *stroke = static_cast<QSvgStrokeStyle *>((*it)->styleProperty(QSvgStyleProperty::STROKE));
-        if (stroke && !stroke->isGradientResolved()) {
-            QString id = stroke->gradientId();
-            QSvgFillStyleProperty *style = structureNode->styleProperty(id);
+        if (stroke && !stroke->isPaintStyleResolved()) {
+            QString id = stroke->paintStyleId();
+            QSvgPaintStyleProperty *style = structureNode->styleProperty(id);
             if (style) {
                 stroke->setStyle(style);
             } else {
@@ -4330,7 +4330,7 @@ void QSvgHandler::resolveGradients(QSvgNode *node, int nestedDepth)
         }
 
         if (nestedDepth < 2048)
-            resolveGradients(*it, nestedDepth + 1);
+            resolvePaintServers(*it, nestedDepth + 1);
     }
 }
 
diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h
index 00e3b02..298b97d 100644
--- a/src/svg/qsvghandler_p.h
+++ b/src/svg/qsvghandler_p.h
@@ -146,7 +146,7 @@ private:
     QCss::Parser m_cssParser;
 #endif
     void parse();
-    void resolveGradients(QSvgNode *node, int nestedDepth = 0);
+    void resolvePaintServers(QSvgNode *node, int nestedDepth = 0);
     void resolveNodes();
 
     QPen m_defaultPen;
diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp
index 79c80a4..85ccf1a 100644
--- a/src/svg/qsvgnode.cpp
+++ b/src/svg/qsvgnode.cpp
@@ -277,7 +277,7 @@ QSvgStyleProperty * QSvgNode::styleProperty(QSvgStyleProperty::Type type) const
     return 0;
 }
 
-QSvgFillStyleProperty * QSvgNode::styleProperty(const QString &id) const
+QSvgPaintStyleProperty * QSvgNode::styleProperty(const QString &id) const
 {
     QString rid = id;
     if (rid.startsWith(QLatin1Char('#')))
diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h
index 3bea1d4..c15c418 100644
--- a/src/svg/qsvgnode_p.h
+++ b/src/svg/qsvgnode_p.h
@@ -103,7 +103,7 @@ public:
     void applyStyle(QPainter *p, QSvgExtraStates &states) const;
     void revertStyle(QPainter *p, QSvgExtraStates &states) const;
     QSvgStyleProperty *styleProperty(QSvgStyleProperty::Type type) const;
-    QSvgFillStyleProperty *styleProperty(const QString &id) const;
+    QSvgPaintStyleProperty *styleProperty(const QString &id) const;
 
     QSvgTinyDocument *document() const;
 
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 604b4e4..a92ebac 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -34,12 +34,12 @@ QSvgStyleProperty::~QSvgStyleProperty()
 {
 }
 
-void QSvgFillStyleProperty::apply(QPainter *, const QSvgNode *, QSvgExtraStates &)
+void QSvgPaintStyleProperty::apply(QPainter *, const QSvgNode *, QSvgExtraStates &)
 {
     Q_ASSERT(!"This should not be called!");
 }
 
-void QSvgFillStyleProperty::revert(QPainter *, QSvgExtraStates &)
+void QSvgPaintStyleProperty::revert(QPainter *, QSvgExtraStates &)
 {
     Q_ASSERT(!"This should not be called!");
 }
@@ -94,7 +94,7 @@ QSvgFillStyle::QSvgFillStyle()
     , m_oldFillRule(Qt::WindingFill)
     , m_fillOpacity(1.0)
     , m_oldFillOpacity(0)
-    , m_gradientResolved(1)
+    , m_paintStyleResolved(1)
     , m_fillRuleSet(0)
     , m_fillOpacitySet(0)
     , m_fillSet(0)
@@ -113,7 +113,7 @@ void QSvgFillStyle::setFillOpacity(qreal opacity)
     m_fillOpacity = opacity;
 }
 
-void QSvgFillStyle::setFillStyle(QSvgFillStyleProperty* style)
+void QSvgFillStyle::setFillStyle(QSvgPaintStyleProperty* style)
 {
     m_style = style;
     m_fillSet = 1;
@@ -249,7 +249,7 @@ QSvgStrokeStyle::QSvgStrokeStyle()
     , m_strokeDashOffset(0)
     , m_oldStrokeDashOffset(0)
     , m_style(0)
-    , m_gradientResolved(1)
+    , m_paintStyleResolved(1)
     , m_vectorEffect(0)
     , m_oldVectorEffect(0)
     , m_strokeSet(0)
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index 6f0bc23..3ce2946 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -144,7 +144,7 @@ public:
     bool isDefault() const { return false; } // [not virtual since called from templated class]
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgFillStyleProperty : public QSvgStyleProperty
+class Q_SVG_PRIVATE_EXPORT QSvgPaintStyleProperty : public QSvgStyleProperty
 {
 public:
     virtual QBrush brush(QPainter *p, QSvgExtraStates &states) = 0;
@@ -219,7 +219,7 @@ public:
 
     void setFillRule(Qt::FillRule f);
     void setFillOpacity(qreal opacity);
-    void setFillStyle(QSvgFillStyleProperty* style);
+    void setFillStyle(QSvgPaintStyleProperty* style);
     void setBrush(QBrush brush);
 
     const QBrush & qbrush() const
@@ -237,29 +237,29 @@ public:
         return m_fillRule;
     }
 
-    QSvgFillStyleProperty* style() const
+    QSvgPaintStyleProperty* style() const
     {
         return m_style;
     }
 
-    void setGradientId(const QString &Id)
+    void setPaintStyleId(const QString &Id)
     {
-        m_gradientId = Id;
+        m_paintStyleId = Id;
     }
 
-    QString gradientId() const
+    QString paintStyleId() const
     {
-        return m_gradientId;
+        return m_paintStyleId;
     }
 
-    void setGradientResolved(bool resolved)
+    void setPaintStyleResolved(bool resolved)
     {
-        m_gradientResolved = resolved;
+        m_paintStyleResolved = resolved;
     }
 
-    bool isGradientResolved() const
+    bool isPaintStyleResolved() const
     {
-        return m_gradientResolved;
+        return m_paintStyleResolved;
     }
 
 private:
@@ -267,15 +267,15 @@ private:
     // fill-opacity    v 	v 	'inherit' | <OpacityValue.datatype>
     QBrush m_fill;
     QBrush m_oldFill;
-    QSvgFillStyleProperty *m_style;
+    QSvgPaintStyleProperty *m_style;
 
     Qt::FillRule m_fillRule;
     Qt::FillRule m_oldFillRule;
     qreal m_fillOpacity;
     qreal m_oldFillOpacity;
 
-    QString m_gradientId;
-    uint m_gradientResolved : 1;
+    QString m_paintStyleId;
+    uint m_paintStyleResolved : 1;
 
     uint m_fillRuleSet : 1;
     uint m_fillOpacitySet : 1;
@@ -399,7 +399,7 @@ public:
         m_strokeSet = 1;
     }
 
-    void setStyle(QSvgFillStyleProperty *style)
+    void setStyle(QSvgPaintStyleProperty *style)
     {
         m_style = style;
         m_strokeSet = 1;
@@ -461,29 +461,29 @@ public:
         m_vectorEffectSet = 1;
     }
 
-    QSvgFillStyleProperty* style() const
+    QSvgPaintStyleProperty* style() const
     {
         return m_style;
     }
 
-    void setGradientId(const QString &Id)
+    void setPaintStyleId(const QString &Id)
     {
-        m_gradientId = Id;
+        m_paintStyleId = Id;
     }
 
-    QString gradientId() const
+    QString paintStyleId() const
     {
-        return m_gradientId;
+        return m_paintStyleId;
     }
 
-    void setGradientResolved(bool resolved)
+    void setPaintStyleResolved(bool resolved)
     {
-        m_gradientResolved = resolved;
+        m_paintStyleResolved = resolved;
     }
 
-    bool isGradientResolved() const
+    bool isPaintStyleResolved() const
     {
-        return m_gradientResolved;
+        return m_paintStyleResolved;
     }
 
     QPen stroke() const
@@ -507,9 +507,9 @@ private:
     qreal m_strokeDashOffset;
     qreal m_oldStrokeDashOffset;
 
-    QSvgFillStyleProperty *m_style;
-    QString m_gradientId;
-    uint m_gradientResolved : 1;
+    QSvgPaintStyleProperty *m_style;
+    QString m_paintStyleId;
+    uint m_paintStyleResolved : 1;
     uint m_vectorEffect : 1;
     uint m_oldVectorEffect : 1;
 
@@ -524,7 +524,7 @@ private:
     uint m_vectorEffectSet : 1;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgSolidColorStyle : public QSvgFillStyleProperty
+class Q_SVG_PRIVATE_EXPORT QSvgSolidColorStyle : public QSvgPaintStyleProperty
 {
 public:
     QSvgSolidColorStyle(const QColor &color);
@@ -549,7 +549,7 @@ private:
     QPen   m_oldStroke;
 };
 
-class Q_SVG_PRIVATE_EXPORT QSvgGradientStyle : public QSvgFillStyleProperty
+class Q_SVG_PRIVATE_EXPORT QSvgGradientStyle : public QSvgPaintStyleProperty
 {
 public:
     QSvgGradientStyle(QGradient *grad);
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index b901fc1..cdf2d3c 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -365,7 +365,7 @@ QSvgNode *QSvgTinyDocument::namedNode(const QString &id) const
     return m_namedNodes.value(id);
 }
 
-void QSvgTinyDocument::addNamedStyle(const QString &id, QSvgFillStyleProperty *style)
+void QSvgTinyDocument::addNamedStyle(const QString &id, QSvgPaintStyleProperty *style)
 {
     if (!m_namedStyles.contains(id))
         m_namedStyles.insert(id, style);
@@ -373,7 +373,7 @@ void QSvgTinyDocument::addNamedStyle(const QString &id, QSvgFillStyleProperty *s
         qCWarning(lcSvgHandler) << "Duplicate unique style id:" << id;
 }
 
-QSvgFillStyleProperty *QSvgTinyDocument::namedStyle(const QString &id) const
+QSvgPaintStyleProperty *QSvgTinyDocument::namedStyle(const QString &id) const
 {
     return m_namedStyles.value(id);
 }
diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h
index 8d5e180..0b6544a 100644
--- a/src/svg/qsvgtinydocument_p.h
+++ b/src/svg/qsvgtinydocument_p.h
@@ -75,8 +75,8 @@ public:
     QSvgFont *svgFont(const QString &family) const;
     void addNamedNode(const QString &id, QSvgNode *node);
     QSvgNode *namedNode(const QString &id) const;
-    void addNamedStyle(const QString &id, QSvgFillStyleProperty *style);
-    QSvgFillStyleProperty *namedStyle(const QString &id) const;
+    void addNamedStyle(const QString &id, QSvgPaintStyleProperty *style);
+    QSvgPaintStyleProperty *namedStyle(const QString &id) const;
 
     void restartAnimation();
     int currentElapsed() const;
@@ -99,7 +99,7 @@ private:
 
     QHash<QString, QSvgRefCounter<QSvgFont> > m_fonts;
     QHash<QString, QSvgNode *> m_namedNodes;
-    QHash<QString, QSvgRefCounter<QSvgFillStyleProperty> > m_namedStyles;
+    QHash<QString, QSvgRefCounter<QSvgPaintStyleProperty> > m_namedStyles;
 
     qint64 m_time;
     bool  m_animated;