1 files changed, 49 insertions, 49 deletions

diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index e1bbbf52..af5b91a1 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -183,7 +183,7 @@ bool Style::operator == (const Style& style) const
 
 void Style::loadOasisStyle( KoOasisStyles& oasisStyles, const TQDomElement & element )
 {
-  // NOTE Stefan: Don't fill the style stack with the tqparent styles!
+  // NOTE Stefan: Don't fill the style stack with the parent styles!
   KoStyleStack styleStack;
   styleStack.push( element );
   styleStack.setTypeProperties( "table-cell" );
@@ -1131,10 +1131,10 @@ void Style::saveOasisStyle( KoGenStyle &style, KoGenStyles &mainStyles )
     //  kdDebug() << "AUTO" << endl;
 #endif
 
-    // don't store tqparent, if it's the default style
+    // don't store parent, if it's the default style
     if ( m_parent && (m_parent->type() != BUILTIN || m_parent->name() != "Default") )
-        // FIXME this is not the OASIS tqparent style's name. it's its display name!
-        style.addAttribute( "style:tqparent-style-name", m_parent->name() );
+        // FIXME this is not the OASIS parent style's name. it's its display name!
+        style.addAttribute( "style:parent-style-name", m_parent->name() );
 
     if ( featureSet( SAlignX ) && alignX() != Format::Undefined )
     {
@@ -1803,14 +1803,14 @@ bool Style::loadXML( TQDomElement & format )
   return true;
 }
 
-void Style::setParent( CustomStyle * tqparent )
+void Style::setParent( CustomStyle * parent )
 {
-  m_parent = tqparent;
+  m_parent = parent;
   if ( m_parent )
     m_parentName = m_parent->name();
 }
 
-CustomStyle * Style::tqparent() const
+CustomStyle * Style::parent() const
 {
   return m_parent;
 }
@@ -1871,7 +1871,7 @@ bool Style::hasFeature( FlagsSet f, bool withoutParent ) const
 {
   bool b = ( m_featuresSet & (uint) f );
 
-  // check if feature is defined here or at tqparent level
+  // check if feature is defined here or at parent level
   if ( m_parent && !withoutParent )
     b = ( m_parent->hasFeature( f, withoutParent ) ? true : b );
 
@@ -2699,7 +2699,7 @@ CustomStyle::CustomStyle()
   m_parent = 0;
 }
 
-CustomStyle::CustomStyle( Style * tqparent, TQString const & name )
+CustomStyle::CustomStyle( Style * parent, TQString const & name )
   : Style(),
     m_name( name )
 {
@@ -2707,52 +2707,52 @@ CustomStyle::CustomStyle( Style * tqparent, TQString const & name )
   m_parent = 0;
 
   // one to one copy
-  if ( tqparent->hasProperty( PDontPrintText ) )
+  if ( parent->hasProperty( PDontPrintText ) )
     addProperty( PDontPrintText );
-  if ( tqparent->hasProperty( PCustomFormat ) )
+  if ( parent->hasProperty( PCustomFormat ) )
     addProperty( PCustomFormat );
-  if ( tqparent->hasProperty( PNotProtected ) )
+  if ( parent->hasProperty( PNotProtected ) )
     addProperty( PNotProtected );
-  if ( tqparent->hasProperty( PHideAll ) )
+  if ( parent->hasProperty( PHideAll ) )
     addProperty( PHideAll );
-  if ( tqparent->hasProperty( PHideFormula ) )
+  if ( parent->hasProperty( PHideFormula ) )
     addProperty( PHideFormula );
-  if ( tqparent->hasProperty( PMultiRow ) )
+  if ( parent->hasProperty( PMultiRow ) )
     addProperty( PMultiRow );
-  if ( tqparent->hasProperty( PVerticalText ) )
+  if ( parent->hasProperty( PVerticalText ) )
     addProperty( PVerticalText );
 
-  changeAlignX( tqparent->alignX() );
-  changeAlignY( tqparent->alignY() );
-  changeFloatFormat( tqparent->floatFormat() );
-  changeFloatColor( tqparent->floatColor() );
-  changeFormatType( tqparent->formatType() );
-  changeFontFamily( tqparent->fontFamily() );
-  changeFontSize( tqparent->fontSize() );
-  changeFontFlags( tqparent->fontFlags() );
-  changePen( tqparent->pen() );
-  changeBgColor( tqparent->bgColor() );
-  changeRightBorderPen( tqparent->rightBorderPen() );
-  changeBottomBorderPen( tqparent->bottomBorderPen() );
-  changeLeftBorderPen( tqparent->leftBorderPen() );
-  changeTopBorderPen( tqparent->topBorderPen() );
-  changeFallBorderPen( tqparent->fallDiagonalPen() );
-  changeGoUpBorderPen( tqparent->goUpDiagonalPen() );
-  changeBackGroundBrush( tqparent->backGroundBrush() );
-  changeRotateAngle( tqparent->rotateAngle() );
-  changeIndent( tqparent->indent() );
-  changeStrFormat( tqparent->strFormat() );
-  changePrecision( tqparent->precision() );
-  changePrefix( tqparent->prefix() );
-  changePostfix( tqparent->postfix() );
-  changeCurrency( tqparent->currency() );
-}
-
-CustomStyle::CustomStyle( TQString const & name, CustomStyle * tqparent )
+  changeAlignX( parent->alignX() );
+  changeAlignY( parent->alignY() );
+  changeFloatFormat( parent->floatFormat() );
+  changeFloatColor( parent->floatColor() );
+  changeFormatType( parent->formatType() );
+  changeFontFamily( parent->fontFamily() );
+  changeFontSize( parent->fontSize() );
+  changeFontFlags( parent->fontFlags() );
+  changePen( parent->pen() );
+  changeBgColor( parent->bgColor() );
+  changeRightBorderPen( parent->rightBorderPen() );
+  changeBottomBorderPen( parent->bottomBorderPen() );
+  changeLeftBorderPen( parent->leftBorderPen() );
+  changeTopBorderPen( parent->topBorderPen() );
+  changeFallBorderPen( parent->fallDiagonalPen() );
+  changeGoUpBorderPen( parent->goUpDiagonalPen() );
+  changeBackGroundBrush( parent->backGroundBrush() );
+  changeRotateAngle( parent->rotateAngle() );
+  changeIndent( parent->indent() );
+  changeStrFormat( parent->strFormat() );
+  changePrecision( parent->precision() );
+  changePrefix( parent->prefix() );
+  changePostfix( parent->postfix() );
+  changeCurrency( parent->currency() );
+}
+
+CustomStyle::CustomStyle( TQString const & name, CustomStyle * parent )
   : Style(),
     m_name( name )
 {
-  m_parent = tqparent;
+  m_parent = parent;
   if ( m_parent )
     m_parentName = m_parent->name();
 }
@@ -2800,8 +2800,8 @@ TQString CustomStyle::saveOasis( KoGenStyle& style, KoGenStyles &mainStyles )
 void CustomStyle::loadOasis( KoOasisStyles& oasisStyles, const TQDomElement& style, const TQString & name )
 {
     m_name = name;
-    if ( style.hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-        m_parentName = style.attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+    if ( style.hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+        m_parentName = style.attributeNS( KoXmlNS::style, "parent-style-name", TQString() );
     else if ( m_name != "Default" )
         m_parentName = "Default";
 
@@ -2818,7 +2818,7 @@ void CustomStyle::save( TQDomDocument & doc, TQDomElement & styles )
   TQDomElement style( doc.createElement( "style" ) );
   style.setAttribute( "type", (int) m_type );
   if ( m_parent )
-    style.setAttribute( "tqparent", m_parent->name() );
+    style.setAttribute( "parent", m_parent->name() );
   style.setAttribute( "name", m_name );
 
   TQDomElement format( doc.createElement( "format" ) );
@@ -2832,8 +2832,8 @@ bool CustomStyle::loadXML( TQDomElement const & style, TQString const & name )
 {
   m_name = name;
 
-  if ( style.hasAttribute( "tqparent" ) )
-    m_parentName = style.attribute( "tqparent" );
+  if ( style.hasAttribute( "parent" ) )
+    m_parentName = style.attribute( "parent" );
 
   if ( !style.hasAttribute( "type" ) )
     return false;