diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-27 14:28:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 16:40:19 +0100 |
| commit | 283140742a356ba96612486b1bd613d397029efd (patch) | |
| tree | 9bc9f1c78c3dce319f85b826e87766789e0b58af /src/corelib/kernel/qvariant.cpp | |
| parent | 4c63838039e410d6d68f4b76be5b42d4e620d224 (diff) | |
Remove type id/name conversion for QVariant::UserType
QVariant::UserType does not correspond to an actual type named
"UserType". This logic didn't make sense.
Change-Id: I369911e514f7902fc863cb05174011d6fc15c447
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 0e89f7b148..c8db27515c 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1590,8 +1590,6 @@ const char *QVariant::typeToName(Type typ) { if (typ == Invalid) return 0; - if (typ == UserType) - return "UserType"; return QMetaType::typeName(typ); } @@ -1608,8 +1606,6 @@ QVariant::Type QVariant::nameToType(const char *name) { if (!name || !*name) return Invalid; - if (strcmp(name, "UserType") == 0) - return UserType; int metaType = QMetaType::type(name); return metaType <= int(LastGuiType) ? QVariant::Type(metaType) : UserType; |