From ebbee358abafa1b5166404c6fe5cc44ae2837a57 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:21:13 -0600 Subject: Rename obsolete tq methods to standard names --- ksvg/data/SVGGlyphElementImpl.lut.h | 2 +- ksvg/data/SVGStylableImpl.lut.h | 2 +- ksvg/dom/SVGSVGElement.h | 2 +- ksvg/ecma/ksvg_helper.cpp | 4 ++-- ksvg/impl/SVGEventImpl.cc | 6 +++--- ksvg/impl/SVGGlyphElementImpl.cc | 2 +- ksvg/impl/SVGStylableImpl.cc | 4 ++-- ksvg/impl/libs/libtext2path/src/Converter.cpp | 28 +++++++++++++-------------- ksvg/impl/libs/libtext2path/src/Font.cpp | 6 +++--- ksvg/impl/libs/libtext2path/src/Glyph.cpp | 6 +++--- ksvg/impl/libs/libtext2path/src/Glyph.h | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) (limited to 'ksvg') diff --git a/ksvg/data/SVGGlyphElementImpl.lut.h b/ksvg/data/SVGGlyphElementImpl.lut.h index 8a4bb903..8300e1c8 100644 --- a/ksvg/data/SVGGlyphElementImpl.lut.h +++ b/ksvg/data/SVGGlyphElementImpl.lut.h @@ -13,7 +13,7 @@ static const char SVGGlyphElementImpl__s_hashTableStrings[] = { "orientation\0" "glyph-name\0" "vert-adv-y\0" - "tqunicode\0" + "unicode\0" "lang\0" "d\0" }; diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h index d652d4cb..838001a7 100644 --- a/ksvg/data/SVGStylableImpl.lut.h +++ b/ksvg/data/SVGStylableImpl.lut.h @@ -23,7 +23,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = { "fill-opacity\0" "marker-start\0" "stroke-width\0" - "tqunicode-bidi\0" + "unicode-bidi\0" "word-spacing\0" "writing-mode\0" "font-family\0" diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h index cdb0ef74..59621e2e 100644 --- a/ksvg/dom/SVGSVGElement.h +++ b/ksvg/dom/SVGSVGElement.h @@ -190,7 +190,7 @@ public: * this SVG document is embedded as part of another document (e.g., via the * HTML 'object' element), then the position and size are unitless values in * the coordinate system of the parent document. (If the parent uses CSS or - * XSL tqlayout, then unitless values represent pixel units for the current CSS + * XSL layout, then unitless values represent pixel units for the current CSS * or XSL viewport, as described in the CSS2 specification.) If the parent * element does not have a coordinate system, then the user agent should * provide reasonable default values for this attribute. diff --git a/ksvg/ecma/ksvg_helper.cpp b/ksvg/ecma/ksvg_helper.cpp index 1d41733e..24f05101 100644 --- a/ksvg/ecma/ksvg_helper.cpp +++ b/ksvg/ecma/ksvg_helper.cpp @@ -33,7 +33,7 @@ KJS::UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } @@ -41,7 +41,7 @@ KJS::UString::UString(const TQString &d) { unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc index 38ab5e64..e1252af8 100644 --- a/ksvg/impl/SVGEventImpl.cc +++ b/ksvg/impl/SVGEventImpl.cc @@ -507,17 +507,17 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv break; } - // m_keyVal should contain the tqunicode value + // m_keyVal should contain the unicode value // of the pressed key if available. if (!key->text().isNull()) - m_keyVal = TQString(key->text()).tqunicode()[0]; + m_keyVal = TQString(key->text()).unicode()[0]; // m_numPad = ??? // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. m_modifier = key->state(); - // key->text() returns the tqunicode sequence as a TQString + // key->text() returns the unicode sequence as a TQString m_outputString = DOM::DOMString(key->text()); } diff --git a/ksvg/impl/SVGGlyphElementImpl.cc b/ksvg/impl/SVGGlyphElementImpl.cc index ef891912..4975b2c5 100644 --- a/ksvg/impl/SVGGlyphElementImpl.cc +++ b/ksvg/impl/SVGGlyphElementImpl.cc @@ -43,7 +43,7 @@ TQString SVGGlyphElementImpl::d() const /* @namespace KSVG @begin SVGGlyphElementImpl::s_hashTable 11 - tqunicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly + unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly d SVGGlyphElementImpl::D DontDelete|ReadOnly orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc index 2808bc7f..9471c562 100644 --- a/ksvg/impl/SVGStylableImpl.cc +++ b/ksvg/impl/SVGStylableImpl.cc @@ -711,7 +711,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value) text-anchor SVGStylableImpl::TextAnchor DontDelete|ReadOnly direction SVGStylableImpl::Direction DontDelete|ReadOnly writing-mode SVGStylableImpl::WritingMode DontDelete|ReadOnly - tqunicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly + unicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly opacity SVGStylableImpl::Opacity DontDelete|ReadOnly fill-opacity SVGStylableImpl::FillOpacity DontDelete|ReadOnly stroke-opacity SVGStylableImpl::StrokeOpacity DontDelete|ReadOnly @@ -1006,7 +1006,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value & break; case Direction: m_flags |= SVG_STYLE_FLAG_TEXT_DIRECTION; - // Spec: direction is only processed when tqunicode-bidi + // Spec: direction is only processed when unicode-bidi // is set to bidi-override or embedded if(m_textUnicodeBidi == OVERRIDE || m_textUnicodeBidi == EMBED || diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp index 11de3177..59ab8e5c 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.cpp +++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp @@ -125,7 +125,7 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params)); // If not available in cache, render new one and cache it :) - // If we're mixing ie. japanese and latin characters (TTB tqlayout), + // If we're mixing ie. japanese and latin characters (TTB layout), // then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko) if(!cached || !onlyLatin) cached = calcGlyph(params, affine, onlyLatin); @@ -164,11 +164,11 @@ void Converter::selectGlyph(GlyphRenderParams *params) // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering // a latin glyph because it needs to be rotated... - if(params->tqlayout()->tb()) + if(params->layout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) - if(script != Latin || params->tqlayout()->glyphOrientationVertical() == 0) + if(script != Latin || params->layout()->glyphOrientationVertical() == 0) flags |= FT_LOAD_VERTICAL_LAYOUT; } @@ -193,7 +193,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine affine.dx() += kx + affine.m21() * ky; // Only apply y kerning in TB mode - if(params->tqlayout()->tb()) + if(params->layout()->tb()) affine.dy() += kx + affine.m22() * ky; } @@ -206,7 +206,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine traceAffine.scale(1000.0 / params->font()->fontFace()->units_per_EM); // 3b. Enable character rotation, if needed - if(params->tqlayout()->tb()) + if(params->layout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) @@ -214,7 +214,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine { FT_Matrix matrix; - double angle = deg2rad * params->tqlayout()->glyphOrientationVertical(); + double angle = deg2rad * params->layout()->glyphOrientationVertical(); matrix.xx = (FT_Fixed)( cos(angle) * 0x10000L); matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L); matrix.yx = (FT_Fixed)( sin(angle) * 0x10000L); @@ -257,21 +257,21 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned if(params->useBidi()) { FriBidiCharType baseDir = FRIBIDI_TYPE_N; - FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1]; - FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1]; + FriBidiChar *unicodeIn = new FriBidiChar[length + 1]; + FriBidiChar *unicodeOut = new FriBidiChar[length + 1]; bidi = new unsigned short[length + 1]; for(unsigned int i = 0; i < length; i++) - tqunicodeIn[i] = text[i]; + unicodeIn[i] = text[i]; - fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0); + fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0); for(unsigned int i = 0; i < length; i++) - bidi[i] = tqunicodeOut[i]; + bidi[i] = unicodeOut[i]; bidi[length] = 0; - delete []tqunicodeIn; - delete []tqunicodeOut; + delete []unicodeIn; + delete []unicodeOut; } else bidi = const_cast(text); @@ -302,7 +302,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned int pixelUnderlineThickness = T2PMAX(1, (int) ((font->fontFace()->underline_thickness * fontSize / font->fontFace()->units_per_EM) * affine.m22())); // 3. Prepare needed variables for the rendering loop - // - rendering params (tqlayout, font...) + // - rendering params (layout, font...) // - bounding box (per glyph, overall) // - glyph matrix (overall) // - resulting glyph sets diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp index 2ced971d..1d6f7005 100644 --- a/ksvg/impl/libs/libtext2path/src/Font.cpp +++ b/ksvg/impl/libs/libtext2path/src/Font.cpp @@ -141,7 +141,7 @@ std::string Font::buildRequest(const FontVisualParams *fontParams, int &id) FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast(string.c_str())); } - // Always load vertical tqlayout + // Always load vertical layout FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true); // Disable hinting @@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams) return false; } - // Choose tqunicode charmap + // Choose unicode charmap for(int charmap = 0; charmap < m_fontFace->num_charmaps; charmap++) { if(m_fontFace->charmaps[charmap]->encoding == ft_encoding_unicode) @@ -217,7 +217,7 @@ bool Font::load(const FontVisualParams *fontParams) if(error) { - std::cout << "Font::load(), unable to select tqunicode charmap. Aborting!" << std::endl; + std::cout << "Font::load(), unable to select unicode charmap. Aborting!" << std::endl; FT_Done_Face(m_fontFace); m_fontFace = 0; diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.cpp b/ksvg/impl/libs/libtext2path/src/Glyph.cpp index 08ad55a8..d2e16189 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp +++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp @@ -309,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font) m_font = font; } -const GlyphLayoutParams *GlyphRenderParams::tqlayout() const +const GlyphLayoutParams *GlyphRenderParams::layout() const { return m_layout; } -void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout) +void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout) { - m_layout = tqlayout; + m_layout = layout; } unsigned int GlyphRenderParams::glyphIndex() const diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h index 8dcbe599..b3bd3fb5 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.h +++ b/ksvg/impl/libs/libtext2path/src/Glyph.h @@ -171,8 +171,8 @@ namespace T2P Font *font() const; void setFont(Font *font); - const GlyphLayoutParams *tqlayout() const; - void setLayout(const GlyphLayoutParams *tqlayout); + const GlyphLayoutParams *layout() const; + void setLayout(const GlyphLayoutParams *layout); unsigned int glyphIndex() const; void setGlyphIndex(unsigned int glyphIndex); -- cgit v1.2.3