diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-13 00:25:47 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 19:30:05 +0200 |
commit | e842e1de9df9b2d1ec2bea9c6a12f6371cd82ffa (patch) | |
tree | 33332ec7fb974491bc57aa4ed326407792a44f61 /ksvg | |
parent | b93ebd692de461b59ce2db6181b08d736d37a423 (diff) | |
download | tdegraphics-e842e1de9df9b2d1ec2bea9c6a12f6371cd82ffa.tar.gz tdegraphics-e842e1de9df9b2d1ec2bea9c6a12f6371cd82ffa.zip |
Fix inadvertent "TQ" changes.
(cherry picked from commit ca4b0c6d6aef469eede468b405ea89e119da3626)
Diffstat (limited to 'ksvg')
-rw-r--r-- | ksvg/core/KSVGCanvas.cpp | 2 | ||||
-rw-r--r-- | ksvg/data/SVGPathSegImpl.lut.h | 16 | ||||
-rw-r--r-- | ksvg/dom/SVGPathSeg.h | 8 | ||||
-rw-r--r-- | ksvg/impl/SVGPathElementImpl.cc | 8 | ||||
-rw-r--r-- | ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h | 4 | ||||
-rw-r--r-- | ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h | 4 | ||||
-rw-r--r-- | ksvg/impl/SVGPathSegImpl.cc | 8 | ||||
-rw-r--r-- | ksvg/impl/SVGStylableImpl.cc | 2 | ||||
-rw-r--r-- | ksvg/impl/SVGStylableImpl.h | 2 |
9 files changed, 27 insertions, 27 deletions
diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp index bbd63524..347e00ba 100644 --- a/ksvg/core/KSVGCanvas.cpp +++ b/ksvg/core/KSVGCanvas.cpp @@ -341,7 +341,7 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons slant |= FC_SLANT_ROMAN; else if(fontStyle == ITALIC) slant |= FC_SLANT_ITALIC; - else if(fontStyle == OBLITQUE) + else if(fontStyle == OBLIQUE) slant |= FC_SLANT_OBLIQUE; // Calc font names diff --git a/ksvg/data/SVGPathSegImpl.lut.h b/ksvg/data/SVGPathSegImpl.lut.h index 1ef4cf85..94436a77 100644 --- a/ksvg/data/SVGPathSegImpl.lut.h +++ b/ksvg/data/SVGPathSegImpl.lut.h @@ -28,12 +28,12 @@ namespace KSVG { static const char SVGPathSegImplConstructor__s_hashTableStrings[] = { "\0" - "PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS\0" - "PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL\0" + "PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS\0" + "PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL\0" "PATHSEG_CURVETO_CUBIC_SMOOTH_ABS\0" "PATHSEG_CURVETO_CUBIC_SMOOTH_REL\0" - "PATHSEG_CURVETO_TQUADRATIC_ABS\0" - "PATHSEG_CURVETO_TQUADRATIC_REL\0" + "PATHSEG_CURVETO_QUADRATIC_ABS\0" + "PATHSEG_CURVETO_QUADRATIC_REL\0" "PATHSEG_LINETO_HORIZONTAL_ABS\0" "PATHSEG_LINETO_HORIZONTAL_REL\0" "PATHSEG_LINETO_VERTICAL_ABS\0" @@ -56,7 +56,7 @@ static const struct HashEntry SVGPathSegImplConstructor__s_hashTableEntries[] = { 317, KSVG::PATHSEG_CURVETO_CUBIC_ABS, DontDelete|ReadOnly, 0, -1 }, { 0, 0, 0, 0, -1 }, { 0, 0, 0, 0, -1 }, - { 171, KSVG::PATHSEG_CURVETO_TQUADRATIC_REL, DontDelete|ReadOnly, 0, 27 }, + { 171, KSVG::PATHSEG_CURVETO_QUADRATIC_REL, DontDelete|ReadOnly, 0, 27 }, { 479, KSVG::PATHSEG_ARC_REL, DontDelete|ReadOnly, 0, -1 }, { 495, KSVG::PATHSEG_UNKNOWN, DontDelete|ReadOnly, 0, 23 }, { 369, KSVG::PATHSEG_LINETO_ABS, DontDelete|ReadOnly, 0, -1 }, @@ -73,14 +73,14 @@ static const struct HashEntry SVGPathSegImplConstructor__s_hashTableEntries[] = { 75, KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 }, { 231, KSVG::PATHSEG_LINETO_HORIZONTAL_REL, DontDelete|ReadOnly, 0, -1 }, { 388, KSVG::PATHSEG_LINETO_REL, DontDelete|ReadOnly, 0, -1 }, - { 38, KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL, DontDelete|ReadOnly, 0, -1 }, + { 38, KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, DontDelete|ReadOnly, 0, -1 }, { 407, KSVG::PATHSEG_MOVETO_ABS, DontDelete|ReadOnly, 0, -1 }, { 445, KSVG::PATHSEG_CLOSEPATH, DontDelete|ReadOnly, 0, 25 }, - { 141, KSVG::PATHSEG_CURVETO_TQUADRATIC_ABS, DontDelete|ReadOnly, 0, 26 }, + { 141, KSVG::PATHSEG_CURVETO_QUADRATIC_ABS, DontDelete|ReadOnly, 0, 26 }, { 201, KSVG::PATHSEG_LINETO_HORIZONTAL_ABS, DontDelete|ReadOnly, 0, -1 }, { 261, KSVG::PATHSEG_LINETO_VERTICAL_ABS, DontDelete|ReadOnly, 0, -1 }, { 289, KSVG::PATHSEG_LINETO_VERTICAL_REL, DontDelete|ReadOnly, 0, -1 }, - { 1, KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 } + { 1, KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 } }; const struct HashTable SVGPathSegImplConstructor::s_hashTable = { 2, 29, SVGPathSegImplConstructor__s_hashTableEntries, 23, SVGPathSegImplConstructor__s_hashTableStrings}; diff --git a/ksvg/dom/SVGPathSeg.h b/ksvg/dom/SVGPathSeg.h index 0120276b..f82e3c80 100644 --- a/ksvg/dom/SVGPathSeg.h +++ b/ksvg/dom/SVGPathSeg.h @@ -35,8 +35,8 @@ enum PATHSEG_LINETO_REL = 5, PATHSEG_CURVETO_CUBIC_ABS = 6, PATHSEG_CURVETO_CUBIC_REL = 7, - PATHSEG_CURVETO_TQUADRATIC_ABS = 8, - PATHSEG_CURVETO_TQUADRATIC_REL = 9, + PATHSEG_CURVETO_QUADRATIC_ABS = 8, + PATHSEG_CURVETO_QUADRATIC_REL = 9, PATHSEG_ARC_ABS = 10, PATHSEG_ARC_REL = 11, PATHSEG_LINETO_HORIZONTAL_ABS = 12, @@ -45,8 +45,8 @@ enum PATHSEG_LINETO_VERTICAL_REL = 15, PATHSEG_CURVETO_CUBIC_SMOOTH_ABS = 16, PATHSEG_CURVETO_CUBIC_SMOOTH_REL = 17, - PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS = 18, - PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL = 19 + PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS = 18, + PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL = 19 }; class SVGPathSegImpl; diff --git a/ksvg/impl/SVGPathElementImpl.cc b/ksvg/impl/SVGPathElementImpl.cc index 5a0d0057..506ad01a 100644 --- a/ksvg/impl/SVGPathElementImpl.cc +++ b/ksvg/impl/SVGPathElementImpl.cc @@ -678,21 +678,21 @@ SVGPathElementImpl::MarkerData::MarkerData(SVGPathSegListImpl *path) previousCubicY2 = cury + s->y2(); break; } - case PATHSEG_CURVETO_TQUADRATIC_ABS: + case PATHSEG_CURVETO_QUADRATIC_ABS: { SVGPathSegCurvetoQuadraticAbsImpl *s = static_cast<SVGPathSegCurvetoQuadraticAbsImpl *>(segment); previousQuadraticX1 = s->x1(); previousQuadraticY1 = s->y1(); break; } - case PATHSEG_CURVETO_TQUADRATIC_REL: + case PATHSEG_CURVETO_QUADRATIC_REL: { SVGPathSegCurvetoQuadraticRelImpl *s = static_cast<SVGPathSegCurvetoQuadraticRelImpl *>(segment); previousQuadraticX1 = curx + s->x1(); previousQuadraticY1 = cury + s->y1(); break; } - case PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS: + case PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: { SVGPathSegCurvetoQuadraticSmoothAbsImpl *s = static_cast<SVGPathSegCurvetoQuadraticSmoothAbsImpl *>(segment); s->setPreviousX1(previousQuadraticX1); @@ -701,7 +701,7 @@ SVGPathElementImpl::MarkerData::MarkerData(SVGPathSegListImpl *path) previousQuadraticY1 = s->y1(cury); break; } - case PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL: + case PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: { SVGPathSegCurvetoQuadraticSmoothRelImpl *s = static_cast<SVGPathSegCurvetoQuadraticSmoothRelImpl *>(segment); s->setPreviousAbsX1(previousQuadraticX1); diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h index 1fa0aa17..6772605f 100644 --- a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h @@ -34,7 +34,7 @@ public: SVGPathSegCurvetoQuadraticAbsImpl(); virtual ~SVGPathSegCurvetoQuadraticAbsImpl(); - virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_ABS; } + virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "Q"; } virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); } @@ -78,7 +78,7 @@ public: SVGPathSegCurvetoQuadraticRelImpl(); virtual ~SVGPathSegCurvetoQuadraticRelImpl(); - virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_REL; } + virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "q"; } virtual TQString toString() const { return TQString("q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); } diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h index 1d1bdf39..6c471bd6 100644 --- a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h @@ -34,7 +34,7 @@ public: SVGPathSegCurvetoQuadraticSmoothAbsImpl(); virtual ~SVGPathSegCurvetoQuadraticSmoothAbsImpl(); - virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS; } + virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "T"; } virtual TQString toString() const { return TQString("T %1 %2").arg(m_x).arg(m_y); } @@ -78,7 +78,7 @@ public: SVGPathSegCurvetoQuadraticSmoothRelImpl(); virtual ~SVGPathSegCurvetoQuadraticSmoothRelImpl(); - virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL; } + virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "t"; } virtual TQString toString() const { return TQString("t %1 %2").arg(m_x).arg(m_y); } diff --git a/ksvg/impl/SVGPathSegImpl.cc b/ksvg/impl/SVGPathSegImpl.cc index ba2c8ec2..c1f2934d 100644 --- a/ksvg/impl/SVGPathSegImpl.cc +++ b/ksvg/impl/SVGPathSegImpl.cc @@ -79,8 +79,8 @@ Value SVGPathSegImpl::getValueProperty(ExecState *, int token) const PATHSEG_LINETO_REL KSVG::PATHSEG_LINETO_REL DontDelete|ReadOnly PATHSEG_CURVETO_CUBIC_ABS KSVG::PATHSEG_CURVETO_CUBIC_ABS DontDelete|ReadOnly PATHSEG_CURVETO_CUBIC_REL KSVG::PATHSEG_CURVETO_CUBIC_REL DontDelete|ReadOnly - PATHSEG_CURVETO_TQUADRATIC_ABS KSVG::PATHSEG_CURVETO_TQUADRATIC_ABS DontDelete|ReadOnly - PATHSEG_CURVETO_TQUADRATIC_REL KSVG::PATHSEG_CURVETO_TQUADRATIC_REL DontDelete|ReadOnly + PATHSEG_CURVETO_QUADRATIC_ABS KSVG::PATHSEG_CURVETO_QUADRATIC_ABS DontDelete|ReadOnly + PATHSEG_CURVETO_QUADRATIC_REL KSVG::PATHSEG_CURVETO_QUADRATIC_REL DontDelete|ReadOnly PATHSEG_ARC_ABS KSVG::PATHSEG_ARC_ABS DontDelete|ReadOnly PATHSEG_ARC_REL KSVG::PATHSEG_ARC_REL DontDelete|ReadOnly PATHSEG_LINETO_HORIZONTAL_ABS KSVG::PATHSEG_LINETO_HORIZONTAL_ABS DontDelete|ReadOnly @@ -89,8 +89,8 @@ Value SVGPathSegImpl::getValueProperty(ExecState *, int token) const PATHSEG_LINETO_VERTICAL_REL KSVG::PATHSEG_LINETO_VERTICAL_REL DontDelete|ReadOnly PATHSEG_CURVETO_CUBIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS DontDelete|ReadOnly PATHSEG_CURVETO_CUBIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_REL DontDelete|ReadOnly - PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS DontDelete|ReadOnly - PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL DontDelete|ReadOnly + PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS DontDelete|ReadOnly + PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL DontDelete|ReadOnly @end */ diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc index 9471c562..c03c6f19 100644 --- a/ksvg/impl/SVGStylableImpl.cc +++ b/ksvg/impl/SVGStylableImpl.cc @@ -974,7 +974,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value & else if(param == "italic") m_fontStyle = ITALIC; else if(param == "oblique") - m_fontStyle = OBLITQUE; + m_fontStyle = OBLIQUE; break; case TextDecoration: m_flags |= SVG_STYLE_FLAG_TEXT_DECORATION; diff --git a/ksvg/impl/SVGStylableImpl.h b/ksvg/impl/SVGStylableImpl.h index 34ce2f4e..50a37568 100644 --- a/ksvg/impl/SVGStylableImpl.h +++ b/ksvg/impl/SVGStylableImpl.h @@ -162,7 +162,7 @@ enum EUnicodeBidi enum EFontStyle { - FSNORMAL, ITALIC, OBLITQUE + FSNORMAL, ITALIC, OBLIQUE }; enum ETextWritingMode |