diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-01-13 10:41:02 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 21:08:08 +0100 |
| commit | aee1f6cc413f56bf4962324799ee3887c3dd037f (patch) | |
| tree | c0be4eb34dc8fc64a050f8943cbf9d9e1007f0b2 /src/corelib/kernel/qmetatype.h | |
| parent | 4df34f055a152657b30d64128dacc82c075cbd74 (diff) | |
Cleanup mess in public type ids.
There is no reason to keep two separated core types sets. It
couldn't be fixed before Qt5 because of binary compatibility promise.
This patch merges QMetaType core types with ext core types.
This "simple" operation consists of:
- QDataStream version was incremented, because type ids are
saved in QVariant's data stream.
- QMetaType LastExtCoreType and FirstExtCoreType were replaced by
LastCoreType, FirstCoreType and new QMetaType::HighestInternalId.
- New tests checking QVariant data stream for Qt4 and for Qt5 versions
were added.
Change-Id: I02dd74d29317365c297a789a4eb7c9c5edc3b231
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 5a55ca9bd7..bbe482428f 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -65,16 +65,16 @@ QT_BEGIN_NAMESPACE F(LongLong, 4, qlonglong) \ F(ULongLong, 5, qulonglong) \ F(Double, 6, double) \ - F(Long, 129, long) \ - F(Short, 130, short) \ - F(Char, 131, char) \ - F(ULong, 132, ulong) \ - F(UShort, 133, ushort) \ - F(UChar, 134, uchar) \ - F(Float, 135, float) \ + F(Long, 32, long) \ + F(Short, 33, short) \ + F(Char, 34, char) \ + F(ULong, 35, ulong) \ + F(UShort, 36, ushort) \ + F(UChar, 37, uchar) \ + F(Float, 38, float) \ #define QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(F)\ - F(VoidStar, 128, void*) \ + F(VoidStar, 31, void*) \ #define QT_FOR_EACH_STATIC_CORE_CLASS(F)\ F(QChar, 7, QChar) \ @@ -98,12 +98,12 @@ QT_BEGIN_NAMESPACE F(QRegExp, 27, QRegExp) \ F(QEasingCurve, 29, QEasingCurve) \ F(QUuid, 30, QUuid) \ - F(QModelIndex, 31, QModelIndex) \ - F(QVariant, 138, QVariant) \ + F(QVariant, 41, QVariant) \ + F(QModelIndex, 42, QModelIndex) \ #define QT_FOR_EACH_STATIC_CORE_POINTER(F)\ - F(QObjectStar, 136, QObject*) \ - F(QWidgetStar, 137, QWidget*) \ + F(QObjectStar, 39, QObject*) \ + F(QWidgetStar, 40, QWidget*) \ #define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F)\ F(QVariantMap, 8, QVariantMap) \ @@ -188,8 +188,7 @@ public: LastGuiType = QPolygonF, FirstWidgetsType = QIcon, LastWidgetsType = QSizePolicy, - FirstCoreExtType = VoidStar, - LastCoreExtType = QVariant, + HighestInternalId = LastWidgetsType, // This logic must match the one in qglobal.h #if defined(QT_COORD_TYPE) |