From 391031166fd5c8c000a63b21ad98bdb1ca116afd Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 13 Dec 2015 15:57:30 +0200 Subject: [PATCH] cleanup legacy types remains Signed-off-by: Ivailo Monev --- src/core/kernel/qvariant.cpp | 11 ----------- src/declarative/qml/qmetaobjectbuilder.cpp | 8 -------- src/tools/moc/generator.cpp | 8 -------- 3 files changed, 27 deletions(-) diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp index fe26daeb9..9e024e91c 100644 --- a/src/core/kernel/qvariant.cpp +++ b/src/core/kernel/qvariant.cpp @@ -2014,17 +2014,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; - int metaType = QMetaType::type(name); return metaType <= int(LastGuiType) ? QVariant::Type(metaType) : UserType; } diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index 36e08c669..7c6367a07 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -80,14 +80,6 @@ uint qvariant_nameToType(const char* name) if (strcmp(name, "QVariant") == 0) return 0xffffffff; - 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/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index e88cad18b..371a525a6 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -60,14 +60,6 @@ uint qvariant_nameToType(const char* name) if (strcmp(name, "QVariant") == 0) return 0xffffffff; - 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; -- 2.11.0