From bb73c085a6092ea10c60e652cb66d8c369cfb65e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 16 Oct 2012 11:08:13 +0200 Subject: normalise signal/slot signatures [QtWidgets tests] Change-Id: Iffab60f0911a55e4be09faeb29df0bae1ea2eb19 Reviewed-by: Friedemann Kleint --- .../dialogs/qfiledialog/tst_qfiledialog.cpp | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp') diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 8a2d6e33ec..32610fda18 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -196,7 +196,7 @@ void tst_QFiledialog::currentChangedSignal() { QNonNativeFileDialog fd; fd.setViewMode(QFileDialog::List); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); QListView* listView = qFindChild(&fd, "listView"); QVERIFY(listView); @@ -224,7 +224,7 @@ void tst_QFiledialog::directoryEnteredSignal() fd.setOptions(QFileDialog::DontUseNativeDialog); fd.show(); QTRY_COMPARE(fd.isVisible(), true); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); // sidebar QSidebar *sidebar = qFindChild(&fd, "sidebar"); @@ -287,7 +287,7 @@ void tst_QFiledialog::filesSelectedSignal() fd.setDirectory(testDir); QFETCH(QFileDialog::FileMode, fileMode); fd.setFileMode(fileMode); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); fd.show(); QVERIFY(QTest::qWaitForWindowExposed(&fd)); @@ -327,7 +327,7 @@ void tst_QFiledialog::filterSelectedSignal() QNonNativeFileDialog fd; fd.setAcceptMode(QFileDialog::AcceptSave); fd.show(); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); QStringList filterChoices; filterChoices << "Image files (*.png *.xpm *.jpg)" @@ -368,10 +368,10 @@ void tst_QFiledialog::directory() QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); QVERIFY(model); fd.setDirectory(QDir::currentPath()); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); QCOMPARE(QDir::current().absolutePath(), fd.directory().absolutePath()); QDir temp = QDir::temp(); @@ -559,10 +559,10 @@ void tst_QFiledialog::completer_up() { QNonNativeFileDialog fd; fd.setOptions(QFileDialog::DontUseNativeDialog); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); fd.show(); QLineEdit *lineEdit = qFindChild(&fd, "fileNameEdit"); @@ -649,10 +649,10 @@ void tst_QFiledialog::filters() { QNonNativeFileDialog fd; fd.setOptions(QFileDialog::DontUseNativeDialog); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); QCOMPARE(fd.nameFilters(), QStringList("All Files (*)")); // effects @@ -702,7 +702,7 @@ void tst_QFiledialog::filters() void tst_QFiledialog::selectFilter() { QNonNativeFileDialog fd; - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); QCOMPARE(fd.selectedNameFilter(), QString("All Files (*)")); QStringList filters; filters << "Image files (*.png *.xpm *.jpg)" @@ -728,10 +728,10 @@ void tst_QFiledialog::history() fd.setViewMode(QFileDialog::List); QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); QVERIFY(model); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); QCOMPARE(model->index(fd.history().first()), model->index(QDir::toNativeSeparators(fd.directory().absolutePath()))); fd.setDirectory(QDir::current().absolutePath()); QStringList history; @@ -890,10 +890,10 @@ void tst_QFiledialog::selectFiles() QDir dir; QVERIFY(dir.mkpath(tempPath)); fd.setDirectory(tempPath); - QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(const QString &))); - QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &))); - QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); - QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &))); + QSignalSpy spyCurrentChanged(&fd, SIGNAL(currentChanged(QString))); + QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString))); + QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(QStringList))); + QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(QString))); fd.show(); fd.setFileMode(QFileDialog::ExistingFiles); @@ -1043,7 +1043,7 @@ void tst_QFiledialog::historyBack() QToolButton *forwardButton = qFindChild(&fd, "forwardButton"); QVERIFY(forwardButton); - QSignalSpy spy(model, SIGNAL(rootPathChanged(const QString &))); + QSignalSpy spy(model, SIGNAL(rootPathChanged(QString))); QString home = fd.directory().absolutePath(); QString desktop = QDir::homePath(); @@ -1091,7 +1091,7 @@ void tst_QFiledialog::historyForward() QFileSystemModel *model = qFindChild(&fd, "qt_filesystem_model"); QVERIFY(model); - QSignalSpy spy(model, SIGNAL(rootPathChanged(const QString &))); + QSignalSpy spy(model, SIGNAL(rootPathChanged(QString))); QString home = fd.directory().absolutePath(); QString desktop = QDir::homePath(); -- cgit v1.2.3