diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-01-03 10:33:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-03 16:15:37 +0100 |
commit | 4319f698c893683c6a031e41272b85cfb25ac931 (patch) | |
tree | 2f830ad6f0f7474c16932610dc1e4c37dfe12f58 /tests | |
parent | 0fd0f8dfa05b9832f93cb8c1bc82220dd8d78eb2 (diff) |
Remove metatype registration of built-in types.
As they are built-in, they are effectively registered at compile-time
already.
Change-Id: I7ae6ba16088eab5d19213fa7b07c2a7760988a86
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
22 files changed, 0 insertions, 26 deletions
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index 8539b76dc3..49b7c2b648 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -1125,7 +1125,6 @@ void tst_QPropertyAnimation::restart() void tst_QPropertyAnimation::valueChanged() { - qRegisterMetaType<QVariant>("QVariant"); //we check that we receive the valueChanged signal MyErrorObject o; diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index 40208f6e6d..690846fe67 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -804,7 +804,6 @@ void tst_QSettings::testIniParsing_data() #ifdef QT_BUILD_INTERNAL void tst_QSettings::testIniParsing() { - qRegisterMetaType<QVariant>("QVariant"); qRegisterMetaType<QSettings::Status>("QSettings::Status"); QDir dir(settingsPath()); diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index e3dc0d3e14..9660c28f03 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -179,7 +179,6 @@ tst_QSortFilterProxyModel::tst_QSortFilterProxyModel() void tst_QSortFilterProxyModel::initTestCase() { - qRegisterMetaType<QModelIndex>("QModelIndex"); qRegisterMetaType<IntList>("IntList"); qRegisterMetaType<IntPair>("IntPair"); qRegisterMetaType<IntPairList>("IntPairList"); diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index 1084b5a7b1..da597bf627 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -245,7 +245,6 @@ QByteArray verifyZeroTermination(const QByteArray &ba) tst_QByteArray::tst_QByteArray() { - qRegisterMetaType<qulonglong>("qulonglong"); } void tst_QByteArray::qCompress_data() diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp index 8e63556bf1..143599c989 100644 --- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp +++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp @@ -130,7 +130,6 @@ void tst_QTimeLine::currentTime() { QTimeLine timeLine(2000); timeLine.setUpdateInterval((timeLine.duration()/2) / 33); - qRegisterMetaType<qreal>("qreal"); QSignalSpy spy(&timeLine, SIGNAL(valueChanged(qreal))); QVERIFY(spy.isValid()); timeLine.setFrameRange(10, 20); @@ -225,7 +224,6 @@ void tst_QTimeLine::value() QVERIFY(timeLine.currentValue() == 0.0); // Default speed - qRegisterMetaType<qreal>("qreal"); QSignalSpy spy(&timeLine, SIGNAL(valueChanged(qreal))); QVERIFY(spy.isValid()); timeLine.start(); diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp index d28e4298b4..335a1791f6 100644 --- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -178,7 +178,6 @@ tst_QStandardItemModel::~tst_QStandardItemModel() */ void tst_QStandardItemModel::init() { - qRegisterMetaType<QModelIndex>("QModelIndex"); qRegisterMetaType<QStandardItem*>("QStandardItem*"); qRegisterMetaType<Qt::Orientation>("Qt::Orientation"); diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 7c21701474..60872746e6 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -674,7 +674,6 @@ void tst_QUdpSocket::writeDatagram() client.setProperty("_q_networksession", QVariant::fromValue(networkSession)); #endif - qRegisterMetaType<qint64>("qint64"); qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError"); for(int i=0;;i++) { diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index 194c0a94a0..8d4631f3cc 100644 --- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -124,7 +124,6 @@ tst_QSqlQueryModel::~tst_QSqlQueryModel() void tst_QSqlQueryModel::initTestCase() { - qRegisterMetaType<QModelIndex>("QModelIndex"); dbs.open(); for (QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it) { QSqlDatabase db = QSqlDatabase::database((*it)); diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index b6a0a7b1fa..b66bec170a 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -152,7 +152,6 @@ private: tst_QSqlTableModel::tst_QSqlTableModel() { - qRegisterMetaType<QModelIndex>("QModelIndex"); dbs.open(); } diff --git a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp index c0ecf51fbb..8871c9d947 100644 --- a/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp +++ b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp @@ -183,7 +183,6 @@ void tst_QSignalSpy::spyWithQtClasses() { QtTestObject2 obj; - qRegisterMetaType<QDateTime>("QDateTime"); QSignalSpy spy(&obj, SIGNAL(sig2(QDateTime))); QDateTime dt = QDateTime::currentDateTime(); diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 46f0e5aafb..fd7154be71 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -141,7 +141,6 @@ private: tst_QFileSystemModel::tst_QFileSystemModel() : model(0) { - qRegisterMetaType<QModelIndex>("QModelIndex"); } void tst_QFileSystemModel::init() 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..b7bd005ca3 100644 --- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp @@ -464,7 +464,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/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index 81e80ed107..248c212ee2 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); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 5aea32996c..343428cf97 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1178,7 +1178,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/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp index e141ec294d..2d65561484 100644 --- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp +++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp @@ -176,7 +176,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..1154ea5ba7 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -402,7 +402,6 @@ void tst_QTreeView::initTestCase() #ifdef Q_OS_WINCE //disable magic for WindowsCE qApp->setAutoMaximizeThreshold(-1); #endif - qRegisterMetaType<QModelIndex>("QModelIndex"); } void tst_QTreeView::cleanupTestCase() diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 8ac3fea457..7af2b40ee5 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -377,7 +377,6 @@ Q_DECLARE_METATYPE(QComboBox::InsertPolicy) tst_QComboBox::tst_QComboBox() { - qRegisterMetaType<QModelIndex>("QModelIndex"); parent = 0; } diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 79ef4f7441..1ef1eb6170 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -323,9 +323,6 @@ void tst_QDateTimeEdit::getSetCheck() tst_QDateTimeEdit::tst_QDateTimeEdit() { - qRegisterMetaType<QDate>("QDate"); - qRegisterMetaType<QTime>("QTime"); - qRegisterMetaType<QDateTime>("QDateTime"); qRegisterMetaType<QList<int> >("QList<int>"); } diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 5f0a1e84b0..a98385fa2f 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -193,7 +193,6 @@ void tst_QMainWindow::getSetCheck() tst_QMainWindow::tst_QMainWindow() { - qRegisterMetaType<QSize>("QSize"); qRegisterMetaType<Qt::ToolButtonStyle>("Qt::ToolButtonStyle"); } diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index 6fef2d4b9a..bc71407cea 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -249,7 +249,6 @@ void tst_QTextBrowser::viewportPositionInHistory() void tst_QTextBrowser::relativeLinks() { - qRegisterMetaType<QUrl>("QUrl"); QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(QUrl))); browser->setSource(QUrl("subdir/../qtextbrowser.html")); QVERIFY(!browser->document()->isEmpty()); diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index 3ad9994336..4b08824cf0 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -99,7 +99,6 @@ QAction *triggered = 0; tst_QToolBar::tst_QToolBar() { - qRegisterMetaType<QSize>("QSize"); qRegisterMetaType<Qt::Orientation>("Qt::Orientation"); qRegisterMetaType<Qt::ToolBarAreas>("Qt::ToolBarAreas"); qRegisterMetaType<Qt::ToolButtonStyle>("Qt::ToolButtonStyle"); |