normalise signal/slot signatures [QtWidgets tests]

Change-Id: Iffab60f0911a55e4be09faeb29df0bae1ea2eb19
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

3 files changed, 38 insertions, 38 deletions

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<QListView*>(&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<QSidebar*>(&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<QFileSystemModel*>(&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<QLineEdit*>(&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<QFileSystemModel*>(&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<QToolButton*>(&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<QFileSystemModel*>(&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();
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index e0256d207c..46f0e5aafb 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -202,7 +202,7 @@ void tst_QFileSystemModel::rootPath()
 {
     QCOMPARE(model->rootPath(), QString(QDir().path()));
 
-    QSignalSpy rootChanged(model, SIGNAL(rootPathChanged(const QString &)));
+    QSignalSpy rootChanged(model, SIGNAL(rootPathChanged(QString)));
     QModelIndex root = model->setRootPath(model->rootPath());
     root = model->setRootPath("this directory shouldn't exist");
     QCOMPARE(rootChanged.count(), 0);
@@ -430,8 +430,8 @@ void tst_QFileSystemModel::rowCount()
     QString tmp = flatDirTestPath;
     QVERIFY(createFiles(tmp, QStringList()));
 
-    QSignalSpy spy2(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-    QSignalSpy spy3(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)));
+    QSignalSpy spy2(model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    QSignalSpy spy3(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
 
 #if !defined(Q_OS_WINCE)
     QStringList files = QStringList() <<  "b" << "d" << "f" << "h" << "j" << ".a" << ".c" << ".e" << ".g";
@@ -472,8 +472,8 @@ void tst_QFileSystemModel::rowsInserted()
     QFETCH(int, count);
     model->sort(0, (Qt::SortOrder)assending);
 
-    QSignalSpy spy0(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
-    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)));
+    QSignalSpy spy0(model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
     int oldCount = model->rowCount(root);
     QStringList files;
     for (int i = 0; i < count; ++i)
@@ -528,8 +528,8 @@ void tst_QFileSystemModel::rowsRemoved()
     model->sort(0, (Qt::SortOrder)assending);
     QTest::qWait(WAITTIME);
 
-    QSignalSpy spy0(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
-    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
+    QSignalSpy spy0(model, SIGNAL(rowsRemoved(QModelIndex,int,int)));
+    QSignalSpy spy1(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)));
     int oldCount = model->rowCount(root);
     for (int i = count - 1; i >= 0; --i) {
         //qDebug() << "removing" <<  model->index(i, 0, root).data().toString();
@@ -588,7 +588,7 @@ void tst_QFileSystemModel::dataChanged()
     QFETCH(int, assending);
     model->sort(0, (Qt::SortOrder)assending);
 
-    QSignalSpy spy(model, SIGNAL(dataChanged (const QModelIndex &, const QModelIndex &)));
+    QSignalSpy spy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
     QStringList files;
     for (int i = 0; i < count; ++i)
         files.append(model->index(i, 0, root).data().toString());
@@ -763,7 +763,7 @@ void tst_QFileSystemModel::setData_data()
 
 void tst_QFileSystemModel::setData()
 {
-    QSignalSpy spy(model, SIGNAL(fileRenamed(const QString&, const QString&, const QString&)));
+    QSignalSpy spy(model, SIGNAL(fileRenamed(QString,QString,QString)));
     QString tmp = flatDirTestPath;
     QFETCH(QStringList, files);
     QFETCH(QString, oldFileName);
diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index 809627e188..9752e163b4 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -107,7 +107,7 @@ void tst_QSidebar::selectUrls()
     QSidebar qsidebar;
     qsidebar.setModelAndUrls(&fsmodel, urls);
 
-    QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(const QUrl &)));
+    QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(QUrl)));
     qsidebar.selectUrl(urls.at(0));
     QCOMPARE(spy.count(), 0);
 }
@@ -214,7 +214,7 @@ void tst_QSidebar::goToUrl()
     qsidebar.setModelAndUrls(&fsmodel, urls);
     qsidebar.show();
 
-    QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(const QUrl &)));
+    QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(QUrl)));
     QTest::mousePress(qsidebar.viewport(), Qt::LeftButton, 0, qsidebar.visualRect(qsidebar.model()->index(0, 0)).center());
     QCOMPARE(spy.count(), 1);
     QCOMPARE((spy.value(0)).at(0).toUrl(), urls.first());