From 958cd3ee1094a068b6d0ff27c73a4b3caff088ad Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 5 Oct 2022 07:29:16 +0200 Subject: Port from container::count() and length() to size() This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName()))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: Idb1f75dfe2323bd1d9e8b4d58d54f1b4b80c7ed7 Reviewed-by: Fabian Kosmale --- src/qml/animations/qabstractanimationjob.cpp | 4 +- src/qml/animations/qabstractanimationjob_p.h | 2 +- src/qml/common/qqmljsfixedpoolarray_p.h | 4 +- src/qml/common/qqmltranslation.cpp | 2 +- src/qml/common/qv4compileddata_p.h | 4 +- src/qml/common/qv4stringtoarrayindex_p.h | 2 +- src/qml/compiler/qqmlirbuilder.cpp | 24 ++++----- src/qml/compiler/qv4codegen.cpp | 6 +-- src/qml/compiler/qv4compiler.cpp | 28 +++++------ src/qml/compiler/qv4compilercontext.cpp | 8 +-- src/qml/compiler/qv4compilerscanfunctions.cpp | 2 +- src/qml/compiler/qv4instr_moth_p.h | 2 +- src/qml/debugger/qqmldebugconnector.cpp | 2 +- src/qml/jsapi/qjsengine.cpp | 2 +- src/qml/jsruntime/qv4dateobject.cpp | 2 +- src/qml/jsruntime/qv4engine.cpp | 12 ++--- src/qml/jsruntime/qv4engine_p.h | 2 +- src/qml/jsruntime/qv4executableallocator_p.h | 4 +- src/qml/jsruntime/qv4executablecompilationunit.cpp | 2 +- src/qml/jsruntime/qv4function.cpp | 2 +- src/qml/jsruntime/qv4globalobject.cpp | 14 +++--- src/qml/jsruntime/qv4identifiertable.cpp | 6 +-- src/qml/jsruntime/qv4jsonobject.cpp | 4 +- src/qml/jsruntime/qv4module.cpp | 2 +- src/qml/jsruntime/qv4object.cpp | 2 +- src/qml/jsruntime/qv4propertykey.cpp | 2 +- src/qml/jsruntime/qv4qobjectwrapper.cpp | 10 ++-- src/qml/jsruntime/qv4regexp.cpp | 12 ++--- src/qml/jsruntime/qv4regexpobject.cpp | 18 +++---- src/qml/jsruntime/qv4runtime.cpp | 4 +- src/qml/jsruntime/qv4stringiterator.cpp | 2 +- src/qml/jsruntime/qv4stringobject.cpp | 58 +++++++++++----------- src/qml/memory/qv4mm.cpp | 2 +- src/qml/parser/qqmljslexer.cpp | 4 +- src/qml/qml/ftw/qhashedstring_p.h | 8 +-- src/qml/qml/ftw/qstringhash_p.h | 4 +- src/qml/qml/qqmlbuiltinfunctions.cpp | 6 +-- src/qml/qml/qqmlcomponent.cpp | 6 +-- src/qml/qml/qqmlcontext_p.h | 2 +- src/qml/qml/qqmlcustomparser.cpp | 4 +- src/qml/qml/qqmldatablob.cpp | 12 ++--- src/qml/qml/qqmlengine.cpp | 14 +++--- src/qml/qml/qqmlerror.cpp | 4 +- src/qml/qml/qqmlfile.cpp | 28 +++++------ src/qml/qml/qqmlimport.cpp | 30 +++++------ src/qml/qml/qqmlirloader.cpp | 10 ++-- src/qml/qml/qqmllocale.cpp | 4 +- src/qml/qml/qqmlmetatype.cpp | 6 +-- src/qml/qml/qqmlmetatypedata.cpp | 14 +++--- src/qml/qml/qqmlnotifier.cpp | 4 +- src/qml/qml/qqmlopenmetaobject.cpp | 20 ++++---- src/qml/qml/qqmlpluginimporter.cpp | 2 +- src/qml/qml/qqmlproperty.cpp | 16 +++--- src/qml/qml/qqmlpropertycache.cpp | 18 +++---- src/qml/qml/qqmlpropertycache_p.h | 4 +- src/qml/qml/qqmlpropertycachecreator.cpp | 2 +- src/qml/qml/qqmlpropertycachevector_p.h | 4 +- src/qml/qml/qqmlpropertyresolver.cpp | 2 +- src/qml/qml/qqmlscriptblob.cpp | 4 +- src/qml/qml/qqmlscriptdata.cpp | 4 +- src/qml/qml/qqmlscriptstring.cpp | 2 +- src/qml/qml/qqmltype.cpp | 20 ++++---- src/qml/qml/qqmltypecompiler.cpp | 26 +++++----- src/qml/qml/qqmltypecompiler_p.h | 2 +- src/qml/qml/qqmltypedata.cpp | 12 ++--- src/qml/qml/qqmltypeloader.cpp | 8 +-- src/qml/qml/qqmltypemodule.cpp | 2 +- src/qml/qml/qqmltypenamecache.cpp | 4 +- src/qml/qml/qqmlxmlhttprequest.cpp | 26 +++++----- src/qml/qmldirparser/qqmldirparser.cpp | 6 +-- src/qml/qmldirparser/qqmlimportresolver.cpp | 4 +- src/qml/types/qqmlbind.cpp | 10 ++-- src/qml/types/qqmlconnections.cpp | 6 +-- src/qml/util/qqmlpropertymap.cpp | 2 +- 74 files changed, 309 insertions(+), 309 deletions(-) (limited to 'src/qml') diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp index 196fe7ed4a..6224d033fe 100644 --- a/src/qml/animations/qabstractanimationjob.cpp +++ b/src/qml/animations/qabstractanimationjob.cpp @@ -93,7 +93,7 @@ void QQmlAnimationTimer::updateAnimationsTime(qint64 delta) //when the CPU load is high if (delta) { insideTick = true; - for (currentAnimationIdx = 0; currentAnimationIdx < animations.count(); ++currentAnimationIdx) { + for (currentAnimationIdx = 0; currentAnimationIdx < animations.size(); ++currentAnimationIdx) { QAbstractAnimationJob *animation = animations.at(currentAnimationIdx); int elapsed = animation->m_totalCurrentTime + (animation->direction() == QAbstractAnimationJob::Forward ? delta : -delta); @@ -101,7 +101,7 @@ void QQmlAnimationTimer::updateAnimationsTime(qint64 delta) } if (animationTickDump()) { qDebug() << "***** Dumping Animation Tree ***** ( tick:" << lastTick << "delta:" << delta << ")"; - for (int i = 0; i < animations.count(); ++i) + for (int i = 0; i < animations.size(); ++i) qDebug() << animations.at(i); } insideTick = false; diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index a933f49be3..6330b01bb1 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -193,7 +193,7 @@ public: void updateAnimationsTime(qint64 timeStep) override; //useful for profiling/debugging - int runningAnimationCount() override { return animations.count(); } + int runningAnimationCount() override { return animations.size(); } bool hasStartAnimationPending() const { return startAnimationPending; } diff --git a/src/qml/common/qqmljsfixedpoolarray_p.h b/src/qml/common/qqmljsfixedpoolarray_p.h index 16f60c002e..e946b1ecfd 100644 --- a/src/qml/common/qqmljsfixedpoolarray_p.h +++ b/src/qml/common/qqmljsfixedpoolarray_p.h @@ -44,7 +44,7 @@ public: void allocate(MemoryPool *pool, const QVector &vector) { - count = vector.count(); + count = vector.size(); data = reinterpret_cast(pool->allocate(count * sizeof(T))); if (QTypeInfo::isComplex) { @@ -58,7 +58,7 @@ public: template void allocate(MemoryPool *pool, const Container &container) { - count = container.count(); + count = container.size(); data = reinterpret_cast(pool->allocate(count * sizeof(T))); typename Container::ConstIterator it = container.constBegin(); for (int i = 0; i < count; ++i) diff --git a/src/qml/common/qqmltranslation.cpp b/src/qml/common/qqmltranslation.cpp index ed598f104a..6230bd93be 100644 --- a/src/qml/common/qqmltranslation.cpp +++ b/src/qml/common/qqmltranslation.cpp @@ -61,7 +61,7 @@ QString QQmlTranslation::contextFromQmlFilename(const QString &qmlFilename) { int lastSlash = qmlFilename.lastIndexOf(QLatin1Char('/')); QStringView contextView = (lastSlash > -1) - ? QStringView{ qmlFilename }.mid(lastSlash + 1, qmlFilename.length() - lastSlash - 5) + ? QStringView{ qmlFilename }.mid(lastSlash + 1, qmlFilename.size() - lastSlash - 5) : QStringView(); return contextView.toString(); } diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h index 45ce45934e..d9cd4ce569 100644 --- a/src/qml/common/qv4compileddata_p.h +++ b/src/qml/common/qv4compileddata_p.h @@ -231,7 +231,7 @@ struct String qint32_le size; static int calculateSize(const QString &str) { - return (sizeof(String) + (str.length() + 1) * sizeof(quint16) + 7) & ~0x7; + return (sizeof(String) + (str.size() + 1) * sizeof(quint16) + 7) & ~0x7; } }; @@ -587,7 +587,7 @@ struct Binding static QString escapedString(const QString &string) { QString tmp = QLatin1String("\""); - for (int i = 0; i < string.length(); ++i) { + for (int i = 0; i < string.size(); ++i) { const QChar &c = string.at(i); switch (c.unicode()) { case 0x08: diff --git a/src/qml/common/qv4stringtoarrayindex_p.h b/src/qml/common/qv4stringtoarrayindex_p.h index ba5642a27d..fc71ca7072 100644 --- a/src/qml/common/qv4stringtoarrayindex_p.h +++ b/src/qml/common/qv4stringtoarrayindex_p.h @@ -52,7 +52,7 @@ uint stringToArrayIndex(const T *ch, const T *end) inline uint stringToArrayIndex(const QString &str) { - return stringToArrayIndex(str.constData(), str.constData() + str.length()); + return stringToArrayIndex(str.constData(), str.constData() + str.size()); } } // namespace QV4 diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index 59db9bd43a..539d3a7a6e 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -456,9 +456,9 @@ bool IRBuilder::generateFromQml(const QString &code, const QString &url, Documen bool IRBuilder::isSignalPropertyName(const QString &name) { - if (name.length() < 3) return false; + if (name.size() < 3) return false; if (!name.startsWith(QLatin1String("on"))) return false; - int ns = name.length(); + int ns = name.size(); for (int i = 2; i < ns; ++i) { const QChar curr = name.at(i); if (curr.unicode() == '_') continue; @@ -604,7 +604,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiArrayBinding *node) memberList.append(member); member = member->next; } - for (int i = memberList.count() - 1; i >= 0; --i) { + for (int i = memberList.size() - 1; i >= 0; --i) { member = memberList.at(i); QQmlJS::AST::UiObjectDefinition *def = QQmlJS::AST::cast(member->member); @@ -732,7 +732,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiImport *node) // Check for script qualifier clashes bool isScript = import->type == QV4::CompiledData::Import::ImportScript; - for (int ii = 0; ii < _imports.count(); ++ii) { + for (int ii = 0; ii < _imports.size(); ++ii) { const QV4::CompiledData::Import *other = _imports.at(ii); bool otherIsScript = other->type == QV4::CompiledData::Import::ImportScript; @@ -1365,13 +1365,13 @@ bool IRBuilder::appendAlias(QQmlJS::AST::UiPublicMember *node) COMPILE_EXCEPTION(rhsLoc, tr("Invalid alias reference. An alias reference must be specified as , . or ..")); } - if (aliasReference.count() < 1 || aliasReference.count() > 3) + if (aliasReference.size() < 1 || aliasReference.size() > 3) COMPILE_EXCEPTION(rhsLoc, tr("Invalid alias reference. An alias reference must be specified as , . or ..")); alias->setIdIndex(registerString(aliasReference.first())); QString propertyValue = aliasReference.value(1); - if (aliasReference.count() == 3) + if (aliasReference.size() == 3) propertyValue += QLatin1Char('.') + aliasReference.at(2); alias->propertyNameIndex = registerString(propertyValue); @@ -1639,8 +1639,8 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen // No more new strings after this point, we're calculating offsets. output.jsGenerator.stringTable.freeze(); - const uint importSize = uint(sizeof(QV4::CompiledData::Import)) * output.imports.count(); - const uint objectOffsetTableSize = output.objects.count() * uint(sizeof(quint32)); + const uint importSize = uint(sizeof(QV4::CompiledData::Import)) * output.imports.size(); + const uint objectOffsetTableSize = output.objects.size() * uint(sizeof(quint32)); QHash objectOffsets; @@ -1668,9 +1668,9 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen memset(data, 0, totalSize); QV4::CompiledData::QmlUnit *qmlUnit = reinterpret_cast(data); qmlUnit->offsetToImports = sizeof(*qmlUnit); - qmlUnit->nImports = output.imports.count(); + qmlUnit->nImports = output.imports.size(); qmlUnit->offsetToObjects = objectOffset; - qmlUnit->nObjects = output.objects.count(); + qmlUnit->nObjects = output.objects.size(); // write imports char *importPtr = data + qmlUnit->offsetToImports; @@ -1682,7 +1682,7 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen // write objects quint32_le *objectTable = reinterpret_cast(data + qmlUnit->offsetToObjects); - for (int i = 0; i < output.objects.count(); ++i) { + for (int i = 0; i < output.objects.size(); ++i) { const Object *o = output.objects.at(i); char * const objectPtr = data + objectOffsets.value(o); *objectTable++ = objectOffsets.value(o); @@ -1926,7 +1926,7 @@ QVector JSCodeGen::generateJSCodeForFunctionsAndBindings( _context = nullptr; - for (int i = 0; i < functions.count(); ++i) { + for (int i = 0; i < functions.size(); ++i) { const CompiledFunctionOrExpression &qmlFunction = functions.at(i); QQmlJS::AST::Node *node = qmlFunction.node; Q_ASSERT(node != document->program); diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 995038e95c..9b0efcba41 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -3257,7 +3257,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast, AST::FormalPara _context->name = name.isEmpty() ? currentExpr().result().name : name; _module->functions.append(_context); - _context->functionIndex = _module->functions.count() - 1; + _context->functionIndex = _module->functions.size() - 1; Context *savedFunctionContext = _functionContext; _functionContext = _context; @@ -3266,7 +3266,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast, AST::FormalPara if (_context->contextType == ContextType::Global || _context->contextType == ContextType::ScriptImportedByQML) { _module->blocks.append(_context); - _context->blockIndex = _module->blocks.count() - 1; + _context->blockIndex = _module->blocks.size() - 1; } if (_module->debugMode) // allow the debugger to see overwritten arguments _context->argumentsCanEscape = true; @@ -3307,7 +3307,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast, AST::FormalPara // register the lexical scope for global code if (!_context->parent && _context->requiresExecutionContext) { _module->blocks.append(_context); - _context->blockIndex = _module->blocks.count() - 1; + _context->blockIndex = _module->blocks.size() - 1; } TailCallBlocker maybeBlockTailCalls(this, _context->canHaveTailCalls()); diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp index 2dad207087..1f4deeca97 100644 --- a/src/qml/compiler/qv4compiler.cpp +++ b/src/qml/compiler/qv4compiler.cpp @@ -74,8 +74,8 @@ void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit) QV4::CompiledData::String *s = reinterpret_cast(stringData); Q_ASSERT(reinterpret_cast(s) % alignof(QV4::CompiledData::String) == 0); - Q_ASSERT(qstr.length() >= 0); - s->size = qstr.length(); + Q_ASSERT(qstr.size() >= 0); + s->size = qstr.size(); ushort *uc = reinterpret_cast(reinterpret_cast(s) + sizeof(*s)); qToLittleEndian(qstr.constData(), s->size, uc); @@ -327,12 +327,12 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit(GeneratorO // write js classes and js class lookup table quint32_le *jsClassOffsetTable = reinterpret_cast(dataPtr + unit->offsetToJSClassTable); - for (int i = 0; i < jsClassOffsets.count(); ++i) + for (int i = 0; i < jsClassOffsets.size(); ++i) jsClassOffsetTable[i] = jsClassDataOffset + jsClassOffsets.at(i); } - if (translations.count()) { - memcpy(dataPtr + unit->offsetToTranslationTable, translations.constData(), translations.count() * sizeof(CompiledData::TranslationData)); + if (translations.size()) { + memcpy(dataPtr + unit->offsetToTranslationTable, translations.constData(), translations.size() * sizeof(CompiledData::TranslationData)); } { @@ -602,7 +602,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp unit.offsetToBlockTable = nextOffset; nextOffset += unit.blockTableSize * sizeof(uint); - unit.lookupTableSize = lookups.count(); + unit.lookupTableSize = lookups.size(); unit.offsetToLookupTable = nextOffset; nextOffset += unit.lookupTableSize * sizeof(CompiledData::Lookup); @@ -617,7 +617,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp unit.offsetToConstantTable = nextOffset; nextOffset += unit.constantTableSize * sizeof(ReturnedValue); - unit.jsClassTableSize = jsClassOffsets.count(); + unit.jsClassTableSize = jsClassOffsets.size(); unit.offsetToJSClassTable = nextOffset; nextOffset += unit.jsClassTableSize * sizeof(uint); @@ -626,7 +626,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp nextOffset = static_cast(roundUpToMultipleOf(8, nextOffset)); - unit.translationTableSize = translations.count(); + unit.translationTableSize = translations.size(); unit.offsetToTranslationTable = nextOffset; nextOffset += unit.translationTableSize * sizeof(CompiledData::TranslationData); @@ -639,16 +639,16 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp nextOffset = static_cast(roundUpToMultipleOf(8, nextOffset)); }; - reserveExportTable(module->localExportEntries.count(), &unit.localExportEntryTableSize, &unit.offsetToLocalExportEntryTable); - reserveExportTable(module->indirectExportEntries.count(), &unit.indirectExportEntryTableSize, &unit.offsetToIndirectExportEntryTable); - reserveExportTable(module->starExportEntries.count(), &unit.starExportEntryTableSize, &unit.offsetToStarExportEntryTable); + reserveExportTable(module->localExportEntries.size(), &unit.localExportEntryTableSize, &unit.offsetToLocalExportEntryTable); + reserveExportTable(module->indirectExportEntries.size(), &unit.indirectExportEntryTableSize, &unit.offsetToIndirectExportEntryTable); + reserveExportTable(module->starExportEntries.size(), &unit.starExportEntryTableSize, &unit.offsetToStarExportEntryTable); - unit.importEntryTableSize = module->importEntries.count(); + unit.importEntryTableSize = module->importEntries.size(); unit.offsetToImportEntryTable = nextOffset; nextOffset += unit.importEntryTableSize * sizeof(CompiledData::ImportEntry); nextOffset = static_cast(roundUpToMultipleOf(8, nextOffset)); - unit.moduleRequestTableSize = module->moduleRequests.count(); + unit.moduleRequestTableSize = module->moduleRequests.size(); unit.offsetToModuleRequestTable = nextOffset; nextOffset += unit.moduleRequestTableSize * sizeof(uint); nextOffset = static_cast(roundUpToMultipleOf(8, nextOffset)); @@ -710,7 +710,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp if (showStats) { qDebug() << "Generated JS unit that is" << unit.unitSize << "bytes contains:"; qDebug() << " " << functionSize << "bytes for non-code function data for" << unit.functionTableSize << "functions"; - qDebug() << " " << translations.count() * sizeof(CompiledData::TranslationData) << "bytes for" << translations.count() << "translations"; + qDebug() << " " << translations.size() * sizeof(CompiledData::TranslationData) << "bytes for" << translations.size() << "translations"; } return unit; diff --git a/src/qml/compiler/qv4compilercontext.cpp b/src/qml/compiler/qv4compilercontext.cpp index d203059bd9..a8f9e6b454 100644 --- a/src/qml/compiler/qv4compilercontext.cpp +++ b/src/qml/compiler/qv4compilercontext.cpp @@ -148,7 +148,7 @@ Context::ResolvedName Context::resolveName(const QString &name, const QQmlJS::So return result; if (c->contextType == ContextType::ESModule) { - for (int i = 0; i < c->importEntries.count(); ++i) { + for (int i = 0; i < c->importEntries.size(); ++i) { if (c->importEntries.at(i).localName == name) { result.index = i; result.type = ResolvedName::Import; @@ -181,7 +181,7 @@ void Context::emitBlockHeader(Codegen *codegen) if (requiresExecutionContext) { if (blockIndex < 0) { codegen->module()->blocks.append(this); - blockIndex = codegen->module()->blocks.count() - 1; + blockIndex = codegen->module()->blocks.size() - 1; } if (contextType == ContextType::Global) { @@ -361,7 +361,7 @@ void Context::setupFunctionIndices(Moth::BytecodeGenerator *bytecodeGenerator) break; } - sizeOfLocalTemporalDeadZone = localsInTDZ.count(); + sizeOfLocalTemporalDeadZone = localsInTDZ.size(); for (auto &member: qAsConst(localsInTDZ)) { member->index = locals.size(); locals.append(member.key()); @@ -376,7 +376,7 @@ void Context::setupFunctionIndices(Moth::BytecodeGenerator *bytecodeGenerator) } } - sizeOfRegisterTemporalDeadZone = registersInTDZ.count(); + sizeOfRegisterTemporalDeadZone = registersInTDZ.size(); firstTemporalDeadZoneRegister = bytecodeGenerator->currentRegister(); for (auto &member: qAsConst(registersInTDZ)) member->index = bytecodeGenerator->newRegister(); diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp index 29bc3918ea..ee54137c10 100644 --- a/src/qml/compiler/qv4compilerscanfunctions.cpp +++ b/src/qml/compiler/qv4compilerscanfunctions.cpp @@ -861,7 +861,7 @@ void ScanFunctions::calcEscapingVariables() mIt->canEscape = true; } const QLatin1String exprForOn("expression for on"); - if (c->contextType == ContextType::Binding && c->name.length() > exprForOn.size() && + if (c->contextType == ContextType::Binding && c->name.size() > exprForOn.size() && c->name.startsWith(exprForOn) && c->name.at(exprForOn.size()).isUpper()) // we don't really need this for bindings, but we do for signal handlers, and in this case, // we don't know if the code is a signal handler or not. diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h index c7fdec1a4d..75408fd348 100644 --- a/src/qml/compiler/qv4instr_moth_p.h +++ b/src/qml/compiler/qv4instr_moth_p.h @@ -503,7 +503,7 @@ void dumpBytecode(const char *bytecode, int len, int nLocals, int nFormals, int const QVector &lineNumberMapping = QVector()); inline void dumpBytecode(const QByteArray &bytecode, int nLocals, int nFormals, int startLine = 1, const QVector &lineNumberMapping = QVector()) { - dumpBytecode(bytecode.constData(), bytecode.length(), nLocals, nFormals, startLine, lineNumberMapping); + dumpBytecode(bytecode.constData(), bytecode.size(), nLocals, nFormals, startLine, lineNumberMapping); } union Instr diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp index add0396228..0b66a29e18 100644 --- a/src/qml/debugger/qqmldebugconnector.cpp +++ b/src/qml/debugger/qqmldebugconnector.cpp @@ -95,7 +95,7 @@ QQmlDebugConnector *QQmlDebugConnector::instance() int connectorEnd = params->arguments.indexOf(QLatin1Char(','), connectorBegin); if (connectorEnd == -1) - connectorEnd = params->arguments.length(); + connectorEnd = params->arguments.size(); params->instance = loadQQmlDebugConnector(params->arguments.mid( connectorBegin, diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 1c235755fb..61042607c9 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -837,7 +837,7 @@ static bool convertString(const QString &string, QMetaType metaType, void *ptr) { // have a string based value without engine. Do conversion manually if (metaType == QMetaType::fromType()) { - *reinterpret_cast(ptr) = string.length() != 0; + *reinterpret_cast(ptr) = string.size() != 0; return true; } if (metaType == QMetaType::fromType()) { diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 6f00ae7b6e..cbab5a239a 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -339,7 +339,7 @@ static inline double ParseString(const QString &s, double localTZA) }; const QChar *ch = s.constData(); - const QChar *end = ch + s.length(); + const QChar *end = ch + s.size(); uint format = Year; int current = 0; diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 7934fe6779..2800590712 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -954,13 +954,13 @@ Heap::Object *ExecutionEngine::newObject(Heap::InternalClass *internalClass) Heap::String *ExecutionEngine::newString(const QString &s) { - return memoryManager->allocWithStringData(s.length() * sizeof(QChar), s); + return memoryManager->allocWithStringData(s.size() * sizeof(QChar), s); } Heap::String *ExecutionEngine::newIdentifier(const QString &text) { Scope scope(this); - ScopedString s(scope, memoryManager->allocWithStringData(text.length() * sizeof(QChar), text)); + ScopedString s(scope, memoryManager->allocWithStringData(text.size() * sizeof(QChar), text)); s->toPropertyKey(); return s->d(); } @@ -1862,11 +1862,11 @@ QV4::ReturnedValue ExecutionEngine::fromData(QMetaType metaType, const void *ptr // directly against QList? const QList &list = *(const QList*)ptr; QV4::ScopedArrayObject a(scope, newArrayObject()); - a->arrayReserve(list.count()); + a->arrayReserve(list.size()); QV4::ScopedValue v(scope); - for (int ii = 0; ii < list.count(); ++ii) + for (int ii = 0; ii < list.size(); ++ii) a->arrayPut(ii, (v = QV4::QObjectWrapper::wrap(this, list.at(ii)))); - a->setArrayLengthUnchecked(list.count()); + a->setArrayLengthUnchecked(list.size()); return a.asReturnedValue(); } else if (auto flags = metaType.flags(); flags & QMetaType::PointerToQObject) { if (flags.testFlag(QMetaType::IsConst)) @@ -2327,7 +2327,7 @@ int ExecutionEngine::consoleCountHelper(const QString &file, quint16 line, quint void ExecutionEngine::setExtensionData(int index, Deletable *data) { - if (m_extensionData.count() <= index) + if (m_extensionData.size() <= index) m_extensionData.resize(index + 1); if (m_extensionData.at(index)) diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index aa4a6bacd9..e6471e796d 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -705,7 +705,7 @@ public: void setExtensionData(int, Deletable *); Deletable *extensionData(int index) const { - if (index < m_extensionData.count()) + if (index < m_extensionData.size()) return m_extensionData[index]; else return nullptr; diff --git a/src/qml/jsruntime/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h index de9c0c7cd5..2f97c9ae6e 100644 --- a/src/qml/jsruntime/qv4executableallocator_p.h +++ b/src/qml/jsruntime/qv4executableallocator_p.h @@ -79,8 +79,8 @@ public: }; // for debugging / unit-testing - int freeAllocationCount() const { return freeAllocations.count(); } - int chunkCount() const { return chunks.count(); } + int freeAllocationCount() const { return freeAllocations.size(); } + int chunkCount() const { return chunks.size(); } struct ChunkOfPages { diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp index 0a3033a567..c355e064d4 100644 --- a/src/qml/jsruntime/qv4executablecompilationunit.cpp +++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp @@ -935,7 +935,7 @@ QString ExecutableCompilationUnit::translateFrom(TranslationDataIndex index) con const QString &path = fileName(); int lastSlash = path.lastIndexOf(QLatin1Char('/')); QStringView context = (lastSlash > -1) - ? QStringView{ path }.mid(lastSlash + 1, path.length() - lastSlash - 5) + ? QStringView{ path }.mid(lastSlash + 1, path.size() - lastSlash - 5) : QStringView(); QByteArray contextUtf8 = context.toUtf8(); QByteArray comment = stringAt(translation.commentIndex).toUtf8(); diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 666bd3a0de..e03c85d382 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -114,7 +114,7 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QListnewString(s); str->stringHash = hash; @@ -133,7 +133,7 @@ Heap::Symbol *IdentifierTable::insertSymbol(const QString &s) Q_ASSERT(s.at(0) == QLatin1Char('@')); uint subtype; - uint hash = String::createHashValue(s.constData(), s.length(), &subtype); + uint hash = String::createHashValue(s.constData(), s.size(), &subtype); uint idx = hash % alloc; while (Heap::StringOrSymbol *e = entriesByHash[idx]) { if (e->stringHash == hash && e->toQString() == s) @@ -252,7 +252,7 @@ void IdentifierTable::sweep() PropertyKey IdentifierTable::asPropertyKey(const QString &s) { uint subtype; - const uint hash = String::createHashValue(s.constData(), s.length(), &subtype); + const uint hash = String::createHashValue(s.constData(), s.size(), &subtype); if (subtype == Heap::String::StringType_ArrayIndex) return PropertyKey::fromArrayIndex(hash); return resolveStringEntry(s, hash, subtype)->identifier; diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 592e9079f1..4643195cfd 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -634,7 +634,7 @@ private: static QString quote(const QString &str) { QString product; - const int length = str.length(); + const int length = str.size(); product.reserve(length + 2); product += u'"'; for (int i = 0; i < length; ++i) { @@ -884,7 +884,7 @@ ReturnedValue JsonObject::method_parse(const FunctionObject *b, const Value *, c jtext = argv[0].toQString(); DEBUG << "parsing source = " << jtext; - JsonParser parser(v4, jtext.constData(), jtext.length()); + JsonParser parser(v4, jtext.constData(), jtext.size()); QJsonParseError error; ReturnedValue result = parser.parse(&error); if (error.error != QJsonParseError::NoError) { diff --git a/src/qml/jsruntime/qv4module.cpp b/src/qml/jsruntime/qv4module.cpp index 779eb77a36..1e1a059dfa 100644 --- a/src/qml/jsruntime/qv4module.cpp +++ b/src/qml/jsruntime/qv4module.cpp @@ -195,7 +195,7 @@ struct ModuleNamespaceIterator : ObjectOwnPropertyKeyIterator PropertyKey ModuleNamespaceIterator::next(const Object *o, Property *pd, PropertyAttributes *attrs) { const Module *module = static_cast(o); - if (exportIndex < exportedNames.count()) { + if (exportIndex < exportedNames.size()) { if (attrs) *attrs = Attr_Data; Scope scope(module->engine()); diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 77325580d3..d1e9b97307 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -1130,7 +1130,7 @@ void Heap::ArrayObject::init(const QStringList &list) // The result is a new Array object with length equal to the length // of the QStringList, and the elements being the QStringList's // elements converted to JS Strings. - int len = list.count(); + int len = list.size(); a->arrayReserve(len); ScopedValue v(scope); for (int ii = 0; ii < len; ++ii) diff --git a/src/qml/jsruntime/qv4propertykey.cpp b/src/qml/jsruntime/qv4propertykey.cpp index 8a3e1adc65..e07df07543 100644 --- a/src/qml/jsruntime/qv4propertykey.cpp +++ b/src/qml/jsruntime/qv4propertykey.cpp @@ -66,7 +66,7 @@ QV4::Heap::String *QV4::PropertyKey::asFunctionName(ExecutionEngine *engine, Fun QString str = s->toQString(); if (s->internalClass->vtable->isString) n += s->toQString(); - else if (str.length() > 1) + else if (str.size() > 1) n += QChar::fromLatin1('[') + QStringView{str}.mid(1) + QChar::fromLatin1(']'); } return engine->newString(n); diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index ef8c8c76d6..e5e7e7b3cb 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1401,8 +1401,8 @@ static ReturnedValue CallMethod(const QQmlObjectOrGadget &object, int index, QMe } } } - QVarLengthArray argData(args.count()); - for (int ii = 0; ii < args.count(); ++ii) + QVarLengthArray argData(args.size()); + for (int ii = 0; ii < args.size(); ++ii) argData[ii] = args[ii].dataPtr(); object.metacall(callType, index, argData.data()); @@ -2179,11 +2179,11 @@ ReturnedValue CallArgument::toValue(ExecutionEngine *engine) QList &list = *qlistPtr; Scope scope(engine); ScopedArrayObject array(scope, engine->newArrayObject()); - array->arrayReserve(list.count()); + array->arrayReserve(list.size()); ScopedValue v(scope); - for (int ii = 0; ii < list.count(); ++ii) + for (int ii = 0; ii < list.size(); ++ii) array->arrayPut(ii, (v = QObjectWrapper::wrap(engine, list.at(ii)))); - array->setArrayLengthUnchecked(list.count()); + array->setArrayLengthUnchecked(list.size()); return array.asReturnedValue(); } diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index 0c039967ba..be7ff77603 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -49,7 +49,7 @@ uint RegExp::match(const QString &string, int start, uint *matchOffsets) uint ret = JSC::Yarr::offsetNoMatch; #if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS) char buffer[8192]; - ret = uint(priv->jitCode->execute(s.characters16(), start, s.length(), + ret = uint(priv->jitCode->execute(s.characters16(), start, s.size(), (int*)matchOffsets, buffer, 8192).start); #else ret = uint(priv->jitCode->execute(s.characters16(), start, s.length(), @@ -74,18 +74,18 @@ uint RegExp::match(const QString &string, int start, uint *matchOffsets) } #endif // ENABLE(YARR_JIT) - return JSC::Yarr::interpret(byteCode(), s.characters16(), string.length(), start, matchOffsets); + return JSC::Yarr::interpret(byteCode(), s.characters16(), string.size(), start, matchOffsets); } QString RegExp::getSubstitution(const QString &matched, const QString &str, int position, const Value *captures, int nCaptures, const QString &replacement) { QString result; - int matchedLength = matched.length(); - Q_ASSERT(position >= 0 && position <= str.length()); + int matchedLength = matched.size(); + Q_ASSERT(position >= 0 && position <= str.size()); int tailPos = position + matchedLength; int seenDollar = -1; - for (int i = 0; i < replacement.length(); ++i) { + for (int i = 0; i < replacement.size(); ++i) { QChar ch = replacement.at(i); if (seenDollar >= 0) { if (ch.unicode() == '$') { @@ -98,7 +98,7 @@ QString RegExp::getSubstitution(const QString &matched, const QString &str, int result += str.mid(tailPos); } else if (ch.unicode() >= '0' && ch.unicode() <= '9') { int n = ch.unicode() - '0'; - if (i + 1 < replacement.length()) { + if (i + 1 < replacement.size()) { ch = replacement.at(i + 1); if (ch.unicode() >= '0' && ch.unicode() <= '9') { n = n*10 + (ch.unicode() - '0'); diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 1b62717efc..acb9f0acfc 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -46,7 +46,7 @@ void Heap::RegExpObject::init(QV4::RegExp *value) static QString minimalPattern(const QString &pattern) { QString ecmaPattern; - int len = pattern.length(); + int len = pattern.size(); ecmaPattern.reserve(len); int i = 0; const QChar *wc = pattern.unicode(); @@ -144,7 +144,7 @@ ReturnedValue RegExpObject::builtinExec(ExecutionEngine *engine, const String *s Scope scope(engine); int offset = (global() || sticky()) ? lastIndex() : 0; - if (offset < 0 || offset > s.length()) { + if (offset < 0 || offset > s.size()) { setLastIndex(0); RETURN_RESULT(Encode::null()); } @@ -168,7 +168,7 @@ ReturnedValue RegExpObject::builtinExec(ExecutionEngine *engine, const String *s int len = value()->captureCount(); array->arrayReserve(len); ScopedValue v(scope); - int strlen = s.length(); + int strlen = s.size(); for (int i = 0; i < len; ++i) { int start = matchOffsets[i * 2]; int end = matchOffsets[i * 2 + 1]; @@ -230,7 +230,7 @@ uint parseFlags(Scope &scope, const QV4::Value *f) if (scope.hasException()) return flags; QString str = s->toQString(); - for (int i = 0; i < str.length(); ++i) { + for (int i = 0; i < str.size(); ++i) { if (str.at(i) == QLatin1Char('g') && !(flags & CompiledData::RegExp::RegExp_Global)) { flags |= CompiledData::RegExp::RegExp_Global; } else if (str.at(i) == QLatin1Char('i') && !(flags & CompiledData::RegExp::RegExp_IgnoreCase)) { @@ -380,7 +380,7 @@ ReturnedValue RegExpPrototype::execFirstMatch(const FunctionObject *b, const Val QString s = str->toQString(); int offset = r->lastIndex(); - if (offset < 0 || offset > s.length()) { + if (offset < 0 || offset > s.size()) { r->setLastIndex(0); RETURN_RESULT(Encode::null()); } @@ -516,7 +516,7 @@ ReturnedValue RegExpPrototype::method_get_ignoreCase(const FunctionObject *f, co static int advanceStringIndex(int index, const QString &str, bool unicode) { if (unicode) { - if (index < str.length() - 1 && + if (index < str.size() - 1 && str.at(index).isHighSurrogate() && str.at(index + 1).isLowSurrogate()) ++index; @@ -605,7 +605,7 @@ ReturnedValue RegExpPrototype::method_replace(const FunctionObject *f, const Val if (scope.hasException()) return Encode::undefined(); - int lengthS = s->toQString().length(); + int lengthS = s->toQString().size(); ScopedString replaceValue(scope); ScopedFunctionObject replaceFunction(scope, (argc > 1 ? argv[1] : Value::undefinedValue())); @@ -657,7 +657,7 @@ ReturnedValue RegExpPrototype::method_replace(const FunctionObject *f, const Val if (scope.hasException()) return Encode::undefined(); QString m = matchString->toQString(); - int matchLength = m.length(); + int matchLength = m.size(); v = resultObject->get(scope.engine->id_index()); int position = v->toInt32(); position = qMax(qMin(position, lengthS), 0); @@ -784,7 +784,7 @@ ReturnedValue RegExpPrototype::method_split(const FunctionObject *f, const Value return A->asReturnedValue(); QString S = s->toQString(); - int size = S.length(); + int size = S.size(); if (size == 0) { ScopedValue z(scope, exec(scope.engine, splitter, s)); if (z->isNull()) diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 01ee03bddc..71446ca746 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -388,7 +388,7 @@ double RuntimeHelpers::stringToNumber(const QString &string) // libdoubleconversion sources. The same maximum value would be represented by roughly 3.5 times // as many binary digits. const int excessiveLength = 16 * 1024; - if (string.length() > excessiveLength) + if (string.size() > excessiveLength) return qQNaN(); const QStringView s = QStringView(string).trimmed(); @@ -638,7 +638,7 @@ static Q_NEVER_INLINE ReturnedValue getElementIntFallback(ExecutionEngine *engin ScopedObject o(scope, object); if (!o) { if (const String *str = object.as()) { - if (idx >= (uint)str->toQString().length()) { + if (idx >= (uint)str->toQString().size()) { return Encode::undefined(); } const QString s = str->toQString().mid(idx, 1); diff --git a/src/qml/jsruntime/qv4stringiterator.cpp b/src/qml/jsruntime/qv4stringiterator.cpp index 99f10c55b4..9cb2711efb 100644 --- a/src/qml/jsruntime/qv4stringiterator.cpp +++ b/src/qml/jsruntime/qv4stringiterator.cpp @@ -35,7 +35,7 @@ ReturnedValue StringIteratorPrototype::method_next(const FunctionObject *b, cons quint32 index = thisObject->d()->nextIndex; QString str = s->toQString(); - quint32 len = str.length(); + quint32 len = str.size(); if (index >= len) { thisObject->d()->iteratedString.set(scope.engine, nullptr); diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 614171503e..40d1f9bfaf 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -51,7 +51,7 @@ void Heap::StringObject::init(const QV4::String *str) Heap::String *Heap::StringObject::getIndex(uint index) const { QString str = string->toQString(); - if (index >= (uint)str.length()) + if (index >= (uint)str.size()) return nullptr; return internalClass->engine->newString(str.mid(index, 1)); } @@ -67,7 +67,7 @@ bool StringObject::virtualDeleteProperty(Managed *m, PropertyKey id) if (id.isArrayIndex()) { StringObject *o = static_cast(m); uint index = id.asArrayIndex(); - if (index < static_cast(o->d()->string->toQString().length())) + if (index < static_cast(o->d()->string->toQString().size())) return false; } return Object::virtualDeleteProperty(m, id); @@ -83,7 +83,7 @@ struct StringObjectOwnPropertyKeyIterator : ObjectOwnPropertyKeyIterator PropertyKey StringObjectOwnPropertyKeyIterator::next(const QV4::Object *o, Property *pd, PropertyAttributes *attrs) { const StringObject *s = static_cast(o); - uint slen = s->d()->string->toQString().length(); + uint slen = s->d()->string->toQString().size(); if (arrayIndex < slen) { uint index = arrayIndex; ++arrayIndex; @@ -119,7 +119,7 @@ PropertyAttributes StringObject::virtualGetOwnProperty(const Managed *m, Propert if (id.isArrayIndex()) { const uint index = id.asArrayIndex(); const auto s = static_cast(m); - if (index < uint(s->d()->string->toQString().length())) { + if (index < uint(s->d()->string->toQString().size())) { if (p) p->value = s->getIndex(index); return Attr_NotConfigurable|Attr_NotWritable; @@ -338,7 +338,7 @@ ReturnedValue StringPrototype::method_charAt(const FunctionObject *b, const Valu pos = argv[0].toInteger(); QString result; - if (pos >= 0 && pos < str.length()) + if (pos >= 0 && pos < str.size()) result += str.at(pos); return Encode(v4->newString(result)); @@ -356,7 +356,7 @@ ReturnedValue StringPrototype::method_charCodeAt(const FunctionObject *b, const pos = argv[0].toInteger(); - if (pos >= 0 && pos < str.length()) + if (pos >= 0 && pos < str.size()) RETURN_RESULT(Encode(str.at(pos).unicode())); return Encode(qt_qnan()); @@ -419,11 +419,11 @@ ReturnedValue StringPrototype::method_endsWith(const FunctionObject *b, const Va if (v4->hasException) return Encode::undefined(); - double pos = value.length(); + double pos = value.size(); if (argc > 1) pos = argv[1].toInteger(); - if (pos == value.length()) + if (pos == value.size()) RETURN_RESULT(Encode(value.endsWith(searchString))); QStringView stringToSearch = QStringView{value}.left(pos); @@ -447,7 +447,7 @@ ReturnedValue StringPrototype::method_indexOf(const FunctionObject *b, const Val int index = -1; if (!value.isEmpty()) - index = value.indexOf(searchString, qMin(qMax(pos, 0.0), double(value.length()))); + index = value.indexOf(searchString, qMin(qMax(pos, 0.0), double(value.size()))); return Encode(index); } @@ -470,7 +470,7 @@ ReturnedValue StringPrototype::method_includes(const FunctionObject *b, const Va const Value &posArg = argv[1]; pos = posArg.toInteger(); if (!posArg.isInteger() && posArg.isNumber() && qIsInf(posArg.toNumber())) - pos = value.length(); + pos = value.size(); } if (pos == 0) @@ -497,8 +497,8 @@ ReturnedValue StringPrototype::method_lastIndexOf(const FunctionObject *b, const else position = std::trunc(position); - int pos = std::trunc(qMin(qMax(position, 0.0), double(value.length()))); - if (!searchString.isEmpty() && pos == value.length()) + int pos = std::trunc(qMin(qMax(position, 0.0), double(value.size()))); + if (!searchString.isEmpty() && pos == value.size()) --pos; if (searchString.isNull() && pos == 0) RETURN_RESULT(Encode(-1)); @@ -607,12 +607,12 @@ ReturnedValue StringPrototype::method_padEnd(const FunctionObject *f, const Valu return s->asReturnedValue(); QString padded = s->toQString(); - int oldLength = padded.length(); + int oldLength = padded.size(); int toFill = maxLen - oldLength; padded.resize(maxLen); QChar *ch = padded.data() + oldLength; while (toFill) { - int copy = qMin(fillString.length(), toFill); + int copy = qMin(fillString.size(), toFill); memcpy(ch, fillString.constData(), copy*sizeof(QChar)); toFill -= copy; ch += copy; @@ -646,13 +646,13 @@ ReturnedValue StringPrototype::method_padStart(const FunctionObject *f, const Va return s->asReturnedValue(); QString original = s->toQString(); - int oldLength = original.length(); + int oldLength = original.size(); int toFill = maxLen - oldLength; QString padded; padded.resize(maxLen); QChar *ch = padded.data(); while (toFill) { - int copy = qMin(fillString.length(), toFill); + int copy = qMin(fillString.size(), toFill); memcpy(ch, fillString.constData(), copy*sizeof(QChar)); toFill -= copy; ch += copy; @@ -682,9 +682,9 @@ ReturnedValue StringPrototype::method_repeat(const FunctionObject *b, const Valu static void appendReplacementString(QString *result, const QString &input, const QString& replaceValue, uint* matchOffsets, int captureCount) { - result->reserve(result->length() + replaceValue.length()); - for (int i = 0; i < replaceValue.length(); ++i) { - if (replaceValue.at(i) == QLatin1Char('$') && i < replaceValue.length() - 1) { + result->reserve(result->length() + replaceValue.size()); + for (int i = 0; i < replaceValue.size(); ++i) { + if (replaceValue.at(i) == QLatin1Char('$') && i < replaceValue.size() - 1) { ushort ch = replaceValue.at(i + 1).unicode(); uint substStart = JSC::Yarr::offsetNoMatch; uint substEnd = JSC::Yarr::offsetNoMatch; @@ -703,12 +703,12 @@ static void appendReplacementString(QString *result, const QString &input, const skip = 1; } else if (ch == '\'') { substStart = matchOffsets[1]; - substEnd = input.length(); + substEnd = input.size(); skip = 1; } else if (ch >= '0' && ch <= '9') { uint capture = ch - '0'; skip = 1; - if (i < replaceValue.length() - 2) { + if (i < replaceValue.size() - 2) { ch = replaceValue.at(i + 2).unicode(); if (ch >= '0' && ch <= '9') { uint c = capture*10 + ch - '0'; @@ -793,7 +793,7 @@ ReturnedValue StringPrototype::method_replace(const FunctionObject *b, const Val if (idx != -1) { numStringMatches = 1; matchOffsets[0] = idx; - matchOffsets[1] = idx + searchString.length(); + matchOffsets[1] = idx + searchString.size(); } } @@ -802,7 +802,7 @@ ReturnedValue StringPrototype::method_replace(const FunctionObject *b, const Val ScopedValue replaceValue(scope, argc > 1 ? argv[1] : Value::undefinedValue()); ScopedFunctionObject searchCallback(scope, replaceValue); if (!!searchCallback) { - result.reserve(string.length() + 10*numStringMatches); + result.reserve(string.size() + 10*numStringMatches); ScopedValue entry(scope); Value *arguments = scope.alloc(numCaptures + 2); int lastEnd = 0; @@ -832,7 +832,7 @@ ReturnedValue StringPrototype::method_replace(const FunctionObject *b, const Val result += QStringView{string}.mid(lastEnd); } else { QString newString = replaceValue->toQString(); - result.reserve(string.length() + numStringMatches*newString.size()); + result.reserve(string.size() + numStringMatches*newString.size()); int lastEnd = 0; for (int i = 0; i < numStringMatches; ++i) { @@ -975,7 +975,7 @@ ReturnedValue StringPrototype::method_split(const FunctionObject *b, const Value } else { QString separator = separatorValue->toQString(); if (separator.isEmpty()) { - for (uint i = 0; i < qMin(limit, uint(text.length())); ++i) + for (uint i = 0; i < qMin(limit, uint(text.size())); ++i) array->push_back((s = scope.engine->newString(text.mid(i, 1)))); return array.asReturnedValue(); } @@ -1033,7 +1033,7 @@ ReturnedValue StringPrototype::method_substr(const FunctionObject *b, const Valu if (argc > 1) length = argv[1].toInteger(); - double count = value.length(); + double count = value.size(); if (start < 0) start = qMax(count + start, 0.0); @@ -1051,7 +1051,7 @@ ReturnedValue StringPrototype::method_substring(const FunctionObject *b, const V if (v4->hasException) return QV4::Encode::undefined(); - int length = value.length(); + int length = value.size(); double start = 0; double end = length; @@ -1124,11 +1124,11 @@ ReturnedValue StringPrototype::method_trim(const FunctionObject *b, const Value const QChar *chars = s.constData(); int start, end; - for (start = 0; start < s.length(); ++start) { + for (start = 0; start < s.size(); ++start) { if (!chars[start].isSpace() && chars[start].unicode() != 0xfeff) break; } - for (end = s.length() - 1; end >= start; --end) { + for (end = s.size() - 1; end >= start; --end) { if (!chars[end].isSpace() && chars[end].unicode() != 0xfeff) break; } diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 717c59cb26..8e41dc8e3d 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -940,7 +940,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt } // Now it is time to free QV4::QObjectWrapper Value, we must check the Value's tag to make sure its object has been destroyed - const int pendingCount = m_pendingFreedObjectWrapperValue.count(); + const int pendingCount = m_pendingFreedObjectWrapperValue.size(); if (pendingCount) { QVector remainingWeakQObjectWrappers; remainingWeakQObjectWrappers.reserve(pendingCount); diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index 4fbc5b106f..e0a20b00d2 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -68,7 +68,7 @@ void Lexer::setCode(const QString &code, int lineno, bool qmlMode, Lexer::CodeContinuation codeContinuation) { if (codeContinuation == Lexer::CodeContinuation::Continue) - _currentOffset += _code.length(); + _currentOffset += _code.size(); else _currentOffset = 0; if (_engine) @@ -85,7 +85,7 @@ void Lexer::setCode(const QString &code, int lineno, bool qmlMode, _rawString = QStringView(); _codePtr = code.unicode(); - _endPtr = _codePtr + code.length(); + _endPtr = _codePtr + code.size(); _tokenStartPtr = _codePtr; if (lineno >= 0) diff --git a/src/qml/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h index 9beaffc2ae..ae61ca0c83 100644 --- a/src/qml/qml/ftw/qhashedstring_p.h +++ b/src/qml/qml/ftw/qhashedstring_p.h @@ -200,12 +200,12 @@ QHashedStringRef::QHashedStringRef() } QHashedStringRef::QHashedStringRef(const QString &str) -: m_data(str.constData()), m_length(str.length()), m_hash(0) +: m_data(str.constData()), m_length(str.size()), m_hash(0) { } QHashedStringRef::QHashedStringRef(QStringView str) -: m_data(str.constData()), m_length(str.length()), m_hash(0) +: m_data(str.constData()), m_length(str.size()), m_hash(0) { } @@ -220,7 +220,7 @@ QHashedStringRef::QHashedStringRef(const QChar *data, int length, quint32 hash) } QHashedStringRef::QHashedStringRef(const QHashedString &string) -: m_data(string.constData()), m_length(string.length()), m_hash(string.m_hash) +: m_data(string.constData()), m_length(string.size()), m_hash(string.m_hash) { } @@ -248,7 +248,7 @@ bool QHashedStringRef::operator==(const QHashedString &string) const if (m_hash && string.m_hash && m_hash != string.m_hash) return false; QStringView view {m_data, m_length}; - QStringView otherView {string.constData(), string.length()}; + QStringView otherView {string.constData(), string.size()}; return view == otherView; } diff --git a/src/qml/qml/ftw/qstringhash_p.h b/src/qml/qml/ftw/qstringhash_p.h index 1d0e7d6e97..ee2928ee59 100644 --- a/src/qml/qml/ftw/qstringhash_p.h +++ b/src/qml/qml/ftw/qstringhash_p.h @@ -38,7 +38,7 @@ public: } QStringHashNode(const QHashedString &key) - : length(key.length()), hash(key.hash()), symbolId(0) + : length(key.size()), hash(key.hash()), symbolId(0) , arrayData(mutableStringData(key).d_ptr()) , strData(mutableStringData(key).data()) { @@ -491,7 +491,7 @@ int QStringHash::numBuckets() const template void QStringHash::initializeNode(Node *node, const QHashedString &key) { - node->length = key.length(); + node->length = key.size(); node->hash = key.hash(); node->arrayData = mutableStringData(key).d_ptr(); node->strData = mutableStringData(key).data(); diff --git a/src/qml/qml/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp index b8c65a5d15..f18885b0cb 100644 --- a/src/qml/qml/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/qqmlbuiltinfunctions.cpp @@ -1149,7 +1149,7 @@ QObject *QtObject::createQmlObject(const QString &qml, QObject *parent, const QU QV4::ScopedObject qmlerror(scope); QV4::ScopedString s(scope); QV4::ScopedValue v(scope); - for (int ii = 0; ii < errors.count(); ++ii) { + for (int ii = 0; ii < errors.size(); ++ii) { const QQmlError &error = errors.at(ii); errorstr += QLatin1String("\n ") + error.toString(); qmlerror = v4->newObject(); @@ -1225,7 +1225,7 @@ QObject *QtObject::createQmlObject(const QString &qml, QObject *parent, const QU obj->setParent(parent); QList functions = QQmlMetaType::parentFunctions(); - for (int ii = 0; ii < functions.count(); ++ii) { + for (int ii = 0; ii < functions.size(); ++ii) { if (QQmlPrivate::Parented == functions.at(ii)(obj, parent)) break; } @@ -1517,7 +1517,7 @@ static QString jsStack(QV4::ExecutionEngine *engine) { QVector stackTrace = engine->stackTrace(10); - for (int i = 0; i < stackTrace.count(); i++) { + for (int i = 0; i < stackTrace.size(); i++) { const QV4::StackFrame &frame = stackTrace.at(i); QString stackFrame; diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index b980d0e3af..cfc3047356 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -349,7 +349,7 @@ bool QQmlComponentPrivate::setInitialProperty( QV4::ScopedObject object(scope, QV4::QObjectWrapper::wrap(scope.engine, base)); QV4::ScopedString segment(scope); - for (int i = 0; i < properties.length() - 1; ++i) { + for (int i = 0; i < properties.size() - 1; ++i) { segment = scope.engine->newString(properties.at(i)); object = object->get(segment); if (scope.engine->hasException) @@ -1367,7 +1367,7 @@ static void QQmlComponent_setQmlParent(QObject *me, QObject *parent) QList functions = QQmlMetaType::parentFunctions(); bool needParent = false; - for (int ii = 0; ii < functions.count(); ++ii) { + for (int ii = 0; ii < functions.size(); ++ii) { QQmlPrivate::AutoParentResult res = functions.at(ii)(me, parent); if (res == QQmlPrivate::Parented) { needParent = false; @@ -1445,7 +1445,7 @@ void QQmlComponentPrivate::setInitialProperties(QV4::ExecutionEngine *engine, QV object = o; const QStringList properties = name->toQString().split(QLatin1Char('.')); bool isTopLevelProperty = properties.size() == 1; - for (int i = 0; i < properties.length() - 1; ++i) { + for (int i = 0; i < properties.size() - 1; ++i) { name = engine->newString(properties.at(i)); object = object->get(name); if (engine->hasException || !object) { diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h index aa50485a00..5489afb892 100644 --- a/src/qml/qml/qqmlcontext_p.h +++ b/src/qml/qml/qqmlcontext_p.h @@ -50,7 +50,7 @@ public: int notifyIndex() const { return m_notifyIndex; } void setNotifyIndex(int notifyIndex) { m_notifyIndex = notifyIndex; } - int numPropertyValues() const { return m_propertyValues.count(); } + int numPropertyValues() const { return m_propertyValues.size(); } void appendPropertyValue(const QVariant &value) { m_propertyValues.append(value); } void setPropertyValue(int index, const QVariant &value) { m_propertyValues[index] = value; } QVariant propertyValue(int index) const { return m_propertyValues[index]; } diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp index ca3985bd92..f284a82dbe 100644 --- a/src/qml/qml/qqmlcustomparser.cpp +++ b/src/qml/qml/qqmlcustomparser.cpp @@ -93,7 +93,7 @@ int QQmlCustomParser::evaluateEnum(const QString &script, bool *ok) const auto nextDot = [&](int dot) { const int nextDot = script.indexOf(u'.', dot + 1); - return (nextDot == script.length() - 1) ? -1 : nextDot; + return (nextDot == script.size() - 1) ? -1 : nextDot; }; int dot = nextDot(-1); @@ -161,7 +161,7 @@ int QQmlCustomParser::evaluateEnum(const QString &script, bool *ok) const if (!scopedEnumName.isEmpty() && scopedEnumName != enumData->name) continue; - for (int jj = 0; jj < enumData->values.count(); ++jj) { + for (int jj = 0; jj < enumData->values.size(); ++jj) { const QQmlEnumValue value = enumData->values.at(jj); if (value.namedValue == enumValue) { *ok = true; diff --git a/src/qml/qml/qqmldatablob.cpp b/src/qml/qml/qqmldatablob.cpp index d02ec4c5a8..dda5897fd8 100644 --- a/src/qml/qml/qqmldatablob.cpp +++ b/src/qml/qml/qqmldatablob.cpp @@ -256,7 +256,7 @@ void QQmlDataBlob::setError(const QList &errors) Q_ASSERT(m_errors.isEmpty()); // m_errors must be set before the m_data fence - m_errors.reserve(errors.count()); + m_errors.reserve(errors.size()); for (const QQmlError &error : errors) { if (error.url().isEmpty()) { QQmlError mutableError = error; @@ -271,7 +271,7 @@ void QQmlDataBlob::setError(const QList &errors) if (dumpErrors()) { qWarning().nospace() << "Errors for " << urlString(); - for (int ii = 0; ii < errors.count(); ++ii) + for (int ii = 0; ii < errors.size(); ++ii) qWarning().nospace() << " " << qPrintable(errors.at(ii).toString()); } cancelAllWaitingFor(); @@ -506,7 +506,7 @@ void QQmlDataBlob::tryDone() void QQmlDataBlob::cancelAllWaitingFor() { - while (m_waitingFor.count()) { + while (m_waitingFor.size()) { QQmlRefPointer blob = m_waitingFor.takeLast(); Q_ASSERT(blob->m_waitingOnMe.contains(this)); @@ -517,7 +517,7 @@ void QQmlDataBlob::cancelAllWaitingFor() void QQmlDataBlob::notifyAllWaitingOnMe() { - while (m_waitingOnMe.count()) { + while (m_waitingOnMe.size()) { QQmlDataBlob *blob = m_waitingOnMe.takeLast(); Q_ASSERT(std::any_of(blob->m_waitingFor.constBegin(), blob->m_waitingFor.constEnd(), @@ -536,7 +536,7 @@ void QQmlDataBlob::notifyComplete(QQmlDataBlob *blob) m_inCallback = true; QQmlRefPointer blobRef; - for (int i = 0; i < m_waitingFor.count(); ++i) { + for (int i = 0; i < m_waitingFor.size(); ++i) { if (m_waitingFor.at(i).data() == blob) { blobRef = m_waitingFor.takeAt(i); break; @@ -579,7 +579,7 @@ QString QQmlDataBlob::SourceCodeData::readAll(QString *error) const } QByteArray data(fileSize, Qt::Uninitialized); - if (f.read(data.data(), data.length()) != data.length()) { + if (f.read(data.data(), data.size()) != data.size()) { *error = f.errorString(); return QString(); } diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 8f1a7b10b8..b62c2ecb31 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -306,12 +306,12 @@ void QQmlData::signalEmitted(QAbstractDeclarativeData *, QObject *object, int in auto ev = std::make_unique(m.methodIndex(), 0, nullptr, object, index, - parameterTypes.count() + 1); + parameterTypes.size() + 1); void **args = ev->args(); QMetaType *types = ev->types(); - for (int ii = 0; ii < parameterTypes.count(); ++ii) { + for (int ii = 0; ii < parameterTypes.size(); ++ii) { const QByteArray &typeName = parameterTypes.at(ii); if (typeName.endsWith('*')) types[ii + 1] = QMetaType(QMetaType::VoidStar); @@ -1385,7 +1385,7 @@ static void dumpwarning(const QQmlError &error) static void dumpwarning(const QList &errors) { - for (int ii = 0; ii < errors.count(); ++ii) + for (int ii = 0; ii < errors.size(); ++ii) dumpwarning(errors.at(ii)); } @@ -1764,7 +1764,7 @@ void QQmlEnginePrivate::executeRuntimeFunction(const QV4::ExecutableCompilationU int argc, void **args, QMetaType *types) { Q_ASSERT(unit); - Q_ASSERT((functionIndex >= 0) && (functionIndex < unit->runtimeFunctions.length())); + Q_ASSERT((functionIndex >= 0) && (functionIndex < unit->runtimeFunctions.size())); Q_ASSERT(thisObject); QQmlData *ddata = QQmlData::get(thisObject); @@ -1831,15 +1831,15 @@ QQmlEnginePrivate::createInternalContext(const QQmlRefPointersetImports(unit->typeNameCache); context->initFromTypeCompilationUnit(unit, subComponentIndex); - if (isComponentRoot && unit->dependentScripts.count()) { + if (isComponentRoot && unit->dependentScripts.size()) { QV4::ExecutionEngine *v4 = v4engine(); Q_ASSERT(v4); QV4::Scope scope(v4); - QV4::ScopedObject scripts(scope, v4->newArrayObject(unit->dependentScripts.count())); + QV4::ScopedObject scripts(scope, v4->newArrayObject(unit->dependentScripts.size())); context->setImportedScripts(QV4::PersistentValue(v4, scripts.asReturnedValue())); QV4::ScopedValue v(scope); - for (int i = 0; i < unit->dependentScripts.count(); ++i) { + for (int i = 0; i < unit->dependentScripts.size(); ++i) { QQmlRefPointer s = unit->dependentScripts.at(i); scripts->put(i, (v = s->scriptValueForContext(context))); } diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index f15f7a474e..415f8748f5 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -294,13 +294,13 @@ QDebug operator<<(QDebug debug, const QQmlError &error) const QString code = stream.readAll(); const auto lines = QStringView{code}.split(QLatin1Char('\n')); - if (lines.count() >= error.line()) { + if (lines.size() >= error.line()) { const QStringView &line = lines.at(error.line() - 1); debug << "\n " << line.toLocal8Bit().constData(); if(error.column() > 0) { int column = qMax(0, error.column() - 1); - column = qMin(column, line.length()); + column = qMin(column, line.size()); QByteArray ind; ind.reserve(column); diff --git a/src/qml/qml/qqmlfile.cpp b/src/qml/qml/qqmlfile.cpp index 4f18389864..d616616ebd 100644 --- a/src/qml/qml/qqmlfile.cpp +++ b/src/qml/qml/qqmlfile.cpp @@ -413,8 +413,8 @@ bool QQmlFile::isSynchronous(const QUrl &url) { QString scheme = url.scheme(); - if ((scheme.length() == 4 && 0 == scheme.compare(QLatin1String(file_string), Qt::CaseInsensitive)) || - (scheme.length() == 3 && 0 == scheme.compare(QLatin1String(qrc_string), Qt::CaseInsensitive))) { + if ((scheme.size() == 4 && 0 == scheme.compare(QLatin1String(file_string), Qt::CaseInsensitive)) || + (scheme.size() == 3 && 0 == scheme.compare(QLatin1String(qrc_string), Qt::CaseInsensitive))) { return true; #if defined(Q_OS_ANDROID) @@ -438,20 +438,20 @@ Synchronous urls have a qrc:/ or file:// scheme. */ bool QQmlFile::isSynchronous(const QString &url) { - if (url.length() < 5 /* qrc:/ */) + if (url.size() < 5 /* qrc:/ */) return false; QChar f = url[0]; if (f == QLatin1Char('f') || f == QLatin1Char('F')) { - return url.length() >= 7 /* file:// */ && + return url.size() >= 7 /* file:// */ && url.startsWith(QLatin1String(file_string), Qt::CaseInsensitive) && url[4] == QLatin1Char(':') && url[5] == QLatin1Char('/') && url[6] == QLatin1Char('/'); } else if (f == QLatin1Char('q') || f == QLatin1Char('Q')) { - return url.length() >= 5 /* qrc:/ */ && + return url.size() >= 5 /* qrc:/ */ && url.startsWith(QLatin1String(qrc_string), Qt::CaseInsensitive) && url[3] == QLatin1Char(':') && url[4] == QLatin1Char('/'); @@ -497,10 +497,10 @@ bool QQmlFile::isLocalFile(const QUrl &url) // file: URLs with two slashes following the scheme can be interpreted as local files // where the slashes are part of the path. Therefore, disregard the authority. // See QUrl::toLocalFile(). - if (scheme.length() == 4 && scheme.startsWith(QLatin1String(file_string), Qt::CaseInsensitive)) + if (scheme.size() == 4 && scheme.startsWith(QLatin1String(file_string), Qt::CaseInsensitive)) return true; - if (scheme.length() == 3 && scheme.startsWith(QLatin1String(qrc_string), Qt::CaseInsensitive)) + if (scheme.size() == 3 && scheme.startsWith(QLatin1String(qrc_string), Qt::CaseInsensitive)) return url.authority().isEmpty(); #if defined(Q_OS_ANDROID) @@ -517,7 +517,7 @@ bool QQmlFile::isLocalFile(const QUrl &url) static bool hasScheme(const QString &url, const char *scheme, qsizetype schemeLength) { - const qsizetype urlLength = url.length(); + const qsizetype urlLength = url.size(); if (urlLength < schemeLength + 1) return false; @@ -533,7 +533,7 @@ static bool hasScheme(const QString &url, const char *scheme, qsizetype schemeLe static qsizetype authorityOffset(const QString &url, qsizetype schemeLength) { - const qsizetype urlLength = url.length(); + const qsizetype urlLength = url.size(); if (urlLength < schemeLength + 3) return -1; @@ -572,7 +572,7 @@ Local file urls have either a qrc: or file: scheme. */ bool QQmlFile::isLocalFile(const QString &url) { - if (url.length() < 4 /* qrc: */) + if (url.size() < 4 /* qrc: */) return false; switch (url[0].toLatin1()) { @@ -584,7 +584,7 @@ bool QQmlFile::isLocalFile(const QString &url) const qsizetype fileLength = strlen(file_string); return url.startsWith(QLatin1String(file_string, file_string + fileLength), Qt::CaseInsensitive) - && url.length() > fileLength + && url.size() > fileLength && url[fileLength] == QLatin1Char(':'); } case 'q': @@ -646,7 +646,7 @@ static QString toLocalFile(const QString &url) static bool isDoubleSlashed(const QString &url, qsizetype offset) { - const qsizetype urlLength = url.length(); + const qsizetype urlLength = url.size(); if (urlLength < offset + 2) return false; @@ -669,7 +669,7 @@ QString QQmlFile::urlToLocalFileOrQrc(const QString& url) if (url.startsWith(QLatin1String("qrc://"), Qt::CaseInsensitive)) { // Exactly two slashes are bad because that's a URL authority. // One slash is fine and >= 3 slashes are file. - if (url.length() == 6 || url[6] != QLatin1Char('/')) { + if (url.size() == 6 || url[6] != QLatin1Char('/')) { Q_ASSERT(isDoubleSlashed(url, strlen("qrc:"))); return QString(); } @@ -679,7 +679,7 @@ QString QQmlFile::urlToLocalFileOrQrc(const QString& url) if (url.startsWith(QLatin1String("qrc:"), Qt::CaseInsensitive)) { Q_ASSERT(!isDoubleSlashed(url, strlen("qrc:"))); - if (url.length() > 4) + if (url.size() > 4) return QLatin1Char(':') + QStringView{url}.mid(4); return QStringLiteral(":"); } diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 9711079d15..d28842a120 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -123,7 +123,7 @@ QString resolveLocalUrl(const QString &url, const QString &relative) QString base = baseRef + relative; // Remove any relative directory elements in the path - int length = base.length(); + int length = base.size(); int index = 0; while ((index = base.indexOf(QLatin1String("/."), index)) != -1) { if ((length > (index + 2)) && (base.at(index + 2) == Dot) && @@ -235,7 +235,7 @@ void QQmlImports::populateCache(QQmlTypeNameCache *cache) const { const QQmlImportNamespace &set = m_unqualifiedset; - for (int ii = set.imports.count() - 1; ii >= 0; --ii) { + for (int ii = set.imports.size() - 1; ii >= 0; --ii) { const QQmlImportInstance *import = set.imports.at(ii); QQmlTypeModule *module = QQmlMetaType::typeModule(import->uri, import->version); if (module) { @@ -251,7 +251,7 @@ void QQmlImports::populateCache(QQmlTypeNameCache *cache) const QQmlImportRef &typeimport = cache->m_namedImports[set.prefix]; typeimport.m_qualifier = set.prefix; - for (int ii = set.imports.count() - 1; ii >= 0; --ii) { + for (int ii = set.imports.size() - 1; ii >= 0; --ii) { const QQmlImportInstance *import = set.imports.at(ii); QQmlTypeModule *module = QQmlMetaType::typeModule(import->uri, import->version); if (module) { @@ -283,7 +283,7 @@ void findCompositeSingletons(const QQmlImportNamespace &set, QList= 0; --ii) { + for (int ii = set.imports.size() - 1; ii >= 0; --ii) { const QQmlImportInstance *import = set.imports.at(ii); const QQmlDirComponents &components = import->qmlDirComponents; @@ -373,7 +373,7 @@ QList QQmlImports::resolvedScripts() const const QQmlImportNamespace &set = m_unqualifiedset; - for (int ii = set.imports.count() - 1; ii >= 0; --ii) { + for (int ii = set.imports.size() - 1; ii >= 0; --ii) { const QQmlImportInstance *import = set.imports.at(ii); for (const QQmlDirParser::Script &script : import->qmlDirScripts) { @@ -387,7 +387,7 @@ QList QQmlImports::resolvedScripts() const for (QQmlImportNamespace *ns = m_qualifiedSets.first(); ns; ns = m_qualifiedSets.next(ns)) { const QQmlImportNamespace &set = *ns; - for (int ii = set.imports.count() - 1; ii >= 0; --ii) { + for (int ii = set.imports.size() - 1; ii >= 0; --ii) { const QQmlImportInstance *import = set.imports.at(ii); for (const QQmlDirParser::Script &script : import->qmlDirScripts) { @@ -736,7 +736,7 @@ bool QQmlImports::resolveType( m_typeLoader, unqualifiedtype, version_return, type_return, &m_base, errors, registrationType, typeRecursionDetected)) return true; - if (nameSpace->imports.count() == 1 + if (nameSpace->imports.size() == 1 && !nameSpace->imports.at(0)->isLibrary && type_return && nameSpace != &m_unqualifiedset) { @@ -868,13 +868,13 @@ bool QQmlImportNamespace::resolveType(QQmlTypeLoader *typeLoader, const QHashedS }); setNeedsSorting(false); } - for (int i=0; iresolveType(typeLoader, type, version_return, type_return, base, typeRecursionDetected, registrationType, recursionRestriction, errors)) { if (qmlCheckTypes()) { // check for type clashes - for (int j = i+1; jresolveType(typeLoader, type, version_return, nullptr, base, nullptr, registrationType)) { @@ -1012,7 +1012,7 @@ QString QQmlImports::resolvedUri(const QString &dir_arg, QQmlImportDatabase *dat QString stableRelativePath = dir; for (const QString &path : qAsConst(paths)) { if (dir.startsWith(path)) { - stableRelativePath = dir.mid(path.length()+1); + stableRelativePath = dir.mid(path.size()+1); break; } } @@ -1496,7 +1496,7 @@ QUrl QQmlImports::urlFromLocalFileOrQrcOrUrl(const QString &file) QUrl url(QLatin1String(file.at(0) == Colon ? "qrc" : "") + file); // We don't support single character schemes as those conflict with windows drive letters. - if (url.scheme().length() < 2) + if (url.scheme().size() < 2) return QUrl::fromLocalFile(file); return url; } @@ -1554,7 +1554,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) auto addEnvImportPath = [this](const char *var) { if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { const QStringList paths = parseEnvPath(qEnvironmentVariable(var)); - for (int ii = paths.count() - 1; ii >= 0; --ii) + for (int ii = paths.size() - 1; ii >= 0; --ii) addImportPath(paths.at(ii)); } }; @@ -1570,7 +1570,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) auto addEnvPluginPath = [this](const char *var) { if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { const QStringList paths = parseEnvPath(qEnvironmentVariable(var)); - for (int ii = paths.count() - 1; ii >= 0; --ii) + for (int ii = paths.size() - 1; ii >= 0; --ii) addPluginPath(paths.at(ii)); } }; @@ -1617,7 +1617,7 @@ void QQmlImportDatabase::addPluginPath(const QString& path) QUrl url = QUrl(path); if (url.isRelative() || url.scheme() == QLatin1String("file") - || (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path + || (url.scheme().size() == 1 && QFile::exists(path)) ) { // windows path QDir dir = QDir(path); filePluginPath.prepend(dir.canonicalPath()); } else { @@ -1651,7 +1651,7 @@ void QQmlImportDatabase::addImportPath(const QString& path) cPath = QLatin1String("qrc") + path; cPath.replace(Backslash, Slash); } else if (url.isRelative() || - (url.scheme().length() == 1 && QFile::exists(path)) ) { // windows path + (url.scheme().size() == 1 && QFile::exists(path)) ) { // windows path QDir dir = QDir(path); cPath = dir.canonicalPath(); } else { diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp index 4ead4d05cb..5c322ab021 100644 --- a/src/qml/qml/qqmlirloader.cpp +++ b/src/qml/qml/qqmlirloader.cpp @@ -98,7 +98,7 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali object->bindings->append(b); if (b->type() == QV4::CompiledData::Binding::Type_Script) { functionIndices.append(b->value.compiledScriptIndex); - b->value.compiledScriptIndex = functionIndices.count() - 1; + b->value.compiledScriptIndex = functionIndices.size() - 1; QmlIR::CompiledFunctionOrExpression *foe = pool->New(); foe->nameIndex = 0; @@ -106,9 +106,9 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali QQmlJS::AST::ExpressionNode *expr; if (b->stringIndex != quint32(0)) { - const int start = output->code.length(); + const int start = output->code.size(); const QString script = output->stringAt(b->stringIndex); - const int length = script.length(); + const int length = script.size(); output->code.append(script); expr = new (pool) FakeExpression(start, length); } else @@ -118,7 +118,7 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali } } - Q_ASSERT(object->functionsAndExpressions->count == functionIndices.count()); + Q_ASSERT(object->functionsAndExpressions->count == functionIndices.size()); for (uint i = 0; i < serializedObject->nSignals; ++i) { const QV4::CompiledData::Signal *serializedSignal = serializedObject->signalAt(i); @@ -174,7 +174,7 @@ QmlIR::Object *QQmlIRLoader::loadObject(const QV4::CompiledData::Object *seriali const QV4::CompiledData::Function *compiledFunction = unit->functionAt(*functionIdx); functionIndices.append(*functionIdx); - f->index = functionIndices.count() - 1; + f->index = functionIndices.size() - 1; f->location = compiledFunction->location; f->nameIndex = compiledFunction->nameIndex; f->returnType = compiledFunction->returnType; diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 039544b1f2..372cd7a9c4 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -352,7 +352,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(const QV4::Functio if (!argv[1].isString()) THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments"); QString fs = argv[1].toQString(); - if (fs.length()) + if (fs.size()) format = fs.at(0).unicode(); } int prec = 2; @@ -414,7 +414,7 @@ ReturnedValue QQmlNumberExtension::method_fromLocaleString(const QV4::FunctionOb } QString ns = argv[numberIdx].toQString(); - if (!ns.length()) + if (!ns.size()) RETURN_RESULT(QV4::Encode(Q_QNAN)); bool ok = false; diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 8dfab49978..1ee87713a6 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -328,7 +328,7 @@ int QQmlMetaType::registerAutoParentFunction(const QQmlPrivate::RegisterAutoPare data->parentFunctions.append(function.function); - return data->parentFunctions.count() - 1; + return data->parentFunctions.size() - 1; } void QQmlMetaType::unregisterAutoParentFunction(const QQmlPrivate::AutoParentFunction &function) @@ -396,7 +396,7 @@ static bool checkRegistration( // There can also be types that aren't even gadgets, and there can be types for namespaces. // We cannot check those, but namespaces should be uppercase. - int typeNameLen = typeName.length(); + int typeNameLen = typeName.size(); for (int ii = 0; ii < typeNameLen; ++ii) { if (!(typeName.at(ii).isLetterOrNumber() || typeName.at(ii) == u'_')) { QString failure(QCoreApplication::translate("qmlRegisterType", "Invalid QML %1 name \"%2\"")); @@ -1156,7 +1156,7 @@ QQmlType QQmlMetaType::qmlType(const QString &qualifiedName, QTypeRevision versi return QQmlType(); QHashedStringRef module(qualifiedName.constData(), slash); - QHashedStringRef name(qualifiedName.constData() + slash + 1, qualifiedName.length() - slash - 1); + QHashedStringRef name(qualifiedName.constData() + slash + 1, qualifiedName.size() - slash - 1); return qmlType(name, module, version); } diff --git a/src/qml/qml/qqmlmetatypedata.cpp b/src/qml/qml/qqmlmetatypedata.cpp index 2dd86c1c2a..ab6054349a 100644 --- a/src/qml/qml/qqmlmetatypedata.cpp +++ b/src/qml/qml/qqmlmetatypedata.cpp @@ -28,7 +28,7 @@ QQmlMetaTypeData::~QQmlMetaTypeData() // This expects a "fresh" QQmlTypePrivate and adopts its reference. void QQmlMetaTypeData::registerType(QQmlTypePrivate *priv) { - for (int i = 0; i < types.count(); ++i) { + for (int i = 0; i < types.size(); ++i) { if (!types.at(i).isValid()) { types[i] = QQmlType(priv); priv->index = i; @@ -37,7 +37,7 @@ void QQmlMetaTypeData::registerType(QQmlTypePrivate *priv) } } types.append(QQmlType(priv)); - priv->index = types.count() - 1; + priv->index = types.size() - 1; priv->release(); } @@ -86,7 +86,7 @@ bool QQmlMetaTypeData::registerModuleTypes(const QString &uri) QQmlPropertyCache::ConstPtr QQmlMetaTypeData::propertyCacheForVersion( int index, QTypeRevision version) const { - return (index < typePropertyCaches.length()) + return (index < typePropertyCaches.size()) ? typePropertyCaches.at(index).value(version) : QQmlPropertyCache::ConstPtr(); } @@ -94,14 +94,14 @@ QQmlPropertyCache::ConstPtr QQmlMetaTypeData::propertyCacheForVersion( void QQmlMetaTypeData::setPropertyCacheForVersion(int index, QTypeRevision version, const QQmlPropertyCache::ConstPtr &cache) { - if (index >= typePropertyCaches.length()) + if (index >= typePropertyCaches.size()) typePropertyCaches.resize(index + 1); typePropertyCaches[index][version] = cache; } void QQmlMetaTypeData::clearPropertyCachesForVersion(int index) { - if (index < typePropertyCaches.length()) + if (index < typePropertyCaches.size()) typePropertyCaches[index].clear(); } @@ -167,13 +167,13 @@ QQmlPropertyCache::ConstPtr QQmlMetaTypeData::propertyCache( QQmlPropertyCache::ConstPtr raw = propertyCache(type.metaObject(), combinedVersion); QQmlPropertyCache::Ptr copied; - for (int ii = 0; ii < types.count(); ++ii) { + for (int ii = 0; ii < types.size(); ++ii) { const QQmlType ¤tType = types.at(ii); if (!currentType.isValid()) continue; QTypeRevision rev = currentType.metaObjectRevision(); - int moIndex = types.count() - 1 - ii; + int moIndex = types.size() - 1 - ii; if (raw->allowedRevision(moIndex) != rev) { if (copied.isNull()) { diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp index e36be3840e..e7b8799f82 100644 --- a/src/qml/qml/qqmlnotifier.cpp +++ b/src/qml/qml/qqmlnotifier.cpp @@ -89,10 +89,10 @@ void QQmlNotifierEndpoint::connect(QObject *source, int sourceSignal, QQmlEngine QString sourceName; QDebug(&sourceName) << source; - sourceName = sourceName.left(sourceName.length() - 1); + sourceName = sourceName.left(sourceName.size() - 1); QString engineName; QDebug(&engineName).nospace() << engine; - engineName = engineName.left(engineName.length() - 1); + engineName = engineName.left(engineName.size() - 1); qFatal("QQmlEngine: Illegal attempt to connect to %s that is in" " a different thread than the QML engine %s.", qPrintable(sourceName), diff --git a/src/qml/qml/qqmlopenmetaobject.cpp b/src/qml/qml/qqmlopenmetaobject.cpp index b6ea0ee2e6..b9934eb76a 100644 --- a/src/qml/qml/qqmlopenmetaobject.cpp +++ b/src/qml/qml/qqmlopenmetaobject.cpp @@ -59,19 +59,19 @@ int QQmlOpenMetaObjectType::signalOffset() const int QQmlOpenMetaObjectType::propertyCount() const { - return d->names.count(); + return d->names.size(); } QByteArray QQmlOpenMetaObjectType::propertyName(int idx) const { - Q_ASSERT(idx >= 0 && idx < d->names.count()); + Q_ASSERT(idx >= 0 && idx < d->names.size()); return d->mob.property(idx).name(); } void QQmlOpenMetaObjectType::createProperties(const QVector &names) { - for (int i = 0; i < names.count(); ++i) { + for (int i = 0; i < names.size(); ++i) { const QByteArray &name = names.at(i); const int id = d->mob.propertyCount(); d->mob.addSignal("__" + QByteArray::number(id) + "()"); @@ -114,7 +114,7 @@ int QQmlOpenMetaObjectType::createProperty(const QByteArray &name) void QQmlOpenMetaObjectType::propertyCreated(int id, QMetaPropertyBuilder &builder) { - if (d->referers.count()) + if (d->referers.size()) (*d->referers.begin())->propertyCreated(id, builder); } @@ -163,13 +163,13 @@ public: }; inline void setPropertyValue(int idx, const QVariant &value) { - if (data.count() <= idx) + if (data.size() <= idx) data.resize(idx + 1); data[idx].setValue(value); } inline Property &propertyRef(int idx) { - if (data.count() <= idx) + if (data.size() <= idx) data.resize(idx + 1); Property &prop = data[idx]; if (!prop.valueSet) @@ -188,7 +188,7 @@ public: } inline bool hasProperty(int idx) const { - if (idx >= data.count()) + if (idx >= data.size()) return false; return data[idx].valueSet; } @@ -270,7 +270,7 @@ int QQmlOpenMetaObject::metaCall(QObject *o, QMetaObject::Call c, int id, void * propertyRead(propId); *reinterpret_cast(a[0]) = d->propertyValue(propId); } else if (c == QMetaObject::WriteProperty) { - if (propId >= d->data.count() || d->data.at(propId).value() != *reinterpret_cast(a[0])) { + if (propId >= d->data.size() || d->data.at(propId).value() != *reinterpret_cast(a[0])) { propertyWrite(propId); d->setPropertyValue(propId, propertyWriteValue(propId, *reinterpret_cast(a[0]))); propertyWritten(propId); @@ -461,12 +461,12 @@ QVariant QQmlOpenMetaObject::initialValue(int) int QQmlOpenMetaObject::count() const { - return d->type->d->names.count(); + return d->type->d->names.size(); } QByteArray QQmlOpenMetaObject::name(int idx) const { - Q_ASSERT(idx >= 0 && idx < d->type->d->names.count()); + Q_ASSERT(idx >= 0 && idx < d->type->d->names.size()); return d->type->d->mob.property(idx).name(); } diff --git a/src/qml/qml/qqmlpluginimporter.cpp b/src/qml/qml/qqmlpluginimporter.cpp index bee89f0304..9796c57390 100644 --- a/src/qml/qml/qqmlpluginimporter.cpp +++ b/src/qml/qml/qqmlpluginimporter.cpp @@ -96,7 +96,7 @@ static QStringList versionUriList(const QString &uri, QTypeRevision version) { QStringList result; for (int mode = QQmlImports::FullyVersioned; mode <= QQmlImports::Unversioned; ++mode) { - int index = uri.length(); + int index = uri.size(); do { QString versionUri = uri; versionUri.insert(index, QQmlImports::versionString( diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 9f5703a3c3..8f1e32b573 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -245,7 +245,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name, if (path.isEmpty()) return; // Everything up to the last property must be an "object type" property - for (int ii = 0; ii < path.count() - 1; ++ii) { + for (int ii = 0; ii < path.size() - 1; ++ii) { const QStringView &pathName = path.at(ii); // Types must begin with an uppercase letter (see checkRegistration() @@ -261,7 +261,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name, currentObject = qmlAttachedPropertiesObject(currentObject, func); if (!currentObject) return; // Something is broken with the attachable type } else if (r.importNamespace) { - if (++ii == path.count()) + if (++ii == path.size()) return; // No type following the namespace // TODO: Do we really _not_ want to query the namespaced types here? @@ -317,7 +317,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name, return; // Not an object property } - if (ii == (path.count() - 2) && QQmlMetaType::isValueType(property->propType())) { + if (ii == (path.size() - 2) && QQmlMetaType::isValueType(property->propType())) { // We're now at a value type property const QMetaObject *valueTypeMetaObject = QQmlMetaType::metaObjectForValueType(property->propType()); if (!valueTypeMetaObject) return; // Not a value type @@ -371,7 +371,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name, auto findChangeSignal = [&](QStringView signalName) { const QString changed = QStringLiteral("Changed"); if (signalName.endsWith(changed)) { - const QStringView propName = signalName.first(signalName.length() - changed.length()); + const QStringView propName = signalName.first(signalName.size() - changed.size()); const QQmlPropertyData *d = ddata->propertyCache->property(propName, currentObject, context); while (d && d->isFunction()) d = ddata->propertyCache->overrideData(d); @@ -389,7 +389,7 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name, if (QmlIR::IRBuilder::isSignalPropertyName(terminalString)) { QString signalName = terminalString.mid(2); int firstNon_; - int length = signalName.length(); + int length = signalName.size(); for (firstNon_ = 0; firstNon_ < length; ++firstNon_) if (signalName.at(firstNon_) != u'_') break; @@ -750,7 +750,7 @@ QString QQmlProperty::name() const } else if (type() & SignalProperty) { // ### Qt7: Return the original signal name here. Do not prepend "on" QString name = QStringLiteral("on") + d->core.name(d->object); - for (int i = 2, end = name.length(); i != end; ++i) { + for (int i = 2, end = name.size(); i != end; ++i) { const QChar c = name.at(i); if (c != u'_') { name[i] = c.toUpper(); @@ -1545,7 +1545,7 @@ bool QQmlPropertyPrivate::write( } else if (variantMetaType == QMetaType::fromType>()) { const QList &list = qvariant_cast >(value); - for (qsizetype ii = 0; ii < list.count(); ++ii) { + for (qsizetype ii = 0; ii < list.size(); ++ii) { QObject *o = list.at(ii); if (o && !QQmlMetaObject::canConvert(o, valueMetaObject)) o = nullptr; @@ -1891,7 +1891,7 @@ QMetaMethod QQmlPropertyPrivate::findSignalByName(const QMetaObject *mo, const Q // If no signal is found, but the signal is of the form "onBlahChanged", // return the notify signal for the property "Blah" if (name.endsWith("Changed")) { - QByteArray propName = name.mid(0, name.length() - 7); + QByteArray propName = name.mid(0, name.size() - 7); int propIdx = mo->indexOfProperty(propName.constData()); if (propIdx >= 0) { QMetaProperty prop = mo->property(propIdx); diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index c7eed14593..2b029a583c 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -235,7 +235,7 @@ void QQmlPropertyCache::appendSignal(const QString &name, QQmlPropertyData::Flag handler.m_flags.setIsSignalHandler(true); if (types) { - const auto argumentCount = names.length(); + const auto argumentCount = names.size(); QQmlPropertyCacheMethodArguments *args = createArgumentsObject(argumentCount, names); new (args->types) QMetaType; // Invalid return type ::memcpy(args->types + 1, types, argumentCount * sizeof(QMetaType)); @@ -267,7 +267,7 @@ void QQmlPropertyCache::appendMethod(const QString &name, QQmlPropertyData::Flag const QList &names, const QVector ¶meterTypes) { - int argumentCount = names.count(); + int argumentCount = names.size(); QQmlPropertyData data; data.setPropType(returnType); @@ -743,7 +743,7 @@ QString QQmlPropertyCache::signalParameterStringForJS(QV4::ExecutionEngine *engi const QSet &illegalNames = engine->illegalNames(); QString parameters; - const qsizetype count = parameterNameList.count(); + const qsizetype count = parameterNameList.size(); if (count > std::numeric_limits::max()) *errorString = QCoreApplication::translate("QQmlRewrite", "Signal has an excessive number of parameters: %1").arg(count); @@ -980,13 +980,13 @@ void QQmlPropertyCache::toMetaObjectBuilder(QMetaObjectBuilder &builder) const for (StringCache::ConstIterator iter = stringCache.begin(), cend = stringCache.end(); iter != cend; ++iter) Insert::in(this, properties, methods, iter, iter.value().second); - Q_ASSERT(properties.count() == propertyIndexCache.count()); - Q_ASSERT(methods.count() == methodIndexCache.count()); + Q_ASSERT(properties.size() == propertyIndexCache.count()); + Q_ASSERT(methods.size() == methodIndexCache.count()); std::sort(properties.begin(), properties.end(), Sort::lt); std::sort(methods.begin(), methods.end(), Sort::lt); - for (int ii = 0; ii < properties.count(); ++ii) { + for (int ii = 0; ii < properties.size(); ++ii) { const QQmlPropertyData *data = properties.at(ii).second; int notifierId = -1; @@ -1005,7 +1005,7 @@ void QQmlPropertyCache::toMetaObjectBuilder(QMetaObjectBuilder &builder) const property.setAlias(data->isAlias()); } - for (int ii = 0; ii < methods.count(); ++ii) { + for (int ii = 0; ii < methods.size(); ++ii) { const QQmlPropertyData *data = methods.at(ii).second; QByteArray returnType; @@ -1044,11 +1044,11 @@ void QQmlPropertyCache::toMetaObjectBuilder(QMetaObjectBuilder &builder) const method.setReturnType(returnType); } - for (int ii = 0; ii < enumCache.count(); ++ii) { + for (int ii = 0; ii < enumCache.size(); ++ii) { const QQmlEnumData &enumData = enumCache.at(ii); QMetaEnumBuilder enumeration = builder.addEnumerator(enumData.name.toUtf8()); enumeration.setIsScoped(true); - for (int jj = 0; jj < enumData.values.count(); ++jj) { + for (int jj = 0; jj < enumData.values.size(); ++jj) { const QQmlEnumValue &value = enumData.values.at(jj); enumeration.addKey(value.namedValue.toUtf8(), value.value); } diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 681945d5f8..7677735f99 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -371,7 +371,7 @@ inline const QQmlPropertyData *QQmlPropertyCache::signal(int index) const inline QQmlEnumData *QQmlPropertyCache::qmlEnum(int index) const { - if (index < 0 || index >= enumCache.count()) + if (index < 0 || index >= enumCache.size()) return nullptr; return const_cast(&enumCache.at(index)); @@ -464,7 +464,7 @@ int QQmlPropertyCache::signalOffset() const int QQmlPropertyCache::qmlEnumCount() const { - return enumCache.count(); + return enumCache.size(); } bool QQmlPropertyCache::callJSFactoryMethod(QObject *object, void **args) const diff --git a/src/qml/qml/qqmlpropertycachecreator.cpp b/src/qml/qml/qqmlpropertycachecreator.cpp index 50e95dac25..4bc903c22e 100644 --- a/src/qml/qml/qqmlpropertycachecreator.cpp +++ b/src/qml/qml/qqmlpropertycachecreator.cpp @@ -58,7 +58,7 @@ QByteArray QQmlPropertyCacheCreatorBase::createClassNameTypeByUrl(const QUrl &ur if (lastSlash <= -1) return QByteArray(); // ### this might not be correct for .ui.qml files - const QStringView nameBase = QStringView{path}.mid(lastSlash + 1, path.length() - lastSlash - 5); + const QStringView nameBase = QStringView{path}.mid(lastSlash + 1, path.size() - lastSlash - 5); // Not a reusable type if it doesn't start with a upper case letter. if (nameBase.isEmpty() || !nameBase.at(0).isUpper()) return QByteArray(); diff --git a/src/qml/qml/qqmlpropertycachevector_p.h b/src/qml/qml/qqmlpropertycachevector_p.h index 71a4896315..6386795086 100644 --- a/src/qml/qml/qqmlpropertycachevector_p.h +++ b/src/qml/qml/qqmlpropertycachevector_p.h @@ -36,10 +36,10 @@ public: return data.resize(size); } - int count() const { return data.count(); } + int count() const { return data.size(); } void clear() { - for (int i = 0; i < data.count(); ++i) { + for (int i = 0; i < data.size(); ++i) { const auto &cache = data.at(i); if (cache.isT2()) { if (QQmlPropertyCache *data = cache.asT2()) diff --git a/src/qml/qml/qqmlpropertyresolver.cpp b/src/qml/qml/qqmlpropertyresolver.cpp index 6be2c205ed..ff29c38997 100644 --- a/src/qml/qml/qqmlpropertyresolver.cpp +++ b/src/qml/qml/qqmlpropertyresolver.cpp @@ -44,7 +44,7 @@ const QQmlPropertyData *QQmlPropertyResolver::signal(const QString &name, bool * } if (name.endsWith(QLatin1String("Changed"))) { - QString propName = name.mid(0, name.length() - static_cast(strlen("Changed"))); + QString propName = name.mid(0, name.size() - static_cast(strlen("Changed"))); d = property(propName, notInRevision); if (d) diff --git a/src/qml/qml/qqmlscriptblob.cpp b/src/qml/qml/qqmlscriptblob.cpp index 74003133c0..4ea3816ed4 100644 --- a/src/qml/qml/qqmlscriptblob.cpp +++ b/src/qml/qml/qqmlscriptblob.cpp @@ -126,7 +126,7 @@ void QQmlScriptBlob::done() return; // Check all script dependencies for errors - for (int ii = 0; ii < m_scripts.count(); ++ii) { + for (int ii = 0; ii < m_scripts.size(); ++ii) { const ScriptReference &script = m_scripts.at(ii); Q_ASSERT(script.script->isCompleteOrError()); if (script.script->isError()) { @@ -147,7 +147,7 @@ void QQmlScriptBlob::done() QSet ns; - for (int scriptIndex = 0; scriptIndex < m_scripts.count(); ++scriptIndex) { + for (int scriptIndex = 0; scriptIndex < m_scripts.size(); ++scriptIndex) { const ScriptReference &script = m_scripts.at(scriptIndex); m_scriptData->scripts.append(script.script); diff --git a/src/qml/qml/qqmlscriptdata.cpp b/src/qml/qml/qqmlscriptdata.cpp index 43e6b53dab..1a6a8157d0 100644 --- a/src/qml/qml/qqmlscriptdata.cpp +++ b/src/qml/qml/qqmlscriptdata.cpp @@ -55,14 +55,14 @@ QQmlRefPointer QQmlScriptData::qmlContextDataForContext( QV4::Scope scope(v4); QV4::ScopedObject scriptsArray(scope); if (qmlContextData->importedScripts().isNullOrUndefined()) { - scriptsArray = v4->newArrayObject(scripts.count()); + scriptsArray = v4->newArrayObject(scripts.size()); qmlContextData->setImportedScripts( QV4::PersistentValue(v4, scriptsArray.asReturnedValue())); } else { scriptsArray = qmlContextData->importedScripts().valueRef(); } QV4::ScopedValue v(scope); - for (int ii = 0; ii < scripts.count(); ++ii) { + for (int ii = 0; ii < scripts.size(); ++ii) { v = scripts.at(ii)->scriptData()->scriptValueForContext(qmlContextData); scriptsArray->put(ii, v); } diff --git a/src/qml/qml/qqmlscriptstring.cpp b/src/qml/qml/qqmlscriptstring.cpp index d872d4b55c..370573b199 100644 --- a/src/qml/qml/qqmlscriptstring.cpp +++ b/src/qml/qml/qqmlscriptstring.cpp @@ -154,7 +154,7 @@ Otherwise returns a null QString. QString QQmlScriptString::stringLiteral() const { if (d->isStringLiteral) - return d->script.mid(1, d->script.length()-2); + return d->script.mid(1, d->script.size()-2); return QString(); } diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index dd2fd62a52..57b5c15806 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -208,7 +208,7 @@ void QQmlTypePrivate::init() const mo, baseMetaObject, metaObjects.isEmpty() ? nullptr : metaObjects.constLast().metaObject)); - for (int ii = 0; ii < metaObjects.count(); ++ii) { + for (int ii = 0; ii < metaObjects.size(); ++ii) { metaObjects[ii].propertyOffset = metaObjects.at(ii).metaObject->propertyOffset(); metaObjects[ii].methodOffset = @@ -320,7 +320,7 @@ void QQmlTypePrivate::insertEnums(const QMetaObject *metaObject) const if (isScoped) { scopedEnums << scoped; - scopedEnumIndex.insert(QString::fromUtf8(e.name()), scopedEnums.count()-1); + scopedEnumIndex.insert(QString::fromUtf8(e.name()), scopedEnums.size()-1); } } } @@ -392,13 +392,13 @@ void QQmlTypePrivate::insertEnumsFromPropertyCache( QStringHash *scoped = new QStringHash(); QQmlEnumData *enumData = currentCache->qmlEnum(ii); - for (int jj = 0; jj < enumData->values.count(); ++jj) { + for (int jj = 0; jj < enumData->values.size(); ++jj) { const QQmlEnumValue &value = enumData->values.at(jj); enums.insert(value.namedValue, value.value); scoped->insert(value.namedValue, value.value); } scopedEnums << scoped; - scopedEnumIndex.insert(enumData->name, scopedEnums.count()-1); + scopedEnumIndex.insert(enumData->name, scopedEnums.size()-1); } } insertEnums(cppMetaObject); @@ -855,7 +855,7 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::S *ok = true; if (d) { - Q_ASSERT(index > -1 && index < d->scopedEnums.count()); + Q_ASSERT(index > -1 && index < d->scopedEnums.size()); int *rv = d->scopedEnums.at(index)->value(name); if (rv) return *rv; @@ -872,7 +872,7 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QStrin *ok = true; if (d) { - Q_ASSERT(index > -1 && index < d->scopedEnums.count()); + Q_ASSERT(index > -1 && index < d->scopedEnums.size()); int *rv = d->scopedEnums.at(index)->value(name); if (rv) return *rv; @@ -890,11 +890,11 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, const QByteArray &scope d->initEnums(engine); - int *rv = d->scopedEnumIndex.value(QHashedCStringRef(scopedEnumName.constData(), scopedEnumName.length())); + int *rv = d->scopedEnumIndex.value(QHashedCStringRef(scopedEnumName.constData(), scopedEnumName.size())); if (rv) { int index = *rv; - Q_ASSERT(index > -1 && index < d->scopedEnums.count()); - rv = d->scopedEnums.at(index)->value(QHashedCStringRef(name.constData(), name.length())); + Q_ASSERT(index > -1 && index < d->scopedEnums.size()); + rv = d->scopedEnums.at(index)->value(QHashedCStringRef(name.constData(), name.size())); if (rv) return *rv; } @@ -915,7 +915,7 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, QStringView scopedEnumN int *rv = d->scopedEnumIndex.value(QHashedStringRef(scopedEnumName)); if (rv) { int index = *rv; - Q_ASSERT(index > -1 && index < d->scopedEnums.count()); + Q_ASSERT(index > -1 && index < d->scopedEnums.size()); rv = d->scopedEnums.at(index)->value(QHashedStringRef(name)); if (rv) return *rv; diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index 28d73d7cb1..dbf7717b72 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -243,7 +243,7 @@ void QQmlTypeCompiler::addImport(const QString &module, const QString &qualifier const quint32 moduleIdx = registerString(module); const quint32 qualifierIdx = registerString(qualifier); - for (int i = 0, count = document->imports.count(); i < count; ++i) { + for (int i = 0, count = document->imports.size(); i < count; ++i) { const QV4::CompiledData::Import *existingImport = document->imports.at(i); if (existingImport->type == QV4::CompiledData::Import::ImportLibrary && existingImport->uriIndex == moduleIdx @@ -282,7 +282,7 @@ SignalHandlerResolver::SignalHandlerResolver(QQmlTypeCompiler *typeCompiler) bool SignalHandlerResolver::resolveSignalHandlerExpressions() { - for (int objectIndex = 0; objectIndex < qmlObjects.count(); ++objectIndex) { + for (int objectIndex = 0; objectIndex < qmlObjects.size(); ++objectIndex) { const QmlIR::Object * const obj = qmlObjects.at(objectIndex); QQmlPropertyCache::ConstPtr cache = propertyCaches->at(objectIndex); if (!cache) @@ -335,7 +335,7 @@ bool SignalHandlerResolver::resolveSignalHandlerExpressions( QString qPropertyName; if (signalName.endsWith(QLatin1String("Changed"))) - qPropertyName = signalName.mid(0, signalName.length() - static_cast(strlen("Changed"))); + qPropertyName = signalName.mid(0, signalName.size() - static_cast(strlen("Changed"))); bool notInRevision = false; const QQmlPropertyData * const signal = resolver.signal(signalName, ¬InRevision); @@ -353,7 +353,7 @@ bool SignalHandlerResolver::resolveSignalHandlerExpressions( bool unnamedParameter = false; QList parameterNames = propertyCache->signalParameterNames(sigIndex); - for (int i = 0; i < parameterNames.count(); ++i) { + for (int i = 0; i < parameterNames.size(); ++i) { const QString param = QString::fromUtf8(parameterNames.at(i)); if (param.isEmpty()) unnamedParameter = true; @@ -442,7 +442,7 @@ QQmlEnumTypeResolver::QQmlEnumTypeResolver(QQmlTypeCompiler *typeCompiler) bool QQmlEnumTypeResolver::resolveEnumBindings() { - for (int i = 0; i < qmlObjects.count(); ++i) { + for (int i = 0; i < qmlObjects.size(); ++i) { QQmlPropertyCache::ConstPtr propertyCache = propertyCaches->at(i); if (!propertyCache) continue; @@ -517,11 +517,11 @@ bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment( // * .. int dot = string.indexOf(QLatin1Char('.')); - if (dot == -1 || dot == string.length()-1) + if (dot == -1 || dot == string.size()-1) return true; int dot2 = string.indexOf(QLatin1Char('.'), dot+1); - if (dot2 != -1 && dot2 != string.length()-1) { + if (dot2 != -1 && dot2 != string.size()-1) { if (!string.at(dot+1).isUpper()) return true; if (string.indexOf(QLatin1Char('.'), dot2+1) != -1) @@ -612,7 +612,7 @@ int QQmlEnumTypeResolver::evaluateEnum(const QString &scope, QStringView enumNam return -1; if (!enumName.isEmpty()) return type.scopedEnumValue(compiler->enginePrivate(), enumName, enumValue, ok); - return type.enumValue(compiler->enginePrivate(), QHashedStringRef(enumValue.constData(), enumValue.length()), ok); + return type.enumValue(compiler->enginePrivate(), QHashedStringRef(enumValue.constData(), enumValue.size()), ok); } const QMetaObject *mo = &Qt::staticMetaObject; @@ -674,7 +674,7 @@ QQmlAliasAnnotator::QQmlAliasAnnotator(QQmlTypeCompiler *typeCompiler) void QQmlAliasAnnotator::annotateBindingsToAliases() { - for (int i = 0; i < qmlObjects.count(); ++i) { + for (int i = 0; i < qmlObjects.size(); ++i) { QQmlPropertyCache::ConstPtr propertyCache = propertyCaches->at(i); if (!propertyCache) continue; @@ -706,7 +706,7 @@ QQmlScriptStringScanner::QQmlScriptStringScanner(QQmlTypeCompiler *typeCompiler) void QQmlScriptStringScanner::scan() { const QMetaType scriptStringMetaType = QMetaType::fromType(); - for (int i = 0; i < qmlObjects.count(); ++i) { + for (int i = 0; i < qmlObjects.size(); ++i) { QQmlPropertyCache::ConstPtr propertyCache = propertyCaches->at(i); if (!propertyCache) continue; @@ -951,7 +951,7 @@ bool QQmlComponentAndAliasResolver::resolve(int root) } - for (int i = 0; i < componentRoots.count(); ++i) { + for (int i = 0; i < componentRoots.size(); ++i) { QmlIR::Object *component = qmlObjects->at(componentRoots.at(i)); const QmlIR::Binding *rootBinding = component->firstBinding(); @@ -997,7 +997,7 @@ bool QQmlComponentAndAliasResolver::collectIdsAndAliases(int objectIndex) recordError(obj->locationOfIdProperty, tr("id is not unique")); return false; } - obj->id = _idToObjectIndex.count(); + obj->id = _idToObjectIndex.size(); _idToObjectIndex.insert(obj->idNameIndex, objectIndex); } @@ -1416,7 +1416,7 @@ QQmlDefaultPropertyMerger::QQmlDefaultPropertyMerger(QQmlTypeCompiler *typeCompi void QQmlDefaultPropertyMerger::mergeDefaultProperties() { - for (int i = 0; i < qmlObjects.count(); ++i) + for (int i = 0; i < qmlObjects.size(); ++i) mergeDefaultProperties(i); } diff --git a/src/qml/qml/qqmltypecompiler_p.h b/src/qml/qml/qqmltypecompiler_p.h index 188eda471f..02edbb0c08 100644 --- a/src/qml/qml/qqmltypecompiler_p.h +++ b/src/qml/qml/qqmltypecompiler_p.h @@ -55,7 +55,7 @@ public: using ListPropertyAssignBehavior = QmlIR::Pragma::ListPropertyAssignBehaviorValue; const QmlIR::Object *objectAt(int index) const { return document->objects.at(index); } - int objectCount() const { return document->objects.count(); } + int objectCount() const { return document->objects.size(); } QString stringAt(int idx) const; QmlIR::PoolList::Iterator objectFunctionsBegin(const QmlIR::Object *object) const { return object->functionsBegin(); } QmlIR::PoolList::Iterator objectFunctionsEnd(const QmlIR::Object *object) const { return object->functionsEnd(); } diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp index 5848620352..82fe5f23de 100644 --- a/src/qml/qml/qqmltypedata.cpp +++ b/src/qml/qml/qqmltypedata.cpp @@ -293,7 +293,7 @@ void QQmlTypeData::done() return; // Check all script dependencies for errors - for (int ii = 0; ii < m_scripts.count(); ++ii) { + for (int ii = 0; ii < m_scripts.size(); ++ii) { const ScriptReference &script = m_scripts.at(ii); Q_ASSERT(script.script->isCompleteOrError()); if (script.script->isError()) { @@ -350,7 +350,7 @@ void QQmlTypeData::done() } // Check all composite singleton type dependencies for errors - for (int ii = 0; ii < m_compositeSingletons.count(); ++ii) { + for (int ii = 0; ii < m_compositeSingletons.size(); ++ii) { const TypeReference &type = m_compositeSingletons.at(ii); Q_ASSERT(!type.typeData || type.typeData->isCompleteOrError()); if (type.typeData && type.typeData->isError()) { @@ -483,8 +483,8 @@ void QQmlTypeData::done() { // Collect imported scripts - m_compiledData->dependentScripts.reserve(m_scripts.count()); - for (int scriptIndex = 0; scriptIndex < m_scripts.count(); ++scriptIndex) { + m_compiledData->dependentScripts.reserve(m_scripts.size()); + for (int scriptIndex = 0; scriptIndex < m_scripts.size(); ++scriptIndex) { const QQmlTypeData::ScriptReference &script = m_scripts.at(scriptIndex); QStringView qualifier(script.qualifier); @@ -600,7 +600,7 @@ bool QQmlTypeData::loadFromSource() if (!compiler.generateFromQml(source, finalUrlString(), m_document.data())) { QList errors; - errors.reserve(compiler.errors.count()); + errors.reserve(compiler.errors.size()); for (const QQmlJS::DiagnosticMessage &msg : qAsConst(compiler.errors)) { QQmlError e; e.setUrl(url()); @@ -724,7 +724,7 @@ void QQmlTypeData::allDependenciesDone() void QQmlTypeData::downloadProgressChanged(qreal p) { - for (int ii = 0; ii < m_callbacks.count(); ++ii) { + for (int ii = 0; ii < m_callbacks.size(); ++ii) { TypeDataCallback *callback = m_callbacks.at(ii); callback->typeDataProgress(this, p); } diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 4877a56a40..1780879755 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1033,7 +1033,7 @@ QString QQmlTypeLoader::absoluteFilePath(const QString &path) return QString(); QString absoluteFilePath; - QString fileName(path.mid(lastSlash+1, path.length()-lastSlash-1)); + QString fileName(path.mid(lastSlash+1, path.size()-lastSlash-1)); bool *value = fileSet->object(fileName); if (value) { @@ -1046,7 +1046,7 @@ QString QQmlTypeLoader::absoluteFilePath(const QString &path) absoluteFilePath = path; } - if (absoluteFilePath.length() > 2 && absoluteFilePath.at(0) != QLatin1Char('/') && absoluteFilePath.at(1) != QLatin1Char(':')) + if (absoluteFilePath.size() > 2 && absoluteFilePath.at(0) != QLatin1Char('/') && absoluteFilePath.at(1) != QLatin1Char(':')) absoluteFilePath = QFileInfo(absoluteFilePath).absoluteFilePath(); return absoluteFilePath; @@ -1132,7 +1132,7 @@ bool QQmlTypeLoader::directoryExists(const QString &path) return fileInfo.exists() && fileInfo.isDir(); } - int length = path.length(); + int length = path.size(); if (path.endsWith(QLatin1Char('/'))) --length; QString dirPath(path.left(length)); @@ -1169,7 +1169,7 @@ const QQmlTypeLoaderQmldirContent QQmlTypeLoader::qmldirContent(const QString &f // Yet, this heuristic is the best we can do until we pass more structured information here, // for example a QUrl also for local files. QUrl url(filePathIn); - if (url.scheme().length() < 2) { + if (url.scheme().size() < 2) { filePath = filePathIn; } else { filePath = QQmlFile::urlToLocalFileOrQrc(url); diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp index 4360bf8fb9..35e6e72544 100644 --- a/src/qml/qml/qqmltypemodule.cpp +++ b/src/qml/qml/qqmltypemodule.cpp @@ -30,7 +30,7 @@ void QQmlTypeModule::add(QQmlTypePrivate *type) addMinorVersion(type->version.minorVersion()); QList &list = m_typeHash[type->elementName]; - for (int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.size(); ++ii) { QQmlTypePrivate *in_list = list.at(ii); Q_ASSERT(in_list); if (in_list->version.minorVersion() < type->version.minorVersion()) { diff --git a/src/qml/qml/qqmltypenamecache.cpp b/src/qml/qml/qqmltypenamecache.cpp index 3823bf139f..7d3c81cfd7 100644 --- a/src/qml/qml/qqmltypenamecache.cpp +++ b/src/qml/qml/qqmltypenamecache.cpp @@ -7,7 +7,7 @@ QT_BEGIN_NAMESPACE void QQmlTypeNameCache::add(const QHashedString &name, const QUrl &url, const QHashedString &nameSpace) { - if (nameSpace.length() != 0) { + if (nameSpace.size() != 0) { QQmlImportRef *i = m_namedImports.value(nameSpace); Q_ASSERT(i != nullptr); i->compositeSingletons.insert(name, url); @@ -26,7 +26,7 @@ void QQmlTypeNameCache::add(const QHashedString &name, int importedScriptIndex, import.scriptIndex = importedScriptIndex; import.m_qualifier = name; - if (nameSpace.length() != 0) { + if (nameSpace.size() != 0) { QQmlImportRef *i = m_namedImports.value(nameSpace); Q_ASSERT(i != nullptr); m_namespacedImports[i].insert(name, import); diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 144c1a73b8..e9059e53dc 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -503,7 +503,7 @@ ReturnedValue NodePrototype::method_get_previousSibling(const FunctionObject *b, if (!r->d()->d->parent) RETURN_RESULT(Encode::null()); - for (int ii = 0; ii < r->d()->d->parent->children.count(); ++ii) { + for (int ii = 0; ii < r->d()->d->parent->children.size(); ++ii) { if (r->d()->d->parent->children.at(ii) == r->d()->d) { if (ii == 0) return Encode::null(); @@ -525,9 +525,9 @@ ReturnedValue NodePrototype::method_get_nextSibling(const FunctionObject *b, con if (!r->d()->d->parent) RETURN_RESULT(Encode::null()); - for (int ii = 0; ii < r->d()->d->parent->children.count(); ++ii) { + for (int ii = 0; ii < r->d()->d->parent->children.size(); ++ii) { if (r->d()->d->parent->children.at(ii) == r->d()->d) { - if ((ii + 1) == r->d()->d->parent->children.count()) + if ((ii + 1) == r->d()->d->parent->children.size()) return Encode::null(); else return Node::create(scope.engine, r->d()->d->parent->children.at(ii + 1)); @@ -665,7 +665,7 @@ ReturnedValue CharacterData::method_length(const FunctionObject *b, const Value if (!r) RETURN_UNDEFINED(); - return Encode(int(r->d()->d->data.length())); + return Encode(int(r->d()->d->data.size())); } ReturnedValue CharacterData::prototype(ExecutionEngine *v4) @@ -858,7 +858,7 @@ ReturnedValue NamedNodeMap::virtualGet(const Managed *m, PropertyKey id, const V if (id.isArrayIndex()) { uint index = id.asArrayIndex(); - if ((int)index < r->d()->list().count()) { + if ((int)index < r->d()->list().size()) { if (hasProperty) *hasProperty = true; return Node::create(v4, r->d()->list().at(index)); @@ -872,10 +872,10 @@ ReturnedValue NamedNodeMap::virtualGet(const Managed *m, PropertyKey id, const V return Object::virtualGet(m, id, receiver, hasProperty); if (id == v4->id_length()->propertyKey()) - return Value::fromInt32(r->d()->list().count()).asReturnedValue(); + return Value::fromInt32(r->d()->list().size()).asReturnedValue(); QString str = id.toQString(); - for (int ii = 0; ii < r->d()->list().count(); ++ii) { + for (int ii = 0; ii < r->d()->list().size(); ++ii) { if (r->d()->list().at(ii)->name == str) { if (hasProperty) *hasProperty = true; @@ -901,7 +901,7 @@ ReturnedValue NodeList::virtualGet(const Managed *m, PropertyKey id, const Value if (id.isArrayIndex()) { uint index = id.asArrayIndex(); - if ((int)index < r->d()->d->children.count()) { + if ((int)index < r->d()->d->children.size()) { if (hasProperty) *hasProperty = true; return Node::create(v4, r->d()->d->children.at(index)); @@ -912,7 +912,7 @@ ReturnedValue NodeList::virtualGet(const Managed *m, PropertyKey id, const Value } if (id == v4->id_length()->propertyKey()) - return Value::fromInt32(r->d()->d->children.count()).asReturnedValue(); + return Value::fromInt32(r->d()->d->children.size()).asReturnedValue(); return Object::virtualGet(m, id, receiver, hasProperty); } @@ -1137,7 +1137,7 @@ QString QQmlXMLHttpRequest::headers() const QString ret; for (const HeaderPair &header : m_headersList) { - if (ret.length()) + if (ret.size()) ret.append(QLatin1String("\r\n")); ret += QString::fromUtf8(header.first) + QLatin1String(": ") + QString::fromUtf8(header.second); @@ -1201,7 +1201,7 @@ void QQmlXMLHttpRequest::requestFromUrl(const QUrl &url) int n = 0; int semiColon = str.indexOf(QLatin1Char(';'), charsetIdx); if (semiColon == -1) { - n = str.length() - charsetIdx; + n = str.size() - charsetIdx; } else { n = semiColon - charsetIdx; } @@ -1446,7 +1446,7 @@ void QQmlXMLHttpRequest::readEncoding() if (charsetIdx != -1) { charsetIdx += 8; separatorIdx = header.second.indexOf(';', charsetIdx); - m_charset = header.second.mid(charsetIdx, separatorIdx >= 0 ? separatorIdx : header.second.length()); + m_charset = header.second.mid(charsetIdx, separatorIdx >= 0 ? separatorIdx : header.second.size()); } } break; @@ -1479,7 +1479,7 @@ QV4::ReturnedValue QQmlXMLHttpRequest::jsonResponseBody(QV4::ExecutionEngine* en QJsonParseError error; const QString& jtext = responseBody(); - JsonParser parser(scope.engine, jtext.constData(), jtext.length()); + JsonParser parser(scope.engine, jtext.constData(), jtext.size()); ScopedValue jsonObject(scope, parser.parse(&error)); if (error.error != QJsonParseError::NoError) return engine->throwSyntaxError(QStringLiteral("JSON.parse: Parse error")); diff --git a/src/qml/qmldirparser/qqmldirparser.cpp b/src/qml/qmldirparser/qqmldirparser.cpp index 6415e6cee2..112c7d12d0 100644 --- a/src/qml/qmldirparser/qqmldirparser.cpp +++ b/src/qml/qmldirparser/qqmldirparser.cpp @@ -11,13 +11,13 @@ static int parseInt(QStringView str, bool *ok) { int pos = 0; int number = 0; - while (pos < str.length() && str.at(pos).isDigit()) { + while (pos < str.size() && str.at(pos).isDigit()) { if (pos != 0) number *= 10; number += str.at(pos).unicode() - '0'; ++pos; } - if (pos != str.length()) + if (pos != str.size()) *ok = false; else *ok = true; @@ -31,7 +31,7 @@ static QTypeRevision parseVersion(const QString &str) bool ok = false; const int major = parseInt(QStringView(str).left(dotIndex), &ok); if (!ok) return QTypeRevision(); - const int minor = parseInt(QStringView(str).mid(dotIndex + 1, str.length() - dotIndex - 1), &ok); + const int minor = parseInt(QStringView(str).mid(dotIndex + 1, str.size() - dotIndex - 1), &ok); return ok ? QTypeRevision::fromVersion(major, minor) : QTypeRevision(); } return QTypeRevision(); diff --git a/src/qml/qmldirparser/qqmlimportresolver.cpp b/src/qml/qmldirparser/qqmlimportresolver.cpp index b4f4dbf7a1..15ec7765b0 100644 --- a/src/qml/qmldirparser/qqmlimportresolver.cpp +++ b/src/qml/qmldirparser/qqmlimportresolver.cpp @@ -28,7 +28,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths QStringList importPaths; // fully & partially versioned parts + 1 unversioned for each base path - importPaths.reserve(2 * parts.count() + 1); + importPaths.reserve(2 * parts.size() + 1); auto versionString = [](QTypeRevision version, ImportVersion mode) { @@ -71,7 +71,7 @@ QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths if (mode != Unversioned) { // insert in the middle - for (int index = parts.count() - 2; index >= 0; --index) { + for (int index = parts.size() - 2; index >= 0; --index) { importPaths += dir + joinStringRefs(parts.mid(0, index + 1), Slash) + ver + Slash + joinStringRefs(parts.mid(index + 1), Slash); diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 522dc48c92..a01622f25f 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -307,7 +307,7 @@ void QQmlBindPrivate::validate(QQmlBind *q) const if (!when) return; - qsizetype iterationEnd = entries.length(); + qsizetype iterationEnd = entries.size(); if (lastIsTarget) { if (obj) { Q_ASSERT(!entries.isEmpty()); @@ -604,7 +604,7 @@ void QQmlBind::setDelayed(bool delayed) oldEntries.pop_back(); } - for (qsizetype i = 0, end = oldEntries.length(); i < end; ++i) { + for (qsizetype i = 0, end = oldEntries.size(); i < end; ++i) { QQmlBindEntry &newEntry = d->entries[i]; QQmlBindEntry &oldEntry = oldEntries[i]; newEntry.previousKind = newEntry.previous.set( @@ -794,7 +794,7 @@ void QQmlBindPrivate::decodeBinding( if (delayed) { if (!delayedValues) createDelayedValues(); - const QString delayedName = QString::number(entries.length()); + const QString delayedName = QString::number(entries.size()); delayedValues->insert(delayedName, QVariant()); QQmlProperty bindingTarget = QQmlProperty(delayedValues.get(), delayedName); Q_ASSERT(bindingTarget.isValid()); @@ -863,7 +863,7 @@ void QQmlBindPrivate::evalDelayed() bool ok; const int delayedIndex = delayedName.toInt(&ok); Q_ASSERT(ok); - Q_ASSERT(delayedIndex >= 0 && delayedIndex < entries.length()); + Q_ASSERT(delayedIndex >= 0 && delayedIndex < entries.size()); entries[delayedIndex].prop.write((*delayedValues)[delayedName]); } (*delayedValues)[pendingName].setValue(QStringList()); @@ -1010,7 +1010,7 @@ void QQmlBind::eval() return; d->writingProperty = true; - for (qsizetype i = 0, end = d->entries.length(); i != end; ++i) { + for (qsizetype i = 0, end = d->entries.size(); i != end; ++i) { QQmlBindEntry &entry = d->entries[i]; if (!entry.prop.isValid()) continue; diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index e93e40e69f..cb1148a416 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -203,11 +203,11 @@ void QQmlConnections::setIgnoreUnknownSignals(bool ignore) void QQmlConnectionsParser::verifyBindings(const QQmlRefPointer &compilationUnit, const QList &props) { - for (int ii = 0; ii < props.count(); ++ii) { + for (int ii = 0; ii < props.size(); ++ii) { const QV4::CompiledData::Binding *binding = props.at(ii); const QString &propName = compilationUnit->stringAt(binding->propertyNameIndex); - const bool thirdCharacterIsValid = (propName.length() >= 2) + const bool thirdCharacterIsValid = (propName.size() >= 2) && (propName.at(2).isUpper() || propName.at(2) == u'_'); if (!propName.startsWith(QLatin1String("on")) || !thirdCharacterIsValid) { error(props.at(ii), QQmlConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName)); @@ -304,7 +304,7 @@ void QQmlConnections::connectSignalsToMethods() signal->takeExpression(expression); d->boundsignals += signal; } else if (!d->ignoreUnknownSignals - && propName.startsWith(QLatin1String("on")) && propName.length() > 2 + && propName.startsWith(QLatin1String("on")) && propName.size() > 2 && propName.at(2).isUpper()) { qmlWarning(this) << tr("Detected function \"%1\" in Connections element. " "This is probably intended to be a signal handler but no " diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index 663d4974a7..494bf4e744 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -263,7 +263,7 @@ QStringList QQmlPropertyMap::keys() const int QQmlPropertyMap::count() const { Q_D(const QQmlPropertyMap); - return d->keys.count(); + return d->keys.size(); } /*! -- cgit v1.2.3