summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-11-11 15:53:00 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-11-18 22:01:11 +0100
commitc6f7a403e3c89bfbf8ed6d39b8d54c6ec809dbbd (patch)
treed708542400bbf1659149da7ce1a6e9f1c8b33711
parent7dc501a2f4af7f3feeadff25df54a0bff6264dc4 (diff)
Port from container::count() and length() to size() - V5
This is a the same semantic patch (qt-port-to-std-compatible-api V5 with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to avoid cherry-pick conflicts. Change-Id: I9621dee5ed328b47e78919a34c307105e4311903 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat
-rw-r--r--src/scxml/qscxmlcompiler.cpp14
-rw-r--r--src/scxml/qscxmlexecutablecontent.cpp6
-rw-r--r--src/scxml/qscxmlnulldatamodel.cpp2
-rw-r--r--src/statemachineqml/childrenprivate_p.h2
-rw-r--r--src/statemachineqml/signaltransition.cpp8
-rw-r--r--tests/auto/compiled/tst_compiled.cpp8
-rw-r--r--tests/auto/dynamicmetaobject/tst_dynamicmetaobject.cpp2
-rw-r--r--tests/auto/parser/tst_parser.cpp6
-rw-r--r--tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp22
-rw-r--r--tests/auto/qstatemachine/qstate/tst_qstate.cpp8
-rw-r--r--tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp390
-rw-r--r--tests/auto/scion/tst_scion.cpp2
-rw-r--r--tests/auto/shared/bindableqmlutils.h20
-rw-r--r--tests/auto/statemachine/tst_statemachine.cpp30
-rw-r--r--tools/qscxmlc/generator.cpp118
-rw-r--r--tools/qscxmlc/moc.h4
-rw-r--r--tools/qscxmlc/qscxmlc.cpp4
-rw-r--r--tools/qscxmlc/scxmlcppdumper.cpp6
18 files changed, 326 insertions, 326 deletions
diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp
index 91adec8..fdd5aff 100644
--- a/src/scxml/qscxmlcompiler.cpp
+++ b/src/scxml/qscxmlcompiler.cpp
@@ -264,7 +264,7 @@ private:
if (!isLetter(c) && c != QLatin1Char('_'))
return false;
}
- for (int ei = id.length(); i != ei; ++i) {
+ for (int ei = id.size(); i != ei; ++i) {
const QChar c = id.at(i);
if (isLetter(c) || c.isDigit() || c == QLatin1Char('.') || c == QLatin1Char('-')
|| c == QLatin1Char('_') || isNameTail(c))
@@ -336,12 +336,12 @@ private:
if (part.isEmpty())
return false;
- if (wildCardMode == AllowWildCards && part.length() == 1
+ if (wildCardMode == AllowWildCards && part.size() == 1
&& part.at(0) == QLatin1Char('*')) {
continue;
}
- for (int i = 0, ei = part.length(); i != ei; ++i) {
+ for (int i = 0, ei = part.size(); i != ei; ++i) {
const QChar c = part.at(i);
if (!isLetter(c) && !c.isDigit() && c != QLatin1Char('-') && c != QLatin1Char('_')
&& c != QLatin1Char(':')) {
@@ -1409,7 +1409,7 @@ bool QScxmlCompilerPrivate::preReadElementScxml()
} else {
int lastColon = datamodel.lastIndexOf(QLatin1Char(':'));
if (lastColon == -1) {
- lastColon = datamodel.length();
+ lastColon = datamodel.size();
} else {
scxml->cppDataModelHeaderName = datamodel.mid(lastColon + 1).toString();
}
@@ -2165,7 +2165,7 @@ bool QScxmlCompilerPrivate::readElement()
return parseSubElement(i, m_reader, m_fileName);
}
- if (elementKind != ParserState::Scxml && !m_stack.count()) {
+ if (elementKind != ParserState::Scxml && !m_stack.size()) {
addError(QStringLiteral("misplaced %1").arg(currentTag.toString()));
return false;
}
@@ -2382,12 +2382,12 @@ QScxmlCompilerPrivate::ParserState &QScxmlCompilerPrivate::current()
QScxmlCompilerPrivate::ParserState &QScxmlCompilerPrivate::previous()
{
- return m_stack[m_stack.count() - 2];
+ return m_stack[m_stack.size() - 2];
}
bool QScxmlCompilerPrivate::hasPrevious() const
{
- return m_stack.count() > 1;
+ return m_stack.size() > 1;
}
bool QScxmlCompilerPrivate::checkAttributes(const QXmlStreamAttributes &attributes,
diff --git a/src/scxml/qscxmlexecutablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp
index 2379f63..eae7c4a 100644
--- a/src/scxml/qscxmlexecutablecontent.cpp
+++ b/src/scxml/qscxmlexecutablecontent.cpp
@@ -214,7 +214,7 @@ static int parseTime(QStringView t, bool *ok = nullptr)
++startPos;
}
int pos = startPos;
- for (int endPos = t.length(); pos < endPos; ++pos) {
+ for (int endPos = t.size(); pos < endPos; ++pos) {
auto c = t[pos];
if (c < QLatin1Char('0') || c > QLatin1Char('9'))
break;
@@ -225,9 +225,9 @@ static int parseTime(QStringView t, bool *ok = nullptr)
}
int value = t.mid(startPos, pos - startPos).toInt(ok);
if (ok && !*ok) return -1;
- if (t.length() == pos + 1 && t[pos] == QLatin1Char('s')) {
+ if (t.size() == pos + 1 && t[pos] == QLatin1Char('s')) {
value *= 1000;
- } else if (t.length() != pos + 2 || t[pos] != QLatin1Char('m') || t[pos + 1] != QLatin1Char('s')) {
+ } else if (t.size() != pos + 2 || t[pos] != QLatin1Char('m') || t[pos + 1] != QLatin1Char('s')) {
if (ok) *ok = false;
return -1;
}
diff --git a/src/scxml/qscxmlnulldatamodel.cpp b/src/scxml/qscxmlnulldatamodel.cpp
index 07554ec..c62226f 100644
--- a/src/scxml/qscxmlnulldatamodel.cpp
+++ b/src/scxml/qscxmlnulldatamodel.cpp
@@ -63,7 +63,7 @@ public:
ResolvedEvaluatorInfo resolved;
if (expr.startsWith(QStringLiteral("In(")) && expr.endsWith(QLatin1Char(')'))) {
resolved.error = false;
- resolved.str = expr.mid(3, expr.length() - 4);
+ resolved.str = expr.mid(3, expr.size() - 4);
} else {
resolved.error = true;
resolved.str = QStringLiteral("%1 in %2").arg(expr, td->string(info.context));
diff --git a/src/statemachineqml/childrenprivate_p.h b/src/statemachineqml/childrenprivate_p.h
index baea5e9..54f8cc7 100644
--- a/src/statemachineqml/childrenprivate_p.h
+++ b/src/statemachineqml/childrenprivate_p.h
@@ -119,7 +119,7 @@ public:
static qsizetype count(QQmlListProperty<QObject> *prop)
{
- return static_cast<Self *>(prop->data)->children.count();
+ return static_cast<Self *>(prop->data)->children.size();
}
static QObject *at(QQmlListProperty<QObject> *prop, qsizetype index)
diff --git a/src/statemachineqml/signaltransition.cpp b/src/statemachineqml/signaltransition.cpp
index caf6217..4a9c627 100644
--- a/src/statemachineqml/signaltransition.cpp
+++ b/src/statemachineqml/signaltransition.cpp
@@ -37,7 +37,7 @@ bool SignalTransition::eventTest(QEvent *event)
QStateMachine::SignalEvent *e = static_cast<QStateMachine::SignalEvent*>(event);
// Set arguments as context properties
- int count = e->arguments().count();
+ int count = e->arguments().size();
QMetaMethod metaMethod = e->sender()->metaObject()->method(e->signalIndex());
const auto parameterNames = metaMethod.parameterNames();
for (int i = 0; i < count; i++)
@@ -61,7 +61,7 @@ void SignalTransition::onTransition(QEvent *event)
QVarLengthArray<QMetaType, 2> argTypes;
QVariantList eventArguments = e->arguments();
- const int argCount = eventArguments.length();
+ const int argCount = eventArguments.size();
argValues.reserve(argCount + 1);
argTypes.reserve(argCount + 1);
@@ -159,7 +159,7 @@ void SignalTransition::connectTriggered()
QQmlData *ddata = QQmlData::get(this);
QQmlRefPointer<QQmlContextData> ctxtdata = ddata ? ddata->outerContext : nullptr;
- Q_ASSERT(m_bindings.count() == 1);
+ Q_ASSERT(m_bindings.size() == 1);
const QV4::CompiledData::Binding *binding = m_bindings.at(0);
Q_ASSERT(binding->type() == QV4::CompiledData::Binding::Type_Script);
@@ -185,7 +185,7 @@ void SignalTransition::connectTriggered()
void SignalTransitionParser::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);
QString propName = compilationUnit->stringAt(binding->propertyNameIndex);
diff --git a/tests/auto/compiled/tst_compiled.cpp b/tests/auto/compiled/tst_compiled.cpp
index d43f146..36e0f1a 100644
--- a/tests/auto/compiled/tst_compiled.cpp
+++ b/tests/auto/compiled/tst_compiled.cpp
@@ -236,14 +236,14 @@ void tst_Compiled::topMachine()
QObject::connect(&stateMachine, &QScxmlStateMachine::invokedServicesChanged,
[&invokableServicesCount](const QList<QScxmlInvokableService *> &services) {
- invokableServicesCount = services.count();
+ invokableServicesCount = services.size();
});
stateMachine.start();
QTRY_COMPARE(invokableServicesCount, 3);
QTRY_COMPARE(doneCounter, 3);
- QCOMPARE(stateMachine.invokedServices().count(), 3);
+ QCOMPARE(stateMachine.invokedServices().size(), 3);
QTRY_COMPARE(invokableServicesCount, 0);
}
@@ -261,14 +261,14 @@ void tst_Compiled::topMachineDynamic()
QObject::connect(stateMachine.data(), &QScxmlStateMachine::invokedServicesChanged,
[&invokableServicesCount](const QList<QScxmlInvokableService *> &services) {
- invokableServicesCount = services.count();
+ invokableServicesCount = services.size();
});
stateMachine->start();
QTRY_COMPARE(invokableServicesCount, 3);
QTRY_COMPARE(doneCounter, 3);
- QCOMPARE(stateMachine->invokedServices().count(), 3);
+ QCOMPARE(stateMachine->invokedServices().size(), 3);
QTRY_COMPARE(invokableServicesCount, 0);
}
diff --git a/tests/auto/dynamicmetaobject/tst_dynamicmetaobject.cpp b/tests/auto/dynamicmetaobject/tst_dynamicmetaobject.cpp
index 8185293..7fe0791 100644
--- a/tests/auto/dynamicmetaobject/tst_dynamicmetaobject.cpp
+++ b/tests/auto/dynamicmetaobject/tst_dynamicmetaobject.cpp
@@ -52,7 +52,7 @@ void tst_DynamicMetaObject::dynamicPartCheck()
QScopedPointer<QScxmlStateMachine> stateMachine(QScxmlStateMachine::fromFile(scxmlFileName));
QVERIFY(!stateMachine.isNull());
- QVERIFY(!stateMachine->parseErrors().count());
+ QVERIFY(!stateMachine->parseErrors().size());
const QMetaObject *metaObject = stateMachine->metaObject();
diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp
index 9e18792..2e757e9 100644
--- a/tests/auto/parser/tst_parser.cpp
+++ b/tests/auto/parser/tst_parser.cpp
@@ -49,14 +49,14 @@ void tst_Parser::error()
QVERIFY(!stateMachine.isNull());
const QList<QScxmlError> errors = stateMachine->parseErrors();
- if (errors.count() != expectedErrors.count()) {
+ if (errors.size() != expectedErrors.size()) {
for (const QScxmlError &error : errors) {
qDebug() << error.toString();
}
}
- QCOMPARE(errors.count(), expectedErrors.count());
+ QCOMPARE(errors.size(), expectedErrors.size());
- for (int i = 0; i < errors.count(); ++i)
+ for (int i = 0; i < errors.size(); ++i)
QCOMPARE(errors.at(i).toString(), expectedErrors.at(i));
}
diff --git a/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp b/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp
index e394646..c3c3501 100644
--- a/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp
+++ b/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp
@@ -79,24 +79,24 @@ void tst_scxmlqmlcpp::invokedServicesChildrenBinding()
TopMachine topSm;
QScxmlInvokedServices invokedServices;
invokedServices.setStateMachine(&topSm);
- QCOMPARE(invokedServices.children().count(), 0);
- QCOMPARE(topSm.invokedServices().count(), 0);
+ QCOMPARE(invokedServices.children().size(), 0);
+ QCOMPARE(topSm.invokedServices().size(), 0);
// at some point during the topSm execution there are 3 invoked services
// of the same name ('3' filters out as '1' at QML binding)
topSm.start();
- QTRY_COMPARE(topSm.invokedServices().count(), 3);
- QCOMPARE(invokedServices.children().count(), 1);
+ QTRY_COMPARE(topSm.invokedServices().size(), 3);
+ QCOMPARE(invokedServices.children().size(), 1);
// after completion invoked services drop back to 0
- QTRY_COMPARE(topSm.invokedServices().count(), 0);
- QCOMPARE(invokedServices.children().count(), 0);
+ QTRY_COMPARE(topSm.invokedServices().size(), 0);
+ QCOMPARE(invokedServices.children().size(), 0);
// bind *to* the invokedservices property and check that we observe same changes
// during the topSm execution
QProperty<qsizetype> serviceCounter;
- serviceCounter.setBinding([&](){ return invokedServices.children().count(); });
+ serviceCounter.setBinding([&](){ return invokedServices.children().size(); });
QCOMPARE(serviceCounter, 0);
topSm.start();
QTRY_COMPARE(serviceCounter, 1);
- QCOMPARE(topSm.invokedServices().count(), 3);
+ QCOMPARE(topSm.invokedServices().size(), 3);
}
void tst_scxmlqmlcpp::stateMachineLoaderInitialValuesBinding()
@@ -144,7 +144,7 @@ void tst_scxmlqmlcpp::stateMachineLoaderSourceStateMachineBinding()
"Cannot open '" + sourceNonexistent.toString() + "' for reading."));
sml->setSource(sourceNonexistent);
QVERIFY(sml->stateMachine() == nullptr);
- QCOMPARE(smSpy.count(), 1);
+ QCOMPARE(smSpy.size(), 1);
QString sourceBrokenNoScheme;
if (sourceBroken.scheme() == QStringLiteral("qrc"))
@@ -163,12 +163,12 @@ void tst_scxmlqmlcpp::stateMachineLoaderSourceStateMachineBinding()
"went wrong while parsing '" + sourceBroken.toString() + "':\n"));
sml->setSource(sourceBroken);
QVERIFY(sml->stateMachine() == nullptr);
- QCOMPARE(smSpy.count(), 1);
+ QCOMPARE(smSpy.size(), 1);
QProperty<bool> hasStateMachine([&](){ return sml->stateMachine() ? true : false; });
QVERIFY(hasStateMachine == false);
sml->setSource(source1);
- QCOMPARE(smSpy.count(), 2);
+ QCOMPARE(smSpy.size(), 2);
QVERIFY(hasStateMachine == true);
}
diff --git a/tests/auto/qstatemachine/qstate/tst_qstate.cpp b/tests/auto/qstatemachine/qstate/tst_qstate.cpp
index 6d38be7..77f6641 100644
--- a/tests/auto/qstatemachine/qstate/tst_qstate.cpp
+++ b/tests/auto/qstatemachine/qstate/tst_qstate.cpp
@@ -169,7 +169,7 @@ void tst_QState::transitions()
QAbstractTransition *t1_1 = s1.addTransition(this, &tst_QState::destroyed, &s2);
QVERIFY(t1 != 0);
QVERIFY(t1_1 != 0);
- QCOMPARE(s1.transitions().count(), 2);
+ QCOMPARE(s1.transitions().size(), 2);
QCOMPARE(s1.transitions().first(), t1);
QCOMPARE(s1.transitions().last(), t1_1);
QVERIFY(s2.transitions().isEmpty());
@@ -179,11 +179,11 @@ void tst_QState::transitions()
QVERIFY(s1.transitions().isEmpty());
s1.addTransition(t1);
- QCOMPARE(s1.transitions().count(), 1);
+ QCOMPARE(s1.transitions().size(), 1);
QCOMPARE(s1.transitions().first(), t1);
QAbstractTransition *t2 = new QEventTransition(&s1);
- QCOMPARE(s1.transitions().count(), 2);
+ QCOMPARE(s1.transitions().size(), 2);
QVERIFY(s1.transitions().contains(t1));
QVERIFY(s1.transitions().contains(t2));
@@ -191,7 +191,7 @@ void tst_QState::transitions()
QState *s21 = new QState(&s2);
QAbstractTransition *t3 = s21->addTransition(this, SIGNAL(destroyed()), &s2);
QVERIFY(s2.transitions().isEmpty());
- QCOMPARE(s21->transitions().count(), 1);
+ QCOMPARE(s21->transitions().size(), 1);
QCOMPARE(s21->transitions().first(), t3);
}
diff --git a/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp
index 6ecefe7..e3bd8a0 100644
--- a/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp
@@ -314,7 +314,7 @@ void tst_QStateMachine::transitionToRootState()
machine.start();
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(initialState));
TEST_ACTIVE_CHANGED(initialState, 1);
@@ -380,7 +380,7 @@ void tst_QStateMachine::transitionEntersParent()
QTRY_COMPARE(entryController->property("grandParentEntered").toBool(), false);
QTRY_COMPARE(entryController->property("parentEntered").toBool(), false);
QTRY_COMPARE(entryController->property("stateEntered").toBool(), false);
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(greatGrandParent));
QTRY_VERIFY(machine.configuration().contains(initialStateOfGreatGrandParent));
@@ -396,7 +396,7 @@ void tst_QStateMachine::transitionEntersParent()
QTRY_COMPARE(entryController->property("grandParentEntered").toBool(), true);
QTRY_COMPARE(entryController->property("parentEntered").toBool(), true);
QTRY_COMPARE(entryController->property("stateEntered").toBool(), true);
- QTRY_COMPARE(machine.configuration().count(), 4);
+ QTRY_COMPARE(machine.configuration().size(), 4);
QTRY_VERIFY(machine.configuration().contains(greatGrandParent));
QTRY_VERIFY(machine.configuration().contains(grandParent));
QTRY_VERIFY(machine.configuration().contains(parent));
@@ -472,17 +472,17 @@ void tst_QStateMachine::customGlobalErrorState()
machine.start();
QTRY_COMPARE(machine.errorState(), static_cast<QAbstractState*>(customErrorState));
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(initialState));
machine.postEvent(new QEvent(QEvent::Type(QEvent::User + 1)));
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(initialState));
QCoreApplication::processEvents();
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(customErrorState));
QTRY_COMPARE(customErrorState->error, QStateMachine::NoInitialStateError);
QTRY_COMPARE(customErrorState->errorString, QString::fromLatin1("Missing initial state in compound state 'brokenState'"));
@@ -518,7 +518,7 @@ void tst_QStateMachine::customLocalErrorStateInBrokenState()
QCoreApplication::processEvents();
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(customErrorState));
QTRY_COMPARE(customErrorState->error, QStateMachine::NoInitialStateError);
}
@@ -588,7 +588,7 @@ void tst_QStateMachine::customLocalErrorStateInParentOfBrokenState()
QCoreApplication::processEvents();
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(customErrorState));
}
@@ -627,7 +627,7 @@ void tst_QStateMachine::customLocalErrorStateOverridesParent()
machine.postEvent(new QEvent(QEvent::Type(QEvent::User + 1)));
QCoreApplication::processEvents();
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(customErrorStateForBrokenState));
QTRY_COMPARE(customErrorStateForBrokenState->error, QStateMachine::NoInitialStateError);
QTRY_COMPARE(customErrorStateForParent->error, QStateMachine::NoError);
@@ -667,7 +667,7 @@ void tst_QStateMachine::errorStateHasChildren()
QCoreApplication::processEvents();
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(customErrorState));
QTRY_VERIFY(machine.configuration().contains(childOfErrorState));
}
@@ -789,7 +789,7 @@ void tst_QStateMachine::errorStateEntersParentFirst()
QTRY_COMPARE(entryController->property("grandParentEntered").toBool(), false);
QTRY_COMPARE(entryController->property("parentEntered").toBool(), false);
QTRY_COMPARE(entryController->property("errorStateEntered").toBool(), false);
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(greatGrandParent));
QTRY_VERIFY(machine.configuration().contains(initialStateOfGreatGrandParent));
@@ -805,7 +805,7 @@ void tst_QStateMachine::errorStateEntersParentFirst()
QTRY_COMPARE(entryController->property("grandParentEntered").toBool(), true);
QTRY_COMPARE(entryController->property("parentEntered").toBool(), true);
QTRY_COMPARE(entryController->property("errorStateEntered").toBool(), true);
- QTRY_COMPARE(machine.configuration().count(), 4);
+ QTRY_COMPARE(machine.configuration().size(), 4);
QTRY_VERIFY(machine.configuration().contains(greatGrandParent));
QTRY_VERIFY(machine.configuration().contains(grandParent));
QTRY_VERIFY(machine.configuration().contains(parent));
@@ -922,7 +922,7 @@ void tst_QStateMachine::historyStateHasNowhereToGo()
QCoreApplication::processEvents();
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(machine.errorState()));
QTRY_COMPARE(machine.error(), QStateMachine::NoDefaultStateInHistoryStateError);
QTRY_COMPARE(machine.errorString(), QString::fromLatin1("Missing default state in history state 'historyState'"));
@@ -950,15 +950,15 @@ void tst_QStateMachine::historyStateAfterRestart()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QTRY_VERIFY(startedSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(s1));
// s1 -> s2h -> s21 (default state)
machine.postEvent(new QEvent(QEvent::User));
QCoreApplication::processEvents();
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(s2));
// This used to fail on the 2nd run because the
// history had not been cleared.
@@ -967,27 +967,27 @@ void tst_QStateMachine::historyStateAfterRestart()
// s21 -> s22
machine.postEvent(new QEvent(QEvent::User));
QCoreApplication::processEvents();
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(s2));
QTRY_VERIFY(machine.configuration().contains(s22));
// s2 -> s1 (s22 saved in s2h)
machine.postEvent(new QEvent(QEvent::User));
QCoreApplication::processEvents();
- QTRY_COMPARE(machine.configuration().count(), 1);
+ QTRY_COMPARE(machine.configuration().size(), 1);
QTRY_VERIFY(machine.configuration().contains(s1));
// s1 -> s2h -> s22 (saved state)
machine.postEvent(new QEvent(QEvent::User));
QCoreApplication::processEvents();
- QTRY_COMPARE(machine.configuration().count(), 2);
+ QTRY_COMPARE(machine.configuration().size(), 2);
QTRY_VERIFY(machine.configuration().contains(s2));
QTRY_VERIFY(machine.configuration().contains(s22));
QSignalSpy stoppedSpy(&machine, &QStateMachine::stopped);
QTRY_VERIFY(stoppedSpy.isValid());
machine.stop();
- QTRY_COMPARE(stoppedSpy.count(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
}
@@ -1306,36 +1306,36 @@ void tst_QStateMachine::stateEntryAndExit()
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
- QTRY_COMPARE(finishedSpy.count(), 1);
- QTRY_COMPARE(stoppedSpy.count(), 0);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 0);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s3));
// s1 is entered
- QCOMPARE(s1->events.count(), 2);
+ QCOMPARE(s1->events.size(), 2);
QCOMPARE(s1->events.at(0).first, 0);
QCOMPARE(s1->events.at(0).second, TestState::Entry);
// s1 is exited
QCOMPARE(s1->events.at(1).first, 1);
QCOMPARE(s1->events.at(1).second, TestState::Exit);
// t is triggered
- QCOMPARE(t->triggers.count(), 1);
+ QCOMPARE(t->triggers.size(), 1);
QCOMPARE(t->triggers.at(0), 2);
// s2 is entered
- QCOMPARE(s2->events.count(), 2);
+ QCOMPARE(s2->events.size(), 2);
QCOMPARE(s2->events.at(0).first, 3);
QCOMPARE(s2->events.at(0).second, TestState::Entry);
// s2 is exited
QCOMPARE(s2->events.at(1).first, 4);
QCOMPARE(s2->events.at(1).second, TestState::Exit);
- QCOMPARE(s1EnteredSpy.count(), 1);
- QCOMPARE(s1ExitedSpy.count(), 1);
- QCOMPARE(tTriggeredSpy.count(), 1);
- QCOMPARE(s2EnteredSpy.count(), 1);
- QCOMPARE(s2ExitedSpy.count(), 1);
+ QCOMPARE(s1EnteredSpy.size(), 1);
+ QCOMPARE(s1ExitedSpy.size(), 1);
+ QCOMPARE(tTriggeredSpy.size(), 1);
+ QCOMPARE(s2EnteredSpy.size(), 1);
+ QCOMPARE(s2ExitedSpy.size(), 1);
}
// Two top-level states, one has two child states
{
@@ -1364,28 +1364,28 @@ void tst_QStateMachine::stateEntryAndExit()
globalTick = 0;
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s3));
// s1 is entered
- QCOMPARE(s1->events.count(), 2);
+ QCOMPARE(s1->events.size(), 2);
QCOMPARE(s1->events.at(0).first, 0);
QCOMPARE(s1->events.at(0).second, TestState::Entry);
// s11 is entered
- QCOMPARE(s11->events.count(), 2);
+ QCOMPARE(s11->events.size(), 2);
QCOMPARE(s11->events.at(0).first, 1);
QCOMPARE(s11->events.at(0).second, TestState::Entry);
// s11 is exited
QCOMPARE(s11->events.at(1).first, 2);
QCOMPARE(s11->events.at(1).second, TestState::Exit);
// t1 is triggered
- QCOMPARE(t1->triggers.count(), 1);
+ QCOMPARE(t1->triggers.size(), 1);
QCOMPARE(t1->triggers.at(0), 3);
// s12 is entered
- QCOMPARE(s12->events.count(), 2);
+ QCOMPARE(s12->events.size(), 2);
QCOMPARE(s12->events.at(0).first, 4);
QCOMPARE(s12->events.at(0).second, TestState::Entry);
// s12 is exited
@@ -1395,10 +1395,10 @@ void tst_QStateMachine::stateEntryAndExit()
QCOMPARE(s1->events.at(1).first, 6);
QCOMPARE(s1->events.at(1).second, TestState::Exit);
// t2 is triggered
- QCOMPARE(t2->triggers.count(), 1);
+ QCOMPARE(t2->triggers.size(), 1);
QCOMPARE(t2->triggers.at(0), 7);
// s2 is entered
- QCOMPARE(s2->events.count(), 2);
+ QCOMPARE(s2->events.size(), 2);
QCOMPARE(s2->events.at(0).first, 8);
QCOMPARE(s2->events.at(0).second, TestState::Entry);
// s2 is exited
@@ -1440,7 +1440,7 @@ void tst_QStateMachine::assignProperty()
QSignalSpy propertiesAssignedSpy(s1, &QState::propertiesAssigned);
QVERIFY(propertiesAssignedSpy.isValid());
machine.start();
- QTRY_COMPARE(propertiesAssignedSpy.count(), 1);
+ QTRY_COMPARE(propertiesAssignedSpy.size(), 1);
TEST_ACTIVE_CHANGED(s1, 8);
}
@@ -1504,7 +1504,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(obj.property("foo").toInt(), 456);
QCOMPARE(obj.property("bar").toInt(), 789);
@@ -1540,7 +1540,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(obj.property("foo").toInt(), 456);
QCOMPARE(obj.property("bar").toInt(), 789);
@@ -1576,7 +1576,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(obj.property("foo").toInt(), 456);
QCOMPARE(obj.property("bar").toInt(), 654);
@@ -1635,7 +1635,7 @@ void tst_QStateMachine::assignPropertyWithAnimation()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(obj.property("foo").toInt(), 321);
QCOMPARE(obj.property("bar").toInt(), 789);
@@ -1773,7 +1773,7 @@ void tst_QStateMachine::postEvent()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
@@ -1785,7 +1785,7 @@ void tst_QStateMachine::postEvent()
s1->addTransition(new StringTransition("b", s3));
finishedSpy.clear();
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s3));
TEST_ACTIVE_CHANGED(s1, 4);
@@ -1809,7 +1809,7 @@ void tst_QStateMachine::cancelDelayedEvent()
QVERIFY(startedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
@@ -1829,7 +1829,7 @@ void tst_QStateMachine::cancelDelayedEvent()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 2);
QCOMPARE(machine.configuration().size(), 1);
@@ -1850,7 +1850,7 @@ void tst_QStateMachine::postDelayedEventAndStop()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QVERIFY(startedSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
@@ -1861,14 +1861,14 @@ void tst_QStateMachine::postDelayedEventAndStop()
QSignalSpy stoppedSpy(&machine, &QStateMachine::stopped);
QVERIFY(stoppedSpy.isValid());
machine.stop();
- QTRY_COMPARE(stoppedSpy.count(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.start();
- QTRY_COMPARE(startedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 3);
QCOMPARE(machine.configuration().size(), 1);
@@ -1877,11 +1877,11 @@ void tst_QStateMachine::postDelayedEventAndStop()
int id2 = machine.postDelayedEvent(new StringEvent("a"), 1000);
QVERIFY(id2 != -1);
machine.stop();
- QTRY_COMPARE(stoppedSpy.count(), 2);
+ QTRY_COMPARE(stoppedSpy.size(), 2);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 3);
machine.start();
- QTRY_COMPARE(startedSpy.count(), 3);
+ QTRY_COMPARE(startedSpy.size(), 3);
TEST_RUNNING_CHANGED(true);
QTestEventLoop::instance().enterLoop(2);
QCOMPARE(machine.configuration().size(), 1);
@@ -1936,7 +1936,7 @@ void tst_QStateMachine::postDelayedEventFromThread()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s1, 2);
QVERIFY(poster.firstEventWasCancelled);
@@ -1953,15 +1953,15 @@ void tst_QStateMachine::stopAndPostEvent()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QVERIFY(startedSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 1);
QSignalSpy stoppedSpy(&machine, &QStateMachine::stopped);
QVERIFY(stoppedSpy.isValid());
machine.stop();
- QCOMPARE(stoppedSpy.count(), 0);
+ QCOMPARE(stoppedSpy.size(), 0);
machine.postEvent(new QEvent(QEvent::User));
- QTRY_COMPARE(stoppedSpy.count(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 1);
QCoreApplication::processEvents();
@@ -1985,7 +1985,7 @@ void tst_QStateMachine::stateFinished()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s1, 2);
TEST_ACTIVE_CHANGED(s1_1, 2);
@@ -2029,17 +2029,17 @@ void tst_QStateMachine::parallelStates()
QVERIFY(finishedSpy.isValid());
globalTick = 0;
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
- QCOMPARE(s1->events.count(), 2);
+ QCOMPARE(s1->events.size(), 2);
// s1 is entered
QCOMPARE(s1->events.at(0).first, 0);
QCOMPARE(s1->events.at(0).second, TestState::Entry);
// s1_1 is entered
- QCOMPARE(s1_1->events.count(), 2);
+ QCOMPARE(s1_1->events.size(), 2);
QCOMPARE(s1_1->events.at(0).first, 1);
QCOMPARE(s1_1->events.at(0).second, TestState::Entry);
// s1_2 is entered
@@ -2082,13 +2082,13 @@ void tst_QStateMachine::parallelRootState()
machine.start();
QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: "
"Child mode of state machine '' is not 'ExclusiveStates'.");
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
QCOMPARE(machine.configuration().size(), 4);
QVERIFY(machine.configuration().contains(s1));
QVERIFY(machine.configuration().contains(s1_f));
QVERIFY(machine.configuration().contains(s2));
QVERIFY(machine.configuration().contains(s2_f));
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s1, 1);
TEST_ACTIVE_CHANGED(s2, 1);
@@ -2224,7 +2224,7 @@ void tst_QStateMachine::allSourceToTargetConfigurations()
TEST_ACTIVE_CHANGED(s21, 8);
TEST_ACTIVE_CHANGED(s211, 8);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
@@ -2323,7 +2323,7 @@ void tst_QStateMachine::signalTransitions()
emitter.emitSignalWithNoArg();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 2);
emitter.emitSignalWithNoArg();
@@ -2333,7 +2333,7 @@ void tst_QStateMachine::signalTransitions()
machine.start();
QCoreApplication::processEvents();
emitter.emitSignalWithIntArg(123);
- QTRY_COMPARE(finishedSpy.count(), 2);
+ QTRY_COMPARE(finishedSpy.size(), 2);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 4);
@@ -2342,7 +2342,7 @@ void tst_QStateMachine::signalTransitions()
trans->setSignal(SIGNAL(signalWithNoArg()));
QCOMPARE(trans->signal(), QByteArray(SIGNAL(signalWithNoArg())));
emitter.emitSignalWithNoArg();
- QTRY_COMPARE(finishedSpy.count(), 3);
+ QTRY_COMPARE(finishedSpy.size(), 3);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 6);
@@ -2351,7 +2351,7 @@ void tst_QStateMachine::signalTransitions()
QCoreApplication::processEvents();
trans->setSenderObject(&emitter2);
emitter2.emitSignalWithNoArg();
- QTRY_COMPARE(finishedSpy.count(), 4);
+ QTRY_COMPARE(finishedSpy.size(), 4);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 8);
@@ -2387,7 +2387,7 @@ void tst_QStateMachine::signalTransitions()
TEST_ACTIVE_CHANGED(s0, 1);
emitter.emitSignalWithNoArg();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 2);
@@ -2397,7 +2397,7 @@ void tst_QStateMachine::signalTransitions()
QCoreApplication::processEvents();
TEST_ACTIVE_CHANGED(s0, 3);
emitter.emitSignalWithIntArg(123);
- QTRY_COMPARE(finishedSpy.count(), 2);
+ QTRY_COMPARE(finishedSpy.size(), 2);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 4);
}
@@ -2420,7 +2420,7 @@ void tst_QStateMachine::signalTransitions()
TEST_ACTIVE_CHANGED(s0, 1);
emitter.emitSignalWithIntArg(123);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 2);
QCOMPARE(trans->eventTestSenderReceived(), (QObject*)&emitter);
@@ -2453,7 +2453,7 @@ void tst_QStateMachine::signalTransitions()
QString testString = QString::fromLatin1("hello");
emitter.emitSignalWithStringArg(testString);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 2);
QCOMPARE(trans->eventTestSenderReceived(), (QObject*)&emitter);
@@ -2494,7 +2494,7 @@ void tst_QStateMachine::signalTransitions()
emitter.emitSignalWithNoArg();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s0, 2);
}
@@ -2582,22 +2582,22 @@ void tst_QStateMachine::signalTransitions()
machine.start();
TEST_ACTIVE_CHANGED(s0, 1);
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
emitter.emitSignalWithNoArg();
TEST_ACTIVE_CHANGED(s0, 2);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.start();
TEST_ACTIVE_CHANGED(s0, 3);
- QTRY_COMPARE(startedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
TEST_RUNNING_CHANGED(true);
emitter.emitSignalWithIntArg(123);
TEST_ACTIVE_CHANGED(s0, 4);
- QTRY_COMPARE(finishedSpy.count(), 2);
+ QTRY_COMPARE(finishedSpy.size(), 2);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
@@ -2605,11 +2605,11 @@ void tst_QStateMachine::signalTransitions()
machine.start();
QCoreApplication::processEvents();
TEST_ACTIVE_CHANGED(s0, 5);
- QTRY_COMPARE(startedSpy.count(), 3);
+ QTRY_COMPARE(startedSpy.size(), 3);
TEST_RUNNING_CHANGED(true);
emitter.emitSignalWithStringArg("hello");
TEST_ACTIVE_CHANGED(s0, 6);
- QTRY_COMPARE(finishedSpy.count(), 3);
+ QTRY_COMPARE(finishedSpy.size(), 3);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s3));
@@ -2639,14 +2639,14 @@ void tst_QStateMachine::signalTransitions()
machine.start();
QCoreApplication::processEvents();
TEST_ACTIVE_CHANGED(s0, 1);
- QTRY_COMPARE(startedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(true);
emitter.emitSignalWithNoArg();
TEST_ACTIVE_CHANGED(s0, 2);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
}
@@ -2710,7 +2710,7 @@ void tst_QStateMachine::eventTransitions()
QCoreApplication::processEvents();
QTest::mousePress(&button, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QTest::mousePress(&button, Qt::LeftButton);
@@ -2720,14 +2720,14 @@ void tst_QStateMachine::eventTransitions()
machine.start();
QCoreApplication::processEvents();
QTest::mouseRelease(&button, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 2);
+ QTRY_COMPARE(finishedSpy.size(), 2);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
machine.start();
QCoreApplication::processEvents();
trans->setEventType(QEvent::MouseButtonPress);
QTest::mousePress(&button, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 3);
+ QTRY_COMPARE(finishedSpy.size(), 3);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QPushButton button2;
@@ -2735,7 +2735,7 @@ void tst_QStateMachine::eventTransitions()
QCoreApplication::processEvents();
trans->setEventSource(&button2);
QTest::mousePress(&button2, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 4);
+ QTRY_COMPARE(finishedSpy.size(), 4);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
for (int x = 0; x < 2; ++x) {
@@ -2771,7 +2771,7 @@ void tst_QStateMachine::eventTransitions()
QTest::mousePress(&button, Qt::LeftButton);
QCoreApplication::processEvents();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
{
@@ -2800,7 +2800,7 @@ void tst_QStateMachine::eventTransitions()
QTest::mousePress(&button, Qt::LeftButton);
QCoreApplication::processEvents();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
@@ -2827,7 +2827,7 @@ void tst_QStateMachine::eventTransitions()
QTest::keyPress(&button, Qt::Key_A);
QCoreApplication::processEvents();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
{
@@ -2857,7 +2857,7 @@ void tst_QStateMachine::eventTransitions()
QTest::keyPress(&button, Qt::Key_A);
QCoreApplication::processEvents();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
// Multiple transitions for same (object,event)
@@ -2931,19 +2931,19 @@ void tst_QStateMachine::eventTransitions()
machine.setInitialState(s0);
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
QTest::mousePress(&button, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.start();
- QTRY_COMPARE(startedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
TEST_RUNNING_CHANGED(true);
QTest::mouseRelease(&button, Qt::LeftButton);
- QTRY_COMPARE(finishedSpy.count(), 2);
+ QTRY_COMPARE(finishedSpy.size(), 2);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
@@ -2965,7 +2965,7 @@ void tst_QStateMachine::eventTransitions()
machine.setInitialState(s0);
machine.start();
QTest::ignoreMessage(QtWarningMsg, "QObject event transitions are not supported for custom types");
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
}
// custom transition
@@ -2991,7 +2991,7 @@ void tst_QStateMachine::eventTransitions()
QTest::mousePress(&button, Qt::LeftButton);
QCoreApplication::processEvents();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
QCOMPARE(trans->eventSourceReceived(), (QObject*)&button);
@@ -3019,12 +3019,12 @@ void tst_QStateMachine::graphicsSceneEventTransitions()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(true);
QGraphicsSceneMouseEvent mouseEvent(QEvent::GraphicsSceneMouseMove);
scene.sendEvent(textItem, &mouseEvent);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
}
#endif
@@ -3122,7 +3122,7 @@ void tst_QStateMachine::historyStates()
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
}
@@ -3143,16 +3143,16 @@ void tst_QStateMachine::startAndStop()
QVERIFY(!machine.isRunning());
QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start: No initial state set for machine. Refusing to start.");
machine.start();
- QCOMPARE(startedSpy.count(), 0);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(startedSpy.size(), 0);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
+ QCOMPARE(runningSpy.size(), 0);
QVERIFY(!machine.isRunning());
machine.stop();
- QCOMPARE(startedSpy.count(), 0);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(startedSpy.size(), 0);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
+ QCOMPARE(runningSpy.size(), 0);
QState *s1 = new QState(&machine);
DEFINE_ACTIVE_SPY(s1);
@@ -3160,34 +3160,34 @@ void tst_QStateMachine::startAndStop()
machine.start();
TEST_ACTIVE_CHANGED(s1, 1);
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(startedSpy.count(), 1);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(true);
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start(): already running");
machine.start();
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(runningSpy.size(), 0);
machine.stop();
TEST_ACTIVE_CHANGED(s1, 1);
QTRY_COMPARE(machine.isRunning(), false);
- QTRY_COMPARE(stoppedSpy.count(), 1);
- QCOMPARE(startedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
+ QCOMPARE(startedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(false);
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.start();
TEST_ACTIVE_CHANGED(s1, 3);
machine.stop();
TEST_ACTIVE_CHANGED(s1, 3);
- QTRY_COMPARE(startedSpy.count(), 2);
- QTRY_COMPARE(stoppedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
+ QTRY_COMPARE(stoppedSpy.size(), 2);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
@@ -3207,16 +3207,16 @@ void tst_QStateMachine::setRunning()
QVERIFY(!machine.isRunning());
QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start: No initial state set for machine. Refusing to start.");
machine.setRunning(true);
- QCOMPARE(startedSpy.count(), 0);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(startedSpy.size(), 0);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
+ QCOMPARE(runningSpy.size(), 0);
QVERIFY(!machine.isRunning());
machine.setRunning(false);
- QCOMPARE(startedSpy.count(), 0);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(startedSpy.size(), 0);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
+ QCOMPARE(runningSpy.size(), 0);
QState *s1 = new QState(&machine);
DEFINE_ACTIVE_SPY(s1);
@@ -3224,38 +3224,38 @@ void tst_QStateMachine::setRunning()
machine.setRunning(true);
TEST_ACTIVE_CHANGED(s1, 1);
QTRY_COMPARE(machine.isRunning(), true);
- QTRY_COMPARE(startedSpy.count(), 1);
- QCOMPARE(stoppedSpy.count(), 0);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(startedSpy.size(), 1);
+ QCOMPARE(stoppedSpy.size(), 0);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(true);
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
QTest::ignoreMessage(QtWarningMsg, "QStateMachine::start(): already running");
machine.setRunning(true);
TEST_ACTIVE_CHANGED(s1, 1);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(runningSpy.size(), 0);
machine.setRunning(false);
TEST_ACTIVE_CHANGED(s1, 1);
QTRY_COMPARE(machine.isRunning(), false);
- QTRY_COMPARE(stoppedSpy.count(), 1);
- QCOMPARE(startedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
+ QCOMPARE(startedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(false);
- QCOMPARE(machine.configuration().count(), 1);
+ QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.setRunning(false);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(runningSpy.size(), 0);
TEST_ACTIVE_CHANGED(s1, 1);
machine.start();
TEST_ACTIVE_CHANGED(s1, 3);
machine.setRunning(false);
TEST_ACTIVE_CHANGED(s1, 3);
- QTRY_COMPARE(startedSpy.count(), 2);
- QTRY_COMPARE(stoppedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
+ QTRY_COMPARE(stoppedSpy.size(), 2);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QState *s1_1 = new QState(s1);
QFinalState *s1_2 = new QFinalState(s1);
@@ -3264,13 +3264,13 @@ void tst_QStateMachine::setRunning()
QFinalState *s2 = new QFinalState(&machine);
s1->addTransition(s1, SIGNAL(finished()), s2);
machine.setRunning(false);
- QCOMPARE(runningSpy.count(), 0);
+ QCOMPARE(runningSpy.size(), 0);
machine.setRunning(true);
TEST_ACTIVE_CHANGED(s1, 6);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
- QTRY_COMPARE(startedSpy.count(), 3);
- QCOMPARE(stoppedSpy.count(), 2);
- QCOMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 3);
+ QCOMPARE(stoppedSpy.size(), 2);
+ QCOMPARE(finishedSpy.size(), 1);
}
void tst_QStateMachine::targetStateWithNoParent()
@@ -3296,10 +3296,10 @@ void tst_QStateMachine::targetStateWithNoParent()
QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: "
"Child mode of state machine '' is not 'ExclusiveStates'.");
TEST_ACTIVE_CHANGED(s1, 2);
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
QCOMPARE(machine.isRunning(), false);
- QCOMPARE(stoppedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QCOMPARE(stoppedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(machine.error(), QStateMachine::StateMachineChildModeSetToParallelError);
}
@@ -3867,13 +3867,13 @@ void tst_QStateMachine::propertiesAssignedSignalTransitionsReuseAnimationGroup()
TEST_ACTIVE_CHANGED(s1, 2);
TEST_ACTIVE_CHANGED(s2, 2);
TEST_ACTIVE_CHANGED(s3, 2);
- QTRY_COMPARE(machineFinishedSpy.count(), 1);
+ QTRY_COMPARE(machineFinishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QVERIFY(!machine.isRunning());
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s4));
QCOMPARE(object->property("foo").toInt(), 789);
- QCOMPARE(animationFinishedSpy.count(), 2);
+ QCOMPARE(animationFinishedSpy.size(), 2);
}
@@ -4536,9 +4536,9 @@ void tst_QStateMachine::nestedStateMachines()
QVERIFY(finishedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
- QTRY_COMPARE(machine.configuration().count(), 1+2*3);
+ QTRY_COMPARE(machine.configuration().size(), 1+2*3);
QVERIFY(machine.configuration().contains(group));
for (int i = 0; i < 3; ++i)
QVERIFY(machine.configuration().contains(subMachines[i]));
@@ -4549,7 +4549,7 @@ void tst_QStateMachine::nestedStateMachines()
for (int i = 0; i < 3; ++i)
subMachines[i]->postEvent(new QEvent(QEvent::User));
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(group, 2);
}
@@ -4565,7 +4565,7 @@ void tst_QStateMachine::goToState()
QSignalSpy runningSpy(&machine, &QStateMachine::runningChanged);
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
QStateMachinePrivate::get(&machine)->goToState(s2);
@@ -4607,7 +4607,7 @@ void tst_QStateMachine::goToStateFromSourceWithTransition()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QVERIFY(startedSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
QStateMachinePrivate::get(&machine)->goToState(s2);
@@ -4652,7 +4652,7 @@ void tst_QStateMachine::clonedSignals()
QSignalSpy transitionSpy(t1, &CloneSignalTransition::triggered);
emitter.emitSignalWithDefaultArg();
- QTRY_COMPARE(transitionSpy.count(), 1);
+ QTRY_COMPARE(transitionSpy.size(), 1);
QCOMPARE(t1->eventSignalIndex, emitter.metaObject()->indexOfSignal("signalWithDefaultArg()"));
TEST_ACTIVE_CHANGED(s1, 2);
@@ -4707,7 +4707,7 @@ void tst_QStateMachine::postEventFromOtherThread()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
@@ -4772,9 +4772,9 @@ void tst_QStateMachine::stopInTransitionToFinalState()
QVERIFY(runningSpy.isValid());
machine.start();
// Stopping should take precedence over finished.
- QTRY_COMPARE(stoppedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
- QCOMPARE(s2EnteredSpy.count(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
+ QCOMPARE(s2EnteredSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s2));
@@ -4817,7 +4817,7 @@ void tst_QStateMachine::stopInEventTest()
QVERIFY(startedSpy.isValid());
machine.start();
TEST_ACTIVE_CHANGED(s1, 1);
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
QSignalSpy stoppedSpy(&machine, &QStateMachine::stopped);
@@ -4826,8 +4826,8 @@ void tst_QStateMachine::stopInEventTest()
QVERIFY(finishedSpy.isValid());
machine.postEvent(new QEvent(QEvent::User), QStateMachine::EventPriority(eventPriority));
- QTRY_COMPARE(stoppedSpy.count(), 1);
- QCOMPARE(finishedSpy.count(), 0);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
+ QCOMPARE(finishedSpy.size(), 0);
TEST_RUNNING_CHANGED(false);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
@@ -4867,7 +4867,7 @@ void tst_QStateMachine::testIncrementReceivers()
QMetaObject::invokeMethod(&testObject, "mySignal", Qt::QueuedConnection);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
QCOMPARE(testObject.signalList.size(), 1);
QCOMPARE(testObject.signalList.at(0), QMetaMethod::fromSignal(&IncrementReceiversTest::mySignal));
@@ -4890,7 +4890,7 @@ void tst_QStateMachine::initialStateIsEnteredBeforeStartedEmitted()
QVERIFY(runningSpy.isValid());
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s1, 2);
}
@@ -5063,25 +5063,25 @@ void tst_QStateMachine::transitionWithNoTarget()
machine.start();
QTRY_VERIFY(machine.configuration().contains(s1));
- QCOMPARE(s1EnteredSpy.count(), 1);
- QCOMPARE(s1ExitedSpy.count(), 0);
- QCOMPARE(t1TriggeredSpy.count(), 0);
+ QCOMPARE(s1EnteredSpy.size(), 1);
+ QCOMPARE(s1ExitedSpy.size(), 0);
+ QCOMPARE(t1TriggeredSpy.size(), 0);
QCOMPARE(object->property("a").toInt(), 2);
object->setProperty("a", 3);
machine.postEvent(new QEvent(QEvent::User));
- QTRY_COMPARE(t1TriggeredSpy.count(), 1);
- QCOMPARE(s1EnteredSpy.count(), 1);
- QCOMPARE(s1ExitedSpy.count(), 0);
+ QTRY_COMPARE(t1TriggeredSpy.size(), 1);
+ QCOMPARE(s1EnteredSpy.size(), 1);
+ QCOMPARE(s1ExitedSpy.size(), 0);
// the assignProperty should not be re-executed, nor should the old value
// be restored
QCOMPARE(object->property("a").toInt(), 3);
machine.postEvent(new QEvent(QEvent::User));
- QTRY_COMPARE(t1TriggeredSpy.count(), 2);
- QCOMPARE(s1EnteredSpy.count(), 1);
- QCOMPARE(s1ExitedSpy.count(), 0);
+ QTRY_COMPARE(t1TriggeredSpy.size(), 2);
+ QCOMPARE(s1EnteredSpy.size(), 1);
+ QCOMPARE(s1ExitedSpy.size(), 0);
QCOMPARE(object->property("a").toInt(), 3);
delete object;
@@ -5099,7 +5099,7 @@ void tst_QStateMachine::initialStateIsFinal()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
machine.start();
QTRY_VERIFY(machine.configuration().contains(f));
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
}
@@ -6094,13 +6094,13 @@ void tst_QStateMachine::signalTransitionSenderInDifferentThread2()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
emitter.emitSignalWithNoArg();
// The second emission should not get "lost".
emitter.emitSignalWithDefaultArg();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
thread.quit();
@@ -6505,9 +6505,9 @@ void tst_QStateMachine::conflictingTransition2()
QTRY_COMPARE(machine.configuration().contains(&p0s3), true);
QTRY_COMPARE(machine.configuration().contains(&s1), false);
- QCOMPARE(t1Spy.count(), 0);
- QCOMPARE(t2Spy.count(), 0);
- QCOMPARE(t3Spy.count(), 0);
+ QCOMPARE(t1Spy.size(), 0);
+ QCOMPARE(t2Spy.size(), 0);
+ QCOMPARE(t3Spy.size(), 0);
emitter.emitSignalWithNoArg();
@@ -6518,9 +6518,9 @@ void tst_QStateMachine::conflictingTransition2()
QTRY_COMPARE(machine.configuration().contains(&p0s3), true);
QTRY_COMPARE(machine.configuration().contains(&s1), false);
- QCOMPARE(t1Spy.count(), 1);
- QCOMPARE(t2Spy.count(), 1);
- QCOMPARE(t3Spy.count(), 0); // t3 got preempted by t2
+ QCOMPARE(t1Spy.size(), 1);
+ QCOMPARE(t2Spy.size(), 1);
+ QCOMPARE(t3Spy.size(), 0); // t3 got preempted by t2
QVERIFY(machine.isRunning());
}
@@ -6672,8 +6672,8 @@ void tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunning()
machine.start();
QSignalSpy emittedSpy(&emitter, &SignalEmitter::signalWithNoArg);
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
- QTRY_COMPARE_WITH_TIMEOUT(emittedSpy.count(), 2, 100);
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(emittedSpy.size(), 2, 100);
+ QTRY_COMPARE(finishedSpy.size(), 1);
QTRY_VERIFY(emitter.thread.isFinished());
}
@@ -6696,7 +6696,7 @@ void tst_QStateMachine::cancelDelayedEventWithChrono()
QVERIFY(startedSpy.isValid());
QVERIFY(runningSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
@@ -6716,7 +6716,7 @@ void tst_QStateMachine::cancelDelayedEventWithChrono()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 2);
QCOMPARE(machine.configuration().size(), 1);
@@ -6739,7 +6739,7 @@ void tst_QStateMachine::postDelayedEventWithChronoAndStop()
QSignalSpy startedSpy(&machine, &QStateMachine::started);
QVERIFY(startedSpy.isValid());
machine.start();
- QTRY_COMPARE(startedSpy.count(), 1);
+ QTRY_COMPARE(startedSpy.size(), 1);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
@@ -6750,14 +6750,14 @@ void tst_QStateMachine::postDelayedEventWithChronoAndStop()
QSignalSpy stoppedSpy(&machine, &QStateMachine::stopped);
QVERIFY(stoppedSpy.isValid());
machine.stop();
- QTRY_COMPARE(stoppedSpy.count(), 1);
+ QTRY_COMPARE(stoppedSpy.size(), 1);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 1);
QCOMPARE(machine.configuration().size(), 1);
QVERIFY(machine.configuration().contains(s1));
machine.start();
- QTRY_COMPARE(startedSpy.count(), 2);
+ QTRY_COMPARE(startedSpy.size(), 2);
TEST_RUNNING_CHANGED(true);
TEST_ACTIVE_CHANGED(s1, 3);
QCOMPARE(machine.configuration().size(), 1);
@@ -6766,11 +6766,11 @@ void tst_QStateMachine::postDelayedEventWithChronoAndStop()
int id2 = machine.postDelayedEvent(new StringEvent("a"), std::chrono::seconds{1});
QVERIFY(id2 != -1);
machine.stop();
- QTRY_COMPARE(stoppedSpy.count(), 2);
+ QTRY_COMPARE(stoppedSpy.size(), 2);
TEST_RUNNING_CHANGED(false);
TEST_ACTIVE_CHANGED(s1, 3);
machine.start();
- QTRY_COMPARE(startedSpy.count(), 3);
+ QTRY_COMPARE(startedSpy.size(), 3);
TEST_RUNNING_CHANGED(true);
QTestEventLoop::instance().enterLoop(2);
QCOMPARE(machine.configuration().size(), 1);
@@ -6828,7 +6828,7 @@ void tst_QStateMachine::postDelayedEventWithChronoFromThread()
QSignalSpy finishedSpy(&machine, &QStateMachine::finished);
QVERIFY(finishedSpy.isValid());
machine.start();
- QTRY_COMPARE(finishedSpy.count(), 1);
+ QTRY_COMPARE(finishedSpy.size(), 1);
TEST_RUNNING_CHANGED_STARTED_STOPPED;
TEST_ACTIVE_CHANGED(s1, 2);
QVERIFY(poster.firstEventWasCancelled);
@@ -6904,9 +6904,9 @@ void tst_QStateMachine::bindings()
QVERIFY(!active);
machine.start();
// startState should get "enter/active == true" + "exit/active == false"
- QTRY_COMPARE(startState_activeSpy.count(), 2);
+ QTRY_COMPARE(startState_activeSpy.size(), 2);
// endState should get "enter/active == true"
- QTRY_COMPARE(endState_activeSpy.count(), 1);
+ QTRY_COMPARE(endState_activeSpy.size(), 1);
// Verify that the "active" value changed via binding
QVERIFY(active);
diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp
index 37cc42f..8764758 100644
--- a/tests/auto/scion/tst_scion.cpp
+++ b/tests/auto/scion/tst_scion.cpp
@@ -444,7 +444,7 @@ static int verifyEvent(const QList<QScxmlEvent> &receivedEvents, const QJsonObje
const QString invokeId = verifyInvokeId ? event.value(QLatin1String("invokeid")).toString()
: QString();
- while (position < receivedEvents.length()) {
+ while (position < receivedEvents.size()) {
const QScxmlEvent &receivedEvent = receivedEvents[position];
if ((verifyName && receivedEvent.name() != name)
|| (verifyEventType && receivedEvent.eventType() != eventType)
diff --git a/tests/auto/shared/bindableqmlutils.h b/tests/auto/shared/bindableqmlutils.h
index de80f44..1ce94ca 100644
--- a/tests/auto/shared/bindableqmlutils.h
+++ b/tests/auto/shared/bindableqmlutils.h
@@ -47,12 +47,12 @@ void testManipulableQmlListBasics(TestedClass& testedClass,
listRef.append(data1);
QVERIFY2(listRef.count() == 1, qPrintable(id));
if (changedSpy)
- QVERIFY2(changedSpy->count() == 1, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 1, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(listRef.at(0) == data1, qPrintable(id));
listRef.clear();
QVERIFY2(listRef.count() == 0, qPrintable(id));
if (changedSpy)
- QVERIFY2(changedSpy->count() == 2, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 2, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
// Bind to the property and verify that the bindings reflect the listproperty changes
QProperty<bool> data1InList([&](){
@@ -78,35 +78,35 @@ void testManipulableQmlListBasics(TestedClass& testedClass,
listRef.append(data1);
if (changedSpy)
- QVERIFY2(changedSpy->count() == 3, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 3, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(data1InList, qPrintable(id));
QVERIFY2(!data2InList, qPrintable(id));
listRef.append(data2);
if (changedSpy)
- QVERIFY2(changedSpy->count() == 4, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 4, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(data1InList, qPrintable(id));
QVERIFY2(data2InList, qPrintable(id));
- QVERIFY2(listRef.count() == 2, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(listRef.count() == 2, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
listRef.clear();
if (changedSpy)
- QVERIFY2(changedSpy->count() == 5, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 5, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(!data1InList, qPrintable(id));
QVERIFY2(!data2InList, qPrintable(id));
- QVERIFY2(listRef.count() == 0, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(listRef.count() == 0, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
listRef.append(data1);
listRef.replace(0, data2);
if (changedSpy)
- QVERIFY2(changedSpy->count() == 7, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 7, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(!data1InList, qPrintable(id));
QVERIFY2(data2InList, qPrintable(id));
- QVERIFY2(listRef.count() == 1, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(listRef.count() == 1, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
listRef.removeLast();
if (changedSpy)
- QVERIFY2(changedSpy->count() == 8, qPrintable(id + ", actual: " + QString::number(changedSpy->count())));
+ QVERIFY2(changedSpy->size() == 8, qPrintable(id + ", actual: " + QString::number(changedSpy->size())));
QVERIFY2(!data1InList, qPrintable(id));
QVERIFY2(!data2InList, qPrintable(id));
diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp
index eb43dc0..5b717e9 100644
--- a/tests/auto/statemachine/tst_statemachine.cpp
+++ b/tests/auto/statemachine/tst_statemachine.cpp
@@ -73,7 +73,7 @@ void tst_StateMachine::stateNames()
QScopedPointer<QScxmlStateMachine> stateMachine(QScxmlStateMachine::fromFile(scxmlFileName));
QVERIFY(!stateMachine.isNull());
- QCOMPARE(stateMachine->parseErrors().count(), 0);
+ QCOMPARE(stateMachine->parseErrors().size(), 0);
QCOMPARE(stateMachine->stateNames(compressed), expectedStates);
}
@@ -364,7 +364,7 @@ void tst_StateMachine::doneDotStateEvent()
stateMachine->start();
finishedSpy.wait(5000);
- QCOMPARE(finishedSpy.count(), 1);
+ QCOMPARE(finishedSpy.size(), 1);
QCOMPARE(stateMachine->activeStateNames(true).size(), 1);
QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success")));
}
@@ -381,12 +381,12 @@ void tst_StateMachine::running()
stateMachine->start();
- QCOMPARE(runningChangedSpy.count(), 1);
+ QCOMPARE(runningChangedSpy.size(), 1);
QCOMPARE(stateMachine->isRunning(), true);
stateMachine->stop();
- QCOMPARE(runningChangedSpy.count(), 2);
+ QCOMPARE(runningChangedSpy.size(), 2);
QCOMPARE(stateMachine->isRunning(), false);
}
@@ -401,7 +401,7 @@ void tst_StateMachine::invokeStateMachine()
QTRY_VERIFY(stateMachine->activeStateNames().contains(QString("anyplace")));
QList<QScxmlInvokableService *> services = stateMachine->invokedServices();
- QCOMPARE(services.length(), 1);
+ QCOMPARE(services.size(), 1);
QVariant subMachineVariant = services[0]->property("stateMachine");
QVERIFY(subMachineVariant.isValid());
QScxmlStateMachine *subMachine = qvariant_cast<QScxmlStateMachine *>(subMachineVariant);
@@ -420,7 +420,7 @@ void tst_StateMachine::multipleInvokableServices()
QCOMPARE(stateMachine->isRunning(), true);
finishedSpy.wait(5000);
- QCOMPARE(finishedSpy.count(), 1);
+ QCOMPARE(finishedSpy.size(), 1);
QCOMPARE(stateMachine->activeStateNames(true).size(), 1);
QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success")));
}
@@ -433,7 +433,7 @@ void tst_StateMachine::logWithoutExpr()
QTest::ignoreMessage(QtDebugMsg, "\"Hi2\" : \"\"");
stateMachine->start();
QSignalSpy logSpy(stateMachine.data(), SIGNAL(log(QString,QString)));
- QTRY_COMPARE(logSpy.count(), 1);
+ QTRY_COMPARE(logSpy.size(), 1);
}
void tst_StateMachine::bindings()
@@ -504,24 +504,24 @@ void tst_StateMachine::bindings()
// Test executes statemachine and observes as the invoked services change
TopMachine topSm;
QSignalSpy invokedSpy(&topSm, SIGNAL(invokedServicesChanged(const QList<QScxmlInvokableService *>)));
- QCOMPARE(topSm.invokedServices().count(), 0);
+ QCOMPARE(topSm.invokedServices().size(), 0);
// at some point during the topSm execution there are 3 invoked services
topSm.start();
- QTRY_COMPARE(topSm.invokedServices().count(), 3);
- QCOMPARE(invokedSpy.count(), 1);
+ QTRY_COMPARE(topSm.invokedServices().size(), 3);
+ QCOMPARE(invokedSpy.size(), 1);
// after completion invoked services drop back to 0
QTRY_COMPARE(topSm.isRunning(), false);
- QCOMPARE(topSm.invokedServices().count(), 0);
- QCOMPARE(invokedSpy.count(), 2);
+ QCOMPARE(topSm.invokedServices().size(), 0);
+ QCOMPARE(invokedSpy.size(), 2);
// bind *to* the invokedservices property and check that we observe same changes
// during the topSm execution
QProperty<qsizetype> invokedServicesObserver;
- invokedServicesObserver.setBinding([&](){ return topSm.invokedServices().count(); });
+ invokedServicesObserver.setBinding([&](){ return topSm.invokedServices().size(); });
QCOMPARE(invokedServicesObserver, 0);
topSm.start();
QTRY_COMPARE(invokedServicesObserver, 3);
- QCOMPARE(topSm.invokedServices().count(), 3);
- QCOMPARE(invokedSpy.count(), 3);
+ QCOMPARE(topSm.invokedServices().size(), 3);
+ QCOMPARE(invokedSpy.size(), 3);
// -- QScxmlDataModel::stateMachine
QScxmlNullDataModel dataModel1;
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp
index 3027912..419e5da 100644
--- a/tools/qscxmlc/generator.cpp
+++ b/tools/qscxmlc/generator.cpp
@@ -100,23 +100,23 @@ Generator::Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes,
static inline int lengthOfEscapeSequence(const QByteArray &s, int i)
{
- if (s.at(i) != '\\' || i >= s.length() - 1)
+ if (s.at(i) != '\\' || i >= s.size() - 1)
return 1;
const int startPos = i;
++i;
char ch = s.at(i);
if (ch == 'x') {
++i;
- while (i < s.length() && is_hex_char(s.at(i)))
+ while (i < s.size() && is_hex_char(s.at(i)))
++i;
} else if (is_octal_char(ch)) {
while (i < startPos + 4
- && i < s.length()
+ && i < s.size()
&& is_octal_char(s.at(i))) {
++i;
}
} else { // single character escape sequence
- i = qMin(i + 1, s.length());
+ i = qMin(i + 1, s.size());
}
return i - startPos;
}
@@ -140,8 +140,8 @@ int Generator::stridx(const QByteArray &s)
static int aggregateParameterCount(const QList<FunctionDef> &list)
{
int sum = 0;
- for (int i = 0; i < list.count(); ++i)
- sum += list.at(i).arguments.count() + 1; // +1 for return type
+ for (int i = 0; i < list.size(); ++i)
+ sum += list.at(i).arguments.size() + 1; // +1 for return type
return sum;
}
@@ -212,7 +212,7 @@ void Generator::generateCode()
// filter out undeclared enumerators and sets
{
QList<EnumDef> enumList;
- for (int i = 0; i < cdef->enumList.count(); ++i) {
+ for (int i = 0; i < cdef->enumList.size(); ++i) {
EnumDef def = cdef->enumList.at(i);
if (cdef->enumDeclarations.contains(def.name)) {
enumList += def;
@@ -253,7 +253,7 @@ void Generator::generateCode()
int stringDataLength = 0;
int stringDataCounter = 0;
for (int i = 0; i < strings.size(); ++i) {
- int thisLength = strings.at(i).length() + 1;
+ int thisLength = strings.at(i).size() + 1;
stringDataLength += thisLength;
if (stringDataLength / constCharArraySizeLimit) {
// save previous stringdata and start computing the next one.
@@ -286,13 +286,13 @@ void Generator::generateCode()
int idx = 0;
for (int i = 0; i < strings.size(); ++i) {
const QByteArray &str = strings.at(i);
- fprintf(out, "QT_MOC_LITERAL(%d, %d)", idx, int(str.length()));
+ fprintf(out, "QT_MOC_LITERAL(%d, %d)", idx, int(str.size()));
if (i != strings.size() - 1)
fputc(',', out);
- const QByteArray comment = str.length() > 32 ? str.left(29) + "..." : str;
+ const QByteArray comment = str.size() > 32 ? str.left(29) + "..." : str;
fprintf(out, " // \"%s\"\n", comment.size() ? comment.constData() : "");
- idx += str.length() + 1;
- for (int j = 0; j < str.length(); ++j) {
+ idx += str.size() + 1;
+ for (int j = 0; j < str.size(); ++j) {
if (str.at(j) == '\\') {
int cnt = lengthOfEscapeSequence(str, j) - 1;
idx -= cnt;
@@ -309,7 +309,7 @@ void Generator::generateCode()
// -- QtScxml
for (int i = 0; i < strings.size(); ++i) {
QByteArray s = strings.at(i);
- int len = s.length();
+ int len = s.size();
for (int charPos = 0; charPos < len; ++charPos)
fprintf(out, "0x%.2x,", static_cast<quint8>(s.at(charPos)));
fprintf(out, "0%s // %d: %s\n", i < strings.size() - 1 ? "," : "", i, s.constData());
@@ -329,10 +329,10 @@ void Generator::generateCode()
fprintf(out, "\n // content:\n");
fprintf(out, " %4d, // revision\n", int(QMetaObjectPrivate::OutputRevision));
fprintf(out, " %4d, // classname\n", stridx(cdef->qualified));
- fprintf(out, " %4d, %4d, // classinfo\n", int(cdef->classInfoList.count()), int(cdef->classInfoList.count() ? index : 0));
- index += cdef->classInfoList.count() * 2;
+ fprintf(out, " %4d, %4d, // classinfo\n", int(cdef->classInfoList.size()), int(cdef->classInfoList.size() ? index : 0));
+ index += cdef->classInfoList.size() * 2;
- int methodCount = cdef->signalList.count() + cdef->slotList.count() + cdef->methodList.count();
+ int methodCount = cdef->signalList.size() + cdef->slotList.size() + cdef->methodList.size();
fprintf(out, " %4d, %4d, // methods\n", methodCount, methodCount ? index : 0);
index += methodCount * QMetaObjectPrivate::IntsPerMethod;
if (cdef->revisionedMethods)
@@ -344,16 +344,16 @@ void Generator::generateCode()
+ aggregateParameterCount(cdef->constructorList);
index += totalParameterCount * 2 // types and parameter names
- methodCount // return "parameters" don't have names
- - cdef->constructorList.count(); // "this" parameters don't have names
+ - cdef->constructorList.size(); // "this" parameters don't have names
- fprintf(out, " %4d, %4d, // properties\n", int(cdef->propertyList.count()), int(cdef->propertyList.count() ? index : 0));
- index += cdef->propertyList.count() * QMetaObjectPrivate::IntsPerProperty;
- fprintf(out, " %4d, %4d, // enums/sets\n", int(cdef->enumList.count()), cdef->enumList.count() ? index : 0);
+ fprintf(out, " %4d, %4d, // properties\n", int(cdef->propertyList.size()), int(cdef->propertyList.size() ? index : 0));
+ index += cdef->propertyList.size() * QMetaObjectPrivate::IntsPerProperty;
+ fprintf(out, " %4d, %4d, // enums/sets\n", int(cdef->enumList.size()), cdef->enumList.size() ? index : 0);
int enumsIndex = index;
- for (int i = 0; i < cdef->enumList.count(); ++i)
- index += 5 + (cdef->enumList.at(i).values.count() * 2);
- fprintf(out, " %4d, %4d, // constructors\n", isConstructible ? int(cdef->constructorList.count()) : 0,
+ for (int i = 0; i < cdef->enumList.size(); ++i)
+ index += 5 + (cdef->enumList.at(i).values.size() * 2);
+ fprintf(out, " %4d, %4d, // constructors\n", isConstructible ? int(cdef->constructorList.size()) : 0,
isConstructible ? index : 0);
int flags = 0;
@@ -363,7 +363,7 @@ void Generator::generateCode()
flags |= PropertyAccessInStaticMetaCall;
}
fprintf(out, " %4d, // flags\n", flags);
- fprintf(out, " %4d, // signalCount\n", int(cdef->signalList.count()));
+ fprintf(out, " %4d, // signalCount\n", int(cdef->signalList.size()));
//
@@ -371,7 +371,7 @@ void Generator::generateCode()
//
generateClassInfos();
- int initialMetaTypeOffset = cdef->propertyList.count();
+ int initialMetaTypeOffset = cdef->propertyList.size();
//
// Build signals array first, otherwise the signal indices would be wrong
@@ -443,7 +443,7 @@ void Generator::generateCode()
QMultiHash<QByteArray, QByteArray> knownExtraMetaObject(knownGadgets);
knownExtraMetaObject.unite(knownQObjectClasses);
- for (int i = 0; i < cdef->propertyList.count(); ++i) {
+ for (int i = 0; i < cdef->propertyList.size(); ++i) {
const PropertyDef &p = cdef->propertyList.at(i);
if (isBuiltinType(p.type))
continue;
@@ -503,7 +503,7 @@ void Generator::generateCode()
if (!extraList.isEmpty()) {
fprintf(out, "static const QMetaObject::SuperData qt_meta_extradata_%s[] = {\n",
qualifiedClassNameIdentifier.constData());
- for (int i = 0; i < extraList.count(); ++i) {
+ for (int i = 0; i < extraList.size(); ++i) {
fprintf(out, " QMetaObject::SuperData::link<%s::staticMetaObject>(),\n", extraList.at(i).constData());
}
fprintf(out, " nullptr\n};\n\n");
@@ -536,9 +536,9 @@ void Generator::generateCode()
fprintf(out, " qt_meta_extradata_%s,\n", qualifiedClassNameIdentifier.constData());
bool constructorListContainsArgument = false;
- for (int i = 0; i< cdef->constructorList.count(); ++i) {
+ for (int i = 0; i< cdef->constructorList.size(); ++i) {
const FunctionDef& fdef = cdef->constructorList.at(i);
- if (fdef.arguments.count()) {
+ if (fdef.arguments.size()) {
constructorListContainsArgument = true;
break;
}
@@ -554,7 +554,7 @@ void Generator::generateCode()
} else {
fprintf(out, "qt_metaTypeArray<\n");
}
- for (int i = 0; i < cdef->propertyList.count(); ++i) {
+ for (int i = 0; i < cdef->propertyList.size(); ++i) {
const PropertyDef &p = cdef->propertyList.at(i);
if (requireCompleteness)
fprintf(out, "%s%s", needsComma ? ", " : "", p.type.data());
@@ -564,7 +564,7 @@ void Generator::generateCode()
}
for (const QList<FunctionDef> &methodContainer :
{ cdef->signalList, cdef->slotList, cdef->methodList }) {
- for (int i = 0; i< methodContainer.count(); ++i) {
+ for (int i = 0; i< methodContainer.size(); ++i) {
const FunctionDef& fdef = methodContainer.at(i);
if (requireCompleteness)
fprintf(out, "%s%s", needsComma ? ", " : "", fdef.type.name.data());
@@ -580,7 +580,7 @@ void Generator::generateCode()
}
fprintf(out, "\n");
}
- for (int i = 0; i< cdef->constructorList.count(); ++i) {
+ for (int i = 0; i< cdef->constructorList.size(); ++i) {
const FunctionDef& fdef = cdef->constructorList.at(i);
for (const auto &argument: fdef.arguments) {
if (requireCompleteness)
@@ -695,7 +695,7 @@ void Generator::generateClassInfos()
void Generator::registerFunctionStrings(const QList<FunctionDef> &list)
{
- for (int i = 0; i < list.count(); ++i) {
+ for (int i = 0; i < list.size(); ++i) {
const FunctionDef &f = list.at(i);
strreg(f.name);
@@ -703,7 +703,7 @@ void Generator::registerFunctionStrings(const QList<FunctionDef> &list)
strreg(f.normalizedType);
strreg(f.tag);
- int argsCount = f.arguments.count();
+ int argsCount = f.arguments.size();
for (int j = 0; j < argsCount; ++j) {
const ArgumentDef &a = f.arguments.at(j);
if (!isBuiltinType(a.normalizedType))
@@ -726,7 +726,7 @@ void Generator::generateFunctions(const QList<FunctionDef> &list, const char *fu
return;
fprintf(out, "\n // %ss: name, argc, parameters, tag, flags, initial metatype offsets\n", functype);
- for (int i = 0; i < list.count(); ++i) {
+ for (int i = 0; i < list.size(); ++i) {
const FunctionDef &f = list.at(i);
QByteArray comment;
@@ -758,7 +758,7 @@ void Generator::generateFunctions(const QList<FunctionDef> &list, const char *fu
comment.append(" | MethodRevisioned");
}
- int argc = f.arguments.count();
+ int argc = f.arguments.size();
fprintf(out, " %4d, %4d, %4d, %4d, 0x%02x, %4d /* %s */,\n",
stridx(f.name), argc, paramsIndex, stridx(f.tag), flags, initialMetatypeOffset, comment.constData());
@@ -770,9 +770,9 @@ void Generator::generateFunctions(const QList<FunctionDef> &list, const char *fu
void Generator::generateFunctionRevisions(const QList<FunctionDef> &list, const char *functype)
{
- if (list.count())
+ if (list.size())
fprintf(out, "\n // %ss: revision\n", functype);
- for (int i = 0; i < list.count(); ++i) {
+ for (int i = 0; i < list.size(); ++i) {
const FunctionDef &f = list.at(i);
fprintf(out, " %4d,\n", f.revision);
}
@@ -783,12 +783,12 @@ void Generator::generateFunctionParameters(const QList<FunctionDef> &list, const
if (list.isEmpty())
return;
fprintf(out, "\n // %ss: parameters\n", functype);
- for (int i = 0; i < list.count(); ++i) {
+ for (int i = 0; i < list.size(); ++i) {
const FunctionDef &f = list.at(i);
fprintf(out, " ");
// Types
- int argsCount = f.arguments.count();
+ int argsCount = f.arguments.size();
for (int j = -1; j < argsCount; ++j) {
if (j > -1)
fputc(' ', out);
@@ -834,7 +834,7 @@ void Generator::generateTypeInfo(const QByteArray &typeName, bool allowEmptyName
void Generator::registerPropertyStrings()
{
- for (int i = 0; i < cdef->propertyList.count(); ++i) {
+ for (int i = 0; i < cdef->propertyList.size(); ++i) {
const PropertyDef &p = cdef->propertyList.at(i);
strreg(p.name);
if (!isBuiltinType(p.type))
@@ -848,9 +848,9 @@ void Generator::generateProperties()
// Create meta data
//
- if (cdef->propertyList.count())
+ if (cdef->propertyList.size())
fprintf(out, "\n // properties: name, type, flags\n");
- for (int i = 0; i < cdef->propertyList.count(); ++i) {
+ for (int i = 0; i < cdef->propertyList.size(); ++i) {
const PropertyDef &p = cdef->propertyList.at(i);
uint flags = Invalid;
if (!isBuiltinType(p.type))
@@ -904,12 +904,12 @@ void Generator::generateProperties()
void Generator::registerEnumStrings()
{
- for (int i = 0; i < cdef->enumList.count(); ++i) {
+ for (int i = 0; i < cdef->enumList.size(); ++i) {
const EnumDef &e = cdef->enumList.at(i);
strreg(e.name);
if (!e.enumName.isNull())
strreg(e.enumName);
- for (int j = 0; j < e.values.count(); ++j)
+ for (int j = 0; j < e.values.size(); ++j)
strreg(e.values.at(j));
}
}
@@ -920,9 +920,9 @@ void Generator::generateEnums(int index)
return;
fprintf(out, "\n // enums: name, alias, flags, count, data\n");
- index += 5 * cdef->enumList.count();
+ index += 5 * cdef->enumList.size();
int i;
- for (i = 0; i < cdef->enumList.count(); ++i) {
+ for (i = 0; i < cdef->enumList.size(); ++i) {
const EnumDef &e = cdef->enumList.at(i);
int flags = 0;
if (cdef->enumDeclarations.value(e.name))
@@ -933,15 +933,15 @@ void Generator::generateEnums(int index)
stridx(e.name),
e.enumName.isNull() ? stridx(e.name) : stridx(e.enumName),
flags,
- int(e.values.count()),
+ int(e.values.size()),
index);
- index += e.values.count() * 2;
+ index += e.values.size() * 2;
}
fprintf(out, "\n // enum data: key, value\n");
- for (i = 0; i < cdef->enumList.count(); ++i) {
+ for (i = 0; i < cdef->enumList.size(); ++i) {
const EnumDef &e = cdef->enumList.at(i);
- for (int j = 0; j < e.values.count(); ++j) {
+ for (int j = 0; j < e.values.size(); ++j) {
const QByteArray &val = e.values.at(j);
QByteArray code = cdef->qualified.constData();
if (e.isEnumClass)
@@ -1009,7 +1009,7 @@ void Generator::generateMetacall()
" || _c == QMetaObject::ResetProperty || _c == QMetaObject::BindableProperty\n"
" || _c == QMetaObject::RegisterPropertyMetaType) {\n"
" qt_static_metacall(this, _c, _id, _a);\n"
- " _id -= %d;\n }", int(cdef->propertyList.count()));
+ " _id -= %d;\n }", int(cdef->propertyList.size()));
fprintf(out, "\n#endif // QT_NO_PROPERTIES");
}
if (methodList.size() || cdef->propertyList.size())
@@ -1035,7 +1035,7 @@ Generator::methodsWithAutomaticTypesHelper(const QList<FunctionDef> &methodList)
QMap<int, QMultiMap<QByteArray, int> > methodsWithAutomaticTypes;
for (int i = 0; i < methodList.size(); ++i) {
const FunctionDef &f = methodList.at(i);
- for (int j = 0; j < f.arguments.count(); ++j) {
+ for (int j = 0; j < f.arguments.size(); ++j) {
const QByteArray argType = f.arguments.at(j).normalizedType;
if (registerableMetaType(argType) && !isBuiltinType(argType))
methodsWithAutomaticTypes[i].insert(argType, j);
@@ -1055,13 +1055,13 @@ void Generator::generateStaticMetacall()
if (!cdef->constructorList.isEmpty()) {
fprintf(out, " if (_c == QMetaObject::CreateInstance) {\n");
fprintf(out, " switch (_id) {\n");
- for (int ctorindex = 0; ctorindex < cdef->constructorList.count(); ++ctorindex) {
+ for (int ctorindex = 0; ctorindex < cdef->constructorList.size(); ++ctorindex) {
fprintf(out, " case %d: { %s *_r = new %s(", ctorindex,
cdef->classname.constData(), cdef->classname.constData());
const FunctionDef &f = cdef->constructorList.at(ctorindex);
int offset = 1;
- int argsCount = f.arguments.count();
+ int argsCount = f.arguments.size();
for (int j = 0; j < argsCount; ++j) {
const ArgumentDef &a = f.arguments.at(j);
if (j)
@@ -1127,7 +1127,7 @@ void Generator::generateStaticMetacall()
if (f.isRawSlot) {
fprintf(out, "QMethodRawArguments{ _a }");
} else {
- int argsCount = f.arguments.count();
+ int argsCount = f.arguments.size();
for (int j = 0; j < argsCount; ++j) {
const ArgumentDef &a = f.arguments.at(j);
if (j)
@@ -1201,7 +1201,7 @@ void Generator::generateStaticMetacall()
fprintf(out, " {\n");
fprintf(out, " using _t = %s (%s::*)(",f.type.rawName.constData() , cdef->classname.constData());
- int argsCount = f.arguments.count();
+ int argsCount = f.arguments.size();
for (int j = 0; j < argsCount; ++j) {
const ArgumentDef &a = f.arguments.at(j);
if (j)
@@ -1462,7 +1462,7 @@ void Generator::generateSignal(FunctionDef *def,int index)
}
int offset = 1;
- for (int j = 0; j < def->arguments.count(); ++j) {
+ for (int j = 0; j < def->arguments.size(); ++j) {
const ArgumentDef &a = def->arguments.at(j);
if (j)
fputs(", ", out);
@@ -1493,7 +1493,7 @@ void Generator::generateSignal(FunctionDef *def,int index)
}
int i;
for (i = 1; i < offset; ++i)
- if (i <= def->arguments.count() && def->arguments.at(i - 1).type.isVolatile)
+ if (i <= def->arguments.size() && def->arguments.at(i - 1).type.isVolatile)
fprintf(out, ", const_cast<void*>(reinterpret_cast<const volatile void*>(std::addressof(_t%d)))", i);
else
fprintf(out, ", const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t%d)))", i);
diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h
index 6486ca8..de3778f 100644
--- a/tools/qscxmlc/moc.h
+++ b/tools/qscxmlc/moc.h
@@ -287,8 +287,8 @@ inline QByteArray noRef(const QByteArray &type)
{
if (type.endsWith('&')) {
if (type.endsWith("&&"))
- return type.left(type.length()-2);
- return type.left(type.length()-1);
+ return type.left(type.size()-2);
+ return type.left(type.size()-1);
}
return type;
}
diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp
index 63898a4..f8e7a15 100644
--- a/tools/qscxmlc/qscxmlc.cpp
+++ b/tools/qscxmlc/qscxmlc.cpp
@@ -113,12 +113,12 @@ int run(const QStringList &arguments)
const QStringList inputFiles = cmdParser.positionalArguments();
- if (inputFiles.count() < 1) {
+ if (inputFiles.size() < 1) {
errs << QCoreApplication::translate("main", "Error: no input file.") << Qt::endl;
cmdParser.showHelp(NoInputFilesError);
}
- if (inputFiles.count() > 1) {
+ if (inputFiles.size() > 1) {
errs << QCoreApplication::translate("main", "Error: unexpected argument(s): %1")
.arg(inputFiles.mid(1).join(QLatin1Char(' '))) << Qt::endl;
cmdParser.showHelp(NoInputFilesError);
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 6154446..5e19d33 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -42,7 +42,7 @@ QString cEscape(const QString &str)
{
QString res;
int lastI = 0;
- for (int i = 0; i < str.length(); ++i) {
+ for (int i = 0; i < str.size(); ++i) {
QChar c = str.at(i);
if (c < QLatin1Char(' ') || c == QLatin1Char('\\') || c == QLatin1Char('\"')) {
res.append(str.mid(lastI, i - lastI));
@@ -137,7 +137,7 @@ static void generateList(QString &out, std::function<QString(int)> next)
if (i != 0)
line += QLatin1Char(',');
- if (line.length() + nr.length() + 1 > maxLineLength) {
+ if (line.size() + nr.size() + 1 > maxLineLength) {
out += line + QLatin1Char('\n');
line.clear();
} else if (i != 0) {
@@ -652,7 +652,7 @@ QString CppDumper::mangleIdentifier(const QString &str)
}
}
- for (int ei = str.length(); i != ei; ++i) {
+ for (int ei = str.size(); i != ei; ++i) {
auto c = str.at(i);
if ((c >= QLatin1Char('0') && c <= QLatin1Char('9')) || isNonDigit(c)) {
mangled += c;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 03:46:47 +0000