From cf3a3e20dd430274e88fcec8b683d8bac42a5785 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Wed, 9 Jun 2010 16:59:20 -0300 Subject: Only display warning for unnamed arguments when this argument has default value. --- abstractmetabuilder.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'abstractmetabuilder.cpp') diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp index 2fb50632b..a2e771c9b 100644 --- a/abstractmetabuilder.cpp +++ b/abstractmetabuilder.cpp @@ -1658,6 +1658,7 @@ AbstractMetaFunction* AbstractMetaBuilder::traverseFunction(FunctionModelItem fu if (m_currentClass) replacedExpression = metaFunction->replacedDefaultExpression(m_currentClass, i + 1); + bool hasDefaultValue = false; if (arg->defaultValue() || !replacedExpression.isEmpty()) { QString expr = arg->defaultValueExpression(); expr = fixDefaultValue(arg, metaArg->type(), metaFunction, m_currentClass, i); @@ -1675,25 +1676,17 @@ AbstractMetaFunction* AbstractMetaBuilder::traverseFunction(FunctionModelItem fu if (metaArg->type()->isEnum() || metaArg->type()->isFlags()) m_enumDefaultArguments << QPair(metaArg, metaFunction); + + hasDefaultValue = !expr.isEmpty(); } //Check for missing argument name - if (!metaArg->hasName() && !metaFunction->isOperatorOverload() && metaFunction->argumentName(i, false, m_currentClass).isEmpty()) - ReportHandler::warning(QString("Argument %1 on function '%2::%3' declared without name.").arg(i).arg(className).arg(functionItem->name())); + if (hasDefaultValue && !metaArg->hasName() && !metaFunction->isOperatorOverload() && metaFunction->argumentName(i+1, false, m_currentClass).isEmpty()) { + ReportHandler::warning(QString("Argument %1 on function '%2::%3' has default expressiont but does not have name.").arg(i+1).arg(className).arg(functionItem->name())); + } } -#if 0 - // If we where not able to translate the default argument make it - // reset all default arguments before this one too. - for (int i = 0; i < first_default_argument; ++i) - meta_arguments[i]->setDefaultValueExpression("" + QString()); - - if (ReportHandler::debugLevel() == ReportHandler::FullDebug) - foreach (AbstractMetaArgument *arg, meta_arguments) - ReportHandler::debugFull(" - " + arg->toString()); -#endif - return metaFunction; } -- cgit v1.2.3