From 1ce9af6c1c32b20dedc33bd46cde5ee4b34a04c1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 4 Jun 2013 10:13:11 -0700 Subject: Fix warnings found by clang: unused private members Classes with no friends should use all its private members. Otherwise, they just take up space for no good reason -- unless it's a placeholder for future use (binary compatibility). These are also private classes, so BC does not apply. qsvgstyle_p.h:198:9: error: private field 'm_colorRendering' is not used [-Werror,-Wunused-private-field] qsvgstyle_p.h:693:25: error: private field 'm_by' is not used [-Werror,-Wunused-private-field] Change-Id: I6aee61b2ba195b251cd1896e41948cc42ff68c46 Reviewed-by: Robin Burchell --- src/svg/qsvgstyle.cpp | 9 +++++---- src/svg/qsvgstyle_p.h | 6 +++--- 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 &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 m_colors; QBrush m_oldBrush; -- cgit v1.2.1