rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 8 insertions, 8 deletions

diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index 2a2b27de..a5efb703 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -795,7 +795,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
 
   ///Ask parentsc
   if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) {
-    LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
+    LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
     if ( rett->resolved() )
       return rett.increaseDepth();
     else
@@ -842,12 +842,12 @@ TypePointer SimpleTypeImpl::bigContainer() {
     return TypePointer( this );
 }
 
-SimpleType SimpleTypeImpl::tqparent() {
+SimpleType SimpleTypeImpl::parent() {
   if ( m_parent ) {
-    //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl;
+    //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl;
     return SimpleType( m_parent );
   } else {
-    ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl );
+    ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl );
     invalidateSecondaryCache();
     TQStringList sc = scope();
 
@@ -855,13 +855,13 @@ SimpleType SimpleTypeImpl::tqparent() {
       sc.pop_back();
       SimpleType r = SimpleType( sc, m_desc.includeFiles() );
       if ( &( *r.get() ) == this ) {
-        kdDebug( 9007 ) << "error: self set as tqparent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl;
+        kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl;
         return SimpleType( new SimpleTypeImpl( "" ) );
       }
       m_parent = r.get();
       return r;
     } else {
-      ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl );
+      ifVerbose( dbg() << "\"" << str() << "\"warning: returning parent of global scope!" << endl );
       return SimpleType( new SimpleTypeImpl( "" ) );
     }
   }
@@ -934,8 +934,8 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) {
 
 TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) {
   Q_UNUSED( depth );
-  if ( !m_scope.isEmpty() && tqparent() ) {
-    return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved();
+  if ( !m_scope.isEmpty() && parent() ) {
+    return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved();
   } else {
     return fullTypeResolved();
   }