diff options
author | Addison Elliott <addison.elliott@gmail.com> | 2016-12-14 01:01:58 -0600 |
---|---|---|
committer | Addison Elliott <addison.elliott@gmail.com> | 2016-12-22 15:00:23 +0000 |
commit | 5319da1f6d3707ca1d1dca6a026d9a34f6e47b61 (patch) | |
tree | fb9aae4b0a9d74275b3d8d16ecb261f46cb5cae8 /tests/auto/widgets/util/qcompleter | |
parent | 04fbca3c91b58f1c3a212b234d238053d01f441a (diff) |
Update Widgets/Util Tests to Qt5 Connection Syntax
Many of the tests still use the old connection signal/slot syntax for
tests. Since I recently made a change to one of the tests within the
Widgets/Util folder, I went through and updated the entire folder to the
Qt-5 connection syntax.
Change-Id: Iaaa5a38858eed41fbc897b66ef291f08458505f1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'tests/auto/widgets/util/qcompleter')
-rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 92a8dff218..937be944a1 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1193,7 +1193,7 @@ void tst_QCompleter::disabledItems() model->appendRow(suggestions); model->appendRow(new QStandardItem("suggestions Enabled")); QCompleter *completer = new QCompleter(model, &lineEdit); - QSignalSpy spy(completer, SIGNAL(activated(QString))); + QSignalSpy spy(completer, QOverload<const QString &>::of(&QCompleter::activated)); lineEdit.setCompleter(completer); lineEdit.move(200, 200); lineEdit.show(); @@ -1219,7 +1219,7 @@ void tst_QCompleter::task178797_activatedOnReturn() setFrameless(&ledit); QCompleter *completer = new QCompleter(words, &ledit); ledit.setCompleter(completer); - QSignalSpy spy(completer, SIGNAL(activated(QString))); + QSignalSpy spy(completer, QOverload<const QString &>::of(&QCompleter::activated)); QCOMPARE(spy.count(), 0); ledit.move(200, 200); ledit.show(); @@ -1287,7 +1287,7 @@ public: if (completer()) { completer()->setCompletionMode(QCompleter::PopupCompletion); completer()->setCompletionRole(Qt::DisplayRole); - connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix())); + connect(lineEdit(), &QLineEdit::editingFinished, this, &task246056_ComboBox::setCompletionPrefix); } } private slots: @@ -1306,7 +1306,7 @@ void tst_QCompleter::task246056_setCompletionPrefix() comboBox.show(); QApplication::setActiveWindow(&comboBox); QVERIFY(QTest::qWaitForWindowActive(&comboBox)); - QSignalSpy spy(comboBox.completer(), SIGNAL(activated(QModelIndex))); + QSignalSpy spy(comboBox.completer(), QOverload<const QModelIndex &>::of(&QCompleter::activated)); QTest::keyPress(&comboBox, 'a'); QTest::keyPress(comboBox.completer()->popup(), Qt::Key_Down); QTest::keyPress(comboBox.completer()->popup(), Qt::Key_Down); |