diff options
Diffstat (limited to 'languages/cpp/simpletype.cpp')
-rw-r--r-- | languages/cpp/simpletype.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 5111a2a0..b496b96a 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -39,15 +39,15 @@ BuiltinTypes::BuiltinTypes() { } bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { - return m_types.find( desc.name() ) != m_types.end(); + return m_types.tqfind( desc.name() ) != m_types.end(); } TQString BuiltinTypes::comment( const TypeDesc& desc ) { - TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() ); + TQMap<TQString, TQString>::iterator it = m_types.tqfind( desc.name() ); if( it != m_types.end() ) { return *it; } else { - return TQString::null; + return TQString(); } } @@ -301,7 +301,7 @@ TQString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return TQString( "%1" ).arg( ( long ) op ); + return TQString( "%1" ).tqarg( ( long ) op ); }; } @@ -428,7 +428,7 @@ class TemplateParamMatch { for( int a = 0; a < m_candidateParams.count(); a++ ) { SimpleTypeImpl::TemplateParamInfo::TemplateParam t; if( m_candidateParams.getParam( t, a ) ) { - if( !m_hadParameters.contains( t.name ) ) { + if( !m_hadParameters.tqcontains( t.name ) ) { m_matched = false; } } else { @@ -472,7 +472,7 @@ class TemplateParamMatch { t.value = val; - if( m_hadParameters.contains( t.name ) && oldValue != t.value ) { + if( m_hadParameters.tqcontains( t.name ) && oldValue != t.value ) { return false; ///We have a mismatch, two different values for the same template-parameter. } else { m_candidateParams.addParam( t ); @@ -793,9 +793,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d } } - ///Ask parentsc + ///Ask tqparentsc if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) { - LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); + LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); if ( rett->resolved() ) return rett.increaseDepth(); else @@ -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 parents. + ///Ask the bases and allow them to search in their tqparents. 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; - invalidateCache(); + tqinvalidateCache(); } TypePointer SimpleTypeImpl::bigContainer() { @@ -842,26 +842,26 @@ TypePointer SimpleTypeImpl::bigContainer() { return TypePointer( this ); } -SimpleType SimpleTypeImpl::parent() { +SimpleType SimpleTypeImpl::tqparent() { if ( m_parent ) { - //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl; + //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl; return SimpleType( m_parent ); } else { - ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); - invalidateSecondaryCache(); + ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl ); + tqinvalidateSecondaryCache(); TQStringList sc = scope(); if ( !sc.isEmpty() ) { sc.pop_back(); SimpleType r = SimpleType( sc, m_desc.includeFiles() ); if ( &( *r.get() ) == this ) { - kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; + kdDebug( 9007 ) << "error: self set as tqparent: " << 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 parent of global scope!" << endl ); + ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl ); return SimpleType( new SimpleTypeImpl( "" ) ); } } @@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() { TypeDesc& SimpleTypeImpl::descForEdit() { desc(); - invalidateCache(); + tqinvalidateCache(); return m_desc; } @@ -934,15 +934,15 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); - if ( !m_scope.isEmpty() && parent() ) { - return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); + if ( !m_scope.isEmpty() && tqparent() ) { + return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); } else { return fullTypeResolved(); } } void SimpleTypeImpl::checkTemplateParams () { - invalidateCache(); + tqinvalidateCache(); 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 ) { - invalidateCache(); + tqinvalidateCache(); 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> parents = getBases(); - for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) { + TQValueList<LocateResult> tqparents = getBases(); + for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; TypeOfResult type = ( *it ) ->resolved() ->typeOf( name ); @@ -985,20 +985,20 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) { } void SimpleTypeImpl::parseParams( TypeDesc desc ) { - invalidateCache(); + tqinvalidateCache(); m_desc = desc; m_desc.clearInstanceInfo(); } void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { - invalidateCache(); + tqinvalidateCache(); m_desc.templateParams() = desc.templateParams(); } //SimpleTypeImpl::TemplateParamInfo implementation bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { - TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); + TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.tqfind( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQStrin } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.tqfind( number ); if ( it != m_paramsByNumber.end() ) { target = *it; return true; @@ -1016,7 +1016,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int num } void SimpleTypeImpl::TemplateParamInfo::removeParam( int number ) { - TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.tqfind( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); |