Deprecate the static int based API in QMetaType

And remove one of the type id to name mapping that still
existed in QMetaType. QMetaTypeInterface can provide that,
so there's no need to have a second copy of the data.

qMetaTypeTypeInternal() can still map all the names of all
builtin types to ids. That functionality is for now still
required by moc and can't be removed yet.

Change-Id: Ib4f8e9c71e1e7d99d52da9e44477c9a1f1805e57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 35 insertions, 35 deletions

diff --git a/tests/auto/other/qvariant_common/tst_qvariant_common.h b/tests/auto/other/qvariant_common/tst_qvariant_common.h
index 6b69d04a78..7851bf8dcc 100644
--- a/tests/auto/other/qvariant_common/tst_qvariant_common.h
+++ b/tests/auto/other/qvariant_common/tst_qvariant_common.h
@@ -56,14 +56,14 @@ protected:
         QVERIFY2(ok, (QString::fromLatin1("Message is not started correctly: '") + msg + '\'').toLatin1().constData());
         ok &= (currentId == QMetaType::UnknownType
              ? msg.contains("Invalid")
-             : msg.contains(QMetaType::typeName(currentId)));
+             : msg.contains(QMetaType(currentId).name()));
         QVERIFY2(ok, (QString::fromLatin1("Message doesn't contain type name: '") + msg + '\'').toLatin1().constData());
         if (currentId == QMetaType::Char || currentId == QMetaType::QChar) {
             // Chars insert '\0' into the qdebug stream, it is not possible to find a real string length
             return;
         }
-        if (QMetaType::typeFlags(currentId) & QMetaType::IsPointer) {
-            QByteArray currentName = QMetaType::typeName(currentId);
+        if (QMetaType(currentId).flags() & QMetaType::IsPointer) {
+            QByteArray currentName = QMetaType(currentId).name();
             ok &= msg.contains(currentName + ", 0x");
         }
         ok &= msg.endsWith(QLatin1Char(')'));
@@ -147,38 +147,38 @@ int MessageHandler::currentId;
     QFETCH(bool, ULongLongCast);
 
 #define TST_QVARIANT_CANCONVERT_COMPARE_DATA \
-    QCOMPARE(val.canConvert(QVariant::BitArray), BitArrayCast); \
-    QCOMPARE(val.canConvert(QVariant::Bitmap), BitmapCast); \
-    QCOMPARE(val.canConvert(QVariant::Bool), BoolCast); \
-    QCOMPARE(val.canConvert(QVariant::Brush), BrushCast); \
-    QCOMPARE(val.canConvert(QVariant::ByteArray), ByteArrayCast); \
-    QCOMPARE(val.canConvert(QVariant::Color), ColorCast); \
-    QCOMPARE(val.canConvert(QVariant::Cursor), CursorCast); \
-    QCOMPARE(val.canConvert(QVariant::Date), DateCast); \
-    QCOMPARE(val.canConvert(QVariant::DateTime), DateTimeCast); \
-    QCOMPARE(val.canConvert(QVariant::Double), DoubleCast); \
-    QCOMPARE(val.canConvert(QVariant::Type(QMetaType::Float)), DoubleCast); \
-    QCOMPARE(val.canConvert(QVariant::Font), FontCast); \
-    QCOMPARE(val.canConvert(QVariant::Image), ImageCast); \
-    QCOMPARE(val.canConvert(QVariant::Int), IntCast); \
-    QCOMPARE(val.canConvert(QVariant::Invalid), InvalidCast); \
-    QCOMPARE(val.canConvert(QVariant::KeySequence), KeySequenceCast); \
-    QCOMPARE(val.canConvert(QVariant::List), ListCast); \
-    QCOMPARE(val.canConvert(QVariant::LongLong), LongLongCast); \
-    QCOMPARE(val.canConvert(QVariant::Map), MapCast); \
-    QCOMPARE(val.canConvert(QVariant::Palette), PaletteCast); \
-    QCOMPARE(val.canConvert(QVariant::Pen), PenCast); \
-    QCOMPARE(val.canConvert(QVariant::Pixmap), PixmapCast); \
-    QCOMPARE(val.canConvert(QVariant::Point), PointCast); \
-    QCOMPARE(val.canConvert(QVariant::Rect), RectCast); \
-    QCOMPARE(val.canConvert(QVariant::Region), RegionCast); \
-    QCOMPARE(val.canConvert(QVariant::Size), SizeCast); \
-    QCOMPARE(val.canConvert(QVariant::SizePolicy), SizePolicyCast); \
-    QCOMPARE(val.canConvert(QVariant::String), StringCast); \
-    QCOMPARE(val.canConvert(QVariant::StringList), StringListCast); \
-    QCOMPARE(val.canConvert(QVariant::Time), TimeCast); \
-    QCOMPARE(val.canConvert(QVariant::UInt), UIntCast); \
-    QCOMPARE(val.canConvert(QVariant::ULongLong), ULongLongCast);
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QBitArray)), BitArrayCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QBitmap)), BitmapCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::Bool)), BoolCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QBrush)), BrushCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QByteArray)), ByteArrayCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QColor)), ColorCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QCursor)), CursorCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QDate)), DateCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QDateTime)), DateTimeCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::Double)), DoubleCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::Float)), DoubleCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QFont)), FontCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QImage)), ImageCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::Int)), IntCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::UnknownType)), InvalidCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QKeySequence)), KeySequenceCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QVariantList)), ListCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::LongLong)), LongLongCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QVariantMap)), MapCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QPalette)), PaletteCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QPen)), PenCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QPixmap)), PixmapCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QPoint)), PointCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QRect)), RectCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QRegion)), RegionCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QSize)), SizeCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QSizePolicy)), SizePolicyCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QString)), StringCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QStringList)), StringListCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::QTime)), TimeCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::UInt)), UIntCast); \
+    QCOMPARE(val.canConvert(QMetaType(QMetaType::ULongLong)), ULongLongCast);
 
 
 #endif