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/widgets | |
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/widgets')
16 files changed, 52 insertions, 52 deletions
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index a7bcdb1e2a..548d5b7c26 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -1130,7 +1130,7 @@ void tst_QAbstractSlider::rangeChanged() QFETCH(int, expectedCount); QSlider slider; slider.setRange(minimum, maximum); - QSignalSpy spy(&slider, SIGNAL(rangeChanged(int, int))); + QSignalSpy spy(&slider, SIGNAL(rangeChanged(int,int))); slider.setRange(newMin, newMax); QCOMPARE(spy.count(), expectedCount); } @@ -1263,7 +1263,7 @@ void tst_QAbstractSlider::setRepeatAction() void tst_QAbstractSlider::connectedSliders() { Slider *slider2 = new Slider(topLevel); - connect(slider, SIGNAL(rangeChanged(int, int)), slider2, SLOT(setRange(int, int))); + connect(slider, SIGNAL(rangeChanged(int,int)), slider2, SLOT(setRange(int,int))); const int sliderlow = 13; const int sliderhigh = 1017; slider->setRange(sliderlow, sliderhigh); diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index 5c1de27ef9..772ba7e00b 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -317,11 +317,11 @@ void tst_QButtonGroup::testSignals() buttons.addButton(&pb3); qRegisterMetaType<QAbstractButton *>("QAbstractButton *"); - QSignalSpy clickedSpy(&buttons, SIGNAL(buttonClicked(QAbstractButton *))); + QSignalSpy clickedSpy(&buttons, SIGNAL(buttonClicked(QAbstractButton*))); QSignalSpy clickedIdSpy(&buttons, SIGNAL(buttonClicked(int))); - QSignalSpy pressedSpy(&buttons, SIGNAL(buttonPressed(QAbstractButton *))); + QSignalSpy pressedSpy(&buttons, SIGNAL(buttonPressed(QAbstractButton*))); QSignalSpy pressedIdSpy(&buttons, SIGNAL(buttonPressed(int))); - QSignalSpy releasedSpy(&buttons, SIGNAL(buttonReleased(QAbstractButton *))); + QSignalSpy releasedSpy(&buttons, SIGNAL(buttonReleased(QAbstractButton*))); QSignalSpy releasedIdSpy(&buttons, SIGNAL(buttonReleased(int))); pb1.animateClick(); @@ -480,7 +480,7 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler() task209485_ButtonDeleter buttonDeleter(&group, deleteButton); - QSignalSpy spy1(&group, SIGNAL(buttonClicked(QAbstractButton *))); + QSignalSpy spy1(&group, SIGNAL(buttonClicked(QAbstractButton*))); QSignalSpy spy2(&group, SIGNAL(buttonClicked(int))); // NOTE: Reintroducing the bug of this task will cause the following line to crash: diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 116f3a99f3..bd16085639 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1121,7 +1121,7 @@ void tst_QComboBox::currentIndex() // spy on currentIndexChanged QSignalSpy indexChangedInt(testWidget, SIGNAL(currentIndexChanged(int))); - QSignalSpy indexChangedString(testWidget, SIGNAL(currentIndexChanged(const QString&))); + QSignalSpy indexChangedString(testWidget, SIGNAL(currentIndexChanged(QString))); // stuff items into it foreach(QString text, initialItems) { @@ -2120,7 +2120,7 @@ void tst_QComboBox::task247863_keyBoardSelection() QApplication::setActiveWindow(&combo); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); - QSignalSpy spy(&combo, SIGNAL(activated(const QString &))); + QSignalSpy spy(&combo, SIGNAL(activated(QString))); qApp->setEffectEnabled(Qt::UI_AnimateCombo, false); QTest::keyClick(&combo, Qt::Key_Space); qApp->setEffectEnabled(Qt::UI_AnimateCombo, true); diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 916b60ab6f..b12708a159 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -1068,7 +1068,7 @@ void tst_QDateTimeEdit::enterKey() // causes the dateChanged() signal to be emitted, even if the date // wasn't actually changed. While this behaviour is questionable, // we include this test so a change to the behaviour can't go unnoticed. - QSignalSpy enterSpy(testWidget, SIGNAL(dateChanged(const QDate &))); + QSignalSpy enterSpy(testWidget, SIGNAL(dateChanged(QDate))); QTest::keyClick(testWidget, Qt::Key_Enter); QCOMPARE(enterSpy.count(), 1); QVariantList list = enterSpy.takeFirst(); @@ -2028,9 +2028,9 @@ void tst_QDateTimeEdit::dateSignalChecking() testWidget->setDate(originalDate); - QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(const QDate &))); - QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(const QDateTime &))); - QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(const QTime &))); + QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(QDate))); + QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(QDateTime))); + QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(QTime))); testWidget->setDate(newDate); QCOMPARE(dateSpy.count(), timesEmitted); @@ -2064,9 +2064,9 @@ void tst_QDateTimeEdit::timeSignalChecking() testWidget->setTime(originalTime); testWidget->setDisplayFormat("hh:mm:ss"); - QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(const QDate &))); - QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(const QDateTime &))); - QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(const QTime &))); + QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(QDate))); + QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(QDateTime))); + QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(QTime))); testWidget->setTime(newTime); QCOMPARE(timeSpy.count(), timesEmitted); @@ -2114,9 +2114,9 @@ void tst_QDateTimeEdit::dateTimeSignalChecking() testWidget->setDisplayFormat("dd/MM/yyyy hh:mm:ss"); testWidget->setDateTime(originalDateTime); - QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(const QDate &))); - QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(const QTime &))); - QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(const QDateTime &))); + QSignalSpy dateSpy(testWidget, SIGNAL(dateChanged(QDate))); + QSignalSpy timeSpy(testWidget, SIGNAL(timeChanged(QTime))); + QSignalSpy dateTimeSpy(testWidget, SIGNAL(dateTimeChanged(QDateTime))); testWidget->setDateTime(newDateTime); QCOMPARE(dateSpy.count(), timesDateEmitted); @@ -2981,9 +2981,9 @@ void tst_QDateTimeEdit::task108572() void tst_QDateTimeEdit::task149097() { - QSignalSpy dtSpy(testWidget, SIGNAL(dateTimeChanged(const QDateTime &))); - QSignalSpy dSpy(testWidget, SIGNAL(dateChanged(const QDate &))); - QSignalSpy tSpy(testWidget, SIGNAL(timeChanged(const QTime &))); + QSignalSpy dtSpy(testWidget, SIGNAL(dateTimeChanged(QDateTime))); + QSignalSpy dSpy(testWidget, SIGNAL(dateChanged(QDate))); + QSignalSpy tSpy(testWidget, SIGNAL(timeChanged(QTime))); testWidget->setDisplayFormat("yyyy/MM/dd hh:mm:ss"); testWidget->setDateTime(QDateTime(QDate(2001, 02, 03), QTime(5, 1, 2))); diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index 61b57b00b0..8c8f5b5d71 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -547,8 +547,8 @@ void tst_QDialogButtonBox::testSignalOrder() buttonClicked1TimeStamp = acceptTimeStamp = rejectTimeStamp = helpRequestedTimeStamp = timeStamp = 0; QDialogButtonBox buttonBox; - connect(&buttonBox, SIGNAL(clicked(QAbstractButton *)), - this, SLOT(buttonClicked1(QAbstractButton *))); + connect(&buttonBox, SIGNAL(clicked(QAbstractButton*)), + this, SLOT(buttonClicked1(QAbstractButton*))); connect(&buttonBox, SIGNAL(accepted()), this, SLOT(acceptClicked())); connect(&buttonBox, SIGNAL(rejected()), this, SLOT(rejectClicked())); connect(&buttonBox, SIGNAL(helpRequested()), this, SLOT(helpRequestedClicked())); diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index b8af7844bd..898f566995 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -311,7 +311,7 @@ void tst_QDoubleSpinBox::setTracking() spin.setDecimals(decimals); spin.show(); - connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(const QString &))); + connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(QString))); keys.simulate(&spin); QCOMPARE(actualTexts, texts); diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp index faea7f420d..58ef5f1bf9 100644 --- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp +++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp @@ -142,7 +142,7 @@ void tst_QFontComboBox::currentFont() QFETCH(QFont, currentFont); SubQFontComboBox box; - QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont const&))); + QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont))); QFont oldCurrentFont = box.currentFont(); box.setCurrentFont(currentFont); @@ -192,7 +192,7 @@ void tst_QFontComboBox::fontFilters() QFETCH(QFontComboBox::FontFilters, fontFilters); SubQFontComboBox box; - QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont const&))); + QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont))); QFont currentFont = box.currentFont(); box.setFontFilters(fontFilters); @@ -265,7 +265,7 @@ void tst_QFontComboBox::writingSystem() QFETCH(QFontDatabase::WritingSystem, writingSystem); SubQFontComboBox box; - QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont const&))); + QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont))); QFont currentFont = box.currentFont(); box.setWritingSystem(writingSystem); @@ -285,7 +285,7 @@ void tst_QFontComboBox::writingSystem() void tst_QFontComboBox::currentFontChanged() { SubQFontComboBox box; - QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont const&))); + QSignalSpy spy0(&box, SIGNAL(currentFontChanged(QFont))); if (box.model()->rowCount() > 2) { QTest::keyPress(&box, Qt::Key_Down); diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 08913650ad..c971566a6a 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -360,9 +360,9 @@ void tst_QLineEdit::initTestCase() { testWidget = new QLineEdit(0); testWidget->setObjectName("testWidget"); - connect(testWidget, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(onCursorPositionChanged(int, int))); - connect(testWidget, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); - connect(testWidget, SIGNAL(textEdited(const QString&)), this, SLOT(onTextEdited(const QString&))); + connect(testWidget, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onCursorPositionChanged(int,int))); + connect(testWidget, SIGNAL(textChanged(QString)), this, SLOT(onTextChanged(QString))); + connect(testWidget, SIGNAL(textEdited(QString)), this, SLOT(onTextEdited(QString))); connect(testWidget, SIGNAL(returnPressed()), this, SLOT(onReturnPressed())); connect(testWidget, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); connect(testWidget, SIGNAL(editingFinished()), this, SLOT(editingFinished())); @@ -3183,7 +3183,7 @@ void tst_QLineEdit::inlineCompletion() void tst_QLineEdit::noTextEditedOnClear() { testWidget->setText("Test"); - QSignalSpy textEditedSpy(testWidget, SIGNAL(textEdited(const QString &))); + QSignalSpy textEditedSpy(testWidget, SIGNAL(textEdited(QString))); testWidget->clear(); QCOMPARE(textEditedSpy.count(), 0); } diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 259ec2ecd3..6fa9c10ddf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -333,8 +333,8 @@ void tst_QMdiArea::subWindowActivated() QMdiArea *workspace = new QMdiArea(&mw); workspace->setObjectName(QLatin1String("testWidget")); mw.setCentralWidget(workspace); - QSignalSpy spy(workspace, SIGNAL(subWindowActivated(QMdiSubWindow *))); - connect( workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(activeChanged(QMdiSubWindow *))); + QSignalSpy spy(workspace, SIGNAL(subWindowActivated(QMdiSubWindow*))); + connect( workspace, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(activeChanged(QMdiSubWindow*))); mw.show(); qApp->setActiveWindow(&mw); @@ -456,7 +456,7 @@ bool macHasAccessToWindowsServer() void tst_QMdiArea::subWindowActivated2() { QMdiArea mdiArea; - QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *))); + QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*))); for (int i = 0; i < 5; ++i) mdiArea.addSubWindow(new QWidget); QCOMPARE(spy.count(), 0); @@ -540,8 +540,8 @@ void tst_QMdiArea::subWindowActivatedWithMinimize() QMdiArea *workspace = new QMdiArea(&mw); workspace->setObjectName(QLatin1String("testWidget")); mw.setCentralWidget(workspace); - QSignalSpy spy(workspace, SIGNAL(subWindowActivated(QMdiSubWindow *))); - connect( workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(activeChanged(QMdiSubWindow *)) ); + QSignalSpy spy(workspace, SIGNAL(subWindowActivated(QMdiSubWindow*))); + connect( workspace, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(activeChanged(QMdiSubWindow*)) ); mw.show(); qApp->setActiveWindow(&mw); QWidget *widget = new QWidget(workspace); @@ -924,8 +924,8 @@ void tst_QMdiArea::setActiveSubWindow() QMdiArea workspace; workspace.show(); - QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *))); - connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(activeChanged(QMdiSubWindow *))); + QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*))); + connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(activeChanged(QMdiSubWindow*))); qApp->setActiveWindow(&workspace); // Activate hidden windows @@ -1321,8 +1321,8 @@ void tst_QMdiArea::closeWindows() workspace.addSubWindow(new QWidget)->show(); qApp->processEvents(); QCOMPARE(workspace.subWindowList().count(), windowCount); - QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *))); - connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(activeChanged(QMdiSubWindow *))); + QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*))); + connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(activeChanged(QMdiSubWindow*))); workspace.closeAllSubWindows(); qApp->processEvents(); QCOMPARE(workspace.subWindowList().count(), 0); @@ -1344,8 +1344,8 @@ void tst_QMdiArea::activateNextAndPreviousWindow() qApp->processEvents(); } - QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *))); - connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(activeChanged(QMdiSubWindow *))); + QSignalSpy spy(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*))); + connect(&workspace, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(activeChanged(QMdiSubWindow*))); // activateNextSubWindow for (int i = 0; i < windowCount; ++i) { @@ -2284,7 +2284,7 @@ void tst_QMdiArea::tabBetweenSubWindows() QWidget *focusWidget = subWindows.back()->widget(); QCOMPARE(qApp->focusWidget(), focusWidget); - QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow *))); + QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*))); QCOMPARE(spy.count(), 0); // Walk through the entire list of sub windows. diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 3807bad1ba..caf030e3b6 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -502,7 +502,7 @@ void tst_QMdiSubWindow::emittingOfSignals() QSignalSpy spy(window, signal == SIGNAL(aboutToActivate()) ? signal.data() - : SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates))); + : SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates))); QVERIFY(spy.isEmpty()); triggerSignal(window, &workspace, signal); // Unless the signal is windowRestored or windowDeactivated, diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index b159d0e6c3..4a53473903 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -448,7 +448,7 @@ void tst_QMenu::statusTip() { //check that the statustip of actions inserted into the menu are displayed QMainWindow w; - connect(w.statusBar(), SIGNAL(messageChanged(const QString &)), SLOT(onStatusMessageChanged(const QString &)));; //creates the status bar + connect(w.statusBar(), SIGNAL(messageChanged(QString)), SLOT(onStatusMessageChanged(QString)));; //creates the status bar QToolBar tb; QAction a("main action", &tb); a.setStatusTip("main action"); diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index c8b5d95dc9..572f0a6a4f 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -245,7 +245,7 @@ void tst_QMenuBar::initTestCase() // widget under test mw = new QMainWindow(0, Qt::X11BypassWindowManagerHint); mb = new QMenuBar( mw ); - connect( mb, SIGNAL(triggered(QAction *)), this, SLOT(onActivated(QAction *)) ); + connect( mb, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*)) ); initSimpleMenubar(); mw->show(); diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 2e7f281d62..beea5f3052 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -377,7 +377,7 @@ void tst_QSpinBox::setTracking() QSpinBox spin(0); spin.setKeyboardTracking(tracking); spin.show(); - connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(const QString &))); + connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(QString))); keys.simulate(&spin); QCOMPARE(actualTexts, texts); diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index 5bf2b02ce4..6fef2d4b9a 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -250,7 +250,7 @@ void tst_QTextBrowser::viewportPositionInHistory() void tst_QTextBrowser::relativeLinks() { qRegisterMetaType<QUrl>("QUrl"); - QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(const QUrl &))); + QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(QUrl))); browser->setSource(QUrl("subdir/../qtextbrowser.html")); QVERIFY(!browser->document()->isEmpty()); QVERIFY(sourceChangedSpy.count() == 1); @@ -658,7 +658,7 @@ void tst_QTextBrowser::urlEncoding() browser->setHtml("<a href=\"http://www.google.com/q=%22\">link</a>"); browser->focusTheNextChild(); - QSignalSpy spy(browser, SIGNAL(anchorClicked(const QUrl &))); + QSignalSpy spy(browser, SIGNAL(anchorClicked(QUrl))); #ifdef QT_KEYPAD_NAVIGATION browser->setEditFocus(true); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index ec656d35d7..d7a95a8e63 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -1744,7 +1744,7 @@ void tst_QTextEdit::currentCharFormatChanged() ff.setPointSize(11); SignalReceiver receiver; - QObject::connect(ed, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)) , &receiver, SLOT(charFormatChanged(const QTextCharFormat &))); + QObject::connect(ed, SIGNAL(currentCharFormatChanged(QTextCharFormat)) , &receiver, SLOT(charFormatChanged(QTextCharFormat))); ed->show(); ed->setCurrentFont(ff); diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index da5b2a79f6..3ad9994336 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -838,7 +838,7 @@ void tst_QToolBar::toolButtonStyle() void tst_QToolBar::actionTriggered() { QToolBar tb; - connect(&tb, SIGNAL(actionTriggered(QAction *)), SLOT(slot(QAction *))); + connect(&tb, SIGNAL(actionTriggered(QAction*)), SLOT(slot(QAction*))); QAction action1(0); QAction action2(0); |