summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 19:19:21 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 19:19:21 +0200
commitecf4a2fae523163ae0b444a3b7ca081d03fa5a76 (patch)
tree19ba61e1504a0f3f809a785205c237296835d9b6
parenta5ca4a64ac54a2bc67421a74d2caf5f085d26861 (diff)
parent1ce9af6c1c32b20dedc33bd46cde5ee4b34a04c1 (diff)
downloadqtsvg-ecf4a2fae523163ae0b444a3b7ca081d03fa5a76.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idc73ff997eb15638c2f9e142e1a09096687a410a
-rw-r--r--src/svg/qsvgstyle.cpp9
-rw-r--r--src/svg/qsvgstyle_p.h6
2 files changed, 8 insertions, 7 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 16a2ad1..243ed0d 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -85,9 +85,8 @@ void QSvgFillStyleProperty::revert(QPainter *, QSvgExtraStates &)
QSvgQualityStyle::QSvgQualityStyle(int color)
- : m_colorRendering(color)
{
-
+ Q_UNUSED(color);
}
void QSvgQualityStyle::apply(QPainter *, const QSvgNode *, QSvgExtraStates &)
{
@@ -640,10 +639,11 @@ void QSvgStyle::revert(QPainter *p, QSvgExtraStates &states)
QSvgAnimateTransform::QSvgAnimateTransform(int startMs, int endMs, int byMs )
: QSvgStyleProperty(),
- m_from(startMs), m_to(endMs), m_by(byMs),
+ m_from(startMs), m_to(endMs),
m_type(Empty), m_additive(Replace), m_count(0), m_finished(false), m_transformApplied(false)
{
m_totalRunningTime = m_to - m_from;
+ Q_UNUSED(byMs);
}
void QSvgAnimateTransform::setArgs(TransformType type, Additive additive, const QVector<qreal> &args)
@@ -811,10 +811,11 @@ void QSvgAnimateTransform::setRepeatCount(qreal repeatCount)
QSvgAnimateColor::QSvgAnimateColor(int startMs, int endMs, int byMs)
: QSvgStyleProperty(),
- m_from(startMs), m_to(endMs), m_by(byMs),
+ m_from(startMs), m_to(endMs),
m_finished(false)
{
m_totalRunningTime = m_to - m_from;
+ Q_UNUSED(byMs);
}
void QSvgAnimateColor::setArgs(bool fill,
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index d30f18e..fe6fb69 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -195,7 +195,7 @@ public:
private:
// color-render ing v v 'auto' | 'optimizeSpeed' |
// 'optimizeQuality' | 'inherit'
- int m_colorRendering;
+ //int m_colorRendering;
// shape-rendering v v 'auto' | 'optimizeSpeed' | 'crispEdges' |
// 'geometricPrecision' | 'inherit'
@@ -690,7 +690,7 @@ public:
protected:
void resolveMatrix(const QSvgNode *node);
private:
- qreal m_from, m_to, m_by;
+ qreal m_from, m_to;
qreal m_totalRunningTime;
TransformType m_type;
Additive m_additive;
@@ -716,7 +716,7 @@ public:
virtual void revert(QPainter *p, QSvgExtraStates &states);
virtual Type type() const;
private:
- qreal m_from, m_to, m_by;
+ qreal m_from, m_to;
qreal m_totalRunningTime;
QList<QColor> m_colors;
QBrush m_oldBrush;