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

diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index b5058f1b..6126d6c5 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -88,7 +88,7 @@ void KoParagCounter::tqinvalidate()
     m_cache.number = -1;
     m_cache.text = TQString();
     m_cache.width = -1;
-    m_cache.tqparent = INVALID_PARAG;
+    m_cache.parent = INVALID_PARAG;
     m_cache.counterFormat = 0;
 }
 
@@ -345,7 +345,7 @@ int KoParagCounter::number( const KoTextParag *paragraph )
     }
 
     // Go looking for another paragraph at the same level or higher level.
-    // (This code shares logic with tqparent())
+    // (This code shares logic with parent())
     KoTextParag *otherParagraph = paragraph->prev();
     KoParagCounter *otherCounter;
 
@@ -434,11 +434,11 @@ KoParagCounter::Numbering KoParagCounter::numbering() const
 }
 
 // Go looking for another paragraph at a higher level.
-KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph )
+KoTextParag *KoParagCounter::parent( const KoTextParag *paragraph )
 {
     // Return cached value if possible.
-    if ( m_cache.tqparent != INVALID_PARAG )
-        return m_cache.tqparent;
+    if ( m_cache.parent != INVALID_PARAG )
+        return m_cache.parent;
 
     KoTextParag *otherParagraph = paragraph->prev();
     KoParagCounter *otherCounter;
@@ -489,8 +489,8 @@ KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph )
         }
         break;
     }
-    m_cache.tqparent = otherParagraph;
-    return m_cache.tqparent;
+    m_cache.parent = otherParagraph;
+    return m_cache.parent;
 }
 
 TQString KoParagCounter::prefix() const
@@ -714,7 +714,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
     // If necessary, grab the text of the preceding levels.
     if ( m_displayLevels > 1 && m_numbering != NUM_NONE )
     {
-        KoTextParag* p = tqparent( paragraph );
+        KoTextParag* p = parent( paragraph );
         int displayLevels = TQMIN( m_displayLevels, m_depth+1 ); // can't be >depth+1
         for ( int level = 1 ; level < displayLevels ; ++level ) {
             //kdDebug() << "additional level=" << level << "/" << displayLevels-1 << endl;
@@ -740,7 +740,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
                 m_cache.text.prepend( str );
                 // Prepare next iteration
                 if ( level < displayLevels ) // no need to calc it if we won't use it
-                    p = counter->tqparent( p );
+                    p = counter->parent( p );
             }
             else // toplevel parents are missing
             {