diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-08-25 10:13:11 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-08-25 10:34:18 (GMT) |
| commit | 2aeeda9b82440dbcb3564c185003288b83f49683 (patch) | |
| tree | cc21ff80d2c266c0ea86b373c85f098586edf8a6 /src/svg | |
| parent | 59d974cfd899832dc88c0183582147162bf721be (diff) | |
| download | Qt-2aeeda9b82440dbcb3564c185003288b83f49683.zip Qt-2aeeda9b82440dbcb3564c185003288b83f49683.tar.gz Qt-2aeeda9b82440dbcb3564c185003288b83f49683.tar.bz2 | |
Added missing variable initialization in QSvgStrokeStyle ctor.
The bug this commit fixes was introduced by commit
28ac217b04abaa4d226e43e402c14a88539fca3b.
Reviewed-by: Trond
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 6 | ||||
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index b2a2cb8..5b778d2 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -3299,7 +3299,7 @@ bool QSvgHandler::startElement(const QString &localName, m_style = prop; m_nodes.top()->appendStyleProperty(prop, someId(attributes), true); } else { - qWarning("Couldn't parse node: %s", qPrintable(localName)); + qWarning("Could not parse node: %s", qPrintable(localName)); } } else if (StyleParseMethod method = findStyleUtilFactoryMethod(localName)) { if (m_style) { @@ -3366,7 +3366,7 @@ bool QSvgHandler::endElement(const QStringRef &localName) if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT) fill->setFillStyle(reinterpret_cast<QSvgFillStyleProperty *>(style)); } else { - qWarning("Couldn't resolve property : %s",qPrintable(id)); + qWarning("Could not resolve property : %s",qPrintable(id)); fill->setBrush(QBrush(Qt::NoBrush)); } } @@ -3378,7 +3378,7 @@ bool QSvgHandler::endElement(const QStringRef &localName) if (style->type() == QSvgStyleProperty::SOLID_COLOR || style->type() == QSvgStyleProperty::GRADIENT) stroke->setStyle(reinterpret_cast<QSvgFillStyleProperty *>(style)); } else { - qWarning("Couldn't resolve property : %s",qPrintable(id)); + qWarning("Could not resolve property : %s",qPrintable(id)); stroke->setStroke(QBrush(Qt::NoBrush)); } } diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 6922ad9..13a0d30 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -274,10 +274,12 @@ void QSvgFontStyle::revert(QPainter *p, QSvgExtraStates &states) QSvgStrokeStyle::QSvgStrokeStyle() : m_strokeOpacity(1.0) , m_oldStrokeOpacity(0.0) - , m_vectorEffect(0) - , m_oldVectorEffect(0) , m_strokeDashOffset(0) , m_oldStrokeDashOffset(0) + , m_style(0) + , m_gradientResolved(1) + , m_vectorEffect(0) + , m_oldVectorEffect(0) , m_strokeSet(0) , m_strokeDashArraySet(0) , m_strokeDashOffsetSet(0) |