GIT_REPOSITORIES/LPP/PythonQt Commit - r170:193dbb137eb2

fixed polymorphic id handler for QGraphicsItem...

florianlink -

r170:193dbb137eb2

parent child

Context file:

r170:193dbb137eb2

Collapse all files

generator/setupgenerator.cpp +6 -5

                 foreach (const AbstractMetaClass *clazz, allClasses) {
                   bool inherits = false;
                   if (isGraphicsItem) {
-                    foreach(AbstractMetaClass* interfaze, clazz->interfaces()) {
+                    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;
                       // 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

generator/typesystem_gui.xml +14 -11

               <interface-type name="QLayoutItem"/>
               <interface-type name="QPaintDevice"/>
-              <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
+              <interface-type name="QGraphicsItem" delete-in-main-thread="yes" polymorphic-base="yes">
                 <modify-function signature="setCursorForItemOnly(QCursor)" remove="all"/>
                 <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
                 </modify-function>
               </object-type>
-              <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/>
+              <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsEllipseItem::Type" />
               <object-type name="QGraphicsItemAnimation">
                 <modify-function signature="setItem(QGraphicsItem*)">
                     <modify-argument index="1">
                     <include file-name="QPair" location="global"/>
                 </extra-includes>
               </object-type>
-              <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes">
+              <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"
+              polymorphic-id-expression="%1-&gt;type() == QGraphicsItemGroup::Type">
                   <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
               </object-type>
-              <object-type name="QGraphicsLineItem" delete-in-main-thread="yes">
+              <object-type name="QGraphicsLineItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsLineItem::Type">
                   <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
               </object-type>
-              <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/>
+              <object-type name="QGraphicsPathItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsPathItem::Type"/>
-              <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes">
+              <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsPixmapItem::Type">
                   <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
                   <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
               </object-type>
-              <object-type name="QGraphicsPolygonItem" delete-in-main-thread="yes"/>
+              <object-type name="QGraphicsPolygonItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsPolygonItem::Type"/>
-              <object-type name="QGraphicsRectItem" delete-in-main-thread="yes"/>
+              <object-type name="QGraphicsRectItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsRectItem::Type"/>
-              <object-type name="QGraphicsSimpleTextItem" delete-in-main-thread="yes"/>
+              <object-type name="QGraphicsSimpleTextItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type() == QGraphicsSimpleTextItem::Type"/>
               <object-type name="QHBoxLayout"/>
               <object-type name="QHeaderView">
                 <modify-function signature="initStyleOption(QStyleOptionHeader*)const">
                 <modify-function signature="operator&lt;(QListWidgetItem)const" remove="all"/>
               </object-type>
-              <object-type name="QGraphicsTextItem"> <!-- a QObject so main-thread delete redundant -->
+              <object-type name="QGraphicsTextItem" polymorphic-id-expression="%1-&gt;type() == QGraphicsTextItem::Type"> <!-- a QObject so main-thread delete redundant -->
                 <extra-includes>
                   <include file-name="QTextCursor" location="global"/>
                 </extra-includes>
                 </modify-function>
               </object-type>
               <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant -->
-              <object-type name="QGraphicsWidget">  <!-- a QObject so main-thread delete redundant -->
+              <object-type name="QGraphicsWidget"
+                polymorphic-id-expression="%1-&gt;isWidget()">
+                <!-- a QObject so main-thread delete redundant -->
                 <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
                 <modify-function signature="children()const" remove="all"/>
                 <modify-function signature="setLayout(QGraphicsLayout*)">

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages