GIT_REPOSITORIES/LPP/PythonQt Commit - r113:ab319fdfc38d

added initial support for public member variable access via getters/setters...

florianlink -

r113:ab319fdfc38d

parent child

Context file:

r113:ab319fdfc38d

Collapse all files

src/PythonQtInstanceWrapper.cpp +22 -1

                 }
                 break;
               case PythonQtMemberInfo::NotFound:
+                {
+                  // check for a getter_
+                  PythonQtMemberInfo member = wrapper->classInfo()->member(QByteArray("getter_") + attributeName);
+                  if (member._type == PythonQtMemberInfo::Slot) {
+                    return PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, member._slot, NULL, NULL, wrapper->_wrappedPtr);
+                  }
                   // handle dynamic properties
                   if (wrapper->_obj) {
                     QVariant v = wrapper->_obj->property(attributeName);
                       return PythonQtConv::QVariantToPyObject(v);
                     }
                   }
+                }
                 break;
               default:
                 // is an invalid type, go on
             static int PythonQtInstanceWrapper_setattro(PyObject *obj,PyObject *name,PyObject *value)
             {
               QString error;
-              char *attributeName;
+              const char *attributeName;
               PythonQtInstanceWrapper *wrapper = (PythonQtInstanceWrapper *)obj;
               if ((attributeName = PyString_AsString(name)) == NULL)
               } else if (member._type == PythonQtMemberInfo::EnumWrapper) {
                 error = QString("Enum '") + attributeName + "' can not be overwritten on " + obj->ob_type->tp_name + " object";
               } else if (member._type == PythonQtMemberInfo::NotFound) {
+                // check for a setter_
+                PythonQtMemberInfo setter = wrapper->classInfo()->member(QByteArray("setter_") + attributeName);
+                if (setter._type == PythonQtMemberInfo::Slot) {
+                  // call the setter and ignore the result value
+                  void* result;
+                  PyObject* args = PyTuple_New(1);
+                  Py_INCREF(value);
+                  PyTuple_SET_ITEM(args, 0, value);
+                  PythonQtSlotFunction_CallImpl(wrapper->classInfo(), wrapper->_obj, setter._slot, args, NULL, wrapper->_wrappedPtr, &result);
+                  Py_DECREF(args);
+                  return 0;
+                }
                 // handle dynamic properties
                 if (wrapper->_obj) {
                   QVariant prop = wrapper->_obj->property(attributeName);

src/PythonQtSlot.cpp +1 -1

             PyObject *PythonQtSlotFunction_CallImpl(PythonQtClassInfo* classInfo, QObject* objectToCall, PythonQtSlotInfo* info, PyObject *args, PyObject * /*kw*/, void* firstArg, void** directReturnValuePointer)
             {
-              int argc = PyTuple_Size(args);
+              int argc = args?PyTuple_Size(args):0;
             #ifdef PYTHONQT_DEBUG
               std::cout << "called " << info->metaMethod()->typeName() << " " << info->metaMethod()->signature() << std::endl;

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