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/simpletypecatalog.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/simpletypecatalog.cpp')
-rw-r--r-- | languages/cpp/simpletypecatalog.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index 2b02cd9e..f662acc5 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -24,21 +24,21 @@ TypePointer SimpleTypeCatalog::clone() { return new SimpleTypeCachedCatalog( this ); } -QString SimpleTypeCatalog::specialization() const { +TQString SimpleTypeCatalog::specialization() const { return m_tag.getSpecializationDeclaration(); } void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { if ( m_tag.kind() != Tag::Kind_Namespace ) return; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; ///Insert all namespace-imports args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "kind", Tag::Kind_UsingDirective ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { TypeDesc d( (*it).name() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ///@todo implement the include-file-logic ns->addAliasMap( TypeDesc(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -50,9 +50,9 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { tags = cppCompletionInstance->m_repository->query( args ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { - QVariant v = (*it).attribute( "alias" ); - if ( v.type() == QVariant::String ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + TQVariant v = (*it).attribute( "alias" ); + if ( v.type() == TQVariant::String ) { TypeDesc d( v.asString() ); d.setIncludeFiles( HashedString((*it).fileName()) ); ns->addAliasMap( (*it).name(), d, HashedString((*it).fileName()), true, false, bigContainer() ); @@ -61,17 +61,17 @@ void SimpleTypeCatalog::addAliasesTo( SimpleTypeNamespace* ns ) { } } -QValueList<TypePointer> SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { - QValueList<TypePointer> ret; +TQValueList<TypePointer> SimpleTypeCatalog::getMemberClasses( const TypeDesc& name ) { + TQValueList<TypePointer> ret; - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); - for ( QValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class ) { ///It would be better to return all matched class-names from within findMember and use them from there so all this will be cached too. CatalogBuildInfo b( *it, name, TypePointer( this ) ); @@ -101,17 +101,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT } } - QValueList<Catalog::QueryArgument> args; + TQValueList<Catalog::QueryArgument> args; args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name.name() ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); if ( tags.isEmpty() ) return ret; ///skip all using-directives - QValueList<Tag>::iterator it = tags.begin(); + TQValueList<Tag>::iterator it = tags.begin(); while ( ( (*it).kind() == Tag::Kind_UsingDirective || (*it).kind() == Tag::Kind_NamespaceAlias ) && it != tags.end() ) ++it; @@ -148,7 +148,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT bool hasSpecializationDeclaration = tag.hasSpecializationDeclaration(); bool isIncluded = name.includeFiles()[tag.fileName()]; if ( hasSpecializationDeclaration || !isIncluded ) { - for ( QValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { + for ( TQValueList<Tag>::const_iterator it = tags.begin(); it != tags.end(); ++it ) { if ( (*it).kind() == Tag::Kind_Class && !(*it).hasSpecializationDeclaration() ) { if ( name.includeFiles()[(*it).fileName()] ) { tag = *it; @@ -212,17 +212,17 @@ SimpleTypeImpl::MemberInfo SimpleTypeCatalog::findMember( TypeDesc name, SimpleT return ret; } -Tag SimpleTypeCatalog::findSubTag( const QString& name ) { +Tag SimpleTypeCatalog::findSubTag( const TQString& name ) { if ( name.isEmpty() ) return Tag(); - QValueList<Catalog::QueryArgument> args; - QTime t; + TQValueList<Catalog::QueryArgument> args; + TQTime t; t.start(); args << Catalog::QueryArgument( "scope", specializedScope() ); args << Catalog::QueryArgument( "name", name ); - QValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); + TQValueList<Tag> tags( cppCompletionInstance->m_repository->query( args ) ); if ( ! tags.isEmpty() ) { //ifVerbose( dbg() << "findTag: \"" << str() << "\": tag \"" << name << "\" found " << endl ); return tags.front(); @@ -232,22 +232,22 @@ Tag SimpleTypeCatalog::findSubTag( const QString& name ) { } } -QValueList<Tag> SimpleTypeCatalog::getBaseClassList( ) { +TQValueList<Tag> SimpleTypeCatalog::getBaseClassList( ) { if ( scope().isEmpty() ) - return QValueList<Tag>(); + return TQValueList<Tag>(); return cppCompletionInstance->m_repository->getBaseClassList( scope().join("::") + specialization() ); } void SimpleTypeCatalog::initFromTag() { - QStringList l = m_tag.scope(); + TQStringList l = m_tag.scope(); l << m_tag.name(); setScope( l ); } void SimpleTypeCatalog::init() { if ( !scope().isEmpty() ) { - QStringList l = scope(); - QStringList cp = l; + TQStringList l = scope(); + TQStringList cp = l; cp.pop_back(); setScope( cp ); m_tag = findSubTag( l.back() ); @@ -270,21 +270,21 @@ DeclarationInfo SimpleTypeCatalog::getDeclarationInfo() { return ret; } -QStringList SimpleTypeCatalog::getBaseStrings() { +TQStringList SimpleTypeCatalog::getBaseStrings() { Debug d( "#getbases#" ); if ( !d || !safetyCounter ) { //ifVerbose( dbg() << "\"" << str() << "\": recursion to deep while getting bases" << endl ); - return QStringList(); + return TQStringList(); } - QStringList ret; - QMap<QString, bool> bases; + TQStringList ret; + TQMap<TQString, bool> bases; // try with parentsc - QTime t; + TQTime t; t.restart(); - QValueList<Tag> parents( getBaseClassList() ); + TQValueList<Tag> parents( getBaseClassList() ); - QValueList<Tag>::Iterator it = parents.begin(); + TQValueList<Tag>::Iterator it = parents.begin(); while ( it != parents.end() ) { Tag & tag = *it; ++it; @@ -301,11 +301,11 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); TypeDesc::TemplateParams templateParams = m_desc.templateParams(); uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() ) { TemplateParamInfo::TemplateParam curr; curr.name = *it; @@ -326,14 +326,14 @@ SimpleTypeImpl::TemplateParamInfo SimpleTypeCatalog::getTemplateParamInfo() { return ret; } -const LocateResult SimpleTypeCatalog::findTemplateParam( const QString& name ) { +const LocateResult SimpleTypeCatalog::findTemplateParam( const TQString& name ) { if ( m_tag ) { if ( m_tag.hasAttribute( "tpl" ) ) { - QStringList l = m_tag.attribute( "tpl" ).asStringList(); + TQStringList l = m_tag.attribute( "tpl" ).asStringList(); ///we need the index, so count the items through uint pi = 0; - QStringList::const_iterator it = l.begin(); + TQStringList::const_iterator it = l.begin(); while ( it != l.end() && *it != name ) { ++pi; ++it; |