diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | abstractmetabuilder.cpp | 49 |
2 files changed, 2 insertions, 51 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6d3034d2..4e3276007 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,9 @@ find_package(LibXslt 1.1.19 REQUIRED) option(BUILD_TESTS "Build tests." TRUE) if (MSVC) - set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DAPIEXTRACTOR_ENABLE_DUPLICATE_ENUM_VALUES /DAPIEXTRACTOR_BUILD -D_SCL_SECURE_NO_WARNINGS") + set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DAPIEXTRACTOR_BUILD -D_SCL_SECURE_NO_WARNINGS") else (MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DAPIEXTRACTOR_ENABLE_DUPLICATE_ENUM_VALUES -fvisibility=hidden") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden") endif(MSVC) if (BUILD_TESTS) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/tests) diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp index d12cd9411..d6b348ae3 100644 --- a/abstractmetabuilder.cpp +++ b/abstractmetabuilder.cpp @@ -803,55 +803,6 @@ void AbstractMetaBuilder::figureOutEnumValuesForClass(AbstractMetaClass *metaCla lst.at(i)->setValue(value); value++; } - -#ifndef APIEXTRACTOR_ENABLE_DUPLICATE_ENUM_VALUES - // Check for duplicate values... - EnumTypeEntry *ete = e->typeEntry(); - if (!ete->forceInteger()) { - QHash<int, AbstractMetaEnumValue *> entries; - foreach (AbstractMetaEnumValue *v, lst) { - - bool vRejected = ete->isEnumValueRejected(v->name()); - - AbstractMetaEnumValue *current = entries.value(v->value()); - if (current) { - bool currentRejected = ete->isEnumValueRejected(current->name()); - if (!currentRejected && !vRejected) { - ReportHandler::warning( - QString("duplicate enum values: %1::%2, %3 and %4 are %5, already rejected: (%6)") - .arg(metaClass->name()) - .arg(e->name()) - .arg(v->name()) - .arg(entries[v->value()]->name()) - .arg(v->value()) - .arg(ete->enumValueRejections().join(", "))); - continue; - } - } - - if (!vRejected) - entries[v->value()] = v; - } - - // Entries now contain all the original entries, no - // rejected ones... Use this to generate the enumValueRedirection table. - foreach (AbstractMetaEnumValue *reject, lst) { - if (!ete->isEnumValueRejected(reject->name())) - continue; - - AbstractMetaEnumValue *used = entries.value(reject->value()); - if (!used) { - ReportHandler::warning( - QString::fromLatin1("Rejected enum has no alternative...: %1::%2\n") - .arg(metaClass->name()) - .arg(reject->name())); - continue; - } - ete->addEnumValueRedirection(reject->name(), used->name()); - } - - } -#endif } *classes += metaClass; |