git.iko.soy/unity8
on xenial help sign in
Some more new connections i had missed
3f43349Albert Astals Cid
plugins/LightDM/liblightdm/Greeter.cpp+1−1
compare with xenial
unifiedsplit
@@ -175,7 +175,7 @@ void Greeter::sendAuthenticationComplete()
175{
175{
176 if (qgetenv("UNITY_TESTING").isEmpty()) {
176 if (qgetenv("UNITY_TESTING").isEmpty()) {
177 // simulate PAM's delay
177 // simulate PAM's delay
178− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
178+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
179 } else {
179 } else {
180 Q_EMIT authenticationComplete();
180 Q_EMIT authenticationComplete();
181 }
181 }
plugins/Utils/unitysortfilterproxymodelqml.cpp+3−3
@@ -59,9 +59,9 @@ UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
59
59
60 setSourceModel(itemModel);
60 setSourceModel(itemModel);
61
61
62− connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));
62+ connect(itemModel, &QAbstractItemModel::modelReset, this, &UnitySortFilterProxyModelQML::totalCountChanged);
63− connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
63+ connect(itemModel, &QAbstractItemModel::rowsInserted, this, &UnitySortFilterProxyModelQML::totalCountChanged);
64− connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
64+ connect(itemModel, &QAbstractItemModel::rowsRemoved, this, &UnitySortFilterProxyModelQML::totalCountChanged);
65
65
66 Q_EMIT totalCountChanged();
66 Q_EMIT totalCountChanged();
67 Q_EMIT modelChanged();
67 Q_EMIT modelChanged();
tests/mocks/GSettings.1.0/fake_gsettings.cpp+4−4
@@ -95,10 +95,10 @@ GSettingsQml::GSettingsQml(QObject *parent)
95 : QObject(parent)
95 : QObject(parent)
96{
96{
97 m_schema = new GSettingsSchemaQml(this);
97 m_schema = new GSettingsSchemaQml(this);
98− connect(GSettingsControllerQml::instance(), SIGNAL(pictureUriChanged(const QString &)),
98+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::pictureUriChanged,
99− this, SIGNAL(pictureUriChanged(const QString &)));
99+ this, &GSettingsQml::pictureUriChanged);
100− connect(GSettingsControllerQml::instance(), SIGNAL(usageModeChanged(const QString &)),
100+ connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::usageModeChanged,
101− this, SIGNAL(usageModeChanged(const QString &)));
101+ this, &GSettingsQml::usageModeChanged);
102}
102}
103
103
104GSettingsSchemaQml * GSettingsQml::schema() const {
104GSettingsSchemaQml * GSettingsQml::schema() const {
tests/mocks/LightDM/liblightdm/Greeter.cpp+1−1
@@ -173,7 +173,7 @@ void Greeter::sendAuthenticationComplete()
173{
173{
174 if (qgetenv("UNITY_TESTING").isEmpty()) {
174 if (qgetenv("UNITY_TESTING").isEmpty()) {
175 // simulate PAM's delay
175 // simulate PAM's delay
176− QTimer::singleShot(1000, this, SIGNAL(authenticationComplete()));
176+ QTimer::singleShot(1000, this, &Greeter::authenticationComplete);
177 } else {
177 } else {
178 Q_EMIT authenticationComplete();
178 Q_EMIT authenticationComplete();
179 }
179 }
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+1−1
@@ -2069,7 +2069,7 @@ private Q_SLOTS:
2069
2069
2070 void addingRemoveItemsShouldNotChangeContentY()
2070 void addingRemoveItemsShouldNotChangeContentY()
2071 {
2071 {
2072− QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));
2072+ QSignalSpy spy(lvwph, &ListViewWithPageHeader::contentYChanged);
2073 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150), Q_ARG(QVariant, "Agressive"));
2073 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150), Q_ARG(QVariant, "Agressive"));
2074 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
2074 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
2075
2075
tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1
@@ -1660,7 +1660,7 @@ private Q_SLOTS:
1660
1660
1661 void addingRemoveItemsShouldNotChangeContentY()
1661 void addingRemoveItemsShouldNotChangeContentY()
1662 {
1662 {
1663− QSignalSpy spy(lvwph, SIGNAL(contentYChanged()));
1663+ QSignalSpy spy(lvwph, &ListViewWithPageHeader::contentYChanged);
1664 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150));
1664 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 150));
1665 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
1665 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 6));
1666
1666
tests/plugins/LightDM/dbus.cpp+5−5
@@ -94,7 +94,7 @@ private Q_SLOTS:
94
94
95 void testSetActiveEntry()
95 void testSetActiveEntry()
96 {
96 {
97− QSignalSpy spy(greeter, SIGNAL(requestAuthenticationUser(QString)));
97+ QSignalSpy spy(greeter, &Greeter::requestAuthenticationUser);
98 QDBusReply<void> reply = dbusList->call("SetActiveEntry", "has-password");
98 QDBusReply<void> reply = dbusList->call("SetActiveEntry", "has-password");
99 QVERIFY(reply.isValid());
99 QVERIFY(reply.isValid());
100 spy.wait();
100 spy.wait();
@@ -123,7 +123,7 @@ private Q_SLOTS:
123
123
124 void testActiveEntrySet()
124 void testActiveEntrySet()
125 {
125 {
126− QSignalSpy spy(greeter, SIGNAL(requestAuthenticationUser(QString)));
126+ QSignalSpy spy(greeter, &Greeter::requestAuthenticationUser);
127 QVERIFY(dbusList->setProperty("ActiveEntry", "has-password"));
127 QVERIFY(dbusList->setProperty("ActiveEntry", "has-password"));
128 spy.wait();
128 spy.wait();
129
129
@@ -134,7 +134,7 @@ private Q_SLOTS:
134
134
135 void testActiveEntryChanged()
135 void testActiveEntryChanged()
136 {
136 {
137− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
137+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);
138 greeter->authenticate("has-password");
138 greeter->authenticate("has-password");
139 spy.wait();
139 spy.wait();
140
140
@@ -160,7 +160,7 @@ private Q_SLOTS:
160
160
161 void testEntryIsLockedChanged()
161 void testEntryIsLockedChanged()
162 {
162 {
163− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
163+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);
164 greeter->authenticate("no-password");
164 greeter->authenticate("no-password");
165
165
166 // Two property changed signals will be emitted, one for the IsLocked
166 // Two property changed signals will be emitted, one for the IsLocked
@@ -182,7 +182,7 @@ private Q_SLOTS:
182 QVERIFY(!greeter->isActive());
182 QVERIFY(!greeter->isActive());
183 QVERIFY(!dbusMain->property("IsActive").toBool());
183 QVERIFY(!dbusMain->property("IsActive").toBool());
184
184
185− QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
185+ QSignalSpy spy(this, &GreeterDBusTest::PropertiesChangedRelay);
186 greeter->setIsActive(true);
186 greeter->setIsActive(true);
187 spy.wait();
187 spy.wait();
188
188
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+4−4
@@ -305,8 +305,8 @@ void tst_DirectionalDragArea::sceneXAndX()
305
305
306 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);
306 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);
307
307
308− QSignalSpy touchXSpy(edgeDragArea, SIGNAL(touchXChanged(qreal)));
308+ QSignalSpy touchXSpy(edgeDragArea, &DirectionalDragArea::touchXChanged);
309− QSignalSpy touchSceneXSpy(edgeDragArea, SIGNAL(touchSceneXChanged(qreal)));
309+ QSignalSpy touchSceneXSpy(edgeDragArea, &DirectionalDragArea::touchSceneXChanged);
310
310
311 touchScenePos.rx() = m_view->width() / 2;
311 touchScenePos.rx() = m_view->width() / 2;
312 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);
312 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);
@@ -334,8 +334,8 @@ void tst_DirectionalDragArea::sceneYAndY()
334
334
335 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);
335 sendTouchPress(0 /* timestamp */, 0 /* id */, touchScenePos);
336
336
337− QSignalSpy touchYSpy(edgeDragArea, SIGNAL(touchYChanged(qreal)));
337+ QSignalSpy touchYSpy(edgeDragArea, &DirectionalDragArea::touchYChanged);
338− QSignalSpy touchSceneYSpy(edgeDragArea, SIGNAL(touchSceneYChanged(qreal)));
338+ QSignalSpy touchSceneYSpy(edgeDragArea, &DirectionalDragArea::touchSceneYChanged);
339
339
340 touchScenePos.ry() = m_view->height() / 2;
340 touchScenePos.ry() = m_view->height() / 2;
341 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);
341 sendTouchUpdate(50 /* timestamp */, 0 /* id */, touchScenePos);
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp+5−5
@@ -64,7 +64,7 @@ void tst_PressedOutsideNotifier::touchOutsideAreaTriggersSignal()
64 // Therefore, still outside it.
64 // Therefore, still outside it.
65 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
65 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
66
66
67− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
67+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);
68
68
69 QTest::touchEvent(m_view, m_device)
69 QTest::touchEvent(m_view, m_device)
70 .press(0, touch0);
70 .press(0, touch0);
@@ -82,7 +82,7 @@ void tst_PressedOutsideNotifier::touchInsideAreaHasNoEffect()
82 QPoint touch0 = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
82 QPoint touch0 = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
83 m_blueRect->y() + m_blueRect->height()*0.5);
83 m_blueRect->y() + m_blueRect->height()*0.5);
84
84
85− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
85+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);
86
86
87 QTest::touchEvent(m_view, m_device)
87 QTest::touchEvent(m_view, m_device)
88 .press(0, touch0);
88 .press(0, touch0);
@@ -99,7 +99,7 @@ void tst_PressedOutsideNotifier::mousePressOutsideAreaTriggersSignal()
99{
99{
100 QPoint mousePos= QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
100 QPoint mousePos= QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
101
101
102− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
102+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);
103
103
104 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
104 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
105
105
@@ -115,7 +115,7 @@ void tst_PressedOutsideNotifier::mousePresssInsideAreaHasNoEffect()
115 QPoint mousePos = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
115 QPoint mousePos = QPoint(m_blueRect->x() + m_blueRect->width()*0.5,
116 m_blueRect->y() + m_blueRect->height()*0.5);
116 m_blueRect->y() + m_blueRect->height()*0.5);
117
117
118− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
118+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);
119
119
120 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
120 QTest::mousePress(m_view, Qt::LeftButton, 0 /*modifiers*/, mousePos);
121
121
@@ -130,7 +130,7 @@ void tst_PressedOutsideNotifier::nothingHappensWhileDisabled()
130{
130{
131 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
131 QPoint touch0 = QPoint(m_blueRect->x() * 0.5, m_blueRect->y() * 0.5);
132
132
133− QSignalSpy pressedOutsideSpy(m_notifier, SIGNAL(pressedOutside()));
133+ QSignalSpy pressedOutsideSpy(m_notifier, &PressedOutsideNotifier::pressedOutside);
134
134
135 m_notifier->setEnabled(false);
135 m_notifier->setEnabled(false);
136
136
tests/plugins/Unity/Launcher/launchermodeltest.cpp+3−3
@@ -187,7 +187,7 @@ private Q_SLOTS:
187 }
187 }
188
188
189 void testPinning() {
189 void testPinning() {
190− QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
190+ QSignalSpy spy(launcherModel, &LauncherModel::dataChanged);
191 QCOMPARE(launcherModel->get(0)->pinned(), false);
191 QCOMPARE(launcherModel->get(0)->pinned(), false);
192 QCOMPARE(launcherModel->get(1)->pinned(), false);
192 QCOMPARE(launcherModel->get(1)->pinned(), false);
193 launcherModel->pin(launcherModel->get(0)->appId());
193 launcherModel->pin(launcherModel->get(0)->appId());
@@ -424,7 +424,7 @@ private Q_SLOTS:
424 }
424 }
425
425
426 void testCountEmblems() {
426 void testCountEmblems() {
427− QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));
427+ QSignalSpy spy(launcherModel, &LauncherModel::dataChanged);
428
428
429 // Call GetAll on abs-icon
429 // Call GetAll on abs-icon
430 QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
430 QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");
@@ -570,7 +570,7 @@ private Q_SLOTS:
570
570
571 void testSettings() {
571 void testSettings() {
572 GSettings *settings = launcherModel->m_settings;
572 GSettings *settings = launcherModel->m_settings;
573− QSignalSpy spy(launcherModel, SIGNAL(hint()));
573+ QSignalSpy spy(launcherModel, &LauncherModel::hint);
574
574
575 // Nothing pinned at startup
575 // Nothing pinned at startup
576 QCOMPARE(settings->storedApplications().count(), 0);
576 QCOMPARE(settings->storedApplications().count(), 0);
tests/plugins/Utils/HomeKeyWatcherTest.cpp+2−2
@@ -128,7 +128,7 @@ void HomeKeyWatcherTest::touchTapTouch()
128 QFETCH(int, silenceAfterTap);
128 QFETCH(int, silenceAfterTap);
129 QFETCH(int, expectedActivatedCount);
129 QFETCH(int, expectedActivatedCount);
130 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);
130 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);
131− QSignalSpy activatedSpy(&homeKeyWatcher, SIGNAL(activated()));
131+ QSignalSpy activatedSpy(&homeKeyWatcher, &HomeKeyWatcher::activated);
132 QVERIFY(activatedSpy.isValid());
132 QVERIFY(activatedSpy.isValid());
133
133
134 {
134 {
@@ -189,7 +189,7 @@ void HomeKeyWatcherTest::touchTapTouch()
189void HomeKeyWatcherTest::tapWhileTouching()
189void HomeKeyWatcherTest::tapWhileTouching()
190{
190{
191 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);
191 HomeKeyWatcher homeKeyWatcher(m_fakeTimerFactory->create(), new FakeElapsedTimer);
192− QSignalSpy activatedSpy(&homeKeyWatcher, SIGNAL(activated()));
192+ QSignalSpy activatedSpy(&homeKeyWatcher, &HomeKeyWatcher::activated);
193 QVERIFY(activatedSpy.isValid());
193 QVERIFY(activatedSpy.isValid());
194
194
195 {
195 {
tests/plugins/Utils/QLimitProxyModelTest.cpp+21−21
@@ -193,7 +193,7 @@ private Q_SLOTS:
193 MockListModel model;
193 MockListModel model;
194 model.insertRows(0, 5);
194 model.insertRows(0, 5);
195
195
196− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
196+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
197
197
198 proxy.setModel(&model);
198 proxy.setModel(&model);
199 QCOMPARE(proxy.rowCount(), 5);
199 QCOMPARE(proxy.rowCount(), 5);
@@ -207,7 +207,7 @@ private Q_SLOTS:
207
207
208 proxy.setModel(&model);
208 proxy.setModel(&model);
209
209
210− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
210+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
211
211
212 model.insertRows(0, 5);
212 model.insertRows(0, 5);
213 QCOMPARE(proxy.rowCount(), 5);
213 QCOMPARE(proxy.rowCount(), 5);
@@ -222,7 +222,7 @@ private Q_SLOTS:
222
222
223 proxy.setModel(&model);
223 proxy.setModel(&model);
224
224
225− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
225+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
226
226
227 model.removeRows(0, 3);
227 model.removeRows(0, 3);
228 QCOMPARE(proxy.rowCount(), 2);
228 QCOMPARE(proxy.rowCount(), 2);
@@ -237,7 +237,7 @@ private Q_SLOTS:
237 proxy.setModel(&model);
237 proxy.setModel(&model);
238 proxy.setLimit(3);
238 proxy.setLimit(3);
239
239
240− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
240+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
241
241
242 model.insertRows(0, 5);
242 model.insertRows(0, 5);
243 QCOMPARE(proxy.rowCount(), 3);
243 QCOMPARE(proxy.rowCount(), 3);
@@ -253,9 +253,9 @@ private Q_SLOTS:
253
253
254 proxy.setModel(&model);
254 proxy.setModel(&model);
255
255
256− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
256+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);
257− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
257+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);
258− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
258+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
259
259
260 proxy.setLimit(5);
260 proxy.setLimit(5);
261 QCOMPARE(spyOnRowsInserted.count(), 0);
261 QCOMPARE(spyOnRowsInserted.count(), 0);
@@ -300,9 +300,9 @@ private Q_SLOTS:
300
300
301 proxy.setModel(&model);
301 proxy.setModel(&model);
302
302
303− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
303+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);
304− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
304+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);
305− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
305+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
306
306
307 proxy.setLimit(7);
307 proxy.setLimit(7);
308 QCOMPARE(spyOnRowsRemoved.count(), 0);
308 QCOMPARE(spyOnRowsRemoved.count(), 0);
@@ -359,9 +359,9 @@ private Q_SLOTS:
359
359
360 proxy.setModel(&model);
360 proxy.setModel(&model);
361
361
362− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
362+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);
363− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
363+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);
364− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
364+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
365
365
366 proxy.setLimit(7);
366 proxy.setLimit(7);
367 QCOMPARE(spyOnRowsRemoved.count(), 0);
367 QCOMPARE(spyOnRowsRemoved.count(), 0);
@@ -406,9 +406,9 @@ private Q_SLOTS:
406 proxy.setModel(&model);
406 proxy.setModel(&model);
407 proxy.setLimit(7);
407 proxy.setLimit(7);
408
408
409− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
409+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);
410− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
410+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);
411− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
411+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
412
412
413 model.insertRows(0, 5);
413 model.insertRows(0, 5);
414 QCOMPARE(spyOnRowsRemoved.count(), 0);
414 QCOMPARE(spyOnRowsRemoved.count(), 0);
@@ -451,9 +451,9 @@ private Q_SLOTS:
451
451
452 QCOMPARE(proxy.rowCount(), 7);
452 QCOMPARE(proxy.rowCount(), 7);
453
453
454− QSignalSpy spyOnRowsRemoved(&proxy, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
454+ QSignalSpy spyOnRowsRemoved(&proxy, &QLimitProxyModelQML::rowsRemoved);
455− QSignalSpy spyOnRowsInserted(&proxy, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
455+ QSignalSpy spyOnRowsInserted(&proxy, &QLimitProxyModelQML::rowsInserted);
456− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
456+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
457
457
458 model.removeRows(7, 3);
458 model.removeRows(7, 3);
459 QCOMPARE(proxy.rowCount(), 7);
459 QCOMPARE(proxy.rowCount(), 7);
@@ -507,7 +507,7 @@ private Q_SLOTS:
507 QLimitProxyModelQML proxy;
507 QLimitProxyModelQML proxy;
508 MockListModel model, model2;
508 MockListModel model, model2;
509
509
510− QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
510+ QSignalSpy spyOnModelChanged(&proxy, &QLimitProxyModelQML::modelChanged);
511
511
512 proxy.setModel(&model);
512 proxy.setModel(&model);
513 QCOMPARE(spyOnModelChanged.count(), 1);
513 QCOMPARE(spyOnModelChanged.count(), 1);
@@ -529,7 +529,7 @@ private Q_SLOTS:
529 proxy.setModel(&model);
529 proxy.setModel(&model);
530 proxy.setModel(&model);
530 proxy.setModel(&model);
531
531
532− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
532+ QSignalSpy spyOnCountChanged(&proxy, &QLimitProxyModelQML::countChanged);
533
533
534 model.insertRows(0, 5);
534 model.insertRows(0, 5);
535 QCOMPARE(proxy.rowCount(), 5);
535 QCOMPARE(proxy.rowCount(), 5);
tests/plugins/Utils/UnitySortFilterProxyModelTest.cpp+4−4
@@ -135,7 +135,7 @@ private Q_SLOTS:
135 MockListModel model;
135 MockListModel model;
136 model.insertRows(0, 5);
136 model.insertRows(0, 5);
137
137
138− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
138+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);
139
139
140 proxy.setModel(&model);
140 proxy.setModel(&model);
141 QCOMPARE(proxy.count(), 5);
141 QCOMPARE(proxy.count(), 5);
@@ -149,7 +149,7 @@ private Q_SLOTS:
149
149
150 proxy.setModel(&model);
150 proxy.setModel(&model);
151
151
152− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
152+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);
153
153
154 model.insertRows(0, 5);
154 model.insertRows(0, 5);
155 QCOMPARE(proxy.count(), 5);
155 QCOMPARE(proxy.count(), 5);
@@ -165,7 +165,7 @@ private Q_SLOTS:
165 proxy.setModel(&model);
165 proxy.setModel(&model);
166 QCOMPARE(proxy.count(), 5);
166 QCOMPARE(proxy.count(), 5);
167
167
168− QSignalSpy spyOnCountChanged(&proxy, SIGNAL(countChanged()));
168+ QSignalSpy spyOnCountChanged(&proxy, &UnitySortFilterProxyModelQML::countChanged);
169
169
170 model.removeRows(0, 3);
170 model.removeRows(0, 3);
171 QCOMPARE(proxy.count(), 2);
171 QCOMPARE(proxy.count(), 2);
@@ -249,7 +249,7 @@ private Q_SLOTS:
249 UnitySortFilterProxyModelQML proxy;
249 UnitySortFilterProxyModelQML proxy;
250 MockListModel model, model2;
250 MockListModel model, model2;
251
251
252− QSignalSpy spyOnModelChanged(&proxy, SIGNAL(modelChanged()));
252+ QSignalSpy spyOnModelChanged(&proxy, &UnitySortFilterProxyModelQML::modelChanged);
253
253
254 proxy.setModel(&model);
254 proxy.setModel(&model);
255 QCOMPARE(spyOnModelChanged.count(), 1);
255 QCOMPARE(spyOnModelChanged.count(), 1);
tests/qmltests/Components/tst_DragHandle.cpp+1−1
@@ -467,7 +467,7 @@ void tst_DragHandle::hintingAnimation_dontRestartAfterFinishedAndStillPressed()
467 tryCompare([&](){ return parentItem->height(); }, hintDisplacement);
467 tryCompare([&](){ return parentItem->height(); }, hintDisplacement);
468
468
469
469
470− QSignalSpy parentHeightChangedSpy(parentItem, SIGNAL(heightChanged()));
470+ QSignalSpy parentHeightChangedSpy(parentItem, &QQuickItem::heightChanged);
471
471
472 drag(touchPoint, QPointF(0.0, -1.0) /*dragDirectionVector*/, 15 /*distance*/, 3 /*numSteps*/);
472 drag(touchPoint, QPointF(0.0, -1.0) /*dragDirectionVector*/, 15 /*distance*/, 3 /*numSteps*/);
473
473