diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:56:07 +0000 |
commit | d6f8bbb45b267065a6907e71ff9c98bb6d161241 (patch) | |
tree | d109539636691d7b03036ca1c0ed29dbae6577cf /languages/cpp/simpletype.cpp | |
parent | 3331a47a9cad24795c7440ee8107143ce444ef34 (diff) | |
download | tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.tar.gz tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp/simpletype.cpp')
-rw-r--r-- | languages/cpp/simpletype.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index e4334ae5..5111a2a0 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -17,7 +17,7 @@ #include "simpletypefunction.h" #include <klocale.h> -QMap<QString, QString> BuiltinTypes::m_types; +TQMap<TQString, TQString> BuiltinTypes::m_types; BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized BuiltinTypes::BuiltinTypes() { @@ -42,12 +42,12 @@ bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { return m_types.find( desc.name() ) != m_types.end(); } -QString BuiltinTypes::comment( const TypeDesc& desc ) { - QMap<QString, QString>::iterator it = m_types.find( desc.name() ); +TQString BuiltinTypes::comment( const TypeDesc& desc ) { + TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() ); if( it != m_types.end() ) { return *it; } else { - return QString::null; + return TQString::null; } } @@ -56,7 +56,7 @@ extern SafetyCounter safetyCounter; TypePointer SimpleType::m_globalNamespace; SimpleType::TypeStore SimpleType::m_typeStore; SimpleType::TypeStore SimpleType::m_destroyedStore; -QString globalCurrentFile = ""; +TQString globalCurrentFile = ""; //SimpleType implementation @@ -178,15 +178,15 @@ void SimpleType::makePrivate() { m_type = m_type->clone(); } -const QStringList& SimpleType::scope() const { +const TQStringList& SimpleType::scope() const { return m_type -> scope(); } -const QString SimpleType::str() const { +const TQString SimpleType::str() const { return m_type -> str(); } -void SimpleType::init( const QStringList& scope, const HashedStringSet& files, Repository rep ) { +void SimpleType::init( const TQStringList& scope, const HashedStringSet& files, Repository rep ) { m_includeFiles = files; m_type = TypePointer( new SimpleTypeImpl( scope ) ); @@ -204,10 +204,10 @@ SimpleType::SimpleType( Tag tag ) : m_resolved(true) { // //SimpleTypeImpl implementation -QValueList<LocateResult> SimpleTypeImpl::getBases() { -QValueList<LocateResult> ret; - QStringList bases = getBaseStrings(); - for( QStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { +TQValueList<LocateResult> SimpleTypeImpl::getBases() { +TQValueList<LocateResult> ret; + TQStringList bases = getBaseStrings(); + for( TQStringList::const_iterator it = bases.begin(); it != bases.end(); ++it ) { TypeDesc d( *it ); d.setIncludeFiles( m_findIncludeFiles ); LocateResult res = locateDecType( d, LocateBase ); @@ -286,7 +286,7 @@ SimpleTypeFunctionInterface* SimpleTypeImpl::asFunction() { return dynamic_cast<SimpleTypeFunctionInterface*> ( this ); } -QString SimpleTypeImpl::operatorToString( Operator op ) { +TQString SimpleTypeImpl::operatorToString( Operator op ) { switch ( op ) { case NoOp: return "NoOp"; @@ -301,11 +301,11 @@ QString SimpleTypeImpl::operatorToString( Operator op ) { case ParenOp: return "paren-operator"; default: - return QString( "%1" ).arg( ( long ) op ); + return TQString( "%1" ).arg( ( long ) op ); }; } -LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValueList<LocateResult> params ) { +LocateResult SimpleTypeImpl::getFunctionReturnType( TQString functionName, TQValueList<LocateResult> params ) { LocateResult t = typeOf( functionName, MemberInfo::Function ).type; if ( t->resolved() && t->resolved() ->asFunction() ) { return t->resolved() ->applyOperator( ParenOp, params ); @@ -315,7 +315,7 @@ LocateResult SimpleTypeImpl::getFunctionReturnType( QString functionName, QValue } } -LocateResult SimpleTypeImpl::applyOperator( Operator op , QValueList<LocateResult> params ) { +LocateResult SimpleTypeImpl::applyOperator( Operator op , TQValueList<LocateResult> params ) { Debug d( "#applyn#" ); if ( !d || !safetyCounter ) return LocateResult(); @@ -540,7 +540,7 @@ class TemplateParamMatch { private: TypePointer m_candidate; SimpleTypeImpl::TemplateParamInfo m_candidateParams; - QMap<QString, LocateResult> m_hadParameters; + TQMap<TQString, LocateResult> m_hadParameters; bool m_matched; int m_maxDepth; }; @@ -562,7 +562,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { if ( m_masterProxy ) t = m_masterProxy; - QValueList<TypePointer> classes = t->getMemberClasses( type->desc() ); + TQValueList<TypePointer> classes = t->getMemberClasses( type->desc() ); //Find the specialization that fits the given template-parameters the best @@ -591,7 +591,7 @@ void SimpleTypeImpl::chooseSpecialization( MemberInfo& member ) { TemplateParamMatch bestMatch; - for ( QValueList<TypePointer>::iterator it = classes.begin(); it != classes.end(); ++it ) { + for ( TQValueList<TypePointer>::iterator it = classes.begin(); it != classes.end(); ++it ) { if ( ( *it ) ->specialization().isEmpty() ) continue; TemplateParamMatch match( ( *it ), member.type.desc() ); @@ -776,11 +776,11 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask bases but only on this level if ( ! ( mode & ExcludeBases ) ) { - QValueList<LocateResult> bases = getBases(); + TQValueList<LocateResult> bases = getBases(); if ( !bases.isEmpty() ) { TypeDesc nameInBase = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration - for ( QValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( nameInBase, addFlag( addFlag( mode, ExcludeTemplates ), ExcludeParents ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -806,9 +806,9 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///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 - QValueList<LocateResult> bases = getBases(); + TQValueList<LocateResult> bases = getBases(); if ( !bases.isEmpty() ) { - for ( QValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { + for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { if ( !( *it ) ->resolved() ) continue; LocateResult t = ( *it ) ->resolved() ->locateType( baseName, addFlag( mode, ExcludeTemplates ), dir ); ///The searched Type cannot directly be a template-param in the base-class, so ExcludeTemplates. It's forgotten early enough. @@ -849,7 +849,7 @@ SimpleType SimpleTypeImpl::parent() { } else { ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); invalidateSecondaryCache(); - QStringList sc = scope(); + TQStringList sc = scope(); if ( !sc.isEmpty() ) { sc.pop_back(); @@ -880,11 +880,11 @@ TypeDesc& SimpleTypeImpl::descForEdit() { return m_desc; } -QString SimpleTypeImpl::describeWithParams() { +TQString SimpleTypeImpl::describeWithParams() { TemplateParamInfo pinfo = getTemplateParamInfo(); int num = 0; TemplateParamInfo::TemplateParam param; - QString str = desc().name(); + TQString str = desc().name(); if ( desc().hasTemplateParams() ) { str += "< "; @@ -904,7 +904,7 @@ QString SimpleTypeImpl::describeWithParams() { return str; } -QString SimpleTypeImpl::fullTypeResolved( int depth ) { +TQString SimpleTypeImpl::fullTypeResolved( int depth ) { Debug d( "#tre#" ); TypeDesc t = desc(); @@ -924,7 +924,7 @@ QString SimpleTypeImpl::fullTypeResolved( int depth ) { } -QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { +TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { if ( m_parent && !m_parent->scope().isEmpty() ) { return m_parent->fullTypeUnresolvedWithScope() + "::" + m_desc.fullNameChain(); } else { @@ -932,7 +932,7 @@ QString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { } } -QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { +TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); if ( !m_scope.isEmpty() && parent() ) { return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); @@ -944,7 +944,7 @@ QString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { void SimpleTypeImpl::checkTemplateParams () { invalidateCache(); if ( ! m_scope.isEmpty() ) { - QString str = m_scope.back(); + TQString str = m_scope.back(); m_desc = str; if ( !m_desc.name().isEmpty() ) { m_scope.pop_back(); @@ -955,18 +955,18 @@ void SimpleTypeImpl::checkTemplateParams () { } } -void SimpleTypeImpl::setScope( const QStringList& scope ) { +void SimpleTypeImpl::setScope( const TQStringList& scope ) { invalidateCache(); m_scope = scope; if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) { //kdDebug() << "bad scope set " << kdBacktrace() << endl; - m_scope = QStringList(); + m_scope = TQStringList(); } } SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) { - QValueList<LocateResult> parents = getBases(); - for ( QValueList<LocateResult>::iterator it = parents.begin(); it != parents.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 ); @@ -997,8 +997,8 @@ void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { //SimpleTypeImpl::TemplateParamInfo implementation -bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString name ) const { - QMap<QString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); +bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { + TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, QString } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - QMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( 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 ) { - QMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); + TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); @@ -1029,7 +1029,7 @@ void SimpleTypeImpl::TemplateParamInfo::addParam( const TemplateParam& param ) { } int SimpleTypeImpl::TemplateParamInfo::count() const { - QMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.end(); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.end(); if ( it != m_paramsByNumber.begin() ) { --it; return ( *it ).number + 1; |