diff options
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 10 | ||||
| -rw-r--r-- | src/qml/types/qqmlconnections.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
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<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &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 " |