diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-27 14:04:12 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-29 14:34:12 +0100 |
| commit | 36c057787f8a94abbfd3796e5039cf4e2db3775a (patch) | |
| tree | 09e98b39d316135a6127f2006db0a3814e96cd45 /src/corelib | |
| parent | 889092504e0f1e67dc9c7f27817fb809d7170132 (diff) | |
Get rid of checks for Qt3 types
These types don't exist anymore, so it's pointless to check for them.
Also remove the dead types from uic's type-to-header map.
Change-Id: I7f0af5c337859f3da1c103157a802bbe5372df9f
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: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 49cc8842cd..d685867cb8 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -80,15 +80,6 @@ uint qvariant_nameToType(const char* name) if (!name) return 0; - if (strcmp(name, "QCString") == 0) - return QMetaType::QByteArray; - if (strcmp(name, "Q_LLONG") == 0) - return QMetaType::LongLong; - if (strcmp(name, "Q_ULLONG") == 0) - return QMetaType::ULongLong; - if (strcmp(name, "QIconSet") == 0) - return QMetaType::QIcon; - uint tp = QMetaType::type(name); return tp < QMetaType::User ? tp : 0; } diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 96c2e1fef5..05c6c3ec6e 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1608,14 +1608,6 @@ QVariant::Type QVariant::nameToType(const char *name) { if (!name || !*name) return Invalid; - if (strcmp(name, "Q3CString") == 0) - return ByteArray; - if (strcmp(name, "Q_LLONG") == 0) - return LongLong; - if (strcmp(name, "Q_ULLONG") == 0) - return ULongLong; - if (strcmp(name, "QIconSet") == 0) - return Icon; if (strcmp(name, "UserType") == 0) return UserType; |