Skip to content

Commit 20abb24

Browse files
jcfrmrbean-bremen
jcfr
authored and
mrbean-bremen
committed
chore: Improve const correctness
This change improves const correctness by using `const` references in range-based for loops and other relevant places.
1 parent 29a7f9b commit 20abb24

14 files changed

+114
-108
lines changed

‎examples/PyLauncher/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
7878
}
7979
PythonQtScriptingConsole console(NULL, mainContext);
8080

81-
for (QString file : files) {
81+
for (const QString& file : qAsConst(files)) {
8282
mainContext.evalFile(file);
8383
}
8484
if (showConsole || console.hadError()) {

‎generator/abstractmetabuilder.cpp‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void AbstractMetaBuilder::traverseArithmeticOperator(FunctionModelItem item)
368368
void AbstractMetaBuilder::fixQObjectForScope(TypeDatabase *types,
369369
NamespaceModelItem scope)
370370
{
371-
for (ClassModelItem item : scope->classes()) {
371+
for (const ClassModelItem& item : scope->classes()) {
372372
QString qualified_name = item->qualifiedName().join("::");
373373
TypeEntry *entry = types->findType(qualified_name);
374374
if (entry) {
@@ -378,7 +378,7 @@ void AbstractMetaBuilder::fixQObjectForScope(TypeDatabase *types,
378378
}
379379
}
380380

381-
for (NamespaceModelItem item : scope->namespaceMap().values()) {
381+
for (const NamespaceModelItem& item : scope->namespaceMap().values()) {
382382
if (scope != item)
383383
fixQObjectForScope(types, item);
384384
}
@@ -490,25 +490,22 @@ bool AbstractMetaBuilder::build()
490490
// First automatically add all enums marked as QEnum into the TypeDatabase
491491
// (if they don't contain an entry already). If there is an QEnum entry,
492492
// the enum is obviously meant for scripting.
493-
for (ClassModelItem item : typeMap.values()) {
493+
for (const ClassModelItem& item : typeMap.values()) {
494494
autoAddQEnumsForClassItem(item);
495495
}
496496

497-
498-
for (ClassModelItem item : typeMap.values()) {
497+
for (const ClassModelItem& item : typeMap.values()) {
499498
AbstractMetaClass *cls = traverseClass(item);
500499
addAbstractMetaClass(cls);
501500
}
502501

503-
504502
QHash<QString, NamespaceModelItem> namespaceMap = m_dom->namespaceMap();
505-
for (NamespaceModelItem item : namespaceMap.values()) {
503+
for (const NamespaceModelItem& item : namespaceMap.values()) {
506504
AbstractMetaClass *meta_class = traverseNamespace(item);
507505
if (meta_class)
508506
m_meta_classes << meta_class;
509507
}
510508

511-
512509
// Some trickery to support global-namespace enums...
513510
QHash<QString, EnumModelItem> enumMap = m_dom->enumMap();
514511
m_current_class = 0;
@@ -848,7 +845,7 @@ AbstractMetaEnum *AbstractMetaBuilder::traverseEnum(EnumModelItem enum_item, Abs
848845

849846
ReportHandler::debugMedium(QString(" - traversing enum %1").arg(meta_enum->fullName()));
850847

851-
for (EnumeratorModelItem value : enum_item->enumerators()) {
848+
for (const EnumeratorModelItem& value : enum_item->enumerators()) {
852849
if (meta_enum->typeEntry()->isEnumValueRejected(value->name())) {
853850
continue;
854851
}
@@ -1077,7 +1074,7 @@ AbstractMetaField *AbstractMetaBuilder::traverseField(VariableModelItem field, c
10771074

10781075
void AbstractMetaBuilder::traverseFields(ScopeModelItem scope_item, AbstractMetaClass *meta_class)
10791076
{
1080-
for (VariableModelItem field : scope_item->variables()) {
1077+
for (const VariableModelItem& field : scope_item->variables()) {
10811078
AbstractMetaField *meta_field = traverseField(field, meta_class);
10821079

10831080
if (meta_field) {
@@ -1108,7 +1105,7 @@ void AbstractMetaBuilder::setupFunctionDefaults(AbstractMetaFunction *meta_funct
11081105

11091106
void AbstractMetaBuilder::traverseFunctions(ScopeModelItem scope_item, AbstractMetaClass *meta_class)
11101107
{
1111-
for (FunctionModelItem function : scope_item->functions()) {
1108+
for (const FunctionModelItem& function : scope_item->functions()) {
11121109
AbstractMetaFunction *meta_function = traverseFunction(function);
11131110

11141111
if (meta_function) {
@@ -2040,7 +2037,7 @@ bool AbstractMetaBuilder::inheritTemplate(AbstractMetaClass *subclass,
20402037
}
20412038

20422039
AbstractMetaFunctionList funcs = subclass->functions();
2043-
for (const AbstractMetaFunction *function : template_class->functions()) {
2040+
for (const AbstractMetaFunction* function : template_class->functions()) {
20442041

20452042
if (function->isModifiedRemoved(TypeSystem::All))
20462043
continue;
@@ -2056,7 +2053,7 @@ bool AbstractMetaBuilder::inheritTemplate(AbstractMetaClass *subclass,
20562053
continue;
20572054
}
20582055

2059-
for (AbstractMetaArgument *argument : function->arguments()) {
2056+
for (const AbstractMetaArgument* argument : function->arguments()) {
20602057
AbstractMetaType::shared_pointer atype = argument->type();
20612058

20622059
AbstractMetaArgument *arg = argument->copy();

‎generator/abstractmetalang.cpp‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ bool AbstractMetaFunction::needsCallThrough() const
198198
bool AbstractMetaFunction::needsSuppressUncheckedWarning() const
199199
{
200200
for (int i=-1; i<=arguments().size(); ++i) {
201-
QList<ReferenceCount> referenceCounts = this->referenceCounts(implementingClass(), i);
202-
for (ReferenceCount referenceCount : referenceCounts) {
201+
const QList<ReferenceCount> referenceCounts = this->referenceCounts(implementingClass(), i);
202+
for (const ReferenceCount& referenceCount : referenceCounts) {
203203
if (referenceCount.action != ReferenceCount::Set)
204204
return true;
205205
}
@@ -397,8 +397,8 @@ QList<ReferenceCount> AbstractMetaFunction::referenceCounts(const AbstractMetaCl
397397
{
398398
QList<ReferenceCount> returned;
399399

400-
FunctionModificationList mods = this->modifications(cls);
401-
for (FunctionModification mod : mods) {
400+
const FunctionModificationList mods = this->modifications(cls);
401+
for (const FunctionModification& mod : mods) {
402402
QList<ArgumentModification> argument_mods = mod.argument_mods;
403403
for (ArgumentModification argument_mod : argument_mods) {
404404
if (argument_mod.index != idx && idx != -2)
@@ -412,10 +412,10 @@ QList<ReferenceCount> AbstractMetaFunction::referenceCounts(const AbstractMetaCl
412412

413413
QString AbstractMetaFunction::replacedDefaultExpression(const AbstractMetaClass *cls, int key) const
414414
{
415-
FunctionModificationList modifications = this->modifications(cls);
416-
for (FunctionModification modification : modifications) {
417-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
418-
for (ArgumentModification argument_modification : argument_modifications) {
415+
const FunctionModificationList modifications = this->modifications(cls);
416+
for (const FunctionModification& modification : modifications) {
417+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
418+
for (const ArgumentModification& argument_modification : argument_modifications) {
419419
if (argument_modification.index == key
420420
&& !argument_modification.replaced_default_expression.isEmpty()) {
421421
return argument_modification.replaced_default_expression;
@@ -428,10 +428,10 @@ QString AbstractMetaFunction::replacedDefaultExpression(const AbstractMetaClass
428428

429429
bool AbstractMetaFunction::removedDefaultExpression(const AbstractMetaClass *cls, int key) const
430430
{
431-
FunctionModificationList modifications = this->modifications(cls);
432-
for (FunctionModification modification : modifications) {
433-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
434-
for (ArgumentModification argument_modification : argument_modifications) {
431+
const FunctionModificationList modifications = this->modifications(cls);
432+
for (const FunctionModification& modification : modifications) {
433+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
434+
for (const ArgumentModification& argument_modification : argument_modifications) {
435435
if (argument_modification.index == key
436436
&& argument_modification.removed_default_expression) {
437437
return true;
@@ -445,10 +445,10 @@ bool AbstractMetaFunction::removedDefaultExpression(const AbstractMetaClass *cls
445445
bool AbstractMetaFunction::resetObjectAfterUse(int argument_idx) const
446446
{
447447
const AbstractMetaClass *cls = declaringClass();
448-
FunctionModificationList modifications = this->modifications(cls);
449-
for (FunctionModification modification : modifications) {
450-
QList<ArgumentModification> argumentModifications = modification.argument_mods;
451-
for (ArgumentModification argumentModification : argumentModifications) {
448+
const FunctionModificationList modifications = this->modifications(cls);
449+
for (const FunctionModification& modification : modifications) {
450+
const QList<ArgumentModification> argumentModifications = modification.argument_mods;
451+
for (const ArgumentModification& argumentModification : argumentModifications) {
452452
if (argumentModification.index == argument_idx && argumentModification.reset_after_use)
453453
return true;
454454
}
@@ -466,10 +466,10 @@ QString AbstractMetaFunction::nullPointerDefaultValue(const AbstractMetaClass *m
466466
cls = implementingClass();
467467

468468
do {
469-
FunctionModificationList modifications = this->modifications(cls);
470-
for (FunctionModification modification : modifications) {
471-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
472-
for (ArgumentModification argument_modification : argument_modifications) {
469+
const FunctionModificationList modifications = this->modifications(cls);
470+
for (const FunctionModification& modification : modifications) {
471+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
472+
for (const ArgumentModification& argument_modification : argument_modifications) {
473473
if (argument_modification.index == argument_idx
474474
&& argument_modification.no_null_pointers) {
475475
return argument_modification.null_pointer_default_value;
@@ -491,10 +491,10 @@ bool AbstractMetaFunction::nullPointersDisabled(const AbstractMetaClass *mainCla
491491
cls = implementingClass();
492492

493493
do {
494-
FunctionModificationList modifications = this->modifications(cls);
495-
for (FunctionModification modification : modifications) {
496-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
497-
for (ArgumentModification argument_modification : argument_modifications) {
494+
const FunctionModificationList& modifications = this->modifications(cls);
495+
for (const FunctionModification& modification : modifications) {
496+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
497+
for (const ArgumentModification& argument_modification : argument_modifications) {
498498
if (argument_modification.index == argument_idx
499499
&& argument_modification.no_null_pointers) {
500500
return true;
@@ -510,10 +510,10 @@ bool AbstractMetaFunction::nullPointersDisabled(const AbstractMetaClass *mainCla
510510

511511
QString AbstractMetaFunction::conversionRule(TypeSystem::Language language, int key) const
512512
{
513-
FunctionModificationList modifications = this->modifications(declaringClass());
514-
for (FunctionModification modification : modifications) {
515-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
516-
for (ArgumentModification argument_modification : argument_modifications) {
513+
const FunctionModificationList modifications = this->modifications(declaringClass());
514+
for (const FunctionModification& modification : modifications) {
515+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
516+
for (const ArgumentModification& argument_modification : argument_modifications) {
517517
if (argument_modification.index != key)
518518
continue;
519519

@@ -529,10 +529,10 @@ QString AbstractMetaFunction::conversionRule(TypeSystem::Language language, int
529529

530530
QString AbstractMetaFunction::argumentReplaced(int key) const
531531
{
532-
FunctionModificationList modifications = this->modifications(declaringClass());
533-
for (FunctionModification modification : modifications) {
534-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
535-
for (ArgumentModification argument_modification : argument_modifications) {
532+
const FunctionModificationList modifications = this->modifications(declaringClass());
533+
for (const FunctionModification& modification : modifications) {
534+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
535+
for (const ArgumentModification& argument_modification : argument_modifications) {
536536
if (argument_modification.index == key && !argument_modification.replace_value.isEmpty()) {
537537
return argument_modification.replace_value;
538538
}
@@ -544,10 +544,10 @@ QString AbstractMetaFunction::argumentReplaced(int key) const
544544

545545
bool AbstractMetaFunction::argumentRemoved(int key) const
546546
{
547-
FunctionModificationList modifications = this->modifications(declaringClass());
548-
for (FunctionModification modification : modifications) {
549-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
550-
for (ArgumentModification argument_modification : argument_modifications) {
547+
const FunctionModificationList modifications = this->modifications(declaringClass());
548+
for (const FunctionModification& modification : modifications) {
549+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
550+
for (const ArgumentModification& argument_modification : argument_modifications) {
551551
if (argument_modification.index == key) {
552552
if (argument_modification.removed) {
553553
return true;
@@ -561,8 +561,8 @@ bool AbstractMetaFunction::argumentRemoved(int key) const
561561

562562
bool AbstractMetaFunction::isVirtualSlot() const
563563
{
564-
FunctionModificationList modifications = this->modifications(declaringClass());
565-
for (FunctionModification modification : modifications) {
564+
const FunctionModificationList modifications = this->modifications(declaringClass());
565+
for (const FunctionModification& modification : modifications) {
566566
if (modification.isVirtualSlot())
567567
return true;
568568
}
@@ -572,14 +572,14 @@ bool AbstractMetaFunction::isVirtualSlot() const
572572

573573
bool AbstractMetaFunction::disabledGarbageCollection(const AbstractMetaClass *cls, int key) const
574574
{
575-
FunctionModificationList modifications = this->modifications(cls);
576-
for (FunctionModification modification : modifications) {
577-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
578-
for (ArgumentModification argument_modification : argument_modifications) {
575+
const FunctionModificationList modifications = this->modifications(cls);
576+
for (const FunctionModification& modification : modifications) {
577+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
578+
for (const ArgumentModification& argument_modification : argument_modifications) {
579579
if (argument_modification.index != key)
580580
continue;
581581

582-
for (TypeSystem::Ownership ownership : argument_modification.ownerships.values()) {
582+
for (const TypeSystem::Ownership& ownership : argument_modification.ownerships.values()) {
583583
if (ownership == TypeSystem::CppOwnership)
584584
return true;
585585
}
@@ -592,8 +592,8 @@ bool AbstractMetaFunction::disabledGarbageCollection(const AbstractMetaClass *cl
592592

593593
bool AbstractMetaFunction::isDeprecated() const
594594
{
595-
FunctionModificationList modifications = this->modifications(declaringClass());
596-
for (FunctionModification modification : modifications) {
595+
const FunctionModificationList modifications = this->modifications(declaringClass());
596+
for (const FunctionModification& modification : modifications) {
597597
if (modification.isDeprecated())
598598
return true;
599599
}
@@ -602,10 +602,10 @@ bool AbstractMetaFunction::isDeprecated() const
602602

603603
TypeSystem::Ownership AbstractMetaFunction::ownership(const AbstractMetaClass *cls, TypeSystem::Language language, int key) const
604604
{
605-
FunctionModificationList modifications = this->modifications(cls);
606-
for (FunctionModification modification : modifications) {
607-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
608-
for (ArgumentModification argument_modification : argument_modifications) {
605+
const FunctionModificationList modifications = this->modifications(cls);
606+
for (const FunctionModification& modification : modifications) {
607+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
608+
for (const ArgumentModification& argument_modification : argument_modifications) {
609609
if (argument_modification.index == key)
610610
return argument_modification.ownerships.value(language, TypeSystem::InvalidOwnership);
611611
}
@@ -621,8 +621,8 @@ bool AbstractMetaFunction::isRemovedFromAllLanguages(const AbstractMetaClass *cl
621621

622622
bool AbstractMetaFunction::isRemovedFrom(const AbstractMetaClass *cls, TypeSystem::Language language) const
623623
{
624-
FunctionModificationList modifications = this->modifications(cls);
625-
for (FunctionModification modification : modifications) {
624+
const FunctionModificationList modifications = this->modifications(cls);
625+
for (const FunctionModification& modification : modifications) {
626626
if ((modification.removal & language) == language)
627627
return true;
628628
}
@@ -633,10 +633,10 @@ bool AbstractMetaFunction::isRemovedFrom(const AbstractMetaClass *cls, TypeSyste
633633

634634
QString AbstractMetaFunction::typeReplaced(int key) const
635635
{
636-
FunctionModificationList modifications = this->modifications(declaringClass());
637-
for (FunctionModification modification : modifications) {
638-
QList<ArgumentModification> argument_modifications = modification.argument_mods;
639-
for (ArgumentModification argument_modification : argument_modifications) {
636+
const FunctionModificationList modifications = this->modifications(declaringClass());
637+
for (const FunctionModification& modification : modifications) {
638+
const QList<ArgumentModification> argument_modifications = modification.argument_mods;
639+
for (const ArgumentModification& argument_modification : argument_modifications) {
640640
if (argument_modification.index == key
641641
&& !argument_modification.modified_type.isEmpty()) {
642642
return argument_modification.modified_type;
@@ -688,8 +688,8 @@ bool AbstractMetaFunction::hasModifications(const AbstractMetaClass *implementor
688688
QString AbstractMetaFunction::modifiedName() const
689689
{
690690
if (m_cached_modified_name.isEmpty()) {
691-
FunctionModificationList mods = modifications(implementingClass());
692-
for (FunctionModification mod : mods) {
691+
const FunctionModificationList mods = modifications(implementingClass());
692+
for (const FunctionModification& mod : mods) {
693693
if (mod.isRenameModifier()) {
694694
m_cached_modified_name = mod.renamedToName;
695695
break;
@@ -920,7 +920,7 @@ AbstractMetaFunctionList AbstractMetaClass::functionsInTargetLang() const
920920

921921
AbstractMetaFunctionList AbstractMetaClass::virtualFunctions() const
922922
{
923-
AbstractMetaFunctionList list = functionsInShellClass();
923+
const AbstractMetaFunctionList list = functionsInShellClass();
924924

925925
AbstractMetaFunctionList returned;
926926
for (AbstractMetaFunction* f : list) {
@@ -1278,8 +1278,8 @@ static AbstractMetaFunction *createXetter(const AbstractMetaField *g, const QStr
12781278
f->setAttributes(attr);
12791279
f->setOriginalAttributes(attr);
12801280

1281-
FieldModificationList mods = g->modifications();
1282-
for (FieldModification mod : mods) {
1281+
const FieldModificationList mods = g->modifications();
1282+
for (const FieldModification& mod : mods) {
12831283
if (mod.isRenameModifier())
12841284
f->setName(mod.renamedTo());
12851285
if (mod.isAccessModifier()) {

0 commit comments

Comments
 (0)