diff options
| -rw-r--r-- | src/statemachineqml/signaltransition.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/shared/bindableqmlutils.h | 20 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/statemachineqml/signaltransition.cpp b/src/statemachineqml/signaltransition.cpp index a957de0..4a9c627 100644 --- a/src/statemachineqml/signaltransition.cpp +++ b/src/statemachineqml/signaltransition.cpp @@ -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); diff --git a/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp b/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp index 3916010..c3c3501 100644 --- a/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp +++ b/tests/auto/qml/scxmlqmlcpp/tst_scxmlqmlcpp.cpp @@ -79,20 +79,20 @@ void tst_scxmlqmlcpp::invokedServicesChildrenBinding() TopMachine topSm; QScxmlInvokedServices invokedServices; invokedServices.setStateMachine(&topSm); - QCOMPARE(invokedServices.children().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().size(), 3); - QCOMPARE(invokedServices.children().count(), 1); + QCOMPARE(invokedServices.children().size(), 1); // after completion invoked services drop back to 0 QTRY_COMPARE(topSm.invokedServices().size(), 0); - QCOMPARE(invokedServices.children().count(), 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); 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)); |