rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc
index 61ca5711..47ca18cc 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cc
@@ -108,9 +108,9 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         if ( !name.isEmpty() )
         {
             CustomStyle * style = 0;
-            if ( styleElem.hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
-                // The style's tqparent name will be set in Style::loadOasis(..).
-                // After all styles are loaded the pointer to the tqparent is set.
+            if ( styleElem.hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+                // The style's parent name will be set in Style::loadOasis(..).
+                // After all styles are loaded the pointer to the parent is set.
                 style = new CustomStyle( name, 0 );
             else
                 style = new CustomStyle( name, m_defaultStyle );
@@ -124,7 +124,7 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         }
     }
 
-    // set the tqparent pointers after we loaded all styles
+    // set the parent pointers after we loaded all styles
     Styles::iterator iter = m_styles.begin();
     Styles::iterator end  = m_styles.end();
     while ( iter != end )
@@ -132,7 +132,7 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         CustomStyle * styleData = iter.data();
 
         if ( styleData->name() != "Default" )
-            if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+            if ( !styleData->parent() && !styleData->parentName().isNull() )
                 styleData->setParent( m_oasisStyles[ styleData->parentName() ] );
 
         ++iter;
@@ -182,7 +182,7 @@ bool StyleManager::loadXML( TQDomElement const & styles )
     else if ( !name.isNull() )
     {
       CustomStyle * style = 0;
-      if ( e.hasAttribute( "tqparent" ) && e.attribute( "tqparent" ) == "Default" )
+      if ( e.hasAttribute( "parent" ) && e.attribute( "parent" ) == "Default" )
         style = new CustomStyle( name, m_defaultStyle );
       else
         style = new CustomStyle( name, 0 );
@@ -209,7 +209,7 @@ bool StyleManager::loadXML( TQDomElement const & styles )
   {
     CustomStyle * styleData = iter.data();
 
-    if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+    if ( !styleData->parent() && !styleData->parentName().isNull() )
       styleData->setParent( m_styles[ styleData->parentName() ] );
 
     ++iter;
@@ -257,15 +257,15 @@ CustomStyle * StyleManager::style( TQString const & name ) const
 
 void StyleManager::takeStyle( CustomStyle * style )
 {
-  CustomStyle * tqparent = style->tqparent();
+  CustomStyle * parent = style->parent();
 
   Styles::iterator iter = m_styles.begin();
   Styles::iterator end  = m_styles.end();
 
   while ( iter != end )
   {
-    if ( iter.data()->tqparent() == style )
-      iter.data()->setParent( tqparent );
+    if ( iter.data()->parent() == style )
+      iter.data()->setParent( parent );
 
     ++iter;
   }
@@ -279,10 +279,10 @@ void StyleManager::takeStyle( CustomStyle * style )
   }
 }
 
-bool StyleManager::checkCircle( TQString const & name, TQString const & tqparent )
+bool StyleManager::checkCircle( TQString const & name, TQString const & parent )
 {
-  CustomStyle * s = style( tqparent );
-  if ( !s || s->tqparent() == 0 )
+  CustomStyle * s = style( parent );
+  if ( !s || s->parent() == 0 )
     return true;
   if ( s->parentName() == name )
     return false;
@@ -363,14 +363,14 @@ TQDict<Style> StyleManager::loadOasisAutoStyles( KoOasisStyles& oasisStyles )
       autoStyles.insert( name , new Style());
       autoStyles[name]->loadOasisStyle( oasisStyles , *(it.current()) );
 
-      if ( it.current()->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
+      if ( it.current()->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
       {
-        TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+        TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "parent-style-name", TQString() );
         if ( m_oasisStyles.contains( parentStyleName ) )
         {
           autoStyles[name]->setParent( m_oasisStyles[parentStyleName] );
         }
-        kdDebug() << "\t tqparent-style-name:" << parentStyleName << endl;
+        kdDebug() << "\t parent-style-name:" << parentStyleName << endl;
       }
       else
       {