GIT_REPOSITORIES/LPP/PythonQt Commit - r134:1fceea800edd

fixed support for more than one * indirection via pointerCount, QPixmap crashed on char** constructor, which was thought to be * only...

florianlink -

r134:1fceea800edd

parent child

Context file:

r134:1fceea800edd

Collapse all files

src/PythonQt.cpp +2 -2

                   if (qstrncmp(m.signature(), "new_", 4)==0) {
                     if ((decoTypes & ConstructorDecorator) == 0) continue;
                     const PythonQtMethodInfo* info = PythonQtMethodInfo::getCachedMethodInfo(m, NULL);
-                    if (info->parameters().at(0).isPointer) {
+                    if (info->parameters().at(0).pointerCount == 1) {
                       QByteArray signature = m.signature();
                       QByteArray nameOfClass = signature.mid(4, signature.indexOf('(')-4);
                       PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);
                     const PythonQtMethodInfo* info = PythonQtMethodInfo::getCachedMethodInfo(m, NULL);
                     if (info->parameters().count()>1) {
                       PythonQtMethodInfo::ParameterInfo p = info->parameters().at(1);
-                      if (p.isPointer) {
+                      if (p.pointerCount==1) {
                         PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(p.name);
                         PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::InstanceDecorator);
                         classInfo->addDecoratorSlot(newSlot);

src/PythonQtConversion.cpp +22 -14

             PyObject* PythonQtConv::ConvertQtValueToPython(const PythonQtMethodInfo::ParameterInfo& info, const void* data) {
               // is it an enum value?
               if (info.enumWrapper) {
-                if (!info.isPointer) {
+                if (info.pointerCount==0) {
                   return PythonQtPrivate::createEnumValueInstance(info.enumWrapper, *((unsigned int*)data));
                 } else {
                   // we do not support pointers to enums (who needs them?)
               if (info.typeId == QMetaType::Void) {
                 Py_INCREF(Py_None);
                 return Py_None;
-              } else if (info.isPointer && (info.typeId == QMetaType::Char)) {
+              } else if ((info.pointerCount == 1) && (info.typeId == QMetaType::Char)) {
                 // a char ptr will probably be a null terminated string, so we support that:
                 return PyString_FromString(*((char**)data));
               } else if ((info.typeId == PythonQtMethodInfo::Unknown || info.typeId >= QMetaType::User) &&
                 QByteArray innerType = info.name.mid(6,info.name.length()-7);
                 if (innerType.endsWith("*")) {
                   innerType.truncate(innerType.length()-1);
-                  QList<void*>* listPtr;
+                  QList<void*>* listPtr = NULL;
-                  if (info.isPointer) {
+                  if (info.pointerCount == 1) {
                     listPtr = *((QList<void*>**)data);
-                  } else {
+                  } else if (info.pointerCount == 0) {
                     listPtr = (QList<void*>*)data;
                   }
-                  return ConvertQListOfPointerTypeToPythonList(listPtr, innerType);
+                  if (listPtr) {
+                    return ConvertQListOfPointerTypeToPythonList(listPtr, innerType);
+                  } else {
+                    return NULL;
+                  }
                 }
               }
               }
               // special handling did not match, so we convert the usual way (either pointer or value version):
-              if (info.isPointer) {
+              if (info.pointerCount == 1) {
                 // convert the pointer to a Python Object (we can handle ANY C++ object, in the worst case we just know the type and the pointer)
                 return PythonQt::priv()->wrapPtr(*((void**)data), info.name);
-              } else {
+              } else if (info.pointerCount == 0) {
                 // handle values that are not yet handled and not pointers
                 return ConvertQtValueToPythonInternal(info.typeId, data);
+              } else {
+                return NULL;
               }
             }
              void* PythonQtConv::CreateQtReturnValue(const PythonQtMethodInfo::ParameterInfo& info) {
                void* ptr = NULL;
-               if (info.isPointer) {
+               if (info.pointerCount>1) {
+                 return NULL;
+               } else if (info.pointerCount==1) {
                  PythonQtValueStorage_ADD_VALUE(global_ptrStorage, void*, NULL, ptr);
                } else if (info.enumWrapper) {
                  // create enum return value
                void* ptr = NULL;
                // autoconversion of QPen/QBrush/QCursor/QColor from different type
-               if (!info.isPointer && !strict) {
+               if (info.pointerCount==0 && !strict) {
                  ptr = handlePythonToQtAutoConversion(info.typeId, obj, alreadyAllocatedCPPObject);
                  if (ptr) {
                    return ptr;
                  PythonQtInstanceWrapper* wrap = (PythonQtInstanceWrapper*)obj;
                  void* object = castWrapperTo(wrap, info.name, ok);
                  if (ok) {
-                   if (info.isPointer) {
+                   if (info.pointerCount==1) {
                      // store the wrapped pointer in an extra pointer and let ptr point to the extra pointer
                      PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, object, ptr);
-                   } else {
+                   } else if (info.pointerCount==0) {
                      // store the wrapped pointer directly, since we are a reference
                      ptr = object;
                    }
                  } else {
                   // not matching
                  }
-               } else if (info.isPointer) {
+               } else if (info.pointerCount == 1) {
                  // a pointer
                  if (info.typeId == QMetaType::Char || info.typeId == QMetaType::UChar)
                  {
                      }
                    }
                  }
-               } else {
+               } else if (info.pointerCount == 0) {
                  // not a pointer
                  switch (info.typeId) {
                  case QMetaType::Char:

src/PythonQtMethodInfo.cpp +9 -7

                 } else {
                   type.isConst = false;
                 }
-                bool hadPointer   = false;
+                char pointerCount = 0;
                 bool hadReference = false;
                 // remove * and & from the end of the string, handle & and * the same way
                 while (name.at(len-1) == '*') {
                   len--;
-                  hadPointer = true;
+                  pointerCount++;
                 }
                 while (name.at(len-1) == '&') {
                   len--;
                 if (len!=name.length()) {
                   name = name.left(len);
                 }
-                type.isPointer = hadPointer;
+                type.pointerCount = pointerCount;
                 QByteArray alias = _parameterNameAliases.value(name);
                 if (!alias.isEmpty()) {
                 }
                 type.typeId = nameToType(name);
-                if (!type.isPointer && type.typeId == Unknown) {
+                if ((type.pointerCount == 0) && type.typeId == Unknown) {
                   type.typeId = QMetaType::type(name.constData());
                   if (type.typeId == QMetaType::Void) {
                     type.typeId = Unknown;
                 }
               } else {
                 type.typeId = QMetaType::Void;
-                type.isPointer = false;
+                type.pointerCount = 0;
                 type.isConst = false;
               }
             }
                   result += "const ";
                 }
                 result += _parameters.at(i).name;
-                if (_parameters.at(i).isPointer) {
+                if (_parameters.at(i).pointerCount) {
-                  result += "*";
+                  QByteArray stars;
+                  stars.fill('*', _parameters.at(i).pointerCount);
+                  result += stars;
                 }
                 if (!names.at(i-1).isEmpty()) {
                   result += " ";

src/PythonQtMethodInfo.h +1 -1

                 QByteArray name;
                 PyObject*  enumWrapper; // if it is an enum, a pointer to the enum wrapper
                 int typeId; // a mixture from QMetaType and ParameterType
-                bool isPointer;
+                char pointerCount; // the number of pointers indirections
                 bool isConst;
               };

src/PythonQtSlot.cpp 0 -2

                 if (ok) {
                   for (int i = 2; i<argc && ok; i++) {
                     const PythonQtSlotInfo::ParameterInfo& param = params.at(i);
-                    //std::cout << param.name.data() << " " << param.typeId << (param.isPointer?"*":"") << (param.isConst?" const":"") << std::endl;
                     argList[i] = PythonQtConv::ConvertPythonToQt(param, PyTuple_GET_ITEM(args, i-2), strict, classInfo);
                     if (argList[i]==NULL) {
                       ok = false;
               } else {
                 for (int i = 1; i<argc && ok; i++) {
                   const PythonQtSlotInfo::ParameterInfo& param = params.at(i);
-                  //std::cout << param.name.data() << " " << param.typeId << (param.isPointer?"*":"") << (param.isConst?" const":"") << std::endl;
                   argList[i] = PythonQtConv::ConvertPythonToQt(param, PyTuple_GET_ITEM(args, i-1), strict, classInfo);
                   if (argList[i]==NULL) {
                     ok = false;

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