From ba82958af97b831875ea568f87ec49d8fad32297 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 3 Jan 2013 10:23:56 +0100 Subject: Widgets: 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: Ibe8e2ec867afb4051a3c7eef806d9cd86945928b Reviewed-by: David Faure --- .../auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp | 1 - tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 3 --- .../widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp | 2 -- tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 9 --------- .../widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp | 2 -- tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp | 1 - tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 1 - tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 2 -- tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 2 -- tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | 2 -- tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 2 -- tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp | 1 - tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | 1 - tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp | 3 --- tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp | 2 -- 15 files changed, 34 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index 548d5b7c26..50d24a6b9f 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -113,7 +113,6 @@ private: }; Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QPoint) void tst_QAbstractSlider::initTestCase() { diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 7af2b40ee5..e9340eb6da 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -371,8 +371,6 @@ void tst_QComboBox::getSetCheck() typedef QList VariantList; typedef QList IconList; -Q_DECLARE_METATYPE(VariantList) -Q_DECLARE_METATYPE(IconList) Q_DECLARE_METATYPE(QComboBox::InsertPolicy) tst_QComboBox::tst_QComboBox() @@ -1726,7 +1724,6 @@ void tst_QComboBox::findText() typedef QList IntList; typedef QList KeyList; -Q_DECLARE_METATYPE(IntList) Q_DECLARE_METATYPE(KeyList) void tst_QComboBox::flaggedItems_data() diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index ad3d57f9c0..3d78fb96e2 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -53,8 +53,6 @@ #include #include -Q_DECLARE_METATYPE(QCommandLinkButton*) - class tst_QCommandLinkButton : public QObject { Q_OBJECT diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 1ef1eb6170..269440e37e 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -93,13 +93,9 @@ #endif -Q_DECLARE_METATYPE(QDate); Q_DECLARE_METATYPE(Qt::Key); Q_DECLARE_METATYPE(Qt::KeyboardModifiers); Q_DECLARE_METATYPE(Qt::KeyboardModifier); -Q_DECLARE_METATYPE(QDateTime); -Q_DECLARE_METATYPE(QTime); -Q_DECLARE_METATYPE(QList); #if defined(Q_OS_WINCE) #ifndef SPI_GETPLATFORMTYPE @@ -291,9 +287,6 @@ private: typedef QList TimeList; typedef QList KeyList; -Q_DECLARE_METATYPE(TimeList) -Q_DECLARE_METATYPE(KeyList) - // Testing get/set functions void tst_QDateTimeEdit::getSetCheck() { @@ -3449,9 +3442,7 @@ void tst_QDateTimeEdit::deleteCalendarWidget() typedef QPair KeyPair; typedef QList KeyPairList; -Q_DECLARE_METATYPE(QLocale) Q_DECLARE_METATYPE(KeyPair) -Q_DECLARE_METATYPE(KeyPairList) static inline KeyPair key(Qt::Key key, Qt::KeyboardModifier modifier = Qt::NoModifier) { return KeyPair(key, modifier); diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index 74b30039f8..e6f5a5aa02 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -47,11 +47,9 @@ #include #include -Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QDialogButtonBox::ButtonRole) Q_DECLARE_METATYPE(QDialogButtonBox::StandardButton) Q_DECLARE_METATYPE(QDialogButtonBox::StandardButtons) -Q_DECLARE_METATYPE(QAbstractButton*) class tst_QDialogButtonBox : public QObject { diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 59f6ea46e9..2fbb6c031f 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -155,7 +155,6 @@ private: }; typedef QList DoubleList; -Q_DECLARE_METATYPE(DoubleList) tst_QDoubleSpinBox::tst_QDoubleSpinBox() diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 133a8fa578..b180282a0f 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -318,7 +318,6 @@ private: }; typedef QList IntList; -Q_DECLARE_METATYPE(IntList) Q_DECLARE_METATYPE(QLineEdit::EchoMode) // Testing get/set functions diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index ba5c461223..e03d2de530 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -67,8 +67,6 @@ static const Qt::WindowFlags DefaultWindowFlags | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint; Q_DECLARE_METATYPE(QMdiArea::WindowOrder) -Q_DECLARE_METATYPE(QMdiSubWindow *) -Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QTabWidget::TabPosition) static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool reverse = false) diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index 836333ceb1..8ffc22ed9a 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -65,9 +65,7 @@ //Used in copyAvailable typedef QPair keyPairType; typedef QList pairListType; -Q_DECLARE_METATYPE(pairListType); Q_DECLARE_METATYPE(keyPairType); -Q_DECLARE_METATYPE(QList); QT_FORWARD_DECLARE_CLASS(QPlainTextEdit) diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 9d16393861..372b883479 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -54,8 +54,6 @@ #include #include -Q_DECLARE_METATYPE(QPushButton*) - class tst_QPushButton : public QObject { Q_OBJECT diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 6e1abb9fa9..1cdf552bb3 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -148,8 +148,6 @@ private: }; typedef QList IntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(QLocale) // Testing get/set functions void tst_QSpinBox::getSetCheck() diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index 7f2033f527..4bd4403bf9 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -168,7 +168,6 @@ void tst_QSplitter::cleanupTestCase() typedef QList IntList; -Q_DECLARE_METATYPE(IntList) void tst_QSplitter::setSizes() { diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index ed1f26734d..a52ef0e6a0 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -435,7 +435,6 @@ void tst_QTabBar::tabButton() typedef QList IntList; Q_DECLARE_METATYPE(QTabBar::SelectionBehavior) -Q_DECLARE_METATYPE(IntList) #define ONE(x) (IntList() << x) void tst_QTabBar::selectionBehaviorOnRemove_data() { diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index d7a95a8e63..0531126b5b 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -73,10 +73,7 @@ //Used in copyAvailable typedef QPair keyPairType; typedef QList pairListType; -Q_DECLARE_METATYPE(pairListType); Q_DECLARE_METATYPE(keyPairType); -Q_DECLARE_METATYPE(QList); -Q_DECLARE_METATYPE(QList); QT_FORWARD_DECLARE_CLASS(QTextEdit) diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp index ce4791808b..a52e6788b9 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp @@ -117,8 +117,6 @@ void tst_QToolButton::getSetCheck() delete var4; } -Q_DECLARE_METATYPE(QAction*) - void tst_QToolButton::triggered() { qRegisterMetaType("QAction *"); -- cgit v1.2.3