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/cppevaluation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'languages/cpp/cppevaluation.cpp') diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index b84185f5..a20c2339 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -102,7 +102,7 @@ OperatorIdentification UnaryOperator::identify( TQString& str ) { EvaluationResult UnaryOperator::apply( TQValueList params, TQValueList innerParams ) { if( !checkParams( params ) ) { - log( TQString("parameter-check failed: %1 params: ").arg( params.size() ) + printTypeList( params ) ); + log( TQString("parameter-check failed: %1 params: ").tqarg( params.size() ) + printTypeList( params ) ); return EvaluationResult(); } else { EvaluationResult t = unaryApply( params.front(), innerParams ); @@ -433,7 +433,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } depth++; - if( !ready ) current = current->parent(); + if( !ready ) current = current->tqparent(); } } /* @@ -455,7 +455,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, if( !bestRet || /** Did we find a constructor within a class? */ - (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->parent()->desc() && bestRet->resolved()->asFunction() ) ) ) { + (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->tqparent()->desc() && bestRet->resolved()->asFunction() ) ) ) { /*if ( type && type->resolved() ) {*/ EvaluationResult ret = type; -- cgit v1.2.3