src/corelib/kernel/qvariant.h
changeset 30 5dc02b23752f
parent 18 2f34d5167611
--- a/src/corelib/kernel/qvariant.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/corelib/kernel/qvariant.h	Tue Jul 06 15:10:48 2010 +0300
@@ -60,6 +60,7 @@
 class QDataStream;
 class QDate;
 class QDateTime;
+class QEasingCurve;
 class QLine;
 class QLineF;
 class QLocale;
@@ -128,9 +129,10 @@
         LineF = 24,
         Point = 25,
         PointF = 26,
-	RegExp = 27,
+        RegExp = 27,
         Hash = 28,
-        LastCoreType = Hash,
+        EasingCurve = 29,
+        LastCoreType = EasingCurve,
 
         // value 62 is internally reserved
 #ifdef QT3_SUPPORT
@@ -219,6 +221,9 @@
 #ifndef QT_NO_REGEXP
     QVariant(const QRegExp &regExp);
 #endif
+#ifndef QT_BOOTSTRAPPED
+    QVariant(const QEasingCurve &easing);
+#endif
     QVariant(Qt::GlobalColor color);
 
     QVariant& operator=(const QVariant &other);
@@ -280,6 +285,9 @@
 #ifndef QT_NO_REGEXP
     QRegExp toRegExp() const;
 #endif
+#ifndef QT_BOOTSTRAPPED
+    QEasingCurve toEasingCurve() const;
+#endif
 
 #ifdef QT3_SUPPORT
     inline QT3_SUPPORT int &asInt();
@@ -581,8 +589,7 @@
 
 template<> inline QVariant qvariant_cast<QVariant>(const QVariant &v)
 {
-    static const int vid = qRegisterMetaType<QVariant>("QVariant");
-    if (vid == v.userType())
+    if (v.userType() == QMetaType::QVariant)
         return *reinterpret_cast<const QVariant *>(v.constData());
     return v;
 }