normalise signal/slot signatures [QtWidgets tests]

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

9 files changed, 53 insertions, 53 deletions

diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 1857e18c9e..60c0906d75 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -589,7 +589,7 @@ void tst_QColumnView::clicked()
     QVERIFY(parent.isValid());
 
     qRegisterMetaType<QModelIndex>("QModelIndex");
-    QSignalSpy clickedSpy(&view, SIGNAL(clicked(const QModelIndex &)));
+    QSignalSpy clickedSpy(&view, SIGNAL(clicked(QModelIndex)));
 
     QPoint localPoint = view.visualRect(home).center();
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, localPoint);
@@ -829,7 +829,7 @@ void tst_QColumnView::swapPreview()
     QStringListModel model(sl);
     view.setModel(&model);
     view.setCurrentIndex(view.indexAt(QPoint(1, 1)));
-    connect(&view, SIGNAL(updatePreviewWidget(const QModelIndex &)),
+    connect(&view, SIGNAL(updatePreviewWidget(QModelIndex)),
             this, SLOT(setPreviewWidget()));
     view.setCurrentIndex(view.indexAt(QPoint(1, 1)));
     QTest::qWait(ANIMATION_DELAY);
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index c86eed1deb..844c66432e 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -416,7 +416,7 @@ void tst_QHeaderView::init()
     }
     */
 
-    QSignalSpy spy(view, SIGNAL(sectionCountChanged(int, int)));
+    QSignalSpy spy(view, SIGNAL(sectionCountChanged(int,int)));
     view->setModel(model);
     QCOMPARE(spy.count(), 1);
     view->resize(200,200);
@@ -846,7 +846,7 @@ void tst_QHeaderView::swapSections()
 
     QVector<int> logical = (QVector<int>() << 0 << 1 << 2 << 3);
 
-    QSignalSpy spy1(view, SIGNAL(sectionMoved(int, int, int)));
+    QSignalSpy spy1(view, SIGNAL(sectionMoved(int,int,int)));
 
     QCOMPARE(view->sectionsMoved(), false);
     view->swapSections(1, 1);
@@ -914,7 +914,7 @@ void tst_QHeaderView::moveSection()
     QVERIFY(from.count() == moved.count());
     QVERIFY(view->count() == logical.count());
 
-    QSignalSpy spy1(view, SIGNAL(sectionMoved(int, int, int)));
+    QSignalSpy spy1(view, SIGNAL(sectionMoved(int,int,int)));
     QCOMPARE(view->sectionsMoved(), false);
 
     for (int h = 0; h < hidden.count(); ++h)
@@ -1227,7 +1227,7 @@ void tst_QHeaderView::resizeSection()
     for (int j = 0; j < logical.count(); ++j)
         view->resizeSection(logical.at(j), initial);
 
-    QSignalSpy spy(view, SIGNAL(sectionResized(int, int, int)));
+    QSignalSpy spy(view, SIGNAL(sectionResized(int,int,int)));
 
     for (int k = 0; k < logical.count(); ++k)
         view->resizeSection(logical.at(k), size.at(k));
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index c6a3a69088..bed1d52f94 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -702,7 +702,7 @@ void tst_QItemDelegate::eventFilter()
 
     qRegisterMetaType<QAbstractItemDelegate::EndEditHint>("QAbstractItemDelegate::EndEditHint");
 
-    QSignalSpy commitDataSpy(&delegate, SIGNAL(commitData(QWidget *)));
+    QSignalSpy commitDataSpy(&delegate, SIGNAL(commitData(QWidget*)));
     QSignalSpy closeEditorSpy(&delegate,
                               SIGNAL(closeEditor(QWidget *,
                                                  QAbstractItemDelegate::EndEditHint)));
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index d252d78624..9f3cd0a3e1 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -657,7 +657,7 @@ void tst_QListView::clicked()
         QModelIndex index = view.indexAt(p);
         if (!index.isValid())
             continue;
-        QSignalSpy spy(&view, SIGNAL(clicked(const QModelIndex&)));
+        QSignalSpy spy(&view, SIGNAL(clicked(QModelIndex)));
         QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p);
         QCOMPARE(spy.count(), 1);
     }
@@ -1568,7 +1568,7 @@ void tst_QListView::task228566_infiniteRelayout()
     view.show();
     QTest::qWait(100); //make sure the layout is done once
 
-    QSignalSpy spy(view.horizontalScrollBar(), SIGNAL(rangeChanged(int, int)));
+    QSignalSpy spy(view.horizontalScrollBar(), SIGNAL(rangeChanged(int,int)));
 
     QTest::qWait(200);
     //the layout should already have been done
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index b882b56735..7e246e5936 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -182,23 +182,23 @@ void tst_QListWidget::initTestCase()
     testWidget = new QListWidget();
     testWidget->show();
 
-    connect(testWidget->model(), SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)),
-            this, SLOT(rowsAboutToBeInserted(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(rowsInserted(QModelIndex, int, int)),
-            this, SLOT(rowsInserted(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
-            this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
-            this, SLOT(rowsRemoved(QModelIndex, int, int)));
-
-    connect(testWidget->model(), SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)),
-            this, SLOT(columnsAboutToBeInserted(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(columnsInserted(QModelIndex, int, int)),
-            this, SLOT(columnsInserted(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)),
-            this, SLOT(columnsAboutToBeRemoved(QModelIndex, int, int)));
-    connect(testWidget->model(), SIGNAL(columnsRemoved(QModelIndex, int, int)),
-            this, SLOT(columnsRemoved(QModelIndex, int, int)));
+    connect(testWidget->model(), SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(rowsInserted(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsRemoved(QModelIndex,int,int)));
+
+    connect(testWidget->model(), SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(columnsAboutToBeInserted(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(columnsInserted(QModelIndex,int,int)),
+            this, SLOT(columnsInserted(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(columnsAboutToBeRemoved(QModelIndex,int,int)));
+    connect(testWidget->model(), SIGNAL(columnsRemoved(QModelIndex,int,int)),
+            this, SLOT(columnsRemoved(QModelIndex,int,int)));
 
     checkDefaultValues();
 }
@@ -1187,8 +1187,8 @@ void tst_QListWidget::setData()
         testWidget->insertItems(0, initialItems);
         QCOMPARE(testWidget->count(), initialItems.count());
 
-        QSignalSpy itemChanged(testWidget, SIGNAL(itemChanged(QListWidgetItem *)));
-        QSignalSpy dataChanged(testWidget->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+        QSignalSpy itemChanged(testWidget, SIGNAL(itemChanged(QListWidgetItem*)));
+        QSignalSpy dataChanged(testWidget->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 
         for (int i=0; i < roles.count(); ++i) {
             if (manipulateModel)
@@ -1454,7 +1454,7 @@ void tst_QListWidget::changeDataWithSorting()
     for (int j = 0; j < model->rowCount(QModelIndex()); ++j)
         persistent << model->index(j, 0, QModelIndex());
 
-    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
     QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged()));
 
     QListWidgetItem *item = w.item(itemIndex);
@@ -1569,7 +1569,7 @@ void tst_QListWidget::task199503_crashWhenCleared()
     QListWidget w;
     w.addItems( QStringList() << "item1" << "item2" << "item3");
     w.setCurrentRow(0);
-    w.connect(&w, SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem*)), SLOT(clear()));
+    w.connect(&w, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), SLOT(clear()));
     w.setCurrentRow(1);
 }
 
@@ -1630,7 +1630,7 @@ void tst_QListWidget::QTBUG8086_currentItemChangedOnClick()
     edit.setFocus();
     win.show();
 
-    QSignalSpy spy(&list, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)));
+    QSignalSpy spy(&list, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)));
 
     QVERIFY(QTest::qWaitForWindowExposed(&win));
 
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index dc4171ef56..2fbd90a3fe 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -2028,7 +2028,7 @@ void tst_QTableView::resizeRowsToContents()
 
     delegate.hint = QSize(cellWidth, cellHeight);
 
-    QSignalSpy resizedSpy(view.verticalHeader(), SIGNAL(sectionResized(int, int, int)));
+    QSignalSpy resizedSpy(view.verticalHeader(), SIGNAL(sectionResized(int,int,int)));
     view.resizeRowsToContents();
 
     QCOMPARE(resizedSpy.count(), model.rowCount());
@@ -2075,7 +2075,7 @@ void tst_QTableView::resizeColumnsToContents()
 
     delegate.hint = QSize(cellWidth, cellHeight);
 
-    QSignalSpy resizedSpy(view.horizontalHeader(), SIGNAL(sectionResized(int, int, int)));
+    QSignalSpy resizedSpy(view.horizontalHeader(), SIGNAL(sectionResized(int,int,int)));
     view.resizeColumnsToContents();
 
     QCOMPARE(resizedSpy.count(), model.columnCount());
@@ -3981,7 +3981,7 @@ Q_OBJECT
 public:
     TestTableView(QWidget *parent = 0) : QTableView(parent)
     {
-        connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(openEditor(const QModelIndex&)));
+        connect(this, SIGNAL(entered(QModelIndex)), this, SLOT(openEditor(QModelIndex)));
     }
     ~TestTableView(){}
 public slots:
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index c02479a7c0..2c93492fe9 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -1334,7 +1334,7 @@ void tst_QTableWidget::setItemWithSorting()
         w.sortItems(sortColumn, static_cast<Qt::SortOrder>(sortOrder));
         w.setSortingEnabled(true);
         
-        QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+        QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
         QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged()));
 
         if (i == 0) {
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index b2a87164f1..314592b987 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -1428,8 +1428,8 @@ void tst_QTreeView::expandAndCollapse()
     QModelIndex a = model.index(0, 0, QModelIndex());
     QModelIndex b = model.index(0, 0, a);
 
-    QSignalSpy expandedSpy(&view, SIGNAL(expanded(const QModelIndex&)));
-    QSignalSpy collapsedSpy(&view, SIGNAL(collapsed(const QModelIndex&)));
+    QSignalSpy expandedSpy(&view, SIGNAL(expanded(QModelIndex)));
+    QSignalSpy collapsedSpy(&view, SIGNAL(collapsed(QModelIndex)));
     QVariantList args;
 
     for (int y = 0; y < 2; ++y) {
@@ -1552,8 +1552,8 @@ void tst_QTreeView::expandAndCollapseAll()
     view.setUniformRowHeights(true);
     view.setModel(&model);
 
-    QSignalSpy expandedSpy(&view, SIGNAL(expanded(const QModelIndex&)));
-    QSignalSpy collapsedSpy(&view, SIGNAL(collapsed(const QModelIndex&)));
+    QSignalSpy expandedSpy(&view, SIGNAL(expanded(QModelIndex)));
+    QSignalSpy collapsedSpy(&view, SIGNAL(collapsed(QModelIndex)));
 
     view.expandAll();
     view.show();
@@ -1982,7 +1982,7 @@ void tst_QTreeView::clicked()
         QModelIndex index = view.indexAt(p);
         if (!index.isValid())
             continue;
-        QSignalSpy spy(&view, SIGNAL(clicked(const QModelIndex&)));
+        QSignalSpy spy(&view, SIGNAL(clicked(QModelIndex)));
         QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p);
         QTRY_COMPARE(spy.count(), 1);
     }
@@ -2329,7 +2329,7 @@ void tst_QTreeView::selection()
     treeView.setSelectionBehavior(QAbstractItemView::SelectRows);
     treeView.setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    connect(treeView.selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+    connect(treeView.selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SLOT(selectionOrderTest()));
 
     treeView.show();
@@ -3756,7 +3756,7 @@ public slots:
         //let's select the last item
         QModelIndex idx = model()->index(0, 0);
         selectionModel()->select(QItemSelection(idx, idx), QItemSelectionModel::Select);
-        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(handleSelectionChanged()));
+        disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(handleSelectionChanged()));
     }
 };
 
@@ -3769,7 +3769,7 @@ void tst_QTreeView::task248022_changeSelection()
     QStringListModel model(list);
     view.setSelectionMode(QAbstractItemView::ExtendedSelection);
     view.setModel(&model);
-    view.connect(view.selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(handleSelectionChanged()));
+    view.connect(view.selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(handleSelectionChanged()));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.visualRect(model.index(1)).center());
     QCOMPARE(view.selectionModel()->selectedIndexes().count(), list.count());
 }
@@ -3935,8 +3935,8 @@ public:
         // set up the model to have two top level items and a few others
         m_selectionModel = new QItemSelectionModel(this, this); // owned by this
 
-        connect(m_selectionModel, SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)),
-                this, SLOT(slotCurrentChanged(const QModelIndex &,const QModelIndex &)));
+        connect(m_selectionModel, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+                this, SLOT(slotCurrentChanged(QModelIndex,QModelIndex)));
     };
 
     int rowCount(const QModelIndex &parent) const
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index fe5b5f4def..fa57da0d5d 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -383,7 +383,7 @@ void tst_QTreeWidget::currentItem()
         tree.setSelectionBehavior(x ? QAbstractItemView::SelectItems
                                   : QAbstractItemView::SelectRows);
         QSignalSpy currentItemChangedSpy(
-            &tree, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
+            &tree, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
         QSignalSpy itemSelectionChangedSpy(
             &tree, SIGNAL(itemSelectionChanged()));
 
@@ -1719,9 +1719,9 @@ void tst_QTreeWidget::setData()
         testWidget->setHeaderItem(headerItem);
 
         QSignalSpy headerDataChangedSpy(
-            testWidget->model(), SIGNAL(headerDataChanged(Qt::Orientation, int, int)));
+            testWidget->model(), SIGNAL(headerDataChanged(Qt::Orientation,int,int)));
         QSignalSpy dataChangedSpy(
-            testWidget->model(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+            testWidget->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)));
         QSignalSpy itemChangedSpy(
             testWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)));
         headerItem->setText(0, "test");
@@ -2403,7 +2403,7 @@ void tst_QTreeWidget::changeDataWithSorting()
     for (int j = 0; j < model->rowCount(QModelIndex()); ++j)
         persistent << model->index(j, 0, QModelIndex());
 
-    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
     QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged()));
 
     QTreeWidgetItem *item = w.topLevelItem(itemIndex);
@@ -2579,7 +2579,7 @@ void tst_QTreeWidget::changeDataWithStableSorting()
     for (int j = 0; j < model->rowCount(QModelIndex()); ++j)
         persistent << model->index(j, 0, QModelIndex());
 
-    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
+    QSignalSpy dataChangedSpy(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
     QSignalSpy layoutChangedSpy(model, SIGNAL(layoutChanged()));
 
     StableItem *item = static_cast<StableItem *>(w.topLevelItem(itemIndex));
@@ -2675,8 +2675,8 @@ void tst_QTreeWidget::expandAndCallapse()
         for (int j = 0; j < 10; ++j)
             new QTreeWidgetItem(p, QStringList() << QString("%1").arg(j));
     }
-    QSignalSpy spy0(&tw, SIGNAL(itemExpanded(QTreeWidgetItem *)));
-    QSignalSpy spy1(&tw, SIGNAL(itemCollapsed(QTreeWidgetItem *)));
+    QSignalSpy spy0(&tw, SIGNAL(itemExpanded(QTreeWidgetItem*)));
+    QSignalSpy spy1(&tw, SIGNAL(itemCollapsed(QTreeWidgetItem*)));
 
 
     tw.expandItem(p);
@@ -3183,7 +3183,7 @@ void tst_QTreeWidget::emitDataChanged()
 {
 
     QTreeWidget *tree = new QTreeWidget;
-    QSignalSpy spy(tree, SIGNAL(itemChanged(QTreeWidgetItem *, int)));
+    QSignalSpy spy(tree, SIGNAL(itemChanged(QTreeWidgetItem*,int)));
     TreeWidgetItem *item = new TreeWidgetItem();
     tree->insertTopLevelItem(0, item);
     item->_emitDataChanged();