1 files changed, 11 insertions, 11 deletions

diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index b496b96a..9e9d6113 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -793,7 +793,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
     }
   }
 
-  ///Ask tqparentsc
+  ///Ask parentsc
   if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) {
     LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
     if ( rett->resolved() )
@@ -803,7 +803,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
         ret = rett.increaseDepth();
   }
 
-  ///Ask the bases and allow them to search in their tqparents.
+  ///Ask the bases and allow them to search in their parents.
   if ( ! ( mode & ExcludeBases ) ) {
     TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration
     TQValueList<LocateResult> bases = getBases();
@@ -832,7 +832,7 @@ void SimpleTypeImpl::breakReferences() {
   m_desc.resetResolved();
   //	m_trace.clear();
   m_masterProxy = 0;
-  tqinvalidateCache();
+  invalidateCache();
 }
 
 TypePointer SimpleTypeImpl::bigContainer() {
@@ -848,7 +848,7 @@ SimpleType SimpleTypeImpl::tqparent() {
     return SimpleType( m_parent );
   } else {
     ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl );
-    tqinvalidateSecondaryCache();
+    invalidateSecondaryCache();
     TQStringList sc = scope();
 
     if ( !sc.isEmpty() ) {
@@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() {
 
 TypeDesc& SimpleTypeImpl::descForEdit() {
   desc();
-  tqinvalidateCache();
+  invalidateCache();
   return m_desc;
 }
 
@@ -942,7 +942,7 @@ TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) {
 }
 
 void SimpleTypeImpl::checkTemplateParams () {
-  tqinvalidateCache();
+  invalidateCache();
   if ( ! m_scope.isEmpty() ) {
     TQString str = m_scope.back();
     m_desc = str;
@@ -956,7 +956,7 @@ void SimpleTypeImpl::checkTemplateParams () {
 }
 
 void SimpleTypeImpl::setScope( const TQStringList& scope ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_scope = scope;
   if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) {
     //kdDebug() << "bad scope set " << kdBacktrace() << endl;
@@ -965,8 +965,8 @@ void SimpleTypeImpl::setScope( const TQStringList& scope ) {
 }
 
 SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) {
-  TQValueList<LocateResult> tqparents = getBases();
-  for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
+  TQValueList<LocateResult> parents = getBases();
+  for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) {
     if ( !( *it ) ->resolved() )
       continue;
     TypeOfResult type = ( *it ) ->resolved() ->typeOf( name );
@@ -985,13 +985,13 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) {
 }
 
 void SimpleTypeImpl::parseParams( TypeDesc desc ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_desc = desc;
   m_desc.clearInstanceInfo();
 }
 
 void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_desc.templateParams() = desc.templateParams();
 }