#include "qvector.h"
#include "qlocale.h"
#include "qeasingcurve.h"
+#include "quuid.h"
#include "qvariant.h"
#include "qmetatypeswitcher_p.h"
return false;
qMetaTypeWidgetsHelper[type - FirstWidgetsType].saveOp(stream, data);
break;
+ case QMetaType::QUuid:
+ stream << *static_cast<const NS(QUuid)*>(data);
+ break;
default: {
const QVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
return false;
qMetaTypeWidgetsHelper[type - FirstWidgetsType].loadOp(stream, data);
break;
+ case QMetaType::QUuid:
+ stream >> *static_cast< NS(QUuid)*>(data);
+ break;
default: {
const QVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
case QMetaType::QEasingCurve:
return new NS(QEasingCurve)(*static_cast<const NS(QEasingCurve)*>(copy));
#endif
+ case QMetaType::QUuid:
+ return new NS(QUuid)(*static_cast<const NS(QUuid)*>(copy));
case QMetaType::Void:
return 0;
default:
case QMetaType::QEasingCurve:
return new NS(QEasingCurve);
#endif
+ case QMetaType::QUuid:
+ return new NS(QUuid);
case QMetaType::Void:
return 0;
default:
delete static_cast< NS(QEasingCurve)* >(data);
break;
#endif
+ case QMetaType::QUuid:
+ delete static_cast< NS(QUuid)* >(data);
+ break;
case QMetaType::Void:
break;
default: {
F(QPointF, 26, QPointF) \
F(QRegExp, 27, QRegExp) \
F(QEasingCurve, 29, QEasingCurve) \
+ F(QUuid, 30, QUuid) \
F(QVariant, 138, QVariant) \
#define QT_FOR_EACH_STATIC_CORE_POINTER(F)\
// these are merged with QVariant
QT_FOR_EACH_STATIC_TYPE(QT_DEFINE_METATYPE_ID)
- LastCoreType = QEasingCurve,
+ LastCoreType = QUuid,
FirstGuiType = QFont,
LastGuiType = QPolygonF,
FirstWidgetsType = QIcon,
#include "qstringlist.h"
#include "qurl.h"
#include "qlocale.h"
+#include "quuid.h"
#include "private/qvariant_p.h"
#include "qmetatype_p.h"
case QVariant::Url:
*str = v_cast<QUrl>(d)->toString();
break;
+ case QVariant::Uuid:
+ *str = v_cast<QUuid>(d)->toString();
+ break;
default:
return false;
}
return *ok;
}
#endif
+ case QVariant::Uuid:
+ switch (d->type) {
+ case QVariant::String:
+ *static_cast<QUuid *>(result) = QUuid(*v_cast<QString>(d));
+ break;
+ default:
+ return false;
+ }
+ break;
default:
return false;
}
dbg.nospace() << v.toRectF();
break;
#endif
+ case QVariant::Uuid:
+ dbg.nospace() << v.value<QUuid>().toString();
+ break;
case QVariant::BitArray:
//dbg.nospace() << v.toBitArray();
break;
\value DateTime a QDateTime
\value Double a double
\value EasingCurve a QEasingCurve
+ \value Uuid a QUuid
\value Font a QFont
\value Hash a QVariantHash
\value Icon a QIcon
| 1 << QVariant::UInt | 1 << QVariant::Bool | 1 << QVariant::Double
| 1 << QVariant::Date | 1 << QVariant::Time | 1 << QVariant::DateTime
| 1 << QVariant::LongLong | 1 << QVariant::ULongLong | 1 << QVariant::Char
- | 1 << QVariant::Url,
+ | 1 << QVariant::Url | 1 << QVariant::Uuid,
/*QStringList*/ 1 << QVariant::List | 1 << QVariant::String,
/*QHash*/ 0,
-/*QEasingCurve*/ 0
+/*QEasingCurve*/ 0,
+
+/*QUuid*/ 1 << QVariant::String
};
/*!
RegExp = QMetaType::QRegExp,
Hash = QMetaType::QVariantHash,
EasingCurve = QMetaType::QEasingCurve,
+ Uuid = QMetaType::QUuid,
LastCoreType = QMetaType::LastCoreType,
Font = QMetaType::QFont,
#include "qstringlist.h"
#include "qurl.h"
#include "qlocale.h"
+#include "quuid.h"
#ifndef QT_NO_GEOM_VARIANT
#include "qsize.h"
template<> struct TestValueFactory<QMetaType::QEasingCurve> {
static QEasingCurve *create() { return new QEasingCurve(QEasingCurve::InOutElastic); }
};
+template<> struct TestValueFactory<QMetaType::QUuid> {
+ static QUuid *create() { return new QUuid(); }
+};
template<> struct TestValueFactory<QMetaType::QRegExp> {
static QRegExp *create()
{
void hash();
+ void qvariant();
+ void qvariant_conversion();
+
public:
// Variables
QUuid uuidA;
QCOMPARE(qHash(QUuid(uuidA.toString())), h);
}
+void tst_QUuid::qvariant()
+{
+ QUuid uuid = QUuid::createUuid();
+ QVariant v = QVariant::fromValue(uuid);
+ QVERIFY(!v.isNull());
+ QCOMPARE(v.type(), QVariant::Uuid);
+
+ QUuid uuid2 = v.value<QUuid>();
+ QVERIFY(!uuid2.isNull());
+ QCOMPARE(uuid, uuid2);
+}
+void tst_QUuid::qvariant_conversion()
+{
+ QUuid uuid = QUuid::createUuid();
+ QVariant v = QVariant::fromValue(uuid);
+
+ QVERIFY(v.canConvert<QString>());
+ QCOMPARE(v.toString(), uuid.toString());
+ QCOMPARE(v.value<QString>(), uuid.toString());
+ QVERIFY(!v.canConvert<int>());
+ QVERIFY(!v.canConvert<QStringList>());
+
+ // try reverse conversion QString -> QUuid
+ QVariant sv = QVariant::fromValue(uuid.toString());
+ QCOMPARE(sv.type(), QVariant::String);
+ QVERIFY(sv.canConvert<QUuid>());
+ QCOMPARE(sv.value<QUuid>(), uuid);
+}
QTEST_MAIN(tst_QUuid)
#include "tst_quuid.moc"