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, 11 insertions, 11 deletions

diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 221288df..5c8f680f 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -33,24 +33,24 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int
 {
     StyleMap::iterator it = m_styleMap.find( style );
     if ( it == m_styleMap.end() ) {
-        // Not found, try if this style is in fact equal to its tqparent (the find above
+        // Not found, try if this style is in fact equal to its parent (the find above
         // wouldn't have found it, due to m_parentName being set).
         if ( !style.parentName().isEmpty() ) {
             KoGenStyle testStyle( style );
             const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search
             if( !parentStyle ) {
-                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl;
+                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): parent style '" << style.parentName() << "' not found in collection" << endl;
             } else {
                 if ( testStyle.m_familyName != parentStyle->m_familyName )
                 {
-                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
+                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") parent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
                 }
 
                 testStyle.m_parentName = parentStyle->m_parentName;
                 // Exclude the type from the comparison. It's ok for an auto style
-                // to have a user style as tqparent; they can still be identical
+                // to have a user style as parent; they can still be identical
                 testStyle.m_type = parentStyle->m_type;
-                // Also it's ok to not have the display name of the tqparent style
+                // Also it's ok to not have the display name of the parent style
                 // in the auto style
                 TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" );
                 if ( it != parentStyle->m_attributes.end() )
@@ -211,13 +211,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
         if ( !m_parentName.isEmpty() ) {
             parentStyle = styles.style( m_parentName );
             if ( parentStyle && m_familyName.isEmpty() ) {
-                // get family from tqparent style, just in case
+                // get family from parent style, just in case
                 // Note: this is saving code, don't convert to attributeNS!
                 const_cast<KoGenStyle *>( this )->
                     m_familyName = parentStyle->attribute( "style:family" ).latin1();
-                //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl;
+                //kdDebug(30003) << "Got familyname " << m_familyName << " from parent" << endl;
             }
-            writer->addAttribute( "style:tqparent-style-name", m_parentName );
+            writer->addAttribute( "style:parent-style-name", m_parentName );
         }
     } else { // default-style
         Q_ASSERT( qstrcmp( elementName, "style:default-style" ) == 0 );
@@ -235,13 +235,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     kdDebug() << "style: " << name << endl;
     printDebug();
     if ( parentStyle ) {
-        kdDebug() << " tqparent: " << m_parentName << endl;
+        kdDebug() << " parent: " << m_parentName << endl;
         parentStyle->printDebug();
     }
 #endif
 
-    // Write attributes [which differ from the tqparent style]
-    // We only look at the direct tqparent style because we assume
+    // Write attributes [which differ from the parent style]
+    // We only look at the direct parent style because we assume
     // that styles are fully specified, i.e. the inheritance is
     // only in the final file, not in the caller's code.
     TQMap<TQString, TQString>::const_iterator it = m_attributes.begin();