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

1 files changed, 5 insertions, 5 deletions

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<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) {
+    CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) {
     }
     
     virtual TypePointer build();