1 files changed, 15 insertions, 15 deletions

diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp
index f7937db1..048eb9ad 100644
--- a/languages/cpp/simpletypenamespace.cpp
+++ b/languages/cpp/simpletypenamespace.cpp
@@ -116,7 +116,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
 
   ImportList m_aliasImports;
 
-  AliasMap::iterator itt = m_aliases.find( name.name() );
+  AliasMap::iterator itt = m_aliases.tqfind( name.name() );
 
   if ( itt != m_aliases.end() && !( *itt ).empty() ) {
     ifVerbose( dbg() << "\"" << str() << "\": namespace-sub-aliases \"" << name.name() << "\"" << "\" requested, locating targets" << endl );
@@ -159,7 +159,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
       if ( mem.memberType != MemberInfo::Namespace ) {
 #ifdef PHYSICAL_IMPORT
         TypePointer b = mem.build();
-        if ( b && !( b->parent()->masterProxy().data() == this ) ) {
+        if ( b && !( b->tqparent()->masterProxy().data() == this ) ) {
           b = b ->clone(); //expensive, cache is not shared
           b->setParent( this );
 
@@ -169,7 +169,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe
         if( mem.memberType == MemberInfo::NestedType )
           chooseSpecialization( mem );
         TypePointer b = mem.build();
-        if( b && b->parent() && b->parent()->masterProxy().data() == this )
+        if( b && b->tqparent() && b->tqparent()->masterProxy().data() == this )
           b->setParent( this );
 #endif
         return mem;
@@ -224,10 +224,10 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali
   if ( symmetric )
     addAliasMap( alias, name, files, recurse, false );
 
-  invalidateSecondaryCache();
-  invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
+  tqinvalidateSecondaryCache();
+  tqinvalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
 
-  AliasMap::iterator it = m_aliases.find( name.name() );
+  AliasMap::iterator it = m_aliases.tqfind( name.name() );
   if ( it == m_aliases.end() )
     it = m_aliases.insert( name.name(), ImportList() );
 
@@ -253,7 +253,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
   if ( m_activeSlaves.empty() || !safetyCounter.ok() ) return possibleSlaves;
 //   if( !isRecursion ) {
 //     ///Test the cache
-//     SlavesCache::const_iterator it = m_slavesCache.find( files );
+//     SlavesCache::const_iterator it = m_slavesCache.tqfind( files );
 //     if( it != m_slavesCache.end() && it->second.first == m_slavesCache.size() ) return; ///The cache already contains a valid entry, and the work is done
 //   }
 
@@ -302,7 +302,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
 #ifdef PHYSICALLY_IMPORT_NAMESPACES
         if ( desc.resolved()->masterProxy().data() != this ) {
           desc.setResolved( desc.resolved()->clone() ); //expensive, cache is not shared
-          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the parents of all found members correctly
+          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the tqparents of all found members correctly
         }
 #endif
         d.first.first = desc;
@@ -320,8 +320,8 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
 
 void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) {
   while ( !map.isEmpty() ) {
-    int mid = map.find( "=" );
-    int mid2 = map.find( "<<" );
+    int mid = map.tqfind( "=" );
+    int mid2 = map.tqfind( "<<" );
     int found = mid;
     int len = 1;
     if ( mid2 != -1 && ( mid2 < found || found == -1 ) ) {
@@ -331,7 +331,7 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files )
     if ( found == -1 )
       break;
 
-    int end = map.find( ";", found + len );
+    int end = map.tqfind( ";", found + len );
     if ( end == -1 ) {
       //break;
       end = map.length();
@@ -344,15 +344,15 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files )
   }
 }
 
-void SimpleTypeNamespace::invalidatePrimaryCache( bool onlyNegative ) {
+void SimpleTypeNamespace::tqinvalidatePrimaryCache( bool onlyNegative ) {
   //m_slavesCache.clear();
-  SimpleTypeImpl::invalidatePrimaryCache( onlyNegative );
+  SimpleTypeImpl::tqinvalidatePrimaryCache( onlyNegative );
 }
 
 void SimpleTypeNamespace::addImport( const TypeDesc& import, const IncludeFiles& files, TypePointer perspective ) {
   //ifVerbose( dbg() << "
   if ( !perspective ) perspective = this;
-  invalidateCache();
+  tqinvalidateCache();
   TypeDesc d = import;
   if ( d.resolved() ) {
     #ifdef PHYSICALLY_IMPORT_NAMESPACES
@@ -377,7 +377,7 @@ bool SimpleTypeNamespace::hasNode() const {
 
 SimpleTypeNamespace::SlaveList SimpleTypeNamespace::getSlaves( const IncludeFiles& files ) {
   /*  ///Test the cache
-  SlavesCache::const_iterator it = m_slavesCache.find( files );
+  SlavesCache::const_iterator it = m_slavesCache.tqfind( files );
   if( it != m_slavesCache.end() && it->second.first == m_activeSlaves.size() ) return it->second.second; ///The cache already contains a valid entry, and the work is done*/
 
   std::set<size_t> allSlaves = updateAliases( files );