summaryrefslogtreecommitdiffstats
path: root/ksvg/impl/libs/libtext2path/src
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/impl/libs/libtext2path/src')
-rw-r--r--ksvg/impl/libs/libtext2path/src/Cache.h2
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp36
-rw-r--r--ksvg/impl/libs/libtext2path/src/Font.cpp6
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.cpp9
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.h6
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.cpp12
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.h4
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp2
8 files changed, 38 insertions, 39 deletions
diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h
index a85fdf92..51d09f45 100644
--- a/ksvg/impl/libs/libtext2path/src/Cache.h
+++ b/ksvg/impl/libs/libtext2path/src/Cache.h
@@ -118,7 +118,7 @@ namespace T2P
}
// Lookup entry
- SharedT find(const std::string &key)
+ SharedT tqfind(const std::string &key)
{
for(typename std::vector<SharedT>::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it)
{
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 59ab8e5c..16aef608 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -90,7 +90,7 @@ void Converter::setKerning(bool mode)
SharedFont Converter::requestFont(const FontVisualParams *params)
{
std::string cacheKey = cacheFontKey(params);
- SharedFont cached = m_fontCache.find(cacheKey);
+ SharedFont cached = m_fontCache.tqfind(cacheKey);
// If not available in cache, create new one and cache it :)
if(cached)
@@ -122,10 +122,10 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b
// needed to generate the cache lookup key
selectGlyph(params);
- SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params));
+ SharedGlyph cached = m_glyphCache.tqfind(cacheGlyphKey(params));
// If not available in cache, render new one and cache it :)
- // If we're mixing ie. japanese and latin characters (TTB layout),
+ // If we're mixing ie. japanese and latin characters (TTB tqlayout),
// then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko)
if(!cached || !onlyLatin)
cached = calcGlyph(params, affine, onlyLatin);
@@ -162,13 +162,13 @@ void Converter::selectGlyph(GlyphRenderParams *params)
// 2. Load glyph into font's glyphSlot, according to the GlyphLayoutParams
int flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
- // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering
+ // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB tqlayouts when rendering
// a latin glyph because it needs to be rotated...
- if(params->layout()->tb())
+ if(params->tqlayout()->tb())
{
Script script;
SCRIPT_FOR_CHAR(script, params->character())
- if(script != Latin || params->layout()->glyphOrientationVertical() == 0)
+ if(script != Latin || params->tqlayout()->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->layout()->tb())
+ if(params->tqlayout()->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->layout()->tb())
+ if(params->tqlayout()->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->layout()->glyphOrientationVertical();
+ double angle = deg2rad * params->tqlayout()->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 *unicodeIn = new FriBidiChar[length + 1];
- FriBidiChar *unicodeOut = new FriBidiChar[length + 1];
+ FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1];
+ FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1];
bidi = new unsigned short[length + 1];
for(unsigned int i = 0; i < length; i++)
- unicodeIn[i] = text[i];
+ tqunicodeIn[i] = text[i];
- fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0);
+ fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0);
for(unsigned int i = 0; i < length; i++)
- bidi[i] = unicodeOut[i];
+ bidi[i] = tqunicodeOut[i];
bidi[length] = 0;
- delete []unicodeIn;
- delete []unicodeOut;
+ delete []tqunicodeIn;
+ delete []tqunicodeOut;
}
else
bidi = const_cast<unsigned short *>(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 (layout, font...)
+ // - rendering params (tqlayout, font...)
// - bounding box (per glyph, overall)
// - glyph matrix (overall)
// - resulting glyph sets
@@ -456,7 +456,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
result->m_height = T2PMAX(1, int(bbox.b().y() - bbox.a().y()));
// Correct bounding box information also on
- // vertical layouts! (Niko)
+ // vertical tqlayouts! (Niko)
if(!params->tb())
{
if(bpath)
diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp
index 1d6f7005..2ced971d 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<const FcChar8 *>(string.c_str()));
}
- // Always load vertical layout
+ // Always load vertical tqlayout
FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true);
// Disable hinting
@@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams)
return false;
}
- // Choose unicode charmap
+ // Choose tqunicode 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 unicode charmap. Aborting!" << std::endl;
+ std::cout << "Font::load(), unable to select tqunicode 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 5d172018..08ad55a8 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp
@@ -1,5 +1,4 @@
-/*
- Copyright (C) 2003 Nikolas Zimmermann <wildfox@kde.org>
+/* Copyright (C) 2003 Nikolas Zimmermann <wildfox@kde.org>
This file is part of the KDE project
This library is free software; you can redistribute it and/or
@@ -310,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font)
m_font = font;
}
-const GlyphLayoutParams *GlyphRenderParams::layout() const
+const GlyphLayoutParams *GlyphRenderParams::tqlayout() const
{
return m_layout;
}
-void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout)
+void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout)
{
- m_layout = layout;
+ m_layout = tqlayout;
}
unsigned int GlyphRenderParams::glyphIndex() const
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h
index b3bd3fb5..73951b47 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 *layout() const;
- void setLayout(const GlyphLayoutParams *layout);
+ const GlyphLayoutParams *tqlayout() const;
+ void setLayout(const GlyphLayoutParams *tqlayout);
unsigned int glyphIndex() const;
void setGlyphIndex(unsigned int glyphIndex);
@@ -185,7 +185,7 @@ namespace T2P
private:
Font *m_font;
- const GlyphLayoutParams *m_layout; // Glyph layouting params
+ const GlyphLayoutParams *m_layout; // Glyph tqlayouting params
unsigned int m_glyphIndex; // 'character' index in font
unsigned int m_lastGlyph; // Kerning
diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
index 33855a81..1103ab69 100644
--- a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
+++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
@@ -5,27 +5,27 @@
**
** Copyright (C) 2002-2003 Trolltech AS. All rights reserved.
**
-** This file is part of the kernel module of the Qt GUI Toolkit.
+** This file is part of the kernel module of the TQt GUI Toolkit.
**
** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
** Agreement provided with the Software.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** information about TQt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.h b/ksvg/impl/libs/libtext2path/src/QtUnicode.h
index 41008500..29714502 100644
--- a/ksvg/impl/libs/libtext2path/src/QtUnicode.h
+++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef T2P_QT_UNICODE_H
-#define T2P_QT_UNICODE_H
+#ifndef T2P_TQT_UNICODE_H
+#define T2P_TQT_UNICODE_H
namespace T2P
{
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
index 3f2fe30d..696cfec3 100644
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
+++ b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
@@ -372,7 +372,7 @@ template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> co
#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 also doesn't accept it
+// aptqparently EDG 2.38 also doesn't accept it
template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 19:56:58 +0000