From 36c057787f8a94abbfd3796e5039cf4e2db3775a Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 27 Jan 2012 14:04:12 +0100
Subject: Get rid of checks for Qt3 types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/kernel/qmetaobjectbuilder.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp')

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;
 }
-- 
cgit v1.2.3