GIT_REPOSITORIES/LPP/PythonQt Commit - r15:ae998290bf19

- added hasOwner method to manage ownership more nicely...

florianlink -

r15:ae998290bf19

parent child

Context file:

r15:ae998290bf19

Collapse all files

generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QGraphicsItem.h +2 0

             enum GraphicsItemChange{
               ItemPositionChange = QGraphicsItem::ItemPositionChange,   ItemMatrixChange = QGraphicsItem::ItemMatrixChange,   ItemVisibleChange = QGraphicsItem::ItemVisibleChange,   ItemEnabledChange = QGraphicsItem::ItemEnabledChange,   ItemSelectedChange = QGraphicsItem::ItemSelectedChange,   ItemParentChange = QGraphicsItem::ItemParentChange,   ItemChildAddedChange = QGraphicsItem::ItemChildAddedChange,   ItemChildRemovedChange = QGraphicsItem::ItemChildRemovedChange,   ItemTransformChange = QGraphicsItem::ItemTransformChange,   ItemPositionHasChanged = QGraphicsItem::ItemPositionHasChanged,   ItemTransformHasChanged = QGraphicsItem::ItemTransformHasChanged,   ItemSceneChange = QGraphicsItem::ItemSceneChange,   ItemVisibleHasChanged = QGraphicsItem::ItemVisibleHasChanged,   ItemEnabledHasChanged = QGraphicsItem::ItemEnabledHasChanged,   ItemSelectedHasChanged = QGraphicsItem::ItemSelectedHasChanged,   ItemParentHasChanged = QGraphicsItem::ItemParentHasChanged,   ItemSceneHasChanged = QGraphicsItem::ItemSceneHasChanged,   ItemCursorChange = QGraphicsItem::ItemCursorChange,   ItemCursorHasChanged = QGraphicsItem::ItemCursorHasChanged,   ItemToolTipChange = QGraphicsItem::ItemToolTipChange,   ItemToolTipHasChanged = QGraphicsItem::ItemToolTipHasChanged,   ItemFlagsChange = QGraphicsItem::ItemFlagsChange,   ItemFlagsHaveChanged = QGraphicsItem::ItemFlagsHaveChanged,   ItemZValueChange = QGraphicsItem::ItemZValueChange,   ItemZValueHasChanged = QGraphicsItem::ItemZValueHasChanged};
             public slots:
+              bool hasOwner(QGraphicsItem* theWrappedObject) { return theWrappedObject->scene()!=NULL || theWrappedObject->parentItem()!=NULL; }
             void delete_QGraphicsItem(QGraphicsItem* obj) { delete obj; }
                bool  acceptDrops(QGraphicsItem* theWrappedObject) const;
                bool  acceptHoverEvents(QGraphicsItem* theWrappedObject) const;

generated_cpp/com_trolltech_qt_gui/PythonQtWrapper_QTreeWidgetItem.h +2 0

             enum ChildIndicatorPolicy{
               ShowIndicator = QTreeWidgetItem::ShowIndicator,   DontShowIndicator = QTreeWidgetItem::DontShowIndicator,   DontShowIndicatorWhenChildless = QTreeWidgetItem::DontShowIndicatorWhenChildless};
             public slots:
+              bool hasOwner(QTreeWidgetItem* theWrappedObject) { return theWrappedObject->treeWidget()!=NULL || theWrappedObject->parent()!=NULL; }
             QTreeWidgetItem* new_QTreeWidgetItem(QTreeWidget*  view, QTreeWidgetItem*  after, int  type = Type);
             QTreeWidgetItem* new_QTreeWidgetItem(QTreeWidget*  view, const QStringList&  strings, int  type = Type);
             QTreeWidgetItem* new_QTreeWidgetItem(QTreeWidget*  view, int  type = Type);

generator/shellheadergenerator.cpp +5 0

                 s << "void delete_" << meta_class->name() << "(" << meta_class->qualifiedCppName() << "* obj) { delete obj; } ";
                 s << endl;
               }
+              if (meta_class->name()=="QTreeWidgetItem") {
+                s << "bool hasOwner(QTreeWidgetItem* theWrappedObject) { return theWrappedObject->treeWidget()!=NULL || theWrappedObject->parent()!=NULL; }" << endl;
+              } else if (meta_class->name()=="QGraphicsItem") {
+                s << "bool hasOwner(QGraphicsItem* theWrappedObject) { return theWrappedObject->scene()!=NULL || theWrappedObject->parentItem()!=NULL; }" << endl;
+              }
                 AbstractMetaFunctionList functions = meta_class->queryFunctions(
                     AbstractMetaClass::NormalFunctions | AbstractMetaClass::WasVisible | AbstractMetaClass::WasPublic

src/PythonQtClassInfo.cpp +16 0

@@ -641,3 +641,19 QObject* PythonQtClassInfo::decorator()
641	}	641	}
642	return _decoratorProvider;	642	return _decoratorProvider;
643	}	643	}
		644
		645	bool PythonQtClassInfo::hasOwnerMethodButNoOwner(void* object)
		646	{
		647	PythonQtMemberInfo info = member("hasOwner");
		648	if (info._type == PythonQtMemberInfo::Slot) {
		649	void* obj = object;
		650	bool result = false;
		651	void* args[2];
		652	args[0] = &result;
		653	args[1] = &obj;
		654	info._slot->decorator()->qt_metacall(QMetaObject::InvokeMetaMethod, info._slot->slotIndex(), args);
		655	return !result;
		656	} else {
		657	return false;
		658	}
		659	}

src/PythonQtClassInfo.h +3 0

               //! set the parent class name of a wrapped CPP pointer
               void setWrappedParentClassName(const QByteArray& name) { _wrappedParentClassName = name; _parentClassInfo = NULL; _parentClassInfoResolved = false; }
+              //! check if the special method "hasOwner" is implemented and if it returns false, which means that the object may be destroyed
+              bool hasOwnerMethodButNoOwner(void* object);
             private:
               //! resolve the parent class from either meta object or cpp parent class name
               void resolveParentClassInfo();

src/PythonQtWrapper.cpp +7 -6

             #include "PythonQtClassInfo.h"
             #include "PythonQtConversion.h"
-            static void PythonQtWrapper_deleteObject(PythonQtWrapper* self) {
+            static void PythonQtWrapper_deleteObject(PythonQtWrapper* self, bool force = false) {
-              if (self->_wrappedPtr) {
+              // is this a C++ wrapper?
+              if (self->_wrappedPtr) {
                 //mlabDebugConst("Python","c++ wrapper removed " << self->_wrappedPtr << " " << self->_obj->className() << " " << self->_info->wrappedClassName().latin1());
                 PythonQt::priv()->removeWrapperPointer(self->_wrappedPtr);
                 // we own our qobject, so we delete it now:
                 delete self->_obj;
                 self->_obj = NULL;
-                if (self->_ownedByPythonQt) {
+                if (force || self->_info->hasOwnerMethodButNoOwner(self->_wrappedPtr) || self->_ownedByPythonQt) {
                   int type = self->_info->metaTypeId();
                   if (self->_useQMetaTypeDestroy && type>=0) {
                     // use QMetaType to destroy the object
                   PythonQt::priv()->removeWrapperPointer(self->_objPointerCopy);
                 }
                 if (self->_obj) {
-                  if (self->_ownedByPythonQt) {
+                  if (force || self->_ownedByPythonQt) {
-                    if (!self->_obj->parent()) {
+                    if (force || !self->_obj->parent()) {
                       delete self->_obj;
                     }
                   } else {
             static PyObject *PythonQtWrapper_delete(PythonQtWrapper * self)
             {
-              PythonQtWrapper_deleteObject(self);
+              PythonQtWrapper_deleteObject(self, true);
               Py_INCREF(Py_None);
               return Py_None;
             }

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