Changeset 846 for trunk/src/corelib/kernel/qvariant.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qvariant.h (modified) (6 diffs)

trunk/src/corelib/kernel/qvariant.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -61 +61 @@
 class QDate;
 class QDateTime;
+
 class QLine;
 class QLineF;
@@ -129 +130 @@
         Point = 25,
         PointF = 26,
-        RegExp = 27,
+RegExp = 27,
         Hash = 28,
-        LastCoreType = Hash,
+        EasingCurve = 29,
+        LastCoreType = EasingCurve,
 
         // value 62 is internally reserved
@@ -220 +222 @@
     QVariant(const QRegExp &regExp);
 #endif
+
+
+
     QVariant(Qt::GlobalColor color);
 
@@ -280 +285 @@
 #ifndef QT_NO_REGEXP
     QRegExp toRegExp() const;
+
+
+
 #endif
 
@@ -582 +590 @@
 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;