diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-01-03 17:55:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-06 11:23:45 +0100 |
| commit | cf22e8ea4eb43c736486a2c0b61b73ec1831d90b (patch) | |
| tree | 40c257581868f82ce475d4c544f4900cd11d99d6 /tests/auto | |
| parent | d376a4e5788fa2cc1de20b6a8a57580d3ae3c541 (diff) | |
Tests: Remove declaration of built-in and automatic metatypes.
These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.
Change-Id: Ifd116dee32a450ff89a9a1011e26b434765d6e95
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto')
8 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index b6bc5b085b..5073d87cb5 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -49,13 +49,6 @@ #include "functions.h" -Q_DECLARE_METATYPE(QVector<int>); -Q_DECLARE_METATYPE(QVector<double>); -Q_DECLARE_METATYPE(QVector<QString>); -Q_DECLARE_METATYPE(QList<int>); -Q_DECLARE_METATYPE(QList<double>); -Q_DECLARE_METATYPE(QList<QString>); - class tst_QtConcurrentMap: public QObject { Q_OBJECT diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index 8f76945bf5..98c12b01c1 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -56,7 +56,6 @@ # include <windows.h> # endif -Q_DECLARE_METATYPE(QList<QProcess::ExitStatus>); Q_DECLARE_METATYPE(QProcess::ExitStatus); Q_DECLARE_METATYPE(QProcess::ProcessState); #endif diff --git a/tests/auto/other/modeltest/modeltest.cpp b/tests/auto/other/modeltest/modeltest.cpp index 17f164b638..27b1e5aa95 100644 --- a/tests/auto/other/modeltest/modeltest.cpp +++ b/tests/auto/other/modeltest/modeltest.cpp @@ -46,8 +46,6 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE ( QModelIndex ) - /*! Connect to all of the models signals. Whenever anything happens recheck everything. */ diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index b01f311f4f..85ddc41cdf 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -56,7 +56,6 @@ #include <windows.h> #endif -Q_DECLARE_METATYPE(QRect) QT_FORWARD_DECLARE_CLASS(QPrinter) diff --git a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp index 0ff80c4147..16c0711ee7 100644 --- a/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/printsupport/kernel/qprinterinfo/tst_qprinterinfo.cpp @@ -50,7 +50,6 @@ # include <sys/wait.h> #endif -Q_DECLARE_METATYPE(QRect) class tst_QPrinterInfo : public QObject { diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index b66bec170a..a3341fff24 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -49,7 +49,6 @@ const QString test(qTableName("test", __FILE__)), test2(qTableName("test2", __FILE__)), test3(qTableName("test3", __FILE__)); -Q_DECLARE_METATYPE(QModelIndex) class tst_QSqlTableModel : public QObject { diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index 457be3fddd..572388df6c 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -166,7 +166,6 @@ void tst_Cmptest::compare_pointerfuncs() QCOMPARE(&i, intptr()); } -Q_DECLARE_METATYPE(QVariant) struct PhonyClass { diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index 1b32aad5f2..540c242485 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -143,7 +143,6 @@ private: QList<QByteArray> m_testCodecs; }; -Q_DECLARE_METATYPE(QList<QVariant>) void tst_QDom::setContent_data() { |