GIT_REPOSITORIES/LPP/PythonQt Commit - r189:91b62d374275

added support for kwargs on call() methods...

florianlink -

r189:91b62d374275

parent child

Context file:

r189:91b62d374275

Collapse all files

src/PythonQt.cpp +43 -20

             /*
             *
             *  Copyright (C) 2010 MeVis Medical Solutions AG All Rights Reserved.
             *
             *  This library is free software; you can redistribute it and/or
             *  modify it under the terms of the GNU Lesser General Public
             *  License as published by the Free Software Foundation; either
             *  version 2.1 of the License, or (at your option) any later version.
             *
             *  This library is distributed in the hope that it will be useful,
             *  but WITHOUT ANY WARRANTY; without even the implied warranty of
             *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
             *  Lesser General Public License for more details.
             *
             *  Further, this software is distributed without any warranty that it is
             *  free of the rightful claim of any third person regarding infringement
             *  or the like.  Any license provided herein, whether implied or
             *  otherwise, applies only to this software file.  Patent licenses, if
             *  any, provided herein do not apply to combinations of this program with
             *  other software, or any other product whatsoever.
             *
             *  You should have received a copy of the GNU Lesser General Public
             *  License along with this library; if not, write to the Free Software
             *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             *
             *  Contact information: MeVis Medical Solutions AG, Universitaetsallee 29,
             *  28359 Bremen, Germany or:
             *
             *  http://www.mevis.de
             *
             */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQt.cpp
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQt.h"
             #include "PythonQtImporter.h"
             #include "PythonQtClassInfo.h"
             #include "PythonQtMethodInfo.h"
             #include "PythonQtSignal.h"
             #include "PythonQtSignalReceiver.h"
             #include "PythonQtConversion.h"
             #include "PythonQtStdIn.h"
             #include "PythonQtStdOut.h"
             #include "PythonQtCppWrapperFactory.h"
             #include "PythonQtVariants.h"
             #include "PythonQtStdDecorators.h"
             #include "PythonQtQFileImporter.h"
             #include <pydebug.h>
             #include <vector>
             PythonQt* PythonQt::_self = NULL;
             int       PythonQt::_uniqueModuleCount = 0;
             void PythonQt_init_QtGuiBuiltin(PyObject*);
             void PythonQt_init_QtCoreBuiltin(PyObject*);
             void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
             {
               if (!_self) {
                 _self = new PythonQt(flags, pythonQtModuleName);
                 PythonQtMethodInfo::addParameterTypeAlias("QObjectList", "QList<QObject*>");
                 qRegisterMetaType<QList<QObject*> >("QList<void*>");
                 PythonQtRegisterToolClassesTemplateConverter(int);
                 PythonQtRegisterToolClassesTemplateConverter(float);
                 PythonQtRegisterToolClassesTemplateConverter(double);
                 PythonQtRegisterToolClassesTemplateConverter(qint32);
                 PythonQtRegisterToolClassesTemplateConverter(quint32);
                 PythonQtRegisterToolClassesTemplateConverter(qint64);
                 PythonQtRegisterToolClassesTemplateConverter(quint64);
                 // TODO: which other POD types should be available for QList etc.
                 PythonQt_init_QtCoreBuiltin(NULL);
                 PythonQt_init_QtGuiBuiltin(NULL);
                 PythonQt::self()->addDecorators(new PythonQtStdDecorators());
                 PythonQt::self()->registerCPPClass("QMetaObject",0, "QtCore", PythonQtCreateObject<PythonQtWrapper_QMetaObject>);
                 PythonQtRegisterToolClassesTemplateConverter(QByteArray);
                 PythonQtRegisterToolClassesTemplateConverter(QDate);
                 PythonQtRegisterToolClassesTemplateConverter(QTime);
                 PythonQtRegisterToolClassesTemplateConverter(QDateTime);
                 PythonQtRegisterToolClassesTemplateConverter(QUrl);
                 PythonQtRegisterToolClassesTemplateConverter(QLocale);
                 PythonQtRegisterToolClassesTemplateConverter(QRect);
                 PythonQtRegisterToolClassesTemplateConverter(QRectF);
                 PythonQtRegisterToolClassesTemplateConverter(QSize);
                 PythonQtRegisterToolClassesTemplateConverter(QSizeF);
                 PythonQtRegisterToolClassesTemplateConverter(QLine);
                 PythonQtRegisterToolClassesTemplateConverter(QLineF);
                 PythonQtRegisterToolClassesTemplateConverter(QPoint);
                 PythonQtRegisterToolClassesTemplateConverter(QPointF);
                 PythonQtRegisterToolClassesTemplateConverter(QRegExp);
                 PythonQtRegisterToolClassesTemplateConverter(QFont);
                 PythonQtRegisterToolClassesTemplateConverter(QPixmap);
                 PythonQtRegisterToolClassesTemplateConverter(QBrush);
                 PythonQtRegisterToolClassesTemplateConverter(QColor);
                 PythonQtRegisterToolClassesTemplateConverter(QPalette);
                 PythonQtRegisterToolClassesTemplateConverter(QIcon);
                 PythonQtRegisterToolClassesTemplateConverter(QImage);
                 PythonQtRegisterToolClassesTemplateConverter(QPolygon);
                 PythonQtRegisterToolClassesTemplateConverter(QRegion);
                 PythonQtRegisterToolClassesTemplateConverter(QBitmap);
                 PythonQtRegisterToolClassesTemplateConverter(QCursor);
                 PythonQtRegisterToolClassesTemplateConverter(QSizePolicy);
                 PythonQtRegisterToolClassesTemplateConverter(QKeySequence);
                 PythonQtRegisterToolClassesTemplateConverter(QPen);
                 PythonQtRegisterToolClassesTemplateConverter(QTextLength);
                 PythonQtRegisterToolClassesTemplateConverter(QTextFormat);
                 PythonQtRegisterToolClassesTemplateConverter(QMatrix);
                 PyObject* pack = PythonQt::priv()->packageByName("QtCore");
                 PyObject* pack2 = PythonQt::priv()->packageByName("Qt");
                 PyObject* qtNamespace = PythonQt::priv()->getClassInfo("Qt")->pythonQtClassWrapper();
                 const char* names[16] = {"SIGNAL", "SLOT", "qAbs", "qBound","qDebug","qWarning","qCritical","qFatal"
                                     ,"qFuzzyCompare", "qMax","qMin","qRound","qRound64","qVersion","qrand","qsrand"};
                 for (unsigned int i = 0;i<16; i++) {
                   PyObject* obj = PyObject_GetAttrString(qtNamespace, names[i]);
                   if (obj) {
                     PyModule_AddObject(pack, names[i], obj);
                     Py_INCREF(obj);
                     PyModule_AddObject(pack2, names[i], obj);
                   } else {
                     std::cerr << "method not found " << names[i];
                   }
                 }
               }
             }
             void PythonQt::cleanup()
             {
               if (_self) {
                 delete _self;
                 _self = NULL;
               }
             }
             PythonQt* PythonQt::self() { return _self; }
             PythonQt::PythonQt(int flags, const QByteArray& pythonQtModuleName)
             {
               _p = new PythonQtPrivate;
               _p->_initFlags = flags;
               _p->_PythonQtObjectPtr_metaId = qRegisterMetaType<PythonQtObjectPtr>("PythonQtObjectPtr");
               if ((flags & PythonAlreadyInitialized) == 0) {
                 Py_SetProgramName(const_cast<char*>("PythonQt"));
                 if (flags & IgnoreSiteModule) {
                   // this prevents the automatic importing of Python site files
                   Py_NoSiteFlag = 1;
                 }
                 Py_Initialize();
               }
               // add our own python object types for qt object slots
               if (PyType_Ready(&PythonQtSlotFunction_Type) < 0) {
                 std::cerr << "could not initialize PythonQtSlotFunction_Type" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtSlotFunction_Type);
               if (PyType_Ready(&PythonQtSignalFunction_Type) < 0) {
                 std::cerr << "could not initialize PythonQtSignalFunction_Type" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtSignalFunction_Type);
               // according to Python docs, set the type late here, since it can not safely be stored in the struct when declaring it
               PythonQtClassWrapper_Type.tp_base = &PyType_Type;
               // add our own python object types for classes
               if (PyType_Ready(&PythonQtClassWrapper_Type) < 0) {
                 std::cerr << "could not initialize PythonQtClassWrapper_Type" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtClassWrapper_Type);
               // add our own python object types for CPP instances
               if (PyType_Ready(&PythonQtInstanceWrapper_Type) < 0) {
                 PythonQt::handleError();
                 std::cerr << "could not initialize PythonQtInstanceWrapper_Type" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtInstanceWrapper_Type);
               // add our own python object types for redirection of stdout
               if (PyType_Ready(&PythonQtStdOutRedirectType) < 0) {
                 std::cerr << "could not initialize PythonQtStdOutRedirectType" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtStdOutRedirectType);
               // add our own python object types for redirection of stdin
               if (PyType_Ready(&PythonQtStdInRedirectType) < 0) {
                 std::cerr << "could not initialize PythonQtStdInRedirectType" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
               }
               Py_INCREF(&PythonQtStdInRedirectType);
               initPythonQtModule(flags & RedirectStdOut, pythonQtModuleName);
               _p->setupSharedLibrarySuffixes();
             }
             PythonQt::~PythonQt() {
               delete _p;
               _p = NULL;
             }
             PythonQtPrivate::~PythonQtPrivate() {
               delete _defaultImporter;
               _defaultImporter = NULL;
               {
                 QHashIterator<QByteArray, PythonQtClassInfo *> i(_knownClassInfos);
                 while (i.hasNext()) {
                   delete i.next().value();
                 }
               }
               PythonQtConv::global_valueStorage.clear();
               PythonQtConv::global_ptrStorage.clear();
               PythonQtConv::global_variantStorage.clear();
               PythonQtMethodInfo::cleanupCachedMethodInfos();
             }
             void PythonQt::setRedirectStdInCallback(PythonQtInputChangedCB* callback, void * callbackData)
             {
               if (!callback)
                 {
                 std::cerr << "PythonQt::setRedirectStdInCallback - callback parameter is NULL !" << std::endl;
                 return;
                 }
               PythonQtObjectPtr sys;
               PythonQtObjectPtr in;
               sys.setNewRef(PyImport_ImportModule("sys"));
               // Backup original 'sys.stdin' if not yet done
               PyRun_SimpleString("if not hasattr(sys, 'pythonqt_original_stdin'):"
                                  "sys.pythonqt_original_stdin = sys.stdin");
               in = PythonQtStdInRedirectType.tp_new(&PythonQtStdInRedirectType, NULL, NULL);
               ((PythonQtStdInRedirect*)in.object())->_cb = callback;
               ((PythonQtStdInRedirect*)in.object())->_callData = callbackData;
               // replace the built in file objects with our own objects
               PyModule_AddObject(sys, "stdin", in);
               // Backup custom 'stdin' into 'pythonqt_stdin'
               PyRun_SimpleString("sys.pythonqt_stdin = sys.stdin");
             }
             void PythonQt::setRedirectStdInCallbackEnabled(bool enabled)
             {
               if (enabled)
                 {
                 PyRun_SimpleString("if hasattr(sys, 'pythonqt_stdin'):"
                                    "sys.stdin = sys.pythonqt_stdin");
                 }
               else
                 {
                 PyRun_SimpleString("if hasattr(sys,'pythonqt_original_stdin'):"
                                    "sys.stdin = sys.pythonqt_original_stdin");
                 }
             }
             PythonQtImportFileInterface* PythonQt::importInterface()
             {
               return _self->_p->_importInterface?_self->_p->_importInterface:_self->_p->_defaultImporter;
             }
             void PythonQt::qObjectNoLongerWrappedCB(QObject* o)
             {
               if (_self->_p->_noLongerWrappedCB) {
                 (*_self->_p->_noLongerWrappedCB)(o);
               };
             }
             void PythonQt::registerClass(const QMetaObject* metaobject, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell)
             {
               _p->registerClass(metaobject, package, wrapperCreator, shell);
             }
             void PythonQtPrivate::registerClass(const QMetaObject* metaobject, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell, PyObject* module, int typeSlots)
             {
               // we register all classes in the hierarchy
               const QMetaObject* m = metaobject;
               bool first = true;
               while (m) {
                 PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(m->className());
                 if (!info->pythonQtClassWrapper()) {
                   info->setTypeSlots(typeSlots);
                   info->setupQObject(m);
                   createPythonQtClassWrapper(info, package, module);
                   if (m->superClass()) {
                     PythonQtClassInfo* parentInfo = lookupClassInfoAndCreateIfNotPresent(m->superClass()->className());
                     info->addParentClass(PythonQtClassInfo::ParentClassInfo(parentInfo));
                   }
                 } else if (first && module) {
                   // There is a wrapper already, but if we got a module, we want to place the wrapper into that module as well,
                   // since it might have been placed into "private" earlier on.
                   // If the wrapper was already added to module before, it is just readded, which does no harm.
                   PyObject* classWrapper = info->pythonQtClassWrapper();
                   // AddObject steals a reference, so we need to INCREF
                   Py_INCREF(classWrapper);
                   PyModule_AddObject(module, info->className(), classWrapper);
                 }
                 if (first) {
                   first = false;
                   if (wrapperCreator) {
                     info->setDecoratorProvider(wrapperCreator);
                   }
                   if (shell) {
                     info->setShellSetInstanceWrapperCB(shell);
                   }
                 }
                 m = m->superClass();
               }
             }
             void PythonQtPrivate::createPythonQtClassWrapper(PythonQtClassInfo* info, const char* package, PyObject* module)
             {
               PyObject* pack = module?module:packageByName(package);
               PyObject* pyobj = (PyObject*)createNewPythonQtClassWrapper(info, pack);
               PyModule_AddObject(pack, info->className(), pyobj);
               if (!module && package && strncmp(package,"Qt",2)==0) {
                 // since PyModule_AddObject steals the reference, we need a incref once more...
                 Py_INCREF(pyobj);
                 // put all qt objects into Qt as well
                 PyModule_AddObject(packageByName("Qt"), info->className(), pyobj);
               }
               info->setPythonQtClassWrapper(pyobj);
             }
             PyObject* PythonQtPrivate::wrapQObject(QObject* obj)
             {
               if (!obj) {
                 Py_INCREF(Py_None);
                 return Py_None;
               }
               PythonQtInstanceWrapper* wrap = findWrapperAndRemoveUnused(obj);
               if (wrap && wrap->_wrappedPtr) {
                 // uh oh, we want to wrap a QObject, but have a C++ wrapper at that
                 // address, so probably that C++ wrapper has been deleted earlier and
                 // now we see a QObject with the same address.
                 // Do not use the old wrapper anymore.
                 wrap = NULL;
               }
               if (!wrap) {
                 // smuggling it in...
                 PythonQtClassInfo* classInfo = _knownClassInfos.value(obj->metaObject()->className());
                 if (!classInfo || classInfo->pythonQtClassWrapper()==NULL) {
                   registerClass(obj->metaObject());
                   classInfo = _knownClassInfos.value(obj->metaObject()->className());
                 }
                 wrap = createNewPythonQtInstanceWrapper(obj, classInfo);
                 //    mlabDebugConst("MLABPython","new qobject wrapper added " << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               } else {
                 Py_INCREF(wrap);
                 //    mlabDebugConst("MLABPython","qobject wrapper reused " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               }
               return (PyObject*)wrap;
             }
             PyObject* PythonQtPrivate::wrapPtr(void* ptr, const QByteArray& name)
             {
               if (!ptr) {
                 Py_INCREF(Py_None);
                 return Py_None;
               }
               PythonQtInstanceWrapper* wrap = findWrapperAndRemoveUnused(ptr);
               PythonQtInstanceWrapper* possibleStillAliveWrapper = NULL;
               if (wrap && wrap->_wrappedPtr) {
                 // we have a previous C++ wrapper... if the wrapper is for a C++ object,
                 // we are not sure if it may have been deleted earlier and we just see the same C++
                 // pointer once again. To make sure that we do not reuse a wrapper of the wrong type,
                 // we compare the classInfo() pointer and only reuse the wrapper if it has the same
                 // info. This is only needed for non-QObjects, since we know it when a QObject gets deleted.
                 possibleStillAliveWrapper = wrap;
                 wrap = NULL;
               }
               if (!wrap) {
                 PythonQtClassInfo* info = _knownClassInfos.value(name);
                 if (!info) {
                   // maybe it is a PyObject, which we can return directly
                   if (name == "PyObject") {
                     PyObject* p = (PyObject*)ptr;
                     Py_INCREF(p);
                     return p;
                   }
                   // we do not know the metaobject yet, but we might know it by its name:
                   if (_knownQObjectClassNames.find(name)!=_knownQObjectClassNames.end()) {
                     // yes, we know it, so we can convert to QObject
                     QObject* qptr = (QObject*)ptr;
                     registerClass(qptr->metaObject());
                     info = _knownClassInfos.value(qptr->metaObject()->className());
                   }
                 }
                 if (info && info->isQObject()) {
                   QObject* qptr = (QObject*)ptr;
                   // if the object is a derived object, we want to switch the class info to the one of the derived class:
                   if (name!=(qptr->metaObject()->className())) {
                     registerClass(qptr->metaObject());
                     info = _knownClassInfos.value(qptr->metaObject()->className());
                   }
                   wrap = createNewPythonQtInstanceWrapper(qptr, info);
                   //    mlabDebugConst("MLABPython","new qobject wrapper added " << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
                   return (PyObject*)wrap;
                 }
                 // not a known QObject, try to wrap via foreign wrapper factories
                 PyObject* foreignWrapper = NULL;
                 for (int i=0; i<_foreignWrapperFactories.size(); i++) {
                   foreignWrapper = _foreignWrapperFactories.at(i)->wrap(name, ptr);
                   if (foreignWrapper) {
                     return foreignWrapper;
                   }
                 }
                 // not a known QObject, so try our wrapper factory:
                 QObject* wrapper = NULL;
                 for (int i=0; i<_cppWrapperFactories.size(); i++) {
                   wrapper = _cppWrapperFactories.at(i)->create(name, ptr);
                   if (wrapper) {
                     break;
                   }
                 }
                 if (info) {
                   // try to downcast in the class hierarchy, which will modify info and ptr if it is successfull
                   ptr  = info->castDownIfPossible(ptr, &info);
                   // if downcasting found out that the object is a QObject,
                   // handle it like one:
                   if (info && info->isQObject()) {
                     QObject* qptr = (QObject*)ptr;
                     // if the object is a derived object, we want to switch the class info to the one of the derived class:
                     if (name!=(qptr->metaObject()->className())) {
                       registerClass(qptr->metaObject());
                       info = _knownClassInfos.value(qptr->metaObject()->className());
                     }
                     wrap = createNewPythonQtInstanceWrapper(qptr, info);
                     //    mlabDebugConst("MLABPython","new qobject wrapper added " << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
                     return (PyObject*)wrap;
                   }
                 }
                 if (!info || info->pythonQtClassWrapper()==NULL) {
                   // still unknown, register as CPP class
                   registerCPPClass(name.constData());
                   info = _knownClassInfos.value(name);
                 }
                 if (wrapper && (info->metaObject() != wrapper->metaObject())) {
                   // if we a have a QObject wrapper and the metaobjects do not match, set the metaobject again!
                   info->setMetaObject(wrapper->metaObject());
                 }
                 if (possibleStillAliveWrapper && possibleStillAliveWrapper->classInfo() == info) {
                   wrap = possibleStillAliveWrapper;
                   Py_INCREF(wrap);
                 } else {
                   wrap = createNewPythonQtInstanceWrapper(wrapper, info, ptr);
                 }
                 //          mlabDebugConst("MLABPython","new c++ wrapper added " << wrap->_wrappedPtr << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               } else {
                 Py_INCREF(wrap);
                 //mlabDebugConst("MLABPython","c++ wrapper reused " << wrap->_wrappedPtr << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               }
               return (PyObject*)wrap;
             }
             PyObject* PythonQtPrivate::dummyTuple() {
               static PyObject* dummyTuple = NULL;
               if (dummyTuple==NULL) {
                 dummyTuple = PyTuple_New(1);
                 PyTuple_SET_ITEM(dummyTuple, 0 , PyString_FromString("dummy"));
               }
               return dummyTuple;
             }
             PythonQtInstanceWrapper* PythonQtPrivate::createNewPythonQtInstanceWrapper(QObject* obj, PythonQtClassInfo* info, void* wrappedPtr) {
               // call the associated class type to create a new instance...
               PythonQtInstanceWrapper* result = (PythonQtInstanceWrapper*)PyObject_Call(info->pythonQtClassWrapper(), dummyTuple(), NULL);
               result->setQObject(obj);
               result->_wrappedPtr = wrappedPtr;
               result->_ownedByPythonQt = false;
               result->_useQMetaTypeDestroy = false;
               if (wrappedPtr) {
                 _wrappedObjects.insert(wrappedPtr, result);
               } else {
                 _wrappedObjects.insert(obj, result);
                 if (obj->parent()== NULL && _wrappedCB) {
                   // tell someone who is interested that the qobject is wrapped the first time, if it has no parent
                   (*_wrappedCB)(obj);
                 }
               }
               return result;
             }
             PythonQtClassWrapper* PythonQtPrivate::createNewPythonQtClassWrapper(PythonQtClassInfo* info, PyObject* parentModule) {
               PythonQtClassWrapper* result;
               PyObject* className = PyString_FromString(info->className());
               PyObject* baseClasses = PyTuple_New(1);
               PyTuple_SET_ITEM(baseClasses, 0, (PyObject*)&PythonQtInstanceWrapper_Type);
               PyObject* typeDict = PyDict_New();
               PyObject* moduleName = PyObject_GetAttrString(parentModule, "__name__");
               PyDict_SetItemString(typeDict, "__module__", moduleName);
               PyObject* args  = Py_BuildValue("OOO", className, baseClasses, typeDict);
               // set the class info so that PythonQtClassWrapper_new can read it
               _currentClassInfoForClassWrapperCreation = info;
               // create the new type object by calling the type
               result = (PythonQtClassWrapper *)PyObject_Call((PyObject *)&PythonQtClassWrapper_Type, args, NULL);
               Py_DECREF(baseClasses);
               Py_DECREF(typeDict);
               Py_DECREF(args);
               Py_DECREF(className);
               return result;
             }
             PyObject*  PythonQtPrivate::createEnumValueInstance(PyObject* enumType, unsigned int enumValue)
             {
               PyObject* args = Py_BuildValue("(i)", enumValue);
               PyObject* result = PyObject_Call(enumType, args, NULL);
               Py_DECREF(args);
               return result;
             }
             PyObject* PythonQtPrivate::createNewPythonQtEnumWrapper(const char* enumName, PyObject* parentObject) {
               PyObject* result;
               PyObject* className = PyString_FromString(enumName);
               PyObject* baseClasses = PyTuple_New(1);
               PyTuple_SET_ITEM(baseClasses, 0, (PyObject*)&PyInt_Type);
               PyObject* module = PyObject_GetAttrString(parentObject, "__module__");
               PyObject* typeDict = PyDict_New();
               PyDict_SetItemString(typeDict, "__module__", module);
               PyObject* args  = Py_BuildValue("OOO", className, baseClasses, typeDict);
               // create the new int derived type object by calling the core type
               result = PyObject_Call((PyObject *)&PyType_Type, args, NULL);
               Py_DECREF(baseClasses);
               Py_DECREF(typeDict);
               Py_DECREF(args);
               Py_DECREF(className);
               return result;
             }
             PythonQtSignalReceiver* PythonQt::getSignalReceiver(QObject* obj)
             {
               PythonQtSignalReceiver* r = _p->_signalReceivers[obj];
               if (!r) {
                 r = new PythonQtSignalReceiver(obj);
                 _p->_signalReceivers.insert(obj, r);
               }
               return r;
             }
             bool PythonQt::addSignalHandler(QObject* obj, const char* signal, PyObject* module, const QString& objectname)
             {
               bool flag = false;
               PythonQtObjectPtr callable = lookupCallable(module, objectname);
               if (callable) {
                 PythonQtSignalReceiver* r = getSignalReceiver(obj);
                 flag = r->addSignalHandler(signal, callable);
                 if (!flag) {
                   // signal not found
                 }
               } else {
                 // callable not found
               }
               return flag;
             }
             bool PythonQt::addSignalHandler(QObject* obj, const char* signal, PyObject* receiver)
             {
               bool flag = false;
               PythonQtSignalReceiver* r = getSignalReceiver(obj);
               if (r) {
                 flag = r->addSignalHandler(signal, receiver);
               }
               return flag;
             }
             bool PythonQt::removeSignalHandler(QObject* obj, const char* signal, PyObject* module, const QString& objectname)
             {
               bool flag = false;
               PythonQtObjectPtr callable = lookupCallable(module, objectname);
               if (callable) {
                 PythonQtSignalReceiver* r = _p->_signalReceivers[obj];
                 if (r) {
                   flag = r->removeSignalHandler(signal, callable);
                 }
               } else {
                 // callable not found
               }
               return flag;
             }
             bool PythonQt::removeSignalHandler(QObject* obj, const char* signal, PyObject* receiver)
             {
               bool flag = false;
               PythonQtSignalReceiver* r = _p->_signalReceivers[obj];
               if (r) {
                 flag = r->removeSignalHandler(signal, receiver);
               }
               return flag;
             }
             PythonQtObjectPtr PythonQt::lookupCallable(PyObject* module, const QString& name)
             {
               PythonQtObjectPtr p = lookupObject(module, name);
               if (p) {
                 if (PyCallable_Check(p)) {
                   return p;
                 }
               }
               PyErr_Clear();
               return NULL;
             }
             PythonQtObjectPtr PythonQt::lookupObject(PyObject* module, const QString& name)
             {
               QStringList l = name.split('.');
               PythonQtObjectPtr p = module;
               PythonQtObjectPtr prev;
               QByteArray b;
               for (QStringList::ConstIterator i = l.begin(); i!=l.end() && p; ++i) {
                 prev = p;
                 b = (*i).toLatin1();
                 if (PyDict_Check(p)) {
                   p = PyDict_GetItemString(p, b.data());
                 } else {
                   p.setNewRef(PyObject_GetAttrString(p, b.data()));
                 }
               }
               PyErr_Clear();
               return p;
             }
             PythonQtObjectPtr PythonQt::getMainModule() {
               //both borrowed
               PythonQtObjectPtr dict = PyImport_GetModuleDict();
               return PyDict_GetItemString(dict, "__main__");
             }
             PythonQtObjectPtr PythonQt::importModule(const QString& name)
             {
               PythonQtObjectPtr mod;
               mod.setNewRef(PyImport_ImportModule(name.toLatin1().constData()));
               return mod;
             }
             QVariant PythonQt::evalCode(PyObject* object, PyObject* pycode) {
               QVariant result;
               if (pycode) {
                 PyObject* dict = NULL;
                 if (PyModule_Check(object)) {
                   dict = PyModule_GetDict(object);
                 } else if (PyDict_Check(object)) {
                   dict = object;
                 }
                 PyObject* r = NULL;
                 if (dict) {
                   r = PyEval_EvalCode((PyCodeObject*)pycode, dict , dict);
                 }
                 if (r) {
                   result = PythonQtConv::PyObjToQVariant(r);
                   Py_DECREF(r);
                 } else {
                   handleError();
                 }
               } else {
                 handleError();
               }
               return result;
             }
             QVariant PythonQt::evalScript(PyObject* object, const QString& script, int start)
             {
               QVariant result;
               PythonQtObjectPtr p;
               PyObject* dict = NULL;
               if (PyModule_Check(object)) {
                 dict = PyModule_GetDict(object);
               } else if (PyDict_Check(object)) {
                 dict = object;
               }
               if (dict) {
                 p.setNewRef(PyRun_String(script.toLatin1().data(), start, dict, dict));
               }
               if (p) {
                 result = PythonQtConv::PyObjToQVariant(p);
               } else {
                 handleError();
               }
               return result;
             }
             void PythonQt::evalFile(PyObject* module, const QString& filename)
             {
               PythonQtObjectPtr code = parseFile(filename);
               if (code) {
                 evalCode(module, code);
               } else {
                 handleError();
               }
             }
             PythonQtObjectPtr PythonQt::parseFile(const QString& filename)
             {
               PythonQtObjectPtr p;
               p.setNewRef(PythonQtImport::getCodeFromPyc(filename));
               if (!p) {
                 handleError();
               }
               return p;
             }
             PythonQtObjectPtr PythonQt::createModuleFromFile(const QString& name, const QString& filename)
             {
               PythonQtObjectPtr code = parseFile(filename);
               PythonQtObjectPtr module = _p->createModule(name, code);
               return module;
             }
             PythonQtObjectPtr PythonQt::createModuleFromScript(const QString& name, const QString& script)
             {
               PyErr_Clear();
               QString scriptCode = script;
               if (scriptCode.isEmpty()) {
                 // we always need at least a linefeed
                 scriptCode = "\n";
               }
               PythonQtObjectPtr pycode;
               pycode.setNewRef(Py_CompileString((char*)scriptCode.toLatin1().data(), "",  Py_file_input));
               PythonQtObjectPtr module = _p->createModule(name, pycode);
               return module;
             }
             PythonQtObjectPtr PythonQt::createUniqueModule()
             {
               static QString pyQtStr("PythonQt_module");
               QString moduleName = pyQtStr+QString::number(_uniqueModuleCount++);
               return createModuleFromScript(moduleName);
             }
             void PythonQt::addObject(PyObject* object, const QString& name, QObject* qObject)
             {
               if (PyModule_Check(object)) {
                 PyModule_AddObject(object, name.toLatin1().data(), _p->wrapQObject(qObject));
               } else if (PyDict_Check(object)) {
                 PyDict_SetItemString(object, name.toLatin1().data(), _p->wrapQObject(qObject));
               } else {
                 PyObject_SetAttrString(object, name.toLatin1().data(), _p->wrapQObject(qObject));
               }
             }
             void PythonQt::addVariable(PyObject* object, const QString& name, const QVariant& v)
             {
               if (PyModule_Check(object)) {
                 PyModule_AddObject(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
               } else if (PyDict_Check(object)) {
                 PyDict_SetItemString(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
               } else {
                 PyObject_SetAttrString(object, name.toLatin1().data(), PythonQtConv::QVariantToPyObject(v));
               }
             }
             void PythonQt::removeVariable(PyObject* object, const QString& name)
             {
               if (PyDict_Check(object)) {
                 PyDict_DelItemString(object, name.toLatin1().data());
               } else {
                 PyObject_DelAttrString(object, name.toLatin1().data());
               }
             }
             QVariant PythonQt::getVariable(PyObject* object, const QString& objectname)
             {
               QVariant result;
               PythonQtObjectPtr obj = lookupObject(object, objectname);
               if (obj) {
                 result = PythonQtConv::PyObjToQVariant(obj);
               }
               return result;
             }
             QStringList PythonQt::introspection(PyObject* module, const QString& objectname, PythonQt::ObjectType type)
             {
               QStringList results;
               PythonQtObjectPtr object;
               if (objectname.isEmpty()) {
                 object = module;
               } else {
                 object = lookupObject(module, objectname);
                 if (!object && type == CallOverloads) {
                   PyObject* dict = lookupObject(module, "__builtins__");
                   if (dict) {
                     object = PyDict_GetItemString(dict, objectname.toLatin1().constData());
                   }
                 }
               }
               if (object) {
                 results = introspectObject(object, type);
               }
               return results;
             }
             QStringList PythonQt::introspectObject(PyObject* object, ObjectType type)
             {
               QStringList results;
               if (type == CallOverloads) {
                 if (PythonQtSlotFunction_Check(object)) {
                   PythonQtSlotFunctionObject* o = (PythonQtSlotFunctionObject*)object;
                   PythonQtSlotInfo* info = o->m_ml;
                   while (info) {
                     results << info->fullSignature();
                     info = info->nextInfo();
                   }
                 } else if (PythonQtSignalFunction_Check(object)) {
                   PythonQtSignalFunctionObject* o = (PythonQtSignalFunctionObject*)object;
                   PythonQtSlotInfo* info = o->m_ml;
                   while (info) {
                     results << info->fullSignature();
                     info = info->nextInfo();
                   }
                 } else if (object->ob_type == &PythonQtClassWrapper_Type) {
                   PythonQtClassWrapper* o = (PythonQtClassWrapper*)object;
                   PythonQtSlotInfo* info = o->classInfo()->constructors();
                   while (info) {
                     results << info->fullSignature();
                     info = info->nextInfo();
                   }
                 } else {
                   QString signature = _p->getSignature(object);
                   if (!signature.isEmpty()) {
                     results << signature;
                   } else {
                     PyObject* doc = PyObject_GetAttrString(object, "__doc__");
                     if (doc) {
                       results << PyString_AsString(doc);
                       Py_DECREF(doc);
                     }
                   }
                 }
               } else {
                 PyObject* keys = NULL;
                 bool isDict = false;
                 if (PyDict_Check(object)) {
                   keys = PyDict_Keys(object);
                   isDict = true;
                 } else {
                   keys = PyObject_Dir(object);
                 }
                 if (keys) {
                   int count = PyList_Size(keys);
                   PyObject* key;
                   PyObject* value;
                   QString keystr;
                   for (int i = 0;i<count;i++) {
                     key = PyList_GetItem(keys,i);
                     if (isDict) {
                       value = PyDict_GetItem(object, key);
                       Py_INCREF(value);
                     } else {
                       value = PyObject_GetAttr(object, key);
                     }
                     if (!value) continue;
                     keystr = PyString_AsString(key);
                     static const QString underscoreStr("__tmp");
                     if (!keystr.startsWith(underscoreStr)) {
                       switch (type) {
                       case Anything:
                         results << keystr;
                         break;
                       case Class:
                         if (value->ob_type == &PyClass_Type || value->ob_type == &PyType_Type) {
                           results << keystr;
                         }
                         break;
                       case Variable:
                         if (value->ob_type != &PyClass_Type
                           && value->ob_type != &PyCFunction_Type
                           && value->ob_type != &PyFunction_Type
                           && value->ob_type != &PyMethod_Type
                           && value->ob_type != &PyModule_Type
                           && value->ob_type != &PyType_Type
                           && value->ob_type != &PythonQtSlotFunction_Type
                           ) {
                           results << keystr;
                         }
                         break;
                       case Function:
                         if (value->ob_type == &PyCFunction_Type ||
                             value->ob_type == &PyFunction_Type ||
                             value->ob_type == &PyMethod_Type ||
                             value->ob_type == &PythonQtSlotFunction_Type
                           ) {
                           results << keystr;
                         }
                         break;
                       case Module:
                         if (value->ob_type == &PyModule_Type) {
                           results << keystr;
                         }
                         break;
                       default:
                         std::cerr << "PythonQt: introspection: unknown case" << ", in " << __FILE__ << ":" << __LINE__ << std::endl;
                       }
                     }
                     Py_DECREF(value);
                   }
                   Py_DECREF(keys);
                 }
                 if ((type == Anything) || (type == Variable)) {
                   if (object->ob_type == &PythonQtClassWrapper_Type) {
                     PythonQtClassWrapper* o = (PythonQtClassWrapper*)object;
                     PythonQtClassInfo* info = o->classInfo();
                     results += info->propertyList();
                   }
                 }
               }
               return results;
             }
             PyObject* PythonQt::getObjectByType(const QString& typeName)
             {
               PythonQtObjectPtr sys;
               sys.setNewRef(PyImport_ImportModule("sys"));
               PythonQtObjectPtr modules = lookupObject(sys, "modules");
               Q_ASSERT(PyDict_Check(modules));
               QStringList tmp = typeName.split(".");
               QString simpleTypeName = tmp.takeLast();
               QString moduleName = tmp.join(".");
               PyObject* object = NULL;
               PyObject* moduleObject = PyDict_GetItemString(modules, moduleName.toLatin1().constData());
               if (moduleObject) {
                 object = PyObject_GetAttrString(moduleObject, simpleTypeName.toLatin1().constData());
               }
               if (!object) {
                 moduleObject = PyDict_GetItemString(modules, "__builtin__");
                 if (moduleObject) {
                   object = PyObject_GetAttrString(moduleObject, simpleTypeName.toLatin1().constData());
                 }
               }
               return object;
             }
             QStringList PythonQt::introspectType(const QString& typeName, ObjectType type)
             {
               QStringList results;
               PyObject* object = getObjectByType(typeName);
               if (!object) {
                 // the last item may be a member, split it away and try again
                 QStringList tmp = typeName.split(".");
                 QString memberName = tmp.takeLast();
                 QString typeName;
                 if (tmp.isEmpty()) {
                   typeName = memberName;
                   memberName.clear();
                 } else {
                   typeName = tmp.takeLast();
                 }
                 PyObject* typeObject = getObjectByType(typeName);
                 if (typeObject) {
                   object = PyObject_GetAttrString(typeObject, memberName.toLatin1().constData());
                 }
               }
               if (object) {
                 results = introspectObject(object, type);
                 Py_DECREF(object);
               }
               return results;
             }
-            QVariant PythonQt::call(PyObject* object, const QString& name, const QVariantList& args)
+            QVariant PythonQt::call(PyObject* object, const QString& name, const QVariantList& args, const QVariantMap& kwargs)
             {
               PythonQtObjectPtr callable = lookupCallable(object, name);
               if (callable) {
-                return call(callable, args);
+                return call(callable, args, kwargs);
               } else {
                 return QVariant();
               }
             }
-            QVariant PythonQt::call(PyObject* callable, const QVariantList& args)
+            QVariant PythonQt::call(PyObject* callable, const QVariantList& args, const QVariantMap& kwargs)
             {
               QVariant r;
               PythonQtObjectPtr result;
-              result.setNewRef(callAndReturnPyObject(callable, args));
+              result.setNewRef(callAndReturnPyObject(callable, args, kwargs));
               if (result) {
                 r = PythonQtConv::PyObjToQVariant(result);
               } else {
                 PythonQt::self()->handleError();
               }
               return r;
             }
-            PyObject* PythonQt::callAndReturnPyObject(PyObject* callable, const QVariantList& args)
+            PyObject* PythonQt::callAndReturnPyObject(PyObject* callable, const QVariantList& args, const QVariantMap& kwargs)
             {
               PyObject* result = NULL;
               if (callable) {
+                bool err = false;
                 PythonQtObjectPtr pargs;
                 int count = args.size();
-                if (count>0) {
+                if ((count > 0) || (kwargs.count() > 0)) { // create empty tuple if kwargs are given
                   pargs.setNewRef(PyTuple_New(count));
-                bool err = false;
+                  // transform QVariant arguments to Python
-                // transform QVariants to Python
+                  for (int i = 0; i < count; i++) {
-                for (int i = 0; i < count; i++) {
+                    PyObject* arg = PythonQtConv::QVariantToPyObject(args.at(i));
-                  PyObject* arg = PythonQtConv::QVariantToPyObject(args.at(i));
+                    if (arg) {
-                  if (arg) {
+                      // steals reference, no unref
-                    // steals reference, no unref
+                      PyTuple_SetItem(pargs, i,arg);
-                    PyTuple_SetItem(pargs, i,arg);
+                    } else {
-                  } else {
+                      err = true;
-                    err = true;
+                      break;
-                    break;
                   }
                 }
                 if (!err) {
-                  PyErr_Clear();
+                  if (kwargs.isEmpty()) {
-                  result = PyObject_CallObject(callable, pargs);
+                    // do a direct call if we have no keyword arguments
+                    PyErr_Clear();
+                    result = PyObject_CallObject(callable, pargs);
+                  } else {
+                    // convert keyword arguments to Python
+                    PythonQtObjectPtr pkwargs;
+                    pkwargs.setNewRef(PyDict_New());
+                    QMapIterator<QString, QVariant> it(kwargs);
+                    while (it.hasNext()) {
+                      it.next();
+                      PyObject* arg = PythonQtConv::QVariantToPyObject(it.value());
+                      if (arg) {
+                        PyDict_SetItemString(pkwargs, it.key().toLatin1().constData(), arg);
+                      } else {
+                        err = true;
+                        break;
+                      }
+                    }
+                    if (!err) {
+                      // call with arguments and keyword arguments
+                      PyErr_Clear();
+                      result = PyObject_Call(callable, pargs, pkwargs);
+                    }
+                  }
                 }
               }
               return result;
             }
             void PythonQt::addInstanceDecorators(QObject* o)
             {
               _p->addDecorators(o, PythonQtPrivate::InstanceDecorator);
             }
             void PythonQt::addClassDecorators(QObject* o)
             {
               _p->addDecorators(o, PythonQtPrivate::StaticDecorator | PythonQtPrivate::ConstructorDecorator | PythonQtPrivate::DestructorDecorator);
             }
             void PythonQt::addDecorators(QObject* o)
             {
               _p->addDecorators(o, PythonQtPrivate::AllDecorators);
             }
             void PythonQt::registerQObjectClassNames(const QStringList& names)
             {
               _p->registerQObjectClassNames(names);
             }
             void PythonQt::setImporter(PythonQtImportFileInterface* importInterface)
             {
               _p->_importInterface = importInterface;
               PythonQtImport::init();
             }
             void PythonQt::setImporterIgnorePaths(const QStringList& paths)
             {
               _p->_importIgnorePaths = paths;
             }
             const QStringList& PythonQt::getImporterIgnorePaths()
             {
               return _p->_importIgnorePaths;
             }
             void PythonQt::addWrapperFactory(PythonQtCppWrapperFactory* factory)
             {
               _p->_cppWrapperFactories.append(factory);
             }
             void PythonQt::addWrapperFactory( PythonQtForeignWrapperFactory* factory )
             {
               _p->_foreignWrapperFactories.append(factory);
             }
             //---------------------------------------------------------------------------------------------------
             PythonQtPrivate::PythonQtPrivate()
             {
               _importInterface = NULL;
               _defaultImporter = new PythonQtQFileImporter;
               _noLongerWrappedCB = NULL;
               _wrappedCB = NULL;
               _currentClassInfoForClassWrapperCreation = NULL;
               _profilingCB = NULL;
             }
             void PythonQtPrivate::setupSharedLibrarySuffixes()
             {
               _sharedLibrarySuffixes.clear();
               PythonQtObjectPtr imp;
               imp.setNewRef(PyImport_ImportModule("imp"));
               int cExtensionCode = imp.getVariable("C_EXTENSION").toInt();
               QVariant result = imp.call("get_suffixes");
             #ifdef __linux
               #ifdef _DEBUG
               // First look for shared libraries with the '_d' suffix in debug mode on Linux.
               // This is a workaround, because python does not append the '_d' suffix on Linux
               // and would always load the release library otherwise.
               _sharedLibrarySuffixes << "_d.so";
               #endif
             #endif
               foreach (QVariant entry, result.toList()) {
                 QVariantList suffixEntry = entry.toList();
                 if (suffixEntry.count()==3) {
                   int code = suffixEntry.at(2).toInt();
                   if (code == cExtensionCode) {
                     _sharedLibrarySuffixes << suffixEntry.at(0).toString();
                   }
                 }
               }
             }
             PythonQtClassInfo* PythonQtPrivate::currentClassInfoForClassWrapperCreation()
             {
               PythonQtClassInfo* info = _currentClassInfoForClassWrapperCreation;
               _currentClassInfoForClassWrapperCreation = NULL;
               return info;
             }
             void PythonQtPrivate::addDecorators(QObject* o, int decoTypes)
             {
               o->setParent(this);
               int numMethods = o->metaObject()->methodCount();
               for (int i = 0; i < numMethods; i++) {
                 QMetaMethod m = o->metaObject()->method(i);
                 if ((m.methodType() == QMetaMethod::Method ||
                   m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                   if (qstrncmp(m.signature(), "new_", 4)==0) {
                     if ((decoTypes & ConstructorDecorator) == 0) continue;
                     const PythonQtMethodInfo* info = PythonQtMethodInfo::getCachedMethodInfo(m, NULL);
                     if (info->parameters().at(0).pointerCount == 1) {
                       QByteArray signature = m.signature();
                       QByteArray nameOfClass = signature.mid(4, signature.indexOf('(')-4);
                       PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);
                       PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::ClassDecorator);
                       classInfo->addConstructor(newSlot);
                     }
                   } else if (qstrncmp(m.signature(), "delete_", 7)==0) {
                     if ((decoTypes & DestructorDecorator) == 0) continue;
                     QByteArray signature = m.signature();
                     QByteArray nameOfClass = signature.mid(7, signature.indexOf('(')-7);
                     PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);
                     PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::ClassDecorator);
                     classInfo->setDestructor(newSlot);
                   } else if (qstrncmp(m.signature(), "static_", 7)==0) {
                     if ((decoTypes & StaticDecorator) == 0) continue;
                     QByteArray signature = m.signature();
                     QByteArray nameOfClass = signature.mid(signature.indexOf('_')+1);
                     nameOfClass = nameOfClass.mid(0, nameOfClass.indexOf('_'));
                     PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(nameOfClass);
                     PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::ClassDecorator);
                     classInfo->addDecoratorSlot(newSlot);
                   } else {
                     if ((decoTypes & InstanceDecorator) == 0) continue;
                     const PythonQtMethodInfo* info = PythonQtMethodInfo::getCachedMethodInfo(m, NULL);
                     if (info->parameters().count()>1) {
                       PythonQtMethodInfo::ParameterInfo p = info->parameters().at(1);
                       if (p.pointerCount==1) {
                         PythonQtClassInfo* classInfo = lookupClassInfoAndCreateIfNotPresent(p.name);
                         PythonQtSlotInfo* newSlot = new PythonQtSlotInfo(NULL, m, i, o, PythonQtSlotInfo::InstanceDecorator);
                         classInfo->addDecoratorSlot(newSlot);
                       }
                     }
                   }
                 }
               }
             }
             void PythonQtPrivate::registerQObjectClassNames(const QStringList& names)
             {
               foreach(QString name, names) {
                 _knownQObjectClassNames.insert(name.toLatin1(), true);
               }
             }
             void PythonQtPrivate::removeSignalEmitter(QObject* obj)
             {
               _signalReceivers.remove(obj);
             }
             bool PythonQt::handleError()
             {
               bool flag = false;
               if (PyErr_Occurred()) {
                 // currently we just print the error and the stderr handler parses the errors
                 PyErr_Print();
                 /*
                 // EXTRA: the format of the ptype and ptraceback is not really documented, so I use PyErr_Print() above
                 PyObject *ptype;
                 PyObject *pvalue;
                 PyObject *ptraceback;
                 PyErr_Fetch( &ptype, &pvalue, &ptraceback);
                   Py_XDECREF(ptype);
                   Py_XDECREF(pvalue);
                   Py_XDECREF(ptraceback);
                 */
                 PyErr_Clear();
                 flag = true;
               }
               return flag;
             }
             void PythonQt::addSysPath(const QString& path)
             {
               PythonQtObjectPtr sys;
               sys.setNewRef(PyImport_ImportModule("sys"));
               PythonQtObjectPtr obj = lookupObject(sys, "path");
               PyList_Insert(obj, 0, PythonQtConv::QStringToPyObject(path));
             }
             void PythonQt::overwriteSysPath(const QStringList& paths)
             {
               PythonQtObjectPtr sys;
               sys.setNewRef(PyImport_ImportModule("sys"));
               PyModule_AddObject(sys, "path", PythonQtConv::QStringListToPyList(paths));
             }
             void PythonQt::setModuleImportPath(PyObject* module, const QStringList& paths)
             {
               PyModule_AddObject(module, "__path__", PythonQtConv::QStringListToPyList(paths));
             }
             void PythonQt::stdOutRedirectCB(const QString& str)
             {
               if (!PythonQt::self()) {
                 std::cout << str.toLatin1().data() << std::endl;
                 return;
               }
               emit PythonQt::self()->pythonStdOut(str);
             }
             void PythonQt::stdErrRedirectCB(const QString& str)
             {
               if (!PythonQt::self()) {
                 std::cerr << str.toLatin1().data() << std::endl;
                 return;
               }
               emit PythonQt::self()->pythonStdErr(str);
             }
             void PythonQt::setQObjectWrappedCallback(PythonQtQObjectWrappedCB* cb)
             {
               _p->_wrappedCB = cb;
             }
             void PythonQt::setQObjectNoLongerWrappedCallback(PythonQtQObjectNoLongerWrappedCB* cb)
             {
               _p->_noLongerWrappedCB = cb;
             }
             void PythonQt::setProfilingCallback(ProfilingCB* cb)
             {
               _p->_profilingCB = cb;
             }
             static PyMethodDef PythonQtMethods[] = {
               {NULL, NULL, 0, NULL}
             };
             void PythonQt::initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQtModuleName)
             {
               QByteArray name = "PythonQt";
               if (!pythonQtModuleName.isEmpty()) {
                 name = pythonQtModuleName;
               }
               _p->_pythonQtModule = Py_InitModule(name.constData(), PythonQtMethods);
               _p->_pythonQtModuleName = name;
               if (redirectStdOut) {
                 PythonQtObjectPtr sys;
                 PythonQtObjectPtr out;
                 PythonQtObjectPtr err;
                 sys.setNewRef(PyImport_ImportModule("sys"));
                 // create a redirection object for stdout and stderr
                 out = PythonQtStdOutRedirectType.tp_new(&PythonQtStdOutRedirectType,NULL, NULL);
                 ((PythonQtStdOutRedirect*)out.object())->_cb = stdOutRedirectCB;
                 err = PythonQtStdOutRedirectType.tp_new(&PythonQtStdOutRedirectType,NULL, NULL);
                 ((PythonQtStdOutRedirect*)err.object())->_cb = stdErrRedirectCB;
                 // replace the built in file objects with our own objects
                 PyModule_AddObject(sys, "stdout", out);
                 PyModule_AddObject(sys, "stderr", err);
               }
             }
             QString PythonQt::getReturnTypeOfWrappedMethod(PyObject* module, const QString& name)
             {
               QStringList tmp = name.split(".");
               QString methodName = tmp.takeLast();
               QString variableName = tmp.join(".");
               // TODO: the variableName may be a type name, this needs to be handled differently,
               // because it is not necessarily known in the module context
               PythonQtObjectPtr variableObject = lookupObject(module, variableName);
               if (variableObject.isNull()) {
                 return "";
               }
               return getReturnTypeOfWrappedMethodHelper(variableObject, methodName, name);
             }
             QString PythonQt::getReturnTypeOfWrappedMethod(const QString& typeName, const QString& methodName)
             {
               PythonQtObjectPtr typeObject = getObjectByType(typeName);
               if (typeObject.isNull()) {
                 return "";
               }
               return getReturnTypeOfWrappedMethodHelper(typeObject, methodName, typeName + "." + methodName);
             }
             QString PythonQt::getReturnTypeOfWrappedMethodHelper(const PythonQtObjectPtr& variableObject, const QString& methodName, const QString& context)
             {
               PythonQtObjectPtr methodObject;
               if (PyDict_Check(variableObject)) {
                 methodObject = PyDict_GetItemString(variableObject, methodName.toLatin1().constData());
               } else {
                 methodObject.setNewRef(PyObject_GetAttrString(variableObject, methodName.toLatin1().constData()));
               }
               if (methodObject.isNull()) {
                 return "";
               }
               QString type;
               if (methodObject->ob_type == &PyClass_Type || methodObject->ob_type == &PyType_Type) {
                 // the methodObject is not a method, but the name of a type/class. This means
                 // a constructor is called. Return the context.
                 type = context;
               } else if (methodObject->ob_type == &PythonQtSlotFunction_Type) {
                 QString className;
                 if (PyObject_TypeCheck(variableObject, &PythonQtInstanceWrapper_Type)) {
                   // the type name of wrapped instance is the class name
                   className = variableObject->ob_type->tp_name;
                 } else {
                   PyObject* classNameObject = PyObject_GetAttrString(variableObject, "__name__");
                   if (classNameObject) {
                     Q_ASSERT(PyString_Check(classNameObject));
                     className = PyString_AsString(classNameObject);
                     Py_DECREF(classNameObject);
                   }
                 }
                 if (!className.isEmpty()) {
                   PythonQtClassInfo* info = _p->_knownClassInfos.value(className.toLatin1().constData());
                   if (info) {
                     PythonQtSlotInfo* slotInfo = info->member(methodName.toLatin1().constData())._slot;
                     if (slotInfo) {
                       if (slotInfo->metaMethod()) {
                         type = slotInfo->metaMethod()->typeName();
                         if (!type.isEmpty()) {
                           QChar c = type.at(type.length()-1);
                           while (c == '*' || c == '&') {
                             type.truncate(type.length()-1);
                             if (!type.isEmpty()) {
                               c = type.at(type.length()-1);
                             } else {
                               break;
                             }
                           }
                           // split away template arguments
                           type = type.split("<").first();
                           // split away const
                           type = type.split(" ").last().trimmed();
                           // if the type is a known class info, then create the full type name, i.e. include the
                           // module name. For example, the slot may return a QDate, then this looks up the
                           // name _PythonQt.QtCore.QDate.
                           PythonQtClassInfo* typeInfo = _p->_knownClassInfos.value(type.toLatin1().constData());
                           if (typeInfo && typeInfo->pythonQtClassWrapper()) {
                             PyObject* s = PyObject_GetAttrString(typeInfo->pythonQtClassWrapper(), "__module__");
                             Q_ASSERT(PyString_Check(s));
                             type = QString(PyString_AsString(s)) + "." + type;
                             Py_DECREF(s);
                             s = PyObject_GetAttrString(typeInfo->pythonQtClassWrapper(), "__name__");
                             Q_ASSERT(PyString_Check(s));
                             Py_DECREF(s);
                           }
                         }
                       }
                     }
                   }
                 }
               }
               return type;
             }
             void PythonQt::registerCPPClass(const char* typeName, const char* parentTypeName, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator,  PythonQtShellSetInstanceWrapperCB* shell)
             {
               _p->registerCPPClass(typeName, parentTypeName, package, wrapperCreator, shell);
             }
             PythonQtClassInfo* PythonQtPrivate::lookupClassInfoAndCreateIfNotPresent(const char* typeName)
             {
               PythonQtClassInfo* info = _knownClassInfos.value(typeName);
               if (!info) {
                 info = new PythonQtClassInfo();
                 info->setupCPPObject(typeName);
                 _knownClassInfos.insert(typeName, info);
               }
               return info;
             }
             void PythonQt::addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb)
             {
               _p->addPolymorphicHandler(typeName, cb);
             }
             void PythonQtPrivate::addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb)
             {
               PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName);
               info->addPolymorphicHandler(cb);
             }
             bool PythonQt::addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset)
             {
               return _p->addParentClass(typeName, parentTypeName, upcastingOffset);
             }
             bool PythonQtPrivate::addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset)
             {
               PythonQtClassInfo* info = _knownClassInfos.value(typeName);
               if (info) {
                 PythonQtClassInfo* parentInfo = lookupClassInfoAndCreateIfNotPresent(parentTypeName);
                 info->addParentClass(PythonQtClassInfo::ParentClassInfo(parentInfo, upcastingOffset));
                 return true;
               } else {
                 return false;
               }
             }
             void PythonQtPrivate::registerCPPClass(const char* typeName, const char* parentTypeName, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator,  PythonQtShellSetInstanceWrapperCB* shell, PyObject* module, int typeSlots)
             {
               PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName);
               if (!info->pythonQtClassWrapper()) {
                 info->setTypeSlots(typeSlots);
                 info->setupCPPObject(typeName);
                 createPythonQtClassWrapper(info, package, module);
               }
               if (parentTypeName && strcmp(parentTypeName,"")!=0) {
                 addParentClass(typeName, parentTypeName, 0);
               }
               if (wrapperCreator) {
                 info->setDecoratorProvider(wrapperCreator);
               }
               if (shell) {
                 info->setShellSetInstanceWrapperCB(shell);
               }
             }
             PyObject* PythonQtPrivate::packageByName(const char* name)
             {
               if (name==NULL || name[0]==0) {
                 name = "private";
               }
               PyObject* v = _packages.value(name);
               if (!v) {
                 v = PyImport_AddModule((_pythonQtModuleName + "." + name).constData());
                 _packages.insert(name, v);
                 // AddObject steals the reference, so increment it!
                 Py_INCREF(v);
                 PyModule_AddObject(_pythonQtModule, name, v);
               }
               return v;
             }
             void PythonQtPrivate::handleVirtualOverloadReturnError(const char* signature, const PythonQtMethodInfo* methodInfo, PyObject* result)
             {
               QString error = "Return value '" + PythonQtConv::PyObjGetString(result) + "' can not be converted to expected C++ type '" + methodInfo->parameters().at(0).name + "' as return value of virtual method " + signature;
               PyErr_SetString(PyExc_AttributeError, error.toLatin1().data());
               PythonQt::self()->handleError();
             }
             PyObject* PythonQt::helpCalled(PythonQtClassInfo* info)
             {
               if (_p->_initFlags & ExternalHelp) {
                 emit pythonHelpRequest(QByteArray(info->className()));
                 return Py_BuildValue("");
               } else {
                 return PyString_FromString(info->help().toLatin1().data());
               }
             }
             void PythonQt::clearNotFoundCachedMembers()
             {
               foreach(PythonQtClassInfo* info, _p->_knownClassInfos) {
                 info->clearNotFoundCachedMembers();
               }
             }
             void PythonQt::removeWrapperFactory( PythonQtCppWrapperFactory* factory )
             {
               _p->_cppWrapperFactories.removeAll(factory);
             }
             void PythonQt::removeWrapperFactory( PythonQtForeignWrapperFactory* factory )
             {
               _p->_foreignWrapperFactories.removeAll(factory);
             }
             void PythonQtPrivate::removeWrapperPointer(void* obj)
             {
               _wrappedObjects.remove(obj);
             }
             void PythonQtPrivate::addWrapperPointer(void* obj, PythonQtInstanceWrapper* wrapper)
             {
               _wrappedObjects.insert(obj, wrapper);
             }
             PythonQtInstanceWrapper* PythonQtPrivate::findWrapperAndRemoveUnused(void* obj)
             {
               PythonQtInstanceWrapper* wrap = _wrappedObjects.value(obj);
               if (wrap && !wrap->_wrappedPtr && wrap->_obj == NULL) {
                 // this is a wrapper whose QObject was already removed due to destruction
                 // so the obj pointer has to be a new QObject with the same address...
                 // we remove the old one and set the copy to NULL
                 wrap->_objPointerCopy = NULL;
                 removeWrapperPointer(obj);
                 wrap = NULL;
               }
               return wrap;
             }
             PythonQtObjectPtr PythonQtPrivate::createModule(const QString& name, PyObject* pycode)
             {
               PythonQtObjectPtr result;
               if (pycode) {
                 result.setNewRef(PyImport_ExecCodeModule((char*)name.toLatin1().data(), pycode));
               } else {
                 PythonQt::self()->handleError();
               }
               return result;
             }
             void* PythonQtPrivate::unwrapForeignWrapper( const QByteArray& classname, PyObject* obj )
             {
               void* foreignObject = NULL;
               for (int i=0; i<_foreignWrapperFactories.size(); i++) {
                 foreignObject = _foreignWrapperFactories.at(i)->unwrap(classname, obj);
                 if (foreignObject) {
                   return foreignObject;
                 }
               }
               return NULL;
             }
             bool PythonQtPrivate::isMethodDescriptor(PyObject* object) const
             {
               // This implementation is the same as in inspect.ismethoddescriptor(), inspect.py.
               if (PyObject_HasAttrString(object, "__get__") &&
                   !PyObject_HasAttrString(object, "__set__") &&
                   !PyMethod_Check(object) &&
                   !PyFunction_Check(object) &&
                   !PyClass_Check(object)) {
                 return true;
               }
               return false;
             }
             QString PythonQtPrivate::getSignature(PyObject* object)
             {
               QString signature;
               if (object) {
                 PyMethodObject* method = NULL;
                 PyFunctionObject* func = NULL;
                 bool decrefMethod = false;
                 if (object->ob_type == &PyClass_Type || object->ob_type == &PyType_Type) {
                   method = (PyMethodObject*)PyObject_GetAttrString(object, "__init__");
                   decrefMethod = true;
                 } else if (object->ob_type == &PyFunction_Type) {
                   func = (PyFunctionObject*)object;
                 } else if (object->ob_type == &PyMethod_Type) {
                   method = (PyMethodObject*)object;
                 }
                 if (method)  {
                   if (PyFunction_Check(method->im_func)) {
                     func = (PyFunctionObject*)method->im_func;
                   } else if (isMethodDescriptor((PyObject*)method)) {
                     QString docstr;
                     PyObject* doc = PyObject_GetAttrString(object, "__doc__");
                     if (doc) {
                       docstr = PyString_AsString(doc);
                       Py_DECREF(doc);
                     }
                     PyObject* s = PyObject_GetAttrString(object, "__name__");
                     if (s) {
                       Q_ASSERT(PyString_Check(s));
                       signature = PyString_AsString(s);
                       if (docstr.startsWith(signature + "(")) {
                         signature = docstr;
                       } else {
                         signature += "(...)";
                         if (!docstr.isEmpty()) {
                           signature += "\n\n" + docstr;
                         }
                       }
                       Py_DECREF(s);
                     }
                   }
                 }
                 if (func) {
                   QString funcName;
                   PyObject* s = PyObject_GetAttrString((PyObject*)func, "__name__");
                   if (s) {
                     Q_ASSERT(PyString_Check(s));
                     funcName = PyString_AsString(s);
                     Py_DECREF(s);
                   }
                   if (method && funcName == "__init__") {
                     PyObject* s = PyObject_GetAttrString(object, "__name__");
                     if (s) {
                       Q_ASSERT(PyString_Check(s));
                       funcName = PyString_AsString(s);
                       Py_DECREF(s);
                     }
                   }
                   QStringList arguments;
                   QStringList defaults;
                   QString varargs;
                   QString varkeywords;
                   // NOTE: This implementation is based on function getargs() in inspect.py.
                   //       inspect.getargs() can handle anonymous (tuple) arguments, while this code does not.
                   //       It can be implemented, but it may be rarely needed and not necessary.
                   PyCodeObject* code = (PyCodeObject*)func->func_code;
                   if (code->co_varnames) {
                     int nargs = code->co_argcount;
                     Q_ASSERT(PyTuple_Check(code->co_varnames));
                     for (int i=0; i<nargs; i++) {
                       PyObject* name = PyTuple_GetItem(code->co_varnames, i);
                       Q_ASSERT(PyString_Check(name));
                       arguments << PyString_AsString(name);
                     }
                     if (code->co_flags & CO_VARARGS) {
                       PyObject* s = PyTuple_GetItem(code->co_varnames, nargs);
                       Q_ASSERT(PyString_Check(s));
                       varargs = PyString_AsString(s);
                       nargs += 1;
                     }
                     if (code->co_flags & CO_VARKEYWORDS) {
                       PyObject* s = PyTuple_GetItem(code->co_varnames, nargs);
                       Q_ASSERT(PyString_Check(s));
                       varkeywords = PyString_AsString(s);
                     }
                   }
                   PyObject* defaultsTuple = func->func_defaults;
                   if (defaultsTuple) {
                     Q_ASSERT(PyTuple_Check(defaultsTuple));
                     for (Py_ssize_t i=0; i<PyTuple_Size(defaultsTuple); i++) {
                       PyObject* d = PyTuple_GetItem(defaultsTuple, i);
                       PyObject* s = PyObject_Repr(d);
                       Q_ASSERT(PyString_Check(s));
                       defaults << PyString_AsString(s);
                       Py_DECREF(s);
                     }
                   }
                   int firstdefault = arguments.size() - defaults.size();
                   for (int i=0; i<arguments.size(); i++) {
                     if (!signature.isEmpty()) { signature += ", "; }
                     if (!method || i>0 || arguments[i] != "self") {
                       signature += arguments[i];
                       if (i >= firstdefault) {
                         signature += "=" + defaults[i-firstdefault];
                       }
                     }
                   }
                   if (!varargs.isEmpty()) {
                     if (!signature.isEmpty()) { signature += ", "; }
                     signature += "*" + varargs;
                   }
                   if (!varkeywords.isEmpty()) {
                     if (!signature.isEmpty()) { signature += ", "; }
                     signature += "**" + varkeywords;
                   }
                   signature = funcName + "(" + signature + ")";
                 }
                 if (method && decrefMethod) {
                   Py_DECREF(method);
                 }
               }
               return signature;
             }
             void PythonQtPrivate::shellClassDeleted( void* shellClass )
             {
               PythonQtInstanceWrapper* wrap = _wrappedObjects.value(shellClass);
               if (wrap && wrap->_wrappedPtr) {
                 // this is a pure C++ wrapper and the shell has gone, so we need
                 // to set the _wrappedPtr to NULL on the wrapper
                 wrap->_wrappedPtr = NULL;
                 // and then we remove the wrapper, since the wrapped class is gone
                 _wrappedObjects.remove(shellClass);
               }
               // if the wrapper is a QObject, we do not handle this here,
               // it will be handled by the QPointer<> to the QObject, which becomes NULL
               // via the QObject destructor.
             }

src/PythonQt.h +3 -3

             #ifndef _PYTHONQT_H
             #define _PYTHONQT_H
             /*
              *
              *  Copyright (C) 2010 MeVis Medical Solutions AG All Rights Reserved.
              *
              *  This library is free software; you can redistribute it and/or
              *  modify it under the terms of the GNU Lesser General Public
              *  License as published by the Free Software Foundation; either
              *  version 2.1 of the License, or (at your option) any later version.
              *
              *  This library is distributed in the hope that it will be useful,
              *  but WITHOUT ANY WARRANTY; without even the implied warranty of
              *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
              *  Lesser General Public License for more details.
              *
              *  Further, this software is distributed without any warranty that it is
              *  free of the rightful claim of any third person regarding infringement
              *  or the like.  Any license provided herein, whether implied or
              *  otherwise, applies only to this software file.  Patent licenses, if
              *  any, provided herein do not apply to combinations of this program with
              *  other software, or any other product whatsoever.
              *
              *  You should have received a copy of the GNU Lesser General Public
              *  License along with this library; if not, write to the Free Software
              *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
              *
              *  Contact information: MeVis Medical Solutions AG, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQt.h
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtSystem.h"
             #include "PythonQtInstanceWrapper.h"
             #include "PythonQtClassWrapper.h"
             #include "PythonQtSlot.h"
             #include "PythonQtObjectPtr.h"
             #include "PythonQtStdIn.h"
             #include <QObject>
             #include <QVariant>
             #include <QList>
             #include <QHash>
             #include <QByteArray>
             #include <QStringList>
             #include <QtDebug>
             #include <iostream>
             class PythonQtClassInfo;
             class PythonQtPrivate;
             class PythonQtMethodInfo;
             class PythonQtSignalReceiver;
             class PythonQtImportFileInterface;
             class PythonQtCppWrapperFactory;
             class PythonQtForeignWrapperFactory;
             class PythonQtQFileImporter;
             typedef void  PythonQtQObjectWrappedCB(QObject* object);
             typedef void  PythonQtQObjectNoLongerWrappedCB(QObject* object);
             typedef void* PythonQtPolymorphicHandlerCB(const void *ptr, const char **class_name);
             typedef void PythonQtShellSetInstanceWrapperCB(void* object, PythonQtInstanceWrapper* wrapper);
             template<class T> void PythonQtSetInstanceWrapperOnShell(void* object, PythonQtInstanceWrapper* wrapper) {
               (reinterpret_cast<T*>(object))->_wrapper = wrapper;
             }
             //! returns the offset that needs to be added to upcast an object of type T1 to T2
             template<class T1, class T2> int PythonQtUpcastingOffset() {
               return ((reinterpret_cast<char*>(static_cast<T2*>(reinterpret_cast<T1*>(0x100))))
                       - (reinterpret_cast<char*>(reinterpret_cast<T1*>(0x100))));
             }
             //! callback to create a QObject lazily
             typedef QObject* PythonQtQObjectCreatorFunctionCB();
             //! helper template to create a derived QObject class
             template<class T> QObject* PythonQtCreateObject() { return new T(); };
             //! The main interface to the Python Qt binding, realized as a singleton
             /*!
              Use PythonQt::init() to initialize the singleton and PythonQt::self() to access it.
              While there can be only one PythonQt instance, you can have any number of Python context to do scripting in.
              One possibility is to use createModuleFromFile(), createModuleFromScript() or createUniqueModule() to get a context
              that is separated from the other contexts. Alternatively you can use Python dicts as contexts for script evaluation,
              but you will need to populate the dict with the __builtins__ instance to have all Pythons available when running
              code in the scope of a dict.
              */
             class PYTHONQT_EXPORT PythonQt : public QObject {
               Q_OBJECT
             public:
               //! flags that can be passed to PythonQt::init()
               enum InitFlags {
                 RedirectStdOut = 1,   //!<< sets if the std out/err is redirected to pythonStdOut() and pythonStdErr() signals
                 IgnoreSiteModule = 2, //!<< sets if Python should ignore the site module
                 ExternalHelp = 4,     //!<< sets if help() calls on PythonQt modules are forwarded to the pythonHelpRequest() signal
                 PythonAlreadyInitialized = 8 //!<< sets that PythonQt should not can PyInitialize, since it is already done
               };
               //! flags that tell PythonQt which operators to expect on the registered type
               enum TypeSlots {
                 Type_Add = 1,
                 Type_Subtract = 1 << 1,
                 Type_Multiply = 1 << 2,
                 Type_Divide = 1 << 3,
                 Type_Mod = 1 << 4,
                 Type_And = 1 << 5,
                 Type_Or = 1 << 6,
                 Type_Xor = 1 << 7,
                 Type_LShift = 1 << 8,
                 Type_RShift = 1 << 9,
                 Type_InplaceAdd = 1 << 10,
                 Type_InplaceSubtract = 1 << 11,
                 Type_InplaceMultiply = 1 << 12,
                 Type_InplaceDivide = 1 << 13,
                 Type_InplaceMod = 1 << 14,
                 Type_InplaceAnd = 1 << 15,
                 Type_InplaceOr = 1 << 16,
                 Type_InplaceXor = 1 << 17,
                 Type_InplaceLShift = 1 << 18,
                 Type_InplaceRShift = 1 << 19,
                 // Not yet needed/nicely mappable/generated...
                 //Type_Positive = 1 << 29,
                 //Type_Negative = 1 << 29,
                 //Type_Abs = 1 << 29,
                 //Type_Hash = 1 << 29,
                 Type_Invert = 1 << 29,
                 Type_RichCompare = 1 << 30,
                 Type_NonZero     = 1 << 31,
               };
               //! enum for profiling callback
               enum ProfilingCallbackState {
                 Enter = 1,
                 Leave = 2
               };
               //! callback for profiling. className and methodName are only passed when state == Enter, otherwise
               //! they are NULL.
               typedef void ProfilingCB(ProfilingCallbackState state, const char* className, const char* methodName);
               //---------------------------------------------------------------------------
               //! \name Singleton Initialization
               //@{
               //! initialize the python qt binding (flags are a or combination of PythonQt::InitFlags), if \c pythonQtModuleName is given
               //! it defines the name of the python module that PythonQt will add, otherwise "PythonQt" is used.
               //! This can be used to e.g. pass in PySide or PyQt4 to make it more compatible.
               static void init(int flags = IgnoreSiteModule | RedirectStdOut, const QByteArray& pythonQtModuleName = QByteArray());
               //! cleanup of the singleton
               static void cleanup();
               //! get the singleton instance
               static PythonQt* self();
               //@}
               //! defines the object types for introspection
               enum ObjectType {
                 Class,
                 Function,
                 Variable,
                 Module,
                 Anything,
                 CallOverloads
               };
               //---------------------------------------------------------------------------
               //! \name Standard input handling
               //@{
               //! Overwrite default handling of stdin using a custom callback. It internally backup
               //! the original 'sys.stdin' into 'sys.pythonqt_original_stdin'
               void setRedirectStdInCallback(PythonQtInputChangedCB* callback, void * callbackData = 0);
               //! Enable or disable stdin custom callback. It resets 'sys.stdin' using either 'sys.pythonqt_stdin'
               //! or 'sys.pythonqt_original_stdin'
               void setRedirectStdInCallbackEnabled(bool enabled);
               //@}
               //---------------------------------------------------------------------------
               //! \name Modules
               //@{
               //! get the __main__ module of python
               PythonQtObjectPtr getMainModule();
               //! import the given module and return a reference to it (useful to import e.g. "sys" and call something on it)
               //! If a module is already imported, this returns the already imported module.
               PythonQtObjectPtr importModule(const QString& name);
               //! creates the new module \c name and evaluates the given file in the context of that module
               //! If the \c script is empty, the module contains no initial code. You can use evalScript/evalCode to add code
               //! to a module later on.
               //! The user needs to make sure that the \c name is unique in the python module dictionary.
               PythonQtObjectPtr createModuleFromFile(const QString& name, const QString& filename);
               //! creates the new module \c name and evaluates the given script in the context of that module.
               //! If the \c script is empty, the module contains no initial code. You can use evalScript/evalCode to add code
               //! to a module later on.
               //! The user needs to make sure that the \c name is unique in the python module dictionary.
               PythonQtObjectPtr createModuleFromScript(const QString& name, const QString& script = QString());
               //! create a uniquely named module, you can use evalFile or evalScript to populate the module with
               //! script code
               PythonQtObjectPtr createUniqueModule();
               //@}
               //---------------------------------------------------------------------------
               //! \name Importing/Paths
               //@{
               //! overwrite the python sys path (call this directly after PythonQt::init() if you want to change the std python sys path)
               void overwriteSysPath(const QStringList& paths);
               //! prepend a path to sys.path to allow importing from it
               void addSysPath(const QString& path);
               //! sets the __path__ list of a module to the given list (important for local imports)
               void setModuleImportPath(PyObject* module, const QStringList& paths);
               //@}
               //---------------------------------------------------------------------------
               //! \name Registering Classes
               //@{
               //! registers a QObject derived class to PythonQt (this is implicitly called by addObject as well)
               /* Since Qt4 does not offer a way to detect if a given classname is derived from QObject and thus has a QMetaObject,
                you MUST register all your QObject derived classes here when you want them to be detected in signal and slot calls */
               void registerClass(const QMetaObject* metaobject, const char* package = NULL, PythonQtQObjectCreatorFunctionCB* wrapperCreator = NULL, PythonQtShellSetInstanceWrapperCB* shell = NULL);
               //! add a wrapper object for the given QMetaType typeName, also does an addClassDecorators() to add constructors for variants
               //! (ownership of wrapper is passed to PythonQt)
               /*! Make sure that you have done a qRegisterMetaType first, if typeName is a user type!
                This will add a wrapper object that is used to make calls to the given classname \c typeName.
                All slots that take a pointer to typeName as the first argument will be callable from Python on
                a variant object that contains such a type.
                */
               void registerCPPClass(const char* typeName, const char* parentTypeName = NULL, const char* package = NULL, PythonQtQObjectCreatorFunctionCB* wrapperCreator = NULL, PythonQtShellSetInstanceWrapperCB* shell = NULL);
               //! as an alternative to registerClass, you can tell PythonQt the names of QObject derived classes
               //! and it will register the classes when it first sees a pointer to such a derived class
               void registerQObjectClassNames(const QStringList& names);
               //! add a parent class relation to the \c given typeName, the upcastingOffset is needed for multiple inheritance
               //! and can be calculated using PythonQtUpcastingOffset<type,parentType>(), which also verifies that
               //! type is really derived from parentType.
               //! Returns false if the typeName was not yet registered.
               bool addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset=0);
               //! add a handler for polymorphic downcasting
               void addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb);
               //@}
               //---------------------------------------------------------------------------
               //! \name Script Parsing and Evaluation
               //@{
               //! parses the given file and returns the python code object, this can then be used to call evalCode()
               PythonQtObjectPtr parseFile(const QString& filename);
               //! evaluates the given code and returns the result value (use Py_Compile etc. to create pycode from string)
               //! If pycode is NULL, a python error is printed.
               QVariant evalCode(PyObject* object, PyObject* pycode);
               //! evaluates the given script code and returns the result value
               QVariant evalScript(PyObject* object, const QString& script, int start = Py_file_input);
               //! evaluates the given script code from file
               void evalFile(PyObject* object, const QString& filename);
               //@}
               //---------------------------------------------------------------------------
               //! \name Signal Handlers
               //@{
               //! add a signal handler to the given \c signal of \c obj  and connect it to a callable \c objectname in module
               bool addSignalHandler(QObject* obj, const char* signal, PyObject* module, const QString& objectname);
               //! remove a signal handler from the given \c signal of \c obj
               bool removeSignalHandler(QObject* obj, const char* signal, PyObject* module, const QString& objectname);
               //! add a signal handler to the given \c signal of \c obj  and connect it to a callable \c receiver
               bool addSignalHandler(QObject* obj, const char* signal, PyObject* receiver);
               //! remove a signal handler from the given \c signal of \c obj
               bool removeSignalHandler(QObject* obj, const char* signal, PyObject* receiver);
               //@}
               //---------------------------------------------------------------------------
               //! \name Variable access
               //@{
               //! add the given \c qObject to the python \c object as a variable with \c name (it can be removed via clearVariable)
               void addObject(PyObject* object, const QString& name, QObject* qObject);
               //! add the given variable to the object
               void addVariable(PyObject* object, const QString& name, const QVariant& v);
               //! remove the given variable
               void removeVariable(PyObject* module, const QString& name);
               //! get the variable with the \c name of the \c object, returns an invalid QVariant on error
               QVariant getVariable(PyObject* object, const QString& name);
               //! read vars etc. in scope of an \c object, optional looking inside of an object \c objectname
               QStringList introspection(PyObject* object, const QString& objectname, ObjectType type);
               //! read vars etc. in scope of the given \c object
               QStringList introspectObject(PyObject* object, ObjectType type);
               //! read vars etc. in scope of the type object called \c typename. First the typename
               //! of the form module.type is split into module and type. Then the module is looked up
               //! in sys.modules. If the module or type is not found there, then the type is looked up in
               //! the __builtin__ module.
               QStringList introspectType(const QString& typeName, ObjectType type);
               //! returns the found callable object or NULL
               //! @return new reference
               PythonQtObjectPtr lookupCallable(PyObject* object, const QString& name);
               //! returns the return type of the method of a wrapped c++ object referenced by \c objectname
               QString getReturnTypeOfWrappedMethod(PyObject* module, const QString& objectname);
               //! returns the return type of the method \c methodName of a wrapped c++ type referenced by \c typeName
               QString getReturnTypeOfWrappedMethod(const QString& typeName, const QString& methodName);
               //@}
               //---------------------------------------------------------------------------
               //! \name Calling Python Objects
               //@{
               //! call the given python \c callable in the scope of object, returns the result converted to a QVariant
-              QVariant call(PyObject* object, const QString& callable, const QVariantList& args = QVariantList());
+              QVariant call(PyObject* object, const QString& callable, const QVariantList& args = QVariantList(), const QVariantMap& kwargs = QVariantMap());
               //! call the given python object, returns the result converted to a QVariant
-              QVariant call(PyObject* callable, const QVariantList& args = QVariantList());
+              QVariant call(PyObject* callable, const QVariantList& args = QVariantList(), const QVariantMap& kwargs = QVariantMap());
               //! call the given python object, returns the result as new PyObject
-              PyObject* callAndReturnPyObject(PyObject* callable, const QVariantList& args = QVariantList());
+              PyObject* callAndReturnPyObject(PyObject* callable, const QVariantList& args = QVariantList(), const QVariantMap& kwargs = QVariantMap());
               //@}
               //---------------------------------------------------------------------------
               //! \name Decorations, Constructors, Wrappers...
               //@{
               //! add an object whose slots will be used as decorator slots for
               //! other QObjects or CPP classes. The slots need to follow the
               //! convention that the first argument is a pointer to the wrapped object.
               //! (ownership is passed to PythonQt)
               /*!
               Example:
               A slot with the signature
               \code
               bool doSomething(QWidget* w, int a)
               \endcode
               will extend QWidget instances (and derived classes) with a "bool doSomething(int a)" slot
               that will be called with the concrete instance as first argument.
               So in Python you can now e.g. call
               \code
               someWidget.doSomething(12)
               \endcode
               without QWidget really having this method. This allows to easily make normal methods
               of Qt classes callable by forwarding them with such decorator slots
               or to make CPP classes (which are not derived from QObject) callable from Python.
               */
               void addInstanceDecorators(QObject* o);
               //! add an object whose slots will be used as decorator slots for
               //! class objects (ownership is passed to PythonQt)
               /*!
               The slots need to follow the following convention:
               - SomeClass* new_SomeClass(...)
               - QVariant new_SomeClass(...)
               - void delete_SomeClass(SomeClass*)
               - ... static_SomeClass_someName(...)
               This will add:
               - a constructor
               - a constructor which generates a QVariant
               - a destructor (only useful for CPP objects)
               - a static decorator slot which will be available on the MetaObject (visible in PythonQt module)
               */
               void addClassDecorators(QObject* o);
               //! this will add the object both as class and instance decorator (ownership is passed to PythonQt)
               void addDecorators(QObject* o);
               //! add the given factory to PythonQt (ownership stays with caller)
               void addWrapperFactory(PythonQtCppWrapperFactory* factory);
               //! add the given factory to PythonQt (ownership stays with caller)
               void addWrapperFactory(PythonQtForeignWrapperFactory* factory);
               //! remove the wrapper factory
               void removeWrapperFactory(PythonQtCppWrapperFactory* factory);
               //! remove the wrapper factory
               void removeWrapperFactory(PythonQtForeignWrapperFactory* factory);
               //@}
               //---------------------------------------------------------------------------
               //! \name Custom Importer
               //@{
               //! replace the internal import implementation and use the supplied interface to load files (both py and pyc files)
               //! (this method should be called directly after initialization of init() and before calling overwriteSysPath().
               //! On the first call to this method, it will install a generic PythonQt importer in Pythons "path_hooks".
               //! This is not reversible, so even setting setImporter(NULL) afterwards will
               //! keep the custom PythonQt importer with a QFile default import interface.
               //! Subsequent python import calls will make use of the passed importInterface
               //! which forwards all import calls to the given \c importInterface.
               //! Passing NULL will install a default QFile importer.
               //! (\c importInterface ownership stays with caller)
               void setImporter(PythonQtImportFileInterface* importInterface);
               //! this installs the default QFile importer (which effectively does a setImporter(NULL))
               //! (without calling setImporter or installDefaultImporter at least once, the default python import
               //! mechanism is in place)
               //! the default importer allows to import files from anywhere QFile can read from,
               //! including the Qt resource system using ":". Keep in mind that you need to extend
               //! "sys.path" with ":" to be able to import from the Qt resources.
               void installDefaultImporter() { setImporter(NULL); }
               //! set paths that the importer should ignore
               void setImporterIgnorePaths(const QStringList& paths);
               //! get paths that the importer should ignore
               const QStringList& getImporterIgnorePaths();
               //! get access to the file importer (if set)
               static PythonQtImportFileInterface* importInterface();
               //@}
               //---------------------------------------------------------------------------
               //! \name Other Stuff
               //@{
               //! get access to internal data (should not be used on the public API, but is used by some C functions)
               static PythonQtPrivate* priv() { return _self->_p; }
               //! handle a python error, call this when a python function fails. If no error occurred, it returns false.
               //! The error is currently just output to the python stderr, future version might implement better trace printing
               bool handleError();
               //! clear all NotFound entries on all class infos, to ensure that
               //! newly loaded wrappers can add methods even when the object was wrapped by PythonQt before the wrapper was loaded
               void clearNotFoundCachedMembers();
               //! set a callback that is called when a QObject with parent == NULL is wrapped by pythonqt
               void setQObjectWrappedCallback(PythonQtQObjectWrappedCB* cb);
               //! set a callback that is called when a QObject with parent == NULL is no longer wrapped by pythonqt
               void setQObjectNoLongerWrappedCallback(PythonQtQObjectNoLongerWrappedCB* cb);
               //! call the callback if it is set
               static void qObjectNoLongerWrappedCB(QObject* o);
               //! called by internal help methods
               PyObject* helpCalled(PythonQtClassInfo* info);
               //! returns the found object or NULL
               //! @return new reference
               PythonQtObjectPtr lookupObject(PyObject* module, const QString& name);
               //! sets a callback that is called before and after function calls for profiling
               void setProfilingCallback(ProfilingCB* cb);
               //@}
             signals:
               //! emitted when python outputs something to stdout (and redirection is turned on)
               void pythonStdOut(const QString& str);
               //! emitted when python outputs something to stderr (and redirection is turned on)
               void pythonStdErr(const QString& str);
               //! emitted when help() is called on a PythonQt object and \c ExternalHelp is enabled
               void pythonHelpRequest(const QByteArray& cppClassName);
             private:
               void initPythonQtModule(bool redirectStdOut, const QByteArray& pythonQtModuleName);
               QString getReturnTypeOfWrappedMethodHelper(const PythonQtObjectPtr& variableObject, const QString& methodName, const QString& context);
               PyObject* getObjectByType(const QString& typeName);
               //! callback for stdout redirection, emits pythonStdOut signal
               static void stdOutRedirectCB(const QString& str);
               //! callback for stderr redirection, emits pythonStdErr signal
               static void stdErrRedirectCB(const QString& str);
               //! get (and create if not available) the signal receiver of that QObject, signal receiver is made child of the passed \c obj
               PythonQtSignalReceiver* getSignalReceiver(QObject* obj);
               PythonQt(int flags, const QByteArray& pythonQtModuleName);
               ~PythonQt();
               static PythonQt* _self;
               static int _uniqueModuleCount;
               PythonQtPrivate* _p;
             };
             //! internal PythonQt details
             class PYTHONQT_EXPORT PythonQtPrivate : public QObject {
               Q_OBJECT
             public:
               PythonQtPrivate();
               ~PythonQtPrivate();
               enum DecoratorTypes {
                 StaticDecorator = 1,
                 ConstructorDecorator = 2,
                 DestructorDecorator = 4,
                 InstanceDecorator = 8,
                 AllDecorators = 0xffff
               };
               //! get the suffixes that are used for shared libraries
               const QStringList& sharedLibrarySuffixes() { return _sharedLibrarySuffixes; }
               //! returns if the id is the id for PythonQtObjectPtr
               bool isPythonQtObjectPtrMetaId(int id) { return _PythonQtObjectPtr_metaId == id; }
               //! add the wrapper pointer (for reuse if the same obj appears while wrapper still exists)
               void addWrapperPointer(void* obj, PythonQtInstanceWrapper* wrapper);
               //! remove the wrapper ptr again
               void removeWrapperPointer(void* obj);
               //! called by destructor of shells to allow invalidation of the Python wrapper
               void shellClassDeleted(void* shellClass);
               //! try to unwrap the given object to a C++ pointer using the foreign wrapper factories
               void* unwrapForeignWrapper(const QByteArray& classname, PyObject* obj);
               //! add parent class relation
               bool addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset);
               //! add a handler for polymorphic downcasting
               void addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb);
               //! lookup existing classinfo and return new if not yet present
               PythonQtClassInfo* lookupClassInfoAndCreateIfNotPresent(const char* typeName);
               //! called when a signal emitting QObject is destroyed to remove the signal handler from the hash map
               void removeSignalEmitter(QObject* obj);
               //! wrap the given QObject into a Python object (or return existing wrapper!)
               PyObject* wrapQObject(QObject* obj);
               //! wrap the given ptr into a Python object (or return existing wrapper!) if there is a known QObject of that name or a known wrapper in the factory
               PyObject* wrapPtr(void* ptr, const QByteArray& name);
               //! registers a QObject derived class to PythonQt (this is implicitly called by addObject as well)
               /* Since Qt4 does not offer a way to detect if a given classname is derived from QObject and thus has a QMetaObject,
                  you MUST register all your QObject derived classes here when you want them to be detected in signal and slot calls */
               void registerClass(const QMetaObject* metaobject, const char* package = NULL, PythonQtQObjectCreatorFunctionCB* wrapperCreator = NULL, PythonQtShellSetInstanceWrapperCB* shell = NULL, PyObject* module = NULL, int typeSlots = 0);
               //! add a wrapper object for the given QMetaType typeName, also does an addClassDecorators() to add constructors for variants
               //! (ownership of wrapper is passed to PythonQt)
               /*! Make sure that you have done a qRegisterMetaType first, if typeName is a user type!
                This will add a wrapper object that is used to make calls to the given classname \c typeName.
                All slots that take a pointer to typeName as the first argument will be callable from Python on
                a variant object that contains such a type.
                */
               void registerCPPClass(const char* typeName, const char* parentTypeName = NULL, const char* package = NULL, PythonQtQObjectCreatorFunctionCB* wrapperCreator = NULL, PythonQtShellSetInstanceWrapperCB* shell = NULL, PyObject* module = NULL, int typeSlots = 0);
               //! as an alternative to registerClass, you can tell PythonQt the names of QObject derived classes
               //! and it will register the classes when it first sees a pointer to such a derived class
               void registerQObjectClassNames(const QStringList& names);
               //! add a decorator object
               void addDecorators(QObject* o, int decoTypes);
               //! helper method that creates a PythonQtClassWrapper object  (returns a new reference)
               PythonQtClassWrapper* createNewPythonQtClassWrapper(PythonQtClassInfo* info, PyObject* module);
               //! create a new instance of the given enum type with given value (returns a new reference)
               static PyObject*  createEnumValueInstance(PyObject* enumType, unsigned int enumValue);
               //! helper that creates a new int derived class that represents the enum of the given name  (returns a new reference)
               static PyObject* createNewPythonQtEnumWrapper(const char* enumName, PyObject* parentObject);
               //! helper method that creates a PythonQtInstanceWrapper object and registers it in the object map
               PythonQtInstanceWrapper* createNewPythonQtInstanceWrapper(QObject* obj, PythonQtClassInfo* info, void* wrappedPtr = NULL);
               //! get the class info for a meta object (if available)
               PythonQtClassInfo* getClassInfo(const QMetaObject* meta) { return _knownClassInfos.value(meta->className()); }
               //! get the class info for a meta object (if available)
               PythonQtClassInfo* getClassInfo(const QByteArray& className) { return _knownClassInfos.value(className); }
               //! creates the new module from the given pycode
               PythonQtObjectPtr createModule(const QString& name, PyObject* pycode);
               //! get the current class info (for the next PythonQtClassWrapper that is created) and reset it to NULL again
               PythonQtClassInfo* currentClassInfoForClassWrapperCreation();
               //! the dummy tuple (which is empty and may be used to detected that a wrapper is called from internal wrapper creation
               static PyObject* dummyTuple();
               //! called by virtual overloads when a python return value can not be converted to the required Qt type
               void handleVirtualOverloadReturnError(const char* signature, const PythonQtMethodInfo* methodInfo, PyObject* result);
               //! get access to the PythonQt module
               PythonQtObjectPtr pythonQtModule() const { return _pythonQtModule; }
               //! returns the profiling callback, which may be NULL
               PythonQt::ProfilingCB* profilingCB() const { return _profilingCB; }
               //! determines the signature of the given callable object (similar as pydoc)
               QString getSignature(PyObject* object);
               //! returns true if the object is a method descriptor (same as inspect.ismethoddescriptor() in inspect.py)
               bool isMethodDescriptor(PyObject* object) const;
             private:
               //! Setup the shared library suffixes by getting them from the "imp" module.
               void setupSharedLibrarySuffixes();
               //! create a new pythonqt class wrapper and place it in the pythonqt module
               void createPythonQtClassWrapper(PythonQtClassInfo* info, const char* package, PyObject* module = NULL);
               //! get/create new package module (the returned object is a borrowed reference)
               PyObject* packageByName(const char* name);
               //! get the wrapper for a given pointer (and remove a wrapper of an already destroyed qobject)
               PythonQtInstanceWrapper* findWrapperAndRemoveUnused(void* obj);
               //! stores pointer to PyObject mapping of wrapped QObjects AND C++ objects
               QHash<void* , PythonQtInstanceWrapper *> _wrappedObjects;
               //! stores the meta info of known Qt classes
               QHash<QByteArray, PythonQtClassInfo *>   _knownClassInfos;
               //! names of qobject derived classes that can be casted to qobject savely
               QHash<QByteArray, bool> _knownQObjectClassNames;
               //! stores signal receivers for QObjects
               QHash<QObject* , PythonQtSignalReceiver *> _signalReceivers;
               //! the PythonQt python module
               PythonQtObjectPtr _pythonQtModule;
               //! the name of the PythonQt python module
               QByteArray _pythonQtModuleName;
               //! the importer interface (if set)
               PythonQtImportFileInterface* _importInterface;
               //! the default importer
               PythonQtQFileImporter* _defaultImporter;
               PythonQtQObjectNoLongerWrappedCB* _noLongerWrappedCB;
               PythonQtQObjectWrappedCB* _wrappedCB;
               QStringList _importIgnorePaths;
               QStringList _sharedLibrarySuffixes;
               //! the cpp object wrapper factories
               QList<PythonQtCppWrapperFactory*> _cppWrapperFactories;
               QList<PythonQtForeignWrapperFactory*> _foreignWrapperFactories;
               QHash<QByteArray, PyObject*> _packages;
               PythonQtClassInfo* _currentClassInfoForClassWrapperCreation;
               PythonQt::ProfilingCB* _profilingCB;
               int _initFlags;
               int _PythonQtObjectPtr_metaId;
               friend class PythonQt;
             };
             #endif

src/PythonQtObjectPtr.cpp +4 -4

             /*
              *
              *  Copyright (C) 2010 MeVis Medical Solutions AG All Rights Reserved.
              *
              *  This library is free software; you can redistribute it and/or
              *  modify it under the terms of the GNU Lesser General Public
              *  License as published by the Free Software Foundation; either
              *  version 2.1 of the License, or (at your option) any later version.
              *
              *  This library is distributed in the hope that it will be useful,
              *  but WITHOUT ANY WARRANTY; without even the implied warranty of
              *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
              *  Lesser General Public License for more details.
              *
              *  Further, this software is distributed without any warranty that it is
              *  free of the rightful claim of any third person regarding infringement
              *  or the like.  Any license provided herein, whether implied or
              *  otherwise, applies only to this software file.  Patent licenses, if
              *  any, provided herein do not apply to combinations of this program with
              *  other software, or any other product whatsoever.
              *
              *  You should have received a copy of the GNU Lesser General Public
              *  License along with this library; if not, write to the Free Software
              *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
              *
              *  Contact information: MeVis Medical Solutions AG, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtObjectPtr.cpp
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include <PythonQt.h>
             PythonQtObjectPtr::PythonQtObjectPtr(PyObject* o)
             {
               _object = o;
               if (o) Py_INCREF(_object);
             }
             PythonQtObjectPtr::~PythonQtObjectPtr()
             {
               if (_object) Py_DECREF(_object);
             }
             void PythonQtObjectPtr::setNewRef(PyObject* o)
             {
               if (o != _object) {
                 if (_object) Py_DECREF(_object);
                 _object = o;
               }
             }
             QVariant PythonQtObjectPtr::evalScript(const QString& script, int start)
             {
               return PythonQt::self()->evalScript(_object, script, start);
             }
             void PythonQtObjectPtr::evalFile(const QString& file)
             {
               PythonQt::self()->evalFile(_object, file);
             }
             QVariant PythonQtObjectPtr::evalCode(PyObject* pycode)
             {
               return PythonQt::self()->evalCode(_object, pycode);
             }
             void PythonQtObjectPtr::addObject(const QString& name, QObject* object)
             {
               PythonQt::self()->addObject(_object, name, object);
             }
             void PythonQtObjectPtr::addVariable(const QString& name, const QVariant& v)
             {
               PythonQt::self()->addVariable(_object, name, v);
             }
             void PythonQtObjectPtr::removeVariable(const QString& name)
             {
               PythonQt::self()->removeVariable(_object, name);
             }
             QVariant PythonQtObjectPtr::getVariable(const QString& name)
             {
               return PythonQt::self()->getVariable(_object, name);
             }
-            QVariant PythonQtObjectPtr::call(const QString& callable, const QVariantList& args)
+            QVariant PythonQtObjectPtr::call(const QString& callable, const QVariantList& args, const QVariantMap& kwargs)
             {
-              return PythonQt::self()->call(_object, callable, args);
+              return PythonQt::self()->call(_object, callable, args, kwargs);
             }
-            QVariant PythonQtObjectPtr::call(const QVariantList& args)
+            QVariant PythonQtObjectPtr::call(const QVariantList& args, const QVariantMap& kwargs)
             {
-              return PythonQt::self()->call(_object, args);
+              return PythonQt::self()->call(_object, args, kwargs);
             }
             bool PythonQtObjectPtr::fromVariant(const QVariant& variant)
             {
               if (!variant.isNull()) {
                   setObject(qVariantValue<PythonQtObjectPtr>(variant));
                   return true;
               }
               else {
                   setObject(0);
                   return false;
               }
             }
             void PythonQtObjectPtr::setObject(PyObject* o)
             {
               if (o != _object) {
                 if (_object) Py_DECREF(_object);
                 _object = o;
                 if (_object) Py_INCREF(_object);
               }
             }

src/PythonQtObjectPtr.h +3 -2

             #ifndef _PYTHONQTOBJECTPTR_H
             #define _PYTHONQTOBJECTPTR_H
             /*
              *
              *  Copyright (C) 2010 MeVis Medical Solutions AG All Rights Reserved.
              *
              *  This library is free software; you can redistribute it and/or
              *  modify it under the terms of the GNU Lesser General Public
              *  License as published by the Free Software Foundation; either
              *  version 2.1 of the License, or (at your option) any later version.
              *
              *  This library is distributed in the hope that it will be useful,
              *  but WITHOUT ANY WARRANTY; without even the implied warranty of
              *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
              *  Lesser General Public License for more details.
              *
              *  Further, this software is distributed without any warranty that it is
              *  free of the rightful claim of any third person regarding infringement
              *  or the like.  Any license provided herein, whether implied or
              *  otherwise, applies only to this software file.  Patent licenses, if
              *  any, provided herein do not apply to combinations of this program with
              *  other software, or any other product whatsoever.
              *
              *  You should have received a copy of the GNU Lesser General Public
              *  License along with this library; if not, write to the Free Software
              *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
              *
              *  Contact information: MeVis Medical Solutions AG, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtObjectPtr.h
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtPythonInclude.h"
             #include "PythonQtSystem.h"
             #include <QVariant>
             #include <QVariantList>
+            #include <QVariantMap>
             //! a smart pointer that stores a PyObject pointer and that handles reference counting automatically
             class PYTHONQT_EXPORT PythonQtObjectPtr
             {
             public:
               PythonQtObjectPtr():_object(NULL) {}
               PythonQtObjectPtr(const PythonQtObjectPtr &p)
               :_object(NULL) {
                 setObject(p.object());
               }
               //! If the given variant holds a PythonQtObjectPtr, extract the value from it and hold onto the reference. This results in an increment of the reference count.
               PythonQtObjectPtr(const QVariant& variant):_object(NULL) {
                   fromVariant(variant);
               }
               PythonQtObjectPtr(PyObject* o);
               ~PythonQtObjectPtr();
               //! If the given variant holds a PythonQtObjectPtr, extract the value from it and hold onto the reference. This results in an increment of the reference count.
               bool fromVariant(const QVariant& variant);
               PythonQtObjectPtr &operator=(const PythonQtObjectPtr &p) {
                 setObject(p.object());
                 return *this;
               }
               PythonQtObjectPtr &operator=(PyObject* o) {
                 setObject(o);
                 return *this;
               }
               PythonQtObjectPtr &operator=(const QVariant& variant) {
                   fromVariant(variant);
                   return *this;
               }
               bool operator==( const PythonQtObjectPtr &p ) const {
                 return object() == p.object();
               }
               bool operator!= ( const PythonQtObjectPtr& p ) const {
                 return !( *this == p );
               }
               bool operator==( PyObject* p ) const {
                 return object() == p;
               }
               bool operator!= ( PyObject* p ) const {
                 return object() != p;
               }
               bool isNull() const { return !object(); }
               PyObject* operator->() const { return object(); }
               PyObject& operator*() const { return *( object() ); }
               operator PyObject*() const { return object(); }
               //! sets the object and passes the ownership (stealing the reference, in Python slang)
               void setNewRef(PyObject* o);
               PyObject* object() const {
                 return _object;
               }
               //! evaluates the given script code in the context of this object and returns the result value
               QVariant evalScript(const QString& script, int start = Py_file_input);
               //! evaluates the given code and returns the result value (use Py_Compile etc. to create pycode from string)
               //! If pycode is NULL, a python error is printed.
               QVariant evalCode(PyObject* pycode);
               //! evaluates the given code in the context
               void evalFile(const QString& filename);
               //! add the given \c object to the \c module as a variable with \c name (it can be removed via clearVariable)
               void addObject(const QString& name, QObject* object);
               //! add the given variable to the module
               void addVariable(const QString& name, const QVariant& v);
               //! remove the given variable
               void removeVariable(const QString& name);
               //! get the variable with the \c name of the \c module, returns an invalid QVariant on error
               QVariant getVariable(const QString& name);
               //! call the given python object (in the scope of the current object), returns the result converted to a QVariant
-              QVariant call(const QString& callable, const QVariantList& args = QVariantList());
+              QVariant call(const QString& callable, const QVariantList& args = QVariantList(), const QVariantMap& kwargs = QVariantMap());
               //! call the contained python object directly, returns the result converted to a QVariant
-              QVariant call(const QVariantList& args = QVariantList());
+              QVariant call(const QVariantList& args = QVariantList(), const QVariantMap& kwargs = QVariantMap());
             protected:
               void setObject(PyObject* o);
             private:
               PyObject* _object;
             };
             // register it to the meta type system
             Q_DECLARE_METATYPE(PythonQtObjectPtr)
             #endif

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