GIT_REPOSITORIES/LPP/PythonQt Commit - r77:0b14472ff76a

- fixed support for QList<AnyObject*>* (which occured with QObjectList* return values)...

florianlink -

r77:0b14472ff76a

parent child

Context file:

r77:0b14472ff76a

Collapse all files

src/PythonQtConversion.cpp +7 -2

               } else if ((info.typeId == PythonQtMethodInfo::Unknown || info.typeId >= QMetaType::User) &&
                          info.name.startsWith("QList<")) {
                 // it is a QList template:
-                // (TODO: check what happens if this is a pointer type?!)
                 QByteArray innerType = info.name.mid(6,info.name.length()-7);
                 if (innerType.endsWith("*")) {
                   innerType.truncate(innerType.length()-1);
-                  return ConvertQListOfPointerTypeToPythonList((QList<void*>*)data, innerType);
+                  QList<void*>* listPtr;
+                  if (info.isPointer) {
+                    listPtr = *((QList<void*>**)data);
+                  } else {
+                    listPtr = (QList<void*>*)data;
+                  }
+                  return ConvertQListOfPointerTypeToPythonList(listPtr, innerType);
                 }
               }

src/PythonQtSlot.cpp +12 -1

               PythonQtSlotInfo*    info = f->m_ml;
               if (PyObject_TypeCheck(f->m_self, &PythonQtInstanceWrapper_Type)) {
                 PythonQtInstanceWrapper* self = (PythonQtInstanceWrapper*) f->m_self;
-                return PythonQtSlotFunction_CallImpl(self->classInfo(), self->_obj, info, args, kw, self->_wrappedPtr);
+                if (!info->isClassDecorator() && (self->_obj==NULL && self->_wrappedPtr==NULL)) {
+                  QString error = QString("Trying to call '") + f->m_ml->slotName() + "' on a destroyed " + self->classInfo()->className() + " object";
+                  PyErr_SetString(PyExc_ValueError, error.toLatin1().data());
+                  return NULL;
+                } else {
+                  return PythonQtSlotFunction_CallImpl(self->classInfo(), self->_obj, info, args, kw, self->_wrappedPtr);
+                }
               } else if (f->m_self->ob_type == &PythonQtClassWrapper_Type) {
                 PythonQtClassWrapper* type = (PythonQtClassWrapper*) f->m_self;
                 if (info->isClassDecorator()) {
                     if (PyObject_TypeCheck(firstArg, (PyTypeObject*)&PythonQtInstanceWrapper_Type)
                       && ((PythonQtInstanceWrapper*)firstArg)->classInfo()->inherits(type->classInfo())) {
                       PythonQtInstanceWrapper* self = (PythonQtInstanceWrapper*)firstArg;
+                      if (!info->isClassDecorator() && (self->_obj==NULL && self->_wrappedPtr==NULL)) {
+                        QString error = QString("Trying to call '") + f->m_ml->slotName() + "' on a destroyed " + self->classInfo()->className() + " object";
+                        PyErr_SetString(PyExc_ValueError, error.toLatin1().data());
+                        return NULL;
+                      }
                       // strip the first argument...
                       PyObject* newargs = PyTuple_GetSlice(args, 1, argc);
                       PyObject* result = PythonQtSlotFunction_CallImpl(self->classInfo(), self->_obj, info, newargs, kw, self->_wrappedPtr);

src/PythonQtStdDecorators.cpp +2 -7

               o->setParent(parent);
             }
-            QVariantList PythonQtStdDecorators::children(QObject* o)
+            const QObjectList* PythonQtStdDecorators::children(QObject* o)
             {
-              QVariantList v;
+              return &o->children();
-              QListIterator<QObject*> it(o->children());
-              while (it.hasNext()) {
-                v << qVariantFromValue(it.next());
-              return v;
             }
             QString PythonQtStdDecorators::tr(QObject* obj, const QByteArray& text, const QByteArray& ambig, int n)

src/PythonQtStdDecorators.h +1 -1

               QObject* parent(QObject* o);
               void setParent(QObject* o, QObject* parent);
-              QVariantList children(QObject* o);
+              const QObjectList* children(QObject* o);
               double static_Qt_qAbs(double a) { return qAbs(a); }
               double static_Qt_qBound(double a,double b,double c) { return qBound(a,b,c); }

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