summaryrefslogtreecommitdiffstats
path: root/languages/cpp/simpletypefunction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'languages/cpp/simpletypefunction.cpp')
-rw-r--r--languages/cpp/simpletypefunction.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp
index 3fc1ce52..d0c2c2af 100644
--- a/languages/cpp/simpletypefunction.cpp
+++ b/languages/cpp/simpletypefunction.cpp
@@ -455,7 +455,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb
if ( ret.memberType == MemberInfo::Function || ret.memberType == MemberInfo::Variable || ret.memberType == MemberInfo::Template || ret.memberType == MemberInfo::Typedef || ret.memberType == MemberInfo::NestedType ) {
//For redirected types it is necessary to add the include-files of the context they were searched in.
//That is not quite correct, but it makes sure that at least the same namespace-aliases will be activated while the search for the type,
- //Which is necessary because the alias is parented by exactly this class.
+ //Which is necessary because the alias is tqparented by exactly this class.
ret.type->addIncludeFiles( name.includeFiles() );
}
@@ -494,7 +494,7 @@ DeclarationInfo SimpleTypeCodeModel::getDeclarationInfo() {
TQString SimpleTypeCodeModel::specialization() const {
const ClassModel* klass = dynamic_cast<const ClassModel*>( m_item.data() );
- if ( !klass ) return TQString::null;
+ if ( !klass ) return TQString();
return klass->getSpecializationDeclaration();
}
@@ -553,8 +553,8 @@ TQStringList SimpleTypeCodeModel::getBaseStrings() {
if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret;
- TQStringList parents = klass->baseClassList();
- for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) {
+ TQStringList tqparents = klass->baseClassList();
+ for ( TQStringList::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
ret << *it;
}
@@ -572,8 +572,8 @@ TypePointer SimpleTypeCodeModel::CodeModelBuildInfo::build() {
TypeDesc SimpleTypeCodeModelFunction::getReturnType() {
if ( item() ) {
IncludeFiles files;
- if( parent() )
- files = parent()->getFindIncludeFiles();
+ if( tqparent() )
+ files = tqparent()->getFindIncludeFiles();
if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) {
TypeDesc d = m->resultType();
d.setIncludeFiles( files );
@@ -597,8 +597,8 @@ TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() {
if ( item() ) {
IncludeFiles files;
- if( parent() )
- files = parent()->getFindIncludeFiles();
+ if( tqparent() )
+ files = tqparent()->getFindIncludeFiles();
if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) {
ArgumentList l = m->argumentList();
for ( ArgumentList::iterator it = l.begin(); it != l.end(); ++it ) {
@@ -642,7 +642,7 @@ TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() {
//SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo implementation
-SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ) : m_desc( desc ), m_parent( parent ) {
+SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ) : m_desc( desc ), m_parent( tqparent ) {
for ( FunctionDefinitionList::iterator it = items.begin(); it != items.end(); ++it ) {
m_items << model_cast<FunctionDom> ( *it );