From 193dbb137eb24c53941ba26a31fbfdb8652295e1 2012-03-14 10:37:16 From: florianlink Date: 2012-03-14 10:37:16 Subject: [PATCH] fixed polymorphic id handler for QGraphicsItem git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@209 ea8d5007-eb21-0410-b261-ccb3ea6e24a9 --- diff --git a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp index c06fda3..4b33633 100644 --- a/generator/setupgenerator.cpp +++ b/generator/setupgenerator.cpp @@ -247,17 +247,21 @@ QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QStrin foreach (const AbstractMetaClass *clazz, allClasses) { bool inherits = false; if (isGraphicsItem) { - foreach(AbstractMetaClass* interfaze, clazz->interfaces()) { - if (interfaze->qualifiedCppName()=="QGraphicsItem") { - inherits = true; - break; + const AbstractMetaClass *currentClazz = clazz; + while (!inherits && currentClazz) { + foreach(AbstractMetaClass* interfaze, currentClazz->interfaces()) { + if (interfaze->qualifiedCppName()=="QGraphicsItem") { + inherits = true; + break; + } } + currentClazz = currentClazz->baseClass(); } } else { inherits = clazz->inheritsFrom(cls); } if (clazz->package() == package && inherits) { - if (!clazz->typeEntry()->polymorphicIdValue().isEmpty() || isGraphicsItem) { + if (!clazz->typeEntry()->polymorphicIdValue().isEmpty()) { // On first find, open the function if (first) { first = false; @@ -275,9 +279,6 @@ QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QStrin // For each, add case label QString polyId = clazz->typeEntry()->polymorphicIdValue(); - if (isGraphicsItem) { - polyId = "%1->type() == " + clazz->qualifiedCppName() + "::Type"; - } s << " if (" << polyId.replace("%1", "object") << ") {" << endl diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml index fbf67ba..5ae2920 100644 --- a/generator/typesystem_gui.xml +++ b/generator/typesystem_gui.xml @@ -1455,7 +1455,7 @@ - + @@ -1837,7 +1837,7 @@ - + @@ -1854,29 +1854,30 @@ - + - + - + - + - - - + + + @@ -3518,7 +3519,7 @@ - + @@ -5427,7 +5428,9 @@ - + +