diff options
19 files changed, 65 insertions, 65 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index 956c7deed8..29b1f86e0e 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -363,8 +363,8 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel() q, QQmlDelegateModel, SLOT(_q_columnsRemoved(QModelIndex,int,int))); qmlobject_connect(aim, QAbstractItemModel, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)), q, QQmlDelegateModel, SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int))); - qmlobject_connect(aim, QAbstractItemModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), - q, QQmlDelegateModel, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>))); + qmlobject_connect(aim, QAbstractItemModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), + q, QQmlDelegateModel, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QList<int>))); qmlobject_connect(aim, QAbstractItemModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), q, QQmlDelegateModel, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int))); @@ -393,8 +393,8 @@ void QQmlDelegateModelPrivate::disconnectFromAbstractItemModel() SLOT(_q_columnsRemoved(QModelIndex,int,int))); QObject::disconnect(aim, SIGNAL(columnsMoved(QModelIndex,int,int,QModelIndex,int)), q, SLOT(_q_columnsMoved(QModelIndex,int,int,QModelIndex,int))); - QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), - q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QObject::disconnect(aim, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), + q, SLOT(_q_dataChanged(QModelIndex,QModelIndex,QList<int>))); QObject::disconnect(aim, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), q, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int))); QObject::disconnect(aim, &QAbstractItemModel::modelAboutToBeReset, q, &QQmlDelegateModel::_q_modelAboutToBeReset); diff --git a/src/qmlmodels/qqmltreemodeltotablemodel.cpp b/src/qmlmodels/qqmltreemodeltotablemodel.cpp index f7329b1120..f842169c39 100644 --- a/src/qmlmodels/qqmltreemodeltotablemodel.cpp +++ b/src/qmlmodels/qqmltreemodeltotablemodel.cpp @@ -37,26 +37,26 @@ void QQmlTreeModelToTableModel::setModel(QAbstractItemModel *arg) SLOT(modelHasBeenDestroyed()) }, { SIGNAL(modelReset()), SLOT(modelHasBeenReset()) }, - { SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), - SLOT(modelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)) }, - - { SIGNAL(layoutAboutToBeChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)), - SLOT(modelLayoutAboutToBeChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)) }, - { SIGNAL(layoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)), - SLOT(modelLayoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)) }, - - { SIGNAL(rowsAboutToBeInserted(const QModelIndex&, int, int)), - SLOT(modelRowsAboutToBeInserted(const QModelIndex &, int, int)) }, - { SIGNAL(rowsInserted(const QModelIndex&, int, int)), - SLOT(modelRowsInserted(const QModelIndex&, int, int)) }, - { SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int, int)), - SLOT(modelRowsAboutToBeRemoved(const QModelIndex&, int, int)) }, - { SIGNAL(rowsRemoved(const QModelIndex&, int, int)), - SLOT(modelRowsRemoved(const QModelIndex&, int, int)) }, - { SIGNAL(rowsAboutToBeMoved(const QModelIndex&, int, int, const QModelIndex&, int)), - SLOT(modelRowsAboutToBeMoved(const QModelIndex&, int, int, const QModelIndex&, int)) }, - { SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)), - SLOT(modelRowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)) }, + { SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>)), + SLOT(modelDataChanged(QModelIndex,QModelIndex,QList<int>)) }, + + { SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)), + SLOT(modelLayoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)) }, + { SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)), + SLOT(modelLayoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)) }, + + { SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), + SLOT(modelRowsAboutToBeInserted(QModelIndex,int,int)) }, + { SIGNAL(rowsInserted(QModelIndex,int,int)), + SLOT(modelRowsInserted(QModelIndex,int,int)) }, + { SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + SLOT(modelRowsAboutToBeRemoved(QModelIndex,int,int)) }, + { SIGNAL(rowsRemoved(QModelIndex,int,int)), + SLOT(modelRowsRemoved(QModelIndex,int,int)) }, + { SIGNAL(rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)), + SLOT(modelRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)) }, + { SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), + SLOT(modelRowsMoved(QModelIndex,int,int,QModelIndex,int)) }, { nullptr, nullptr } }; diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 83b9c1e6db..1df0736cc9 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -160,8 +160,8 @@ void QQuickItemView::setModel(const QVariant &m) disconnect(d->model, SIGNAL(createdItem(int,QObject*)), this, SLOT(createdItem(int,QObject*))); disconnect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*))); if (QQmlDelegateModel *delegateModel = qobject_cast<QQmlDelegateModel*>(d->model)) { - disconnect(delegateModel, SIGNAL(itemPooled(int, QObject *)), this, SLOT(onItemPooled(int, QObject *))); - disconnect(delegateModel, SIGNAL(itemReused(int, QObject *)), this, SLOT(onItemReused(int, QObject *))); + disconnect(delegateModel, SIGNAL(itemPooled(int,QObject*)), this, SLOT(onItemPooled(int,QObject*))); + disconnect(delegateModel, SIGNAL(itemReused(int,QObject*)), this, SLOT(onItemReused(int,QObject*))); } } @@ -199,8 +199,8 @@ void QQuickItemView::setModel(const QVariant &m) connect(d->model, SIGNAL(initItem(int,QObject*)), this, SLOT(initItem(int,QObject*))); connect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*))); if (QQmlDelegateModel *delegateModel = qobject_cast<QQmlDelegateModel*>(d->model)) { - connect(delegateModel, SIGNAL(itemPooled(int, QObject *)), this, SLOT(onItemPooled(int, QObject *))); - connect(delegateModel, SIGNAL(itemReused(int, QObject *)), this, SLOT(onItemReused(int, QObject *))); + connect(delegateModel, SIGNAL(itemPooled(int,QObject*)), this, SLOT(onItemPooled(int,QObject*))); + connect(delegateModel, SIGNAL(itemReused(int,QObject*)), this, SLOT(onItemReused(int,QObject*))); } if (isComponentComplete()) { d->updateSectionCriteria(); diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index f6e1f9177a..c95bb399be 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -1953,7 +1953,7 @@ bool QQuickPixmap::connectDownloadProgress(QObject *object, const char *method) return false; } - return QObject::connect(d->reply, SIGNAL(downloadProgress(qint64, qint64)), object, + return QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)), object, method); } diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 80b004fa9d..213193a1c5 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -384,7 +384,7 @@ void tst_QJSEngine::callQObjectSlot() } { - QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString, QString, QString))); + QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString,QString,QString))); eng.evaluate("dummy.slotToCall('arg', 'arg2');"); QCOMPARE(spy.size(), 1); @@ -395,7 +395,7 @@ void tst_QJSEngine::callQObjectSlot() } { - QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString, QString, QString))); + QSignalSpy spy(&dummy, SIGNAL(slotWithArgumentsCalled(QString,QString,QString))); eng.evaluate("dummy.slotToCall('arg', 'arg2', 'arg3');"); QCOMPARE(spy.size(), 1); @@ -406,7 +406,7 @@ void tst_QJSEngine::callQObjectSlot() } { - QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString, Qt::KeyboardModifier, Qt::KeyboardModifiers))); + QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString,Qt::KeyboardModifier,Qt::KeyboardModifiers))); eng.evaluate(QStringLiteral("dummy.slotToCall('arg', %1);").arg(QString::number(Qt::ControlModifier))); QCOMPARE(spy.size(), 1); @@ -418,7 +418,7 @@ void tst_QJSEngine::callQObjectSlot() } { - QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString, Qt::KeyboardModifiers, Qt::KeyboardModifier))); + QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString,Qt::KeyboardModifiers,Qt::KeyboardModifier))); QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCallTwoDefault('arg', %1);").arg(QString::number(Qt::MetaModifier | Qt::KeypadModifier))); QCOMPARE(spy.size(), 1); @@ -439,7 +439,7 @@ void tst_QJSEngine::callQObjectSlot() eng.globalObject().setProperty(QStringLiteral("Qt"), value); { - QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString, Qt::KeyboardModifier, Qt::KeyboardModifiers))); + QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString,Qt::KeyboardModifier,Qt::KeyboardModifiers))); QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCall('arg', Qt.ControlModifier);")); QCOMPARE(spy.size(), 1); @@ -450,7 +450,7 @@ void tst_QJSEngine::callQObjectSlot() } { - QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString, Qt::KeyboardModifiers, Qt::KeyboardModifier))); + QSignalSpy spy(&dummy, SIGNAL(slotWithTwoOverloadedArgumentsCalled(QString,Qt::KeyboardModifiers,Qt::KeyboardModifier))); QJSValue v = eng.evaluate(QStringLiteral("dummy.slotToCallTwoDefault('arg', Qt.MetaModifier | Qt.KeypadModifier);")); QCOMPARE(spy.size(), 1); diff --git a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp index 4908ca210b..e5bde4f94a 100644 --- a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp +++ b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp @@ -213,7 +213,7 @@ void tst_qqmlinfo::attachedObject() { QQmlComponent component(&engine, testFileUrl("AttachedObject.qml")); - QSignalSpy warningSpy(&engine, SIGNAL(warnings(const QList<QQmlError> &))); + QSignalSpy warningSpy(&engine, SIGNAL(warnings(QList<QQmlError>))); QVERIFY(warningSpy.isValid()); const QString qmlBindingLoopMessage = "QML Rectangle: Binding loop detected for property \"width\""; diff --git a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp index 6fd173fb0c..a84ffb87b4 100644 --- a/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp +++ b/tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp @@ -789,7 +789,7 @@ void tst_qqmllistmodel::get() RUNEXPR("model.append({roleC: {} })"); RUNEXPR("model.append({roleD: [ { a:1, b:2 }, { c: 3 } ] })"); - QSignalSpy spy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QSignalSpy spy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>))); QQmlExpression expr(engine.rootContext(), model, expression); expr.evaluate(); QVERIFY(!expr.hasError()); @@ -917,7 +917,7 @@ void tst_qqmllistmodel::get_nested() QString extendedExpression = QString("get(%1).%2.%3").arg(outerListIndex).arg(outerListRoleName).arg(expression); QQmlExpression expr(engine.rootContext(), model, extendedExpression); - QSignalSpy spy(childModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QSignalSpy spy(childModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>))); expr.evaluate(); QVERIFY(!expr.hasError()); @@ -1112,7 +1112,7 @@ void tst_qqmllistmodel::property_changes() QObject *connectionsObject = component.create(); QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString())); - QSignalSpy spyItemsChanged(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QSignalSpy spyItemsChanged(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>))); expr.setExpression(script_change); expr.evaluate(); diff --git a/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp index 4875602314..a371b15b8b 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp +++ b/tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp @@ -453,7 +453,7 @@ void tst_qqmllistmodelworkerscript::get_worker() int role = roleFromName(&model, roleName); QVERIFY(role >= 0); - QSignalSpy spy(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QSignalSpy spy(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>))); // in the worker thread, change the model data and call sync() QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", @@ -577,7 +577,7 @@ void tst_qqmllistmodelworkerscript::property_changes_worker() expr.evaluate(); QVERIFY2(!expr.hasError(), QTest::toString(expr.error().toString())); - QSignalSpy spyItemsChanged(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>))); + QSignalSpy spyItemsChanged(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QList<int>))); QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", Q_ARG(QVariant, QStringList(script_change)))); diff --git a/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp b/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp index 0745853e02..49ad83142d 100644 --- a/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp +++ b/tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp @@ -435,8 +435,8 @@ void tst_QQmlXmlListModel::reload() QVERIFY(model != nullptr); QTRY_COMPARE(model->rowCount(), 9); - QSignalSpy spyInsert(model.get(), SIGNAL(rowsInserted(QModelIndex, int, int))); - QSignalSpy spyRemove(model.get(), SIGNAL(rowsRemoved(QModelIndex, int, int))); + QSignalSpy spyInsert(model.get(), SIGNAL(rowsInserted(QModelIndex,int,int))); + QSignalSpy spyRemove(model.get(), SIGNAL(rowsRemoved(QModelIndex,int,int))); QSignalSpy spyCount(model.get(), SIGNAL(countChanged())); // reload multiple times to test the xml query aborting QMetaObject::invokeMethod(model.get(), "reload"); diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp index 610d03c440..0d60aec37a 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp @@ -232,7 +232,7 @@ void tst_QQuickPinchHandler::scale() QVERIFY(pinchHandler != nullptr); QQuickItem *blackRect = (hasTarget ? pinchHandler->target() : pinchHandler->parentItem()); QVERIFY(blackRect != nullptr); - QSignalSpy grabChangedSpy(pinchHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition, QEventPoint))); + QSignalSpy grabChangedSpy(pinchHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition,QEventPoint))); QSignalSpy scaleChangedSpy(pinchHandler, &QQuickPinchHandler::scaleChanged); if (lcPointerTests().isDebugEnabled()) QTest::qWait(500); diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp index e02e4135b5..a2ea404d62 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp @@ -963,8 +963,8 @@ void tst_TapHandler::componentUserBehavioralOverride() QQuickTapHandler *userTapHandler = button->findChild<QQuickTapHandler*>("override"); QVERIFY(userTapHandler); QSignalSpy tappedSpy(button, SIGNAL(tapped())); - QSignalSpy innerGrabChangedSpy(innerTapHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition, QEventPoint))); - QSignalSpy userGrabChangedSpy(userTapHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition, QEventPoint))); + QSignalSpy innerGrabChangedSpy(innerTapHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition,QEventPoint))); + QSignalSpy userGrabChangedSpy(userTapHandler, SIGNAL(grabChanged(QPointingDevice::GrabTransition,QEventPoint))); QSignalSpy innerPressedChangedSpy(innerTapHandler, SIGNAL(pressedChanged())); QSignalSpy userPressedChangedSpy(userTapHandler, SIGNAL(pressedChanged())); diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 105bb0189d..d376976759 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -2878,7 +2878,7 @@ void tst_qquickflickable::receiveTapOutsideContentItem() QVERIFY(QTest::qWaitForWindowActive(&window)); QQuickTapHandler tapHandler(&flickable); - QSignalSpy clickedSpy(&tapHandler, SIGNAL(tapped(QEventPoint, Qt::MouseButton))); + QSignalSpy clickedSpy(&tapHandler, SIGNAL(tapped(QEventPoint,Qt::MouseButton))); // Tap outside the content item in the top-left corner QTest::mouseClick(&window, Qt::LeftButton, {}, QPoint(5, 5)); diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index 81e57bfd12..88e1c8f1e1 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -1277,7 +1277,7 @@ void tst_QQuickMultiPointTouchArea::mouseGestureStarted() // QTBUG-70258 area->setProperty("grabGesture", grabGesture); QQuickTouchPoint *point1 = view->rootObject()->findChild<QQuickTouchPoint*>("point1"); QCOMPARE(point1->pressed(), false); - QSignalSpy gestureStartedSpy(area, SIGNAL(gestureStarted(QQuickGrabGestureEvent *))); + QSignalSpy gestureStartedSpy(area, SIGNAL(gestureStarted(QQuickGrabGestureEvent*))); QPoint p1 = QPoint(distanceFromOrigin, distanceFromOrigin); QTest::mousePress(view.data(), Qt::LeftButton, Qt::NoModifier, p1); diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 51e0cc68c3..9a3c6efba3 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -6433,7 +6433,7 @@ void tst_qquicktextinput::setInputMask() // inputMaskChanged signal QString unescapedMask = mask; // mask is escaped, because '\' is also escape in a JS string unescapedMask.replace(QLatin1String("\\\\"), QLatin1String("\\")); // simple unescape - QSignalSpy spy(textInput, SIGNAL(inputMaskChanged(const QString &))); + QSignalSpy spy(textInput, SIGNAL(inputMaskChanged(QString))); textInput->setInputMask(unescapedMask); QCOMPARE(spy.size(), 0); diff --git a/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp b/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp index 10865744ad..2450046e21 100644 --- a/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp +++ b/tests/auto/quick/qquicktreeview/tst_qquicktreeview.cpp @@ -141,7 +141,7 @@ void tst_qquicktreeview::expandAndCollapseRoot() // Check that the view only has one row loaded so far (the root of the tree) QCOMPARE(treeViewPrivate->loadedRows.count(), 1); - QSignalSpy expandedSpy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy expandedSpy(treeView, SIGNAL(expanded(int,int))); // Expand the root treeView->expand(0); @@ -186,7 +186,7 @@ void tst_qquicktreeview::expandAndCollapseChildren() LOAD_TREEVIEW("normaltreeview.qml"); const int childCount = 4; - QSignalSpy expandedSpy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy expandedSpy(treeView, SIGNAL(expanded(int,int))); // Expand the last child of a parent recursively four times for (int level = 0; level < 4; ++level) { @@ -436,7 +436,7 @@ void tst_qquicktreeview::expandRecursivelyRoot() QFETCH(int, depth); LOAD_TREEVIEW("normaltreeview.qml"); - QSignalSpy spy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy spy(treeView, SIGNAL(expanded(int,int))); treeView->expandRecursively(rowToExpand, depth); @@ -493,7 +493,7 @@ void tst_qquicktreeview::expandRecursivelyChild() QFETCH(int, depth); LOAD_TREEVIEW("normaltreeview.qml"); - QSignalSpy spy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy spy(treeView, SIGNAL(expanded(int,int))); treeView->expand(0); @@ -545,7 +545,7 @@ void tst_qquicktreeview::expandRecursivelyWholeTree() { // Check that we expand the whole tree recursively by passing -1, -1 LOAD_TREEVIEW("normaltreeview.qml"); - QSignalSpy spy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy spy(treeView, SIGNAL(expanded(int,int))); treeView->expandRecursively(-1, -1); QCOMPARE(spy.size(), 1); @@ -577,7 +577,7 @@ void tst_qquicktreeview::collapseRecursivelyRoot() const int expectedRowCount = 1 + (model->maxDepth() * 8) - 4; QCOMPARE(treeView->rows(), expectedRowCount); - QSignalSpy spy(treeView, SIGNAL(collapsed(int, bool))); + QSignalSpy spy(treeView, SIGNAL(collapsed(int,bool))); // Collapse the whole tree again. This time, only the root should end up visible treeView->collapseRecursively(); @@ -624,7 +624,7 @@ void tst_qquicktreeview::collapseRecursivelyChild() const int expectedRowCount = 1 + (model->maxDepth() * 8) - 4; QCOMPARE(treeView->rows(), expectedRowCount); - QSignalSpy spy(treeView, SIGNAL(collapsed(int, bool))); + QSignalSpy spy(treeView, SIGNAL(collapsed(int,bool))); // Collapse the 8th child recursive const int rowToCollapse = 8; @@ -671,7 +671,7 @@ void tst_qquicktreeview::collapseRecursivelyWholeTree() { // Check that we collapse the whole tree recursively by passing -1 LOAD_TREEVIEW("normaltreeview.qml"); - QSignalSpy spy(treeView, SIGNAL(collapsed(int, bool))); + QSignalSpy spy(treeView, SIGNAL(collapsed(int,bool))); treeView->expandRecursively(); treeView->collapseRecursively(); @@ -690,7 +690,7 @@ void tst_qquicktreeview::expandToIndex() // Check that expandToIndex(index) expands the tree so // that index becomes visible in the view LOAD_TREEVIEW("normaltreeview.qml"); - QSignalSpy spy(treeView, SIGNAL(expanded(int, int))); + QSignalSpy spy(treeView, SIGNAL(expanded(int,int))); const QModelIndex root = model->index(0, 0); const QModelIndex child1 = model->index(3, 0, root); diff --git a/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp index 0cd4b69e00..dbd428e0ae 100644 --- a/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp +++ b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp @@ -42,7 +42,7 @@ void tst_QQuickViewExtra::qtbug_87228() auto children = contentItem->childItems(); QVERIFY(children.size() > 0); // for the sake of this test, any child would be suitable, so pick first - deletionSpy.reset(new QSignalSpy(children[0], SIGNAL(destroyed(QObject *)))); + deletionSpy.reset(new QSignalSpy(children[0], SIGNAL(destroyed(QObject*)))); } QCOMPARE(deletionSpy->size(), 1); } diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index f79c3bd23c..7133e74769 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -2926,8 +2926,8 @@ void tst_qquickwindow::test_circleMapItem() mat->setObjectName("Top Item/MouseArea"); mat->setSize(QSizeF(40, 40)); - QSignalSpy bottomSpy(mab, SIGNAL(clicked(QQuickMouseEvent *))); - QSignalSpy topSpy(mat, SIGNAL(clicked(QQuickMouseEvent *))); + QSignalSpy bottomSpy(mab, SIGNAL(clicked(QQuickMouseEvent*))); + QSignalSpy topSpy(mat, SIGNAL(clicked(QQuickMouseEvent*))); window.show(); QVERIFY(QTest::qWaitForWindowExposed(&window)); diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index 8e8ee223d9..ec521fe0e7 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -1450,11 +1450,11 @@ void tst_TouchMouse::hoverEnabled() // QTBUG-40856 QSignalSpy enterSpy1(mouseArea1, SIGNAL(entered())); QSignalSpy exitSpy1(mouseArea1, SIGNAL(exited())); - QSignalSpy clickSpy1(mouseArea1, SIGNAL(clicked(QQuickMouseEvent *))); + QSignalSpy clickSpy1(mouseArea1, SIGNAL(clicked(QQuickMouseEvent*))); QSignalSpy enterSpy2(mouseArea2, SIGNAL(entered())); QSignalSpy exitSpy2(mouseArea2, SIGNAL(exited())); - QSignalSpy clickSpy2(mouseArea2, SIGNAL(clicked(QQuickMouseEvent *))); + QSignalSpy clickSpy2(mouseArea2, SIGNAL(clicked(QQuickMouseEvent*))); QPoint p1(150, 150); QPoint p2(150, 250); diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp b/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp index 01116aa7e9..0e46259d2f 100644 --- a/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp @@ -185,9 +185,9 @@ class FolderDialogSignalHelper public: FolderDialogSignalHelper(const FolderDialogTestHelper &dialogTestHelper) : dialogSelectedFolderChangedSpy(dialogTestHelper.dialog, SIGNAL(selectedFolderChanged())), - quickDialogSelectedFolderChangedSpy(dialogTestHelper.quickDialog, SIGNAL(selectedFolderChanged(const QUrl &))), + quickDialogSelectedFolderChangedSpy(dialogTestHelper.quickDialog, SIGNAL(selectedFolderChanged(QUrl))), dialogCurrentFolderChangedSpy(dialogTestHelper.dialog, SIGNAL(currentFolderChanged())), - quickDialogCurrentFolderChangedSpy(dialogTestHelper.quickDialog, SIGNAL(currentFolderChanged(const QUrl &))) + quickDialogCurrentFolderChangedSpy(dialogTestHelper.quickDialog, SIGNAL(currentFolderChanged(QUrl))) { if (!dialogSelectedFolderChangedSpy.isValid()) errorMessage = "selectedFolderChanged signal of dialog is not valid"; |