aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/3rdparty/cplusplus/Symbols.cpp18
-rw-r--r--src/libs/cplusplus/CppRewriter.cpp2
-rw-r--r--src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp2
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp2
-rw-r--r--src/libs/cplusplus/TypePrettyPrinter.cpp2
-rw-r--r--src/plugins/cppeditor/cppfunctiondecldeflink.cpp6
-rw-r--r--src/plugins/cpptools/cppcompletionassist.cpp2
-rw-r--r--src/plugins/cpptools/symbolfinder.cpp11
-rw-r--r--src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp2
9 files changed, 25 insertions, 22 deletions
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp
index 3def2ae0f8a..9e9b66cacb8 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.cpp
+++ b/src/libs/3rdparty/cplusplus/Symbols.cpp
@@ -235,11 +235,12 @@ bool Function::isEqualTo(const Type *other) const
const Name *l = unqualifiedName();
const Name *r = o->unqualifiedName();
if (l == r || (l && l->isEqualTo(r))) {
- if (argumentCount() != o->argumentCount())
+ const unsigned argc = argumentCount();
+ if (argc != o->argumentCount())
return false;
else if (! _returnType.isEqualTo(o->_returnType))
return false;
- for (unsigned i = 0; i < argumentCount(); ++i) {
+ for (unsigned i = 0; i < argc; ++i) {
Symbol *l = argumentAt(i);
Symbol *r = o->argumentAt(i);
if (! l->type().isEqualTo(r->type()))
@@ -297,15 +298,15 @@ Symbol *Function::argumentAt(unsigned index) const
bool Function::hasArguments() const
{
- return ! (argumentCount() == 0 ||
- (argumentCount() == 1 && argumentAt(0)->type()->isVoidType()));
+ unsigned argc = argumentCount();
+ return ! (argc == 0 || (argc == 1 && argumentAt(0)->type()->isVoidType()));
}
unsigned Function::minimumArgumentCount() const
{
unsigned index = 0;
- for (; index < argumentCount(); ++index) {
+ for (unsigned ei = argumentCount(); index < ei; ++index) {
if (Argument *arg = argumentAt(index)->asArgument()) {
if (arg->hasInitializer())
break;
@@ -374,10 +375,11 @@ void Function::visitSymbol0(SymbolVisitor *visitor)
bool Function::maybeValidPrototype(unsigned actualArgumentCount) const
{
+ const unsigned argc = argumentCount();
unsigned minNumberArguments = 0;
- for (; minNumberArguments < this->argumentCount(); ++minNumberArguments) {
- Argument *arg = this->argumentAt(minNumberArguments)->asArgument();
+ for (; minNumberArguments < argc; ++minNumberArguments) {
+ Argument *arg = argumentAt(minNumberArguments)->asArgument();
if (! arg) // TODO: Fix me properly - QTCREATORBUG-8316
return false;
@@ -390,7 +392,7 @@ bool Function::maybeValidPrototype(unsigned actualArgumentCount) const
// not enough arguments.
return false;
- } else if (! this->isVariadic() && actualArgumentCount > this->argumentCount()) {
+ } else if (!isVariadic() && actualArgumentCount > argc) {
// too many arguments.
return false;
}
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index 1b88ec5a7f0..7a49fd2b410 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -145,7 +145,7 @@ public:
funTy->setReturnType(rewrite->rewriteType(type->returnType()));
- for (unsigned i = 0; i < type->argumentCount(); ++i) {
+ for (unsigned i = 0, argc = type->argumentCount(); i < argc; ++i) {
Symbol *arg = type->argumentAt(i);
Argument *newArg = control()->newArgument(0, 0);
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
index 0d25bbf1f1b..2954fae24c9 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
@@ -140,7 +140,7 @@ private:
fun->setReturnType(q->apply(funTy->returnType()));
- for (unsigned i = 0; i < funTy->argumentCount(); ++i) {
+ for (unsigned i = 0, argc = funTy->argumentCount(); i < argc; ++i) {
Argument *originalArgument = funTy->argumentAt(i)->asArgument();
Argument *arg = control()->newArgument(/*sourceLocation*/ 0,
originalArgument->name());
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index b547c22d68f..f21e6ff8643 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -638,7 +638,7 @@ bool ResolveExpression::visit(CallAST *ast)
int score = 0;
- for (unsigned i = 0; i < funTy->argumentCount(); ++i) {
+ for (unsigned i = 0, argc = funTy->argumentCount(); i < argc; ++i) {
const FullySpecifiedType formalTy = funTy->argumentAt(i)->type();
FullySpecifiedType actualTy;
diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index a13f64173ee..e26602dccfc 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -409,7 +409,7 @@ void TypePrettyPrinter::visit(Function *type)
_text += QLatin1Char('(');
- for (unsigned index = 0; index < type->argumentCount(); ++index) {
+ for (unsigned index = 0, argc = type->argumentCount(); index < argc; ++index) {
if (index != 0)
_text += QLatin1String(", ");
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index 7d1764ac521..94dd93a7582 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -381,10 +381,10 @@ void FunctionDeclDefLink::showMarker(CPPEditorWidget *editor)
// does consider foo(void) to have one argument
static int declaredParameterCount(Function *function)
{
- int c = function->argumentCount();
- if (c == 0 && function->memberCount() > 0 && function->memberAt(0)->type().type()->isVoidType())
+ int argc = function->argumentCount();
+ if (argc == 0 && function->memberCount() > 0 && function->memberAt(0)->type().type()->isVoidType())
return 1;
- return c;
+ return argc;
}
Q_GLOBAL_STATIC(QRegExp, commentArgNameRegexp)
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 5d9995d3c49..4bebd197f61 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1364,7 +1364,7 @@ void CppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentSco
}
} else if (scope->isFunction()) {
Function *fun = scope->asFunction();
- for (unsigned i = 0; i < fun->argumentCount(); ++i) {
+ for (unsigned i = 0, argc = fun->argumentCount(); i < argc; ++i) {
addCompletionItem(fun->argumentAt(i), FunctionArgumentsOrder);
}
break;
diff --git a/src/plugins/cpptools/symbolfinder.cpp b/src/plugins/cpptools/symbolfinder.cpp
index 2476c11339e..8ac16e40a78 100644
--- a/src/plugins/cpptools/symbolfinder.cpp
+++ b/src/plugins/cpptools/symbolfinder.cpp
@@ -185,15 +185,16 @@ Symbol *SymbolFinder::findMatchingDefinition(Symbol *declaration,
if (! strict && ! best)
best = fun;
- unsigned argc = 0;
- for (; argc < declarationTy->argumentCount(); ++argc) {
- Symbol *arg = fun->argumentAt(argc);
- Symbol *otherArg = declarationTy->argumentAt(argc);
+ const unsigned argc = declarationTy->argumentCount();
+ unsigned argIt = 0;
+ for (; argIt < argc; ++argIt) {
+ Symbol *arg = fun->argumentAt(argIt);
+ Symbol *otherArg = declarationTy->argumentAt(argIt);
if (! arg->type().isEqualTo(otherArg->type()))
break;
}
- if (argc == declarationTy->argumentCount())
+ if (argIt == argc)
best = fun;
}
}
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 369a764371b..79f9cb6c35e 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -569,7 +569,7 @@ static LanguageUtils::FakeMetaObject::Ptr buildFakeMetaObject(
method.setMethodType(FakeMetaMethod::Signal);
else
method.setMethodType(FakeMetaMethod::Slot);
- for (unsigned a = 0; a < func->argumentCount(); ++a) {
+ for (unsigned a = 0, argc = func->argumentCount(); a < argc; ++a) {
Symbol *arg = func->argumentAt(a);
QString name;
if (arg->name())
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 17:53:32 +0000