diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index 47cd41ee4..d98d9f865 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.cpp @@ -42,10 +42,6 @@ void QSvgNode::appendStyleProperty(QSvgStyleProperty *prop, const QString &id) { //qDebug()<<"appending "<type()<< " ("<< id <<") "<<"to "<type(); switch (prop->type()) { - case QSvgStyleProperty::QUALITY: { - m_style.quality = static_cast(prop); - break; - } case QSvgStyleProperty::FILL: { m_style.fill = static_cast(prop); break; @@ -110,10 +106,6 @@ QSvgStyleProperty * QSvgNode::styleProperty(QSvgStyleProperty::Type type) const const QSvgNode *node = this; while (node) { switch (type) { - case QSvgStyleProperty::QUALITY: - if (node->m_style.quality) - return node->m_style.quality; - break; case QSvgStyleProperty::FILL: if (node->m_style.fill) return node->m_style.fill; diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index c4f51b905..424ccf336 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -60,20 +60,6 @@ void QSvgFillStyleProperty::revert(QPainter *, QSvgExtraStates &) Q_ASSERT(!"This should not be called!"); } - -QSvgQualityStyle::QSvgQualityStyle(int color) -{ - Q_UNUSED(color); -} -void QSvgQualityStyle::apply(QPainter *, const QSvgNode *, QSvgExtraStates &) -{ - -} -void QSvgQualityStyle::revert(QPainter *, QSvgExtraStates &) -{ - -} - QSvgFillStyle::QSvgFillStyle() : m_style(0) , m_fillRule(Qt::WindingFill) @@ -425,11 +411,6 @@ void QSvgTransformStyle::revert(QPainter *p, QSvgExtraStates &) p->setWorldTransform(m_oldWorldTransform, false /* don't combine */); } -QSvgStyleProperty::Type QSvgQualityStyle::type() const -{ - return QUALITY; -} - QSvgStyleProperty::Type QSvgFillStyle::type() const { return FILL; @@ -494,10 +475,6 @@ QSvgStyle::~QSvgStyle() void QSvgStyle::apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) { - if (quality) { - quality->apply(p, node, states); - } - if (fill) { fill->apply(p, node, states); } @@ -529,10 +506,6 @@ void QSvgStyle::apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states) { - if (quality) { - quality->revert(p, states); - } - if (fill) { fill->revert(p, states); } diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index ac855d845..7d7aae337 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -134,7 +134,6 @@ class QSvgStyleProperty : public QSvgRefCounted public: enum Type { - QUALITY, FILL, VIEWPORT_FILL, FONT, @@ -160,38 +159,6 @@ public: virtual void revert(QPainter *p, QSvgExtraStates &states); }; -class QSvgQualityStyle : public QSvgStyleProperty -{ -public: - QSvgQualityStyle(int color); - virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); - virtual void revert(QPainter *p, QSvgExtraStates &states); - virtual Type type() const; -private: - // color-render ing v v 'auto' | 'optimizeSpeed' | - // 'optimizeQuality' | 'inherit' - //int m_colorRendering; - - // shape-rendering v v 'auto' | 'optimizeSpeed' | 'crispEdges' | - // 'geometricPrecision' | 'inherit' - //QSvgShapeRendering m_shapeRendering; - - - // text-rendering v v 'auto' | 'optimizeSpeed' | 'optimizeLegibility' - // | 'geometricPrecision' | 'inherit' - //QSvgTextRendering m_textRendering; - - - // vector-effect v x 'default' | 'non-scaling-stroke' | 'inherit' - //QSvgVectorEffect m_vectorEffect; - - // image-rendering v v 'auto' | 'optimizeSpeed' | 'optimizeQuality' | - // 'inherit' - //QSvgImageRendering m_imageRendering; -}; - - - class QSvgOpacityStyle : public QSvgStyleProperty { public: @@ -624,8 +591,7 @@ class QSvgStyle { public: QSvgStyle() - : quality(0), - fill(0), + : fill(0), viewportFill(0), font(0), stroke(0), @@ -639,7 +605,7 @@ public: void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states); void revert(QPainter *p, QSvgExtraStates &states); - QSvgRefCounter quality; + QSvgRefCounter fill; QSvgRefCounter viewportFill; QSvgRefCounter font;