diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-01-02 16:25:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 02:17:04 +0100 |
| commit | 92f9678055eef647c9e6ebc7fb0ce29b89db5f89 (patch) | |
| tree | 3c4a5232263e6684bceff91fd8b351ad3b6fa127 /src/corelib/kernel/qmetatype.cpp | |
| parent | 99eb5051039052bc782ca3224aac1c9b99c67b28 (diff) | |
Registered QUuid in the metatype system as a builtin type.
Change-Id: I6be6129d9f6bf468ba8a5805cfa0f6f79199afb3
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index e72cd7c575..38bfd2987c 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -50,6 +50,7 @@ #include "qvector.h" #include "qlocale.h" #include "qeasingcurve.h" +#include "quuid.h" #include "qvariant.h" #include "qmetatypeswitcher_p.h" @@ -788,6 +789,9 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) 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) @@ -995,6 +999,9 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) 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) @@ -1115,6 +1122,8 @@ void *QMetaType::create(int type, const void *copy) 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: @@ -1212,6 +1221,8 @@ void *QMetaType::create(int type, const void *copy) case QMetaType::QEasingCurve: return new NS(QEasingCurve); #endif + case QMetaType::QUuid: + return new NS(QUuid); case QMetaType::Void: return 0; default: @@ -1379,6 +1390,9 @@ void QMetaType::destroy(int type, void *data) delete static_cast< NS(QEasingCurve)* >(data); break; #endif + case QMetaType::QUuid: + delete static_cast< NS(QUuid)* >(data); + break; case QMetaType::Void: break; default: { |