diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-10-16 11:08:13 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 00:44:54 +0200 |
commit | bb73c085a6092ea10c60e652cb66d8c369cfb65e (patch) | |
tree | e06d5f2b88164ff34ddb46f2a1f10f76f7a8fd7c /tests/auto/widgets/kernel | |
parent | 0783b1670d5862b51747b0246a222878ff3b9c44 (diff) |
normalise signal/slot signatures [QtWidgets tests]
Change-Id: Iffab60f0911a55e4be09faeb29df0bae1ea2eb19
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/widgets/kernel')
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index 8bcfe1f77c..b5e51d9204 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -369,7 +369,7 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup() checkedAction->setChecked(true); QSignalSpy actionSpy(checkedAction, SIGNAL(triggered(bool))); - QSignalSpy actionGroupSpy(&ag, SIGNAL(triggered(QAction *))); + QSignalSpy actionGroupSpy(&ag, SIGNAL(triggered(QAction*))); QCOMPARE(actionGroupSpy.count(), 0); QCOMPARE(actionSpy.count(), 0); checkedAction->trigger(); diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index abb979c76c..4ce2795c9a 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -1513,7 +1513,7 @@ void tst_QApplication::focusChanged() int argc = 0; QApplication app(argc, 0, QApplication::GuiServer); - QSignalSpy spy(&app, SIGNAL(focusChanged(QWidget *, QWidget *))); + QSignalSpy spy(&app, SIGNAL(focusChanged(QWidget*,QWidget*))); QWidget *now = 0; QWidget *old = 0; diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 7fccc494ec..d65a98d7ba 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -218,8 +218,8 @@ void tst_QShortcut::initTestCase() mainW->show(); mainW->activateWindow(); QVERIFY(QTest::qWaitForWindowActive(mainW)); - connect( mainW->statusBar(), SIGNAL(messageChanged(const QString&)), - this, SLOT(statusMessage(const QString&)) ); + connect( mainW->statusBar(), SIGNAL(messageChanged(QString)), + this, SLOT(statusMessage(QString)) ); } void tst_QShortcut::cleanupTestCase() diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index b4f31acaef..1052a9100d 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -4311,7 +4311,7 @@ void tst_QWidget::qobject_castInDestroyedSlot() QWidget *widget = new QWidget(); - QObject::connect(widget, SIGNAL(destroyed(QObject *)), &checker, SLOT(destroyedSlot(QObject *))); + QObject::connect(widget, SIGNAL(destroyed(QObject*)), &checker, SLOT(destroyedSlot(QObject*))); delete widget; QVERIFY(checker.wasQWidget == true); @@ -8757,7 +8757,7 @@ class MyEvilObject : public QObject public: MyEvilObject(QWidget *widgetToCrash) : QObject(), widget(widgetToCrash) { - connect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(beEvil(QObject *))); + connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(beEvil(QObject*))); delete widget; } QWidget *widget; |