From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/cpp/simpletypefunction.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'languages/cpp/simpletypefunction.h') diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index 90b5fcab..86f32a65 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -139,7 +139,7 @@ public: ///paramInfo now contains the information for all implicit types } - return this->parent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); + return this->tqparent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); } else { ifVerbose( dbg() << "failed to find a fitting overloaded method" << endl ); } @@ -239,7 +239,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer parent ) : m_item( item ), m_desc( desc ), m_parent( parent ) { + CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer tqparent ) : m_item( item ), m_desc( desc ), m_parent( tqparent ) { } virtual TypePointer build(); @@ -281,9 +281,9 @@ public: TypeDesc m_desc; TypePointer m_parent; - CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer parent ) : m_items( items ), m_desc( desc ), m_parent( parent ) { + CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer tqparent ) : m_items( items ), m_desc( desc ), m_parent( tqparent ) { } - CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ); + CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ); virtual TypePointer build(); }; @@ -317,7 +317,7 @@ public: TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( TQValueList tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { + CatalogFunctionBuildInfo( TQValueList tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) { } virtual TypePointer build(); -- cgit v1.2.1