diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | bce8199ddac4feecdee9c094fb8f75863cfa9652 (patch) | |
| tree | b0521e39686b4b24960a9d83e72a9c09937a810c /ksvg/impl/libs/libtext2path | |
| parent | 03d51915bf86a00c5953817c89976b62785bb5a1 (diff) | |
| download | tdegraphics-bce8199ddac4feecdee9c094fb8f75863cfa9652.tar.gz tdegraphics-bce8199ddac4feecdee9c094fb8f75863cfa9652.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg/impl/libs/libtext2path')
| -rw-r--r-- | ksvg/impl/libs/libtext2path/src/Converter.cpp | 4 | ||||
| -rw-r--r-- | ksvg/impl/libs/libtext2path/src/Glyph.h | 2 | ||||
| -rw-r--r-- | ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp index 16aef608..2085e003 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.cpp +++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp @@ -162,7 +162,7 @@ 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 tqlayouts when rendering + // 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()) { @@ -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 tqlayouts! (Niko) + // vertical layouts! (Niko) if(!params->tb()) { if(bpath) diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h index 73951b47..8dcbe599 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.h +++ b/ksvg/impl/libs/libtext2path/src/Glyph.h @@ -185,7 +185,7 @@ namespace T2P private: Font *m_font; - const GlyphLayoutParams *m_layout; // Glyph tqlayouting params + const GlyphLayoutParams *m_layout; // Glyph layouting params unsigned int m_glyphIndex; // 'character' index in font unsigned int m_lastGlyph; // Kerning diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp index 696cfec3..3f2fe30d 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 *) -// aptqparently EDG 2.38 also doesn't accept it +// apparently EDG 2.38 also doesn't accept it template<class D, class T> D * get_deleter(shared_ptr<T> const & p) { |