diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
10 files changed, 0 insertions, 30 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 10a10a67ff..c67478cfae 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -990,7 +990,6 @@ public: }; typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) void tst_QAbstractItemView::setItemDelegate_data() { diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 60c0906d75..6f3cf48bea 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -588,7 +588,6 @@ void tst_QColumnView::clicked() QModelIndex parent = home.parent(); QVERIFY(parent.isValid()); - qRegisterMetaType<QModelIndex>("QModelIndex"); QSignalSpy clickedSpy(&view, SIGNAL(clicked(QModelIndex))); QPoint localPoint = view.visualRect(home).center(); diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp index ccc28da3fe..e602438475 100644 --- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp @@ -121,10 +121,6 @@ void tst_QDirModel::getSetCheck() QCOMPARE(true, obj1.lazyChildCount()); } - -Q_DECLARE_METATYPE(QModelIndex) -Q_DECLARE_METATYPE(QModelIndexList) - void tst_QDirModel::cleanupTestCase() { QDir current; @@ -464,7 +460,6 @@ void tst_QDirModel::rowsAboutToBeRemoved() QDirModel model; model.setReadOnly(false); - qRegisterMetaType<QModelIndex>("QModelIndex"); // NOTE: QDirModel will call refresh() when a file is removed. refresh() will reread the entire directory, // and emit layoutAboutToBeChanged and layoutChange. So, instead of checking for diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index e6181158fe..562bd6607c 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -56,10 +56,8 @@ #include <qdebug.h> typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) typedef QList<bool> BoolList; -Q_DECLARE_METATYPE(BoolList) class protected_QHeaderView : public QHeaderView { diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 81e80ed107..2f7b72fefa 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -642,8 +642,6 @@ void tst_QListView::clicked() model.rCount = 10; model.colCount = 2; - qRegisterMetaType<QModelIndex>("QModelIndex"); - QListView view; view.setModel(&model); @@ -930,7 +928,6 @@ public: }; typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) void tst_QListView::selection_data() { diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 5aea32996c..2178bafd6d 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -166,8 +166,6 @@ private: typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(QVariantList) tst_QListWidget::tst_QListWidget(): testWidget(0), rcParent(8), rcFirst(8,0), rcLast(8,0) { @@ -1178,7 +1176,6 @@ void tst_QListWidget::setData() QFETCH(QVariantList, values); QFETCH(int, expectedSignalCount); qRegisterMetaType<QListWidgetItem *>("QListWidgetItem*"); - qRegisterMetaType<QModelIndex>("QModelIndex"); QVERIFY(roles.count() == values.count()); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 9038ae3b00..74511fc87d 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -54,10 +54,8 @@ #endif typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) typedef QList<bool> BoolList; -Q_DECLARE_METATYPE(BoolList) class tst_QTableView : public QObject { @@ -787,7 +785,6 @@ void tst_QTableView::headerSections() } typedef QPair<int,int> IntPair; -Q_DECLARE_METATYPE(IntPair) void tst_QTableView::moveCursor_data() { @@ -1849,7 +1846,6 @@ void tst_QTableView::selectColumn() QCOMPARE(view.selectionModel()->selectedIndexes().at(i).column(), column); } -Q_DECLARE_METATYPE(QRect) void tst_QTableView::visualRect_data() { QTest::addColumn<int>("rowCount"); @@ -2925,7 +2921,6 @@ void tst_QTableView::span() } typedef QVector<QRect> SpanList; -Q_DECLARE_METATYPE(SpanList) void tst_QTableView::spans_data() { diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index e141ec294d..941e17a922 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -110,10 +110,7 @@ typedef QPair<int, int> IntPair; typedef QList<int> IntList; typedef QList<IntPair> IntIntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(IntIntList) Q_DECLARE_METATYPE(QTableWidgetSelectionRange) -Q_DECLARE_METATYPE(QModelIndex) // Testing get/set functions @@ -176,7 +173,6 @@ tst_QTableWidget::~tst_QTableWidget() void tst_QTableWidget::initTestCase() { - qRegisterMetaType<QModelIndex>("QModelIndex"); testWidget = new QTableWidget(); testWidget->show(); } diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 314592b987..c4c8c348ff 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -45,7 +45,6 @@ #include <QtWidgets/QtWidgets> #include <private/qabstractitemview_p.h> -Q_DECLARE_METATYPE(QModelIndex) #ifndef QT_NO_DRAGANDDROP Q_DECLARE_METATYPE(QAbstractItemView::DragDropMode) #endif @@ -402,7 +401,6 @@ void tst_QTreeView::initTestCase() #ifdef Q_OS_WINCE //disable magic for WindowsCE qApp->setAutoMaximizeThreshold(-1); #endif - qRegisterMetaType<QModelIndex>("QModelIndex"); } void tst_QTreeView::cleanupTestCase() @@ -1799,7 +1797,6 @@ public: }; typedef QList<QPoint> PointList; -Q_DECLARE_METATYPE(PointList) void tst_QTreeView::setSelection_data() { diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index fa57da0d5d..64265ca4b3 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -215,9 +215,6 @@ void tst_QTreeWidget::getSetCheck() typedef QList<int> IntList; typedef QList<IntList> ListIntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(ListIntList) -Q_DECLARE_METATYPE(QModelIndex) Q_DECLARE_METATYPE(Qt::Orientation) typedef QTreeWidgetItem TreeItem; |