From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- karbon/core/vtext.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'karbon/core/vtext.cc') diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc index 4c7d3989..c45d91cb 100644 --- a/karbon/core/vtext.cc +++ b/karbon/core/vtext.cc @@ -128,7 +128,7 @@ VText::VText( VObject* parent, VState state ) m_stroke = new VStroke( this ); m_fill = new VFill(); m_position = (VText::Position)0; - m_alignment = (VText::Alignment)0; + m_tqalignment = (VText::Alignment)0; m_shadow = false; m_translucentShadow = false; m_shadowAngle = 0; @@ -137,8 +137,8 @@ VText::VText( VObject* parent, VState state ) } -VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text ) - : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_alignment( alignment ), m_text( text ) +VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text ) + : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_tqalignment( tqalignment ), m_text( text ) { m_glyphs.setAutoDelete( true ); m_boundingBoxIsInvalid = true; @@ -148,7 +148,7 @@ VText::VText( const TQFont &font, const VSubpath& basePath, Position position, A } VText::VText( const VText& text ) - : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_alignment( text.m_alignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) + : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_tqalignment( text.m_tqalignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) { m_stroke = new VStroke( *text.m_stroke ); m_stroke->setParent( this ); @@ -323,7 +323,7 @@ VText::save( TQDomElement& element ) const me.setAttribute( "italic", m_font.italic() ); me.setAttribute( "bold", m_font.bold() ); me.setAttribute( "position", m_position ); - me.setAttribute( "alignment", m_alignment ); + me.setAttribute( "tqalignment", m_tqalignment ); me.setAttribute( "shadow", m_shadow ); me.setAttribute( "translucentshadow", m_translucentShadow ); me.setAttribute( "shadowangle", m_shadowAngle ); @@ -349,7 +349,7 @@ VText::load( const TQDomElement& element ) m_font.setWeight( TQFont::Normal ); m_font.setBold( element.attribute( "bold" ).toInt() == 1 ); m_position = (Position)element.attribute( "position", "0" ).toInt(); - m_alignment = (Alignment)element.attribute( "alignment", "0" ).toInt(); + m_tqalignment = (Alignment)element.attribute( "tqalignment", "0" ).toInt(); m_shadow = ( element.attribute( "shadow" ).toInt() == 1 ); m_translucentShadow = ( element.attribute( "translucentshadow" ).toInt() == 1 ); m_shadowAngle = element.attribute( "shadowangle" ).toInt(); @@ -473,7 +473,7 @@ VText::traceText() bool foundCharmap = false; - // Try to choose unicode charmap + // Try to choose tqunicode charmap for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ ) { if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode ) @@ -481,14 +481,14 @@ VText::traceText() FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] ); if( error ) { - kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl; + kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl; continue; } foundCharmap = true; } } - // Choose first charmap if no unicode charmap was found + // Choose first charmap if no tqunicode charmap was found if( ! foundCharmap ) { error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] ); @@ -518,7 +518,7 @@ VText::traceText() { // get the glyph index for the current character TQChar character = m_text.at( i ); - glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() ); + glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() ); if( ! glyphIndex ) { kdDebug(38000) << "traceText(), unable get index of char : " << character << endl; @@ -575,7 +575,7 @@ VText::traceText() kdDebug(38000) << "traceText(), using offset : " << m_offset << endl; float x = m_offset * pathLength; - switch( m_alignment ) + switch( m_tqalignment ) { case Left: x += 0; break; case Center: x -= 0.5 * l; break; -- cgit v1.2.1