1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gui: Remove declaration of built-in and automatic metatypes.

Browse Source 
These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.

Change-Id: I95b8b4b674e85b2b3c374931f6231d60f35be984
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Stephen Kelly 2013-01-03 10:30:09 +01:00 committed by The Qt Project
parent 79f1afc23c
commit cc69dff01b
17 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/gui/image/qicon/tst_qicon.cpp
View File

@ -45,7 +45,6 @@
#include <qicon.h> #include <qicon.h>
#include <qiconengine.h> #include <qiconengine.h>
Q_DECLARE_METATYPE(QSize)
class tst_QIcon : public QObject class tst_QIcon : public QObject
{ {

7
tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
View File

@ -57,13 +57,6 @@
typedef QMap<QString, QString> QStringMap; typedef QMap<QString, QString> QStringMap;
typedef QList<int> QIntList; typedef QList<int> QIntList;
Q_DECLARE_METATYPE(QImage)
Q_DECLARE_METATYPE(QRect)
Q_DECLARE_METATYPE(QSize)
Q_DECLARE_METATYPE(QColor)
Q_DECLARE_METATYPE(QStringMap)
Q_DECLARE_METATYPE(QIntList)
Q_DECLARE_METATYPE(QIODevice *)
Q_DECLARE_METATYPE(QImage::Format) Q_DECLARE_METATYPE(QImage::Format)
class tst_QImageReader : public QObject class tst_QImageReader : public QObject

4
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
View File

@ -58,11 +58,7 @@
typedef QMap<QString, QString> QStringMap; typedef QMap<QString, QString> QStringMap;
typedef QList<int> QIntList; typedef QList<int> QIntList;
Q_DECLARE_METATYPE(QImage)
Q_DECLARE_METATYPE(QStringMap)
Q_DECLARE_METATYPE(QIntList)
Q_DECLARE_METATYPE(QImageWriter::ImageWriterError) Q_DECLARE_METATYPE(QImageWriter::ImageWriterError)
Q_DECLARE_METATYPE(QIODevice *)
Q_DECLARE_METATYPE(QImage::Format) Q_DECLARE_METATYPE(QImage::Format)
class tst_QImageWriter : public QObject class tst_QImageWriter : public QObject

4
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -200,10 +200,6 @@ static bool lenientCompare(const QPixmap &actual, const QPixmap &expected)
return true; return true;
} }
Q_DECLARE_METATYPE(QImage)
Q_DECLARE_METATYPE(QPixmap)
Q_DECLARE_METATYPE(QMatrix)
Q_DECLARE_METATYPE(QBitmap)
tst_QPixmap::tst_QPixmap() tst_QPixmap::tst_QPixmap()
{ {

2
tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
View File

@ -153,10 +153,8 @@ private:
static const int defaultSize = 3; static const int defaultSize = 3;
Q_DECLARE_METATYPE(QModelIndex)
Q_DECLARE_METATYPE(QStandardItem*) Q_DECLARE_METATYPE(QStandardItem*)
Q_DECLARE_METATYPE(Qt::Orientation) Q_DECLARE_METATYPE(Qt::Orientation)
Q_DECLARE_METATYPE(QVariantList)
tst_QStandardItemModel::tst_QStandardItemModel() : m_model(0), rcParent(8), rcFirst(8,0), rcLast(8,0) tst_QStandardItemModel::tst_QStandardItemModel() : m_model(0), rcParent(8), rcFirst(8,0), rcLast(8,0)
{ {

1
tests/auto/gui/painting/qbrush/tst_qbrush.cpp
View File

@ -79,7 +79,6 @@ private slots:
void debug(); void debug();
}; };
Q_DECLARE_METATYPE(QBrush)
tst_QBrush::tst_QBrush() tst_QBrush::tst_QBrush()
{ {

1
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
View File

@ -224,7 +224,6 @@ void tst_QColor::getSetCheck()
QCOMPARE(obj1.rgb(), qRgb(0, 0, 0)); QCOMPARE(obj1.rgb(), qRgb(0, 0, 0));
} }
Q_DECLARE_METATYPE(QColor)
tst_QColor::tst_QColor() tst_QColor::tst_QColor()

11
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -81,10 +81,6 @@
#include <qfontdatabase.h> #include <qfontdatabase.h>
Q_DECLARE_METATYPE(QGradientStops) Q_DECLARE_METATYPE(QGradientStops)
Q_DECLARE_METATYPE(QLine)
Q_DECLARE_METATYPE(QRect)
Q_DECLARE_METATYPE(QSize)
Q_DECLARE_METATYPE(QPoint)
Q_DECLARE_METATYPE(QPainterPath) Q_DECLARE_METATYPE(QPainterPath)
class tst_QPainter : public QObject class tst_QPainter : public QObject
@ -365,13 +361,6 @@ void tst_QPainter::getSetCheck()
QCOMPARE(true, obj1.viewTransformEnabled()); QCOMPARE(true, obj1.viewTransformEnabled());
} }
Q_DECLARE_METATYPE(QPixmap)
Q_DECLARE_METATYPE(QPolygon)
Q_DECLARE_METATYPE(QBrush)
Q_DECLARE_METATYPE(QPen)
Q_DECLARE_METATYPE(QFont)
Q_DECLARE_METATYPE(QColor)
Q_DECLARE_METATYPE(QRegion)
tst_QPainter::tst_QPainter() tst_QPainter::tst_QPainter()
{ {

2
tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
View File

@ -161,8 +161,6 @@ void tst_QPainterPath::swap()
} }
Q_DECLARE_METATYPE(QPainterPath) Q_DECLARE_METATYPE(QPainterPath)
Q_DECLARE_METATYPE(QPointF)
Q_DECLARE_METATYPE(QRectF)
void tst_QPainterPath::currentPosition() void tst_QPainterPath::currentPosition()
{ {

1
tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
View File

@ -1165,7 +1165,6 @@ static bool strictContains(const QPainterPath &a, const QPainterPath &b)
return b.subtracted(a) == QPainterPath(); return b.subtracted(a) == QPainterPath();
} }
Q_DECLARE_METATYPE(QPolygonF)
void tst_QPathClipper::task204301_data() void tst_QPathClipper::task204301_data()
{ {

2
tests/auto/gui/painting/qpen/tst_qpen.cpp
View File

@ -101,8 +101,6 @@ void tst_QPen::swap()
QCOMPARE(p2.color(), QColor(Qt::black)); QCOMPARE(p2.color(), QColor(Qt::black));
} }
Q_DECLARE_METATYPE(QPen)
Q_DECLARE_METATYPE(QBrush)
tst_QPen::tst_QPen() tst_QPen::tst_QPen()

4
tests/auto/gui/painting/qregion/tst_qregion.cpp
View File

@ -102,10 +102,6 @@ private slots:
#endif #endif
}; };
Q_DECLARE_METATYPE(QPolygon)
Q_DECLARE_METATYPE(QVector<QRect>)
Q_DECLARE_METATYPE(QRegion)
tst_QRegion::tst_QRegion() tst_QRegion::tst_QRegion()
{ {
} }

2
tests/auto/gui/painting/qtransform/tst_qtransform.cpp
View File

@ -46,7 +46,6 @@
#include <qpolygon.h> #include <qpolygon.h>
#include <qdebug.h> #include <qdebug.h>
Q_DECLARE_METATYPE(QRect)
class tst_QTransform : public QObject class tst_QTransform : public QObject
{ {
@ -87,7 +86,6 @@ private:
}; };
Q_DECLARE_METATYPE(QTransform) Q_DECLARE_METATYPE(QTransform)
Q_DECLARE_METATYPE(QPolygon)
tst_QTransform::tst_QTransform() tst_QTransform::tst_QTransform()
{ {

3
tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
View File

@ -45,7 +45,6 @@
#include <qmath.h> #include <qmath.h>
#include <qpolygon.h> #include <qpolygon.h>
Q_DECLARE_METATYPE(QRect)
class tst_QWMatrix : public QObject class tst_QWMatrix : public QObject
{ {
@ -74,8 +73,6 @@ private:
void mapping_data(); void mapping_data();
}; };
Q_DECLARE_METATYPE(QMatrix)
Q_DECLARE_METATYPE(QPolygon)
tst_QWMatrix::tst_QWMatrix() tst_QWMatrix::tst_QWMatrix()
{ {

3
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -383,8 +383,6 @@ void tst_QCssParser::term()
} }
} }
Q_DECLARE_METATYPE(QVector<QCss::Value>)
void tst_QCssParser::expr_data() void tst_QCssParser::expr_data()
{ {
QTest::addColumn<bool>("parseSuccess"); QTest::addColumn<bool>("parseSuccess");
@ -842,7 +840,6 @@ void tst_QCssParser::invalidAtKeywords()
QCOMPARE(rule.declarations.at(0).d->values.at(0).variant.toString(), QString("blue")); QCOMPARE(rule.declarations.at(0).d->values.at(0).variant.toString(), QString("blue"));
} }
Q_DECLARE_METATYPE(QColor)
void tst_QCssParser::colorValue_data() void tst_QCssParser::colorValue_data()
{ {

1
tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
View File

@ -162,7 +162,6 @@ private:
QTextCursor cursor; QTextCursor cursor;
}; };
Q_DECLARE_METATYPE(QList<QVariant>)
tst_QTextCursor::tst_QTextCursor() tst_QTextCursor::tst_QTextCursor()
{} {}

1
tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
View File

@ -54,7 +54,6 @@
#endif #endif
typedef QList<int> IntList; typedef QList<int> IntList;
Q_DECLARE_METATYPE(IntList)
QT_FORWARD_DECLARE_CLASS(QTextDocument) QT_FORWARD_DECLARE_CLASS(QTextDocument)