GIT_REPOSITORIES/LPP/PythonQt Commit - r67:57d78f859ef3

added error handling for virtual method overloads, added more global functions (qsrand etc.), added support for exec_ etc (python keyword overlap resolution), change virtual method handling, this will require code regeneration (I will do that tomorrow)...

florianlink -

r67:57d78f859ef3

parent child

Context file:

r67:57d78f859ef3

Collapse all files

src/PythonQt.cpp +22 -34

             /*
             *
             *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, 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 "PythonQtSignalReceiver.h"
             #include "PythonQtConversion.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(int flags)
             {
               if (!_self) {
                 _self = new PythonQt(flags);
               }
               PythonQtMethodInfo::addParameterTypeAlias("QObjectList", "QList<QObject*>");
               qRegisterMetaType<QList<QObject*> >("QList<void*>");
               PythonQtRegisterToolClassesTemplateConverter(int);
               PythonQtRegisterToolClassesTemplateConverter(float);
               PythonQtRegisterToolClassesTemplateConverter(double);
               // TODO: which other POD types should be available for QList etc.
               PythonQt::self()->addDecorators(new PythonQtStdDecorators());
               PythonQt::self()->registerCPPClass("Qt", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_Qt>);
               PythonQt::self()->registerCPPClass("QBitArray", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QBitArray>);
               PythonQt::self()->registerCPPClass("QDate", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QDate>);
               PythonQt::self()->registerCPPClass("QTime", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QTime>);
               PythonQt::self()->registerCPPClass("QDateTime", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QDateTime>);
               PythonQt::self()->registerCPPClass("QUrl", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QUrl>);
               PythonQt::self()->registerCPPClass("QLocale", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QLocale>);
               PythonQt::self()->registerCPPClass("QRect", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QRect>);
               PythonQt::self()->registerCPPClass("QRectF", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QRectF>);
               PythonQt::self()->registerCPPClass("QSize", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QSize>);
               PythonQt::self()->registerCPPClass("QSizeF", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QSizeF>);
               PythonQt::self()->registerCPPClass("QLine", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QLine>);
               PythonQt::self()->registerCPPClass("QLineF", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QLineF>);
               PythonQt::self()->registerCPPClass("QPoint", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QPoint>);
               PythonQt::self()->registerCPPClass("QPointF", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QPointF>);
               PythonQt::self()->registerCPPClass("QRegExp", "", "QtCore", PythonQtCreateObject<PythonQtWrapper_QRegExp>);
               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);
               PythonQt::self()->registerCPPClass("QFont", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QFont>);
               PythonQt::self()->registerCPPClass("QPixmap", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QPixmap>);
               PythonQt::self()->registerCPPClass("QBrush", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QBrush>);
               PythonQt::self()->registerCPPClass("QColor", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QColor>);
               PythonQt::self()->registerCPPClass("QPalette", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QPalette>);
               PythonQt::self()->registerCPPClass("QIcon", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QIcon>);
               PythonQt::self()->registerCPPClass("QImage", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QImage>);
               PythonQt::self()->registerCPPClass("QPolygon", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QPolygon>);
               PythonQt::self()->registerCPPClass("QRegion", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QRegion>);
               PythonQt::self()->registerCPPClass("QBitmap", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QBitmap>);
               PythonQt::self()->registerCPPClass("QCursor", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QCursor>);
               PythonQt::self()->registerCPPClass("QSizePolicy", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QSizePolicy>);
               PythonQt::self()->registerCPPClass("QKeySequence", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QKeySequence>);
               PythonQt::self()->registerCPPClass("QPen", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QPen>);
               PythonQt::self()->registerCPPClass("QTextLength", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QTextLength>);
               PythonQt::self()->registerCPPClass("QTextFormat", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QTextFormat>);
               PythonQt::self()->registerCPPClass("QMatrix", "", "QtGui", PythonQtCreateObject<PythonQtWrapper_QMatrix>);
               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(int flags)
             {
               _p = new PythonQtPrivate;
               _p->_initFlags = flags;
               _p->_PythonQtObjectPtr_metaId = qRegisterMetaType<PythonQtObjectPtr>("PythonQtObjectPtr");
               Py_SetProgramName("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);
               // 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);
               initPythonQtModule(flags & RedirectStdOut);
             }
             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();
             }
             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)
             {
               // 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->setupQObject(m);
                   createPythonQtClassWrapper(info, package);
                   if (m->superClass()) {
                     PythonQtClassInfo* parentInfo = lookupClassInfoAndCreateIfNotPresent(m->superClass()->className());
                     info->addParentClass(PythonQtClassInfo::ParentClassInfo(parentInfo));
                   }
                 }
                 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* pack = packageByName(package);
               PyObject* pyobj = (PyObject*)createNewPythonQtClassWrapper(info, package);
               PyModule_AddObject(pack, info->className(), pyobj);
               if (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) {
                 // 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);
               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 it's 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, 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 (!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());
                 }
                 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, const char* package) {
               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();
               QByteArray moduleName("PythonQt");
               if (package && strcmp(package, "")!=0) {
                 moduleName += ".";
                 moduleName += package;
               }
               PyDict_SetItemString(typeDict, "__module__", PyString_FromString(moduleName.constData()));
               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;
               QString s;
               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__");
             }
             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) {
                 if (type == CallOverloads) {
                   if (PythonQtSlotFunction_Check(object)) {
                     PythonQtSlotFunctionObject* o = (PythonQtSlotFunctionObject*)object.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.object();
                     PythonQtSlotInfo* info = o->classInfo()->constructors();
                     while (info) {
                       results << info->fullSignature();
                       info = info->nextInfo();
                     }
                   } else {
                     //TODO: use pydoc!
                     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) {
                             results << keystr;
                           }
                           break;
                         case Variable:
                           if (value->ob_type != &PyClass_Type
                             && value->ob_type != &PyCFunction_Type
                             && value->ob_type != &PyFunction_Type
                             && value->ob_type != &PyModule_Type
                             ) {
                             results << keystr;
                           }
                           break;
                         case Function:
                           if (value->ob_type == &PyFunction_Type ||
                             value->ob_type == &PyMethod_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);
                   }
                 }
               }
               return results;
             }
             QVariant PythonQt::call(PyObject* object, const QString& name, const QVariantList& args)
             {
               PythonQtObjectPtr callable = lookupCallable(object, name);
               if (callable) {
                 return call(callable, args);
               } else {
                 return QVariant();
               }
             }
             QVariant PythonQt::call(PyObject* callable, const QVariantList& args)
             {
               QVariant r;
               if (callable) {
                 PythonQtObjectPtr pargs;
                 int count = args.size();
                 if (count>0) {
                   pargs.setNewRef(PyTuple_New(count));
                 }
                 bool err = false;
                 // transform QVariants to Python
                 for (int i = 0; i < count; i++) {
                   PyObject* arg = PythonQtConv::QVariantToPyObject(args.at(i));
                   if (arg) {
                     // steals reference, no unref
                     PyTuple_SetItem(pargs, i,arg);
                   } else {
                     err = true;
                     break;
                   }
                 }
                 if (!err) {
                   PyErr_Clear();
                   PythonQtObjectPtr result;
                   result.setNewRef(PyObject_CallObject(callable, pargs));
                   if (result) {
                     // ok
                     r = PythonQtConv::PyObjToQVariant(result);
                   } else {
                     PythonQt::self()->handleError();
                   }
                 }
               }
               return r;
             }
             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)
             {
               PythonQtImport::init();
               _p->_importInterface = importInterface;
             }
             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);
             }
             //---------------------------------------------------------------------------------------------------
             PythonQtPrivate::PythonQtPrivate()
             {
               _importInterface = NULL;
               _defaultImporter = new PythonQtQFileImporter;
               _noLongerWrappedCB = NULL;
               _wrappedCB = NULL;
               _currentClassInfoForClassWrapperCreation = NULL;
             }
             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).isPointer) {
                       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.isPointer) {
                         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)
             {
               emit PythonQt::self()->pythonStdOut(str);
             }
             void PythonQt::stdErrRedirectCB(const QString& str)
             {
               emit PythonQt::self()->pythonStdErr(str);
             }
             void PythonQt::setQObjectWrappedCallback(PythonQtQObjectWrappedCB* cb)
             {
               _p->_wrappedCB = cb;
             }
             void PythonQt::setQObjectNoLongerWrappedCallback(PythonQtQObjectNoLongerWrappedCB* cb)
             {
               _p->_noLongerWrappedCB = cb;
             }
             static PyMethodDef PythonQtMethods[] = {
               {NULL, NULL, 0, NULL}
             };
             void PythonQt::initPythonQtModule(bool redirectStdOut)
             {
               _p->_pythonQtModule = Py_InitModule("PythonQt", PythonQtMethods);
               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);
               }
             }
             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)
             {
               PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName);
               if (!info->pythonQtClassWrapper()) {
                 info->setupCPPObject(typeName);
                 createPythonQtClassWrapper(info, package);
               }
               if (parentTypeName && strcmp(parentTypeName,"")!=0) {
                 addParentClass(typeName, parentTypeName, 0);
               }
               if (wrapperCreator) {
                 info->setDecoratorProvider(wrapperCreator);
               }
               if (shell) {
                 info->setShellSetInstanceWrapperCB(shell);
               }
             }
-            static PyObject *PythonQt_SIGNAL(PyObject * /*type*/, PyObject *args)
-              const char* value;
-              if (!PyArg_ParseTuple(args, "s", &value)) {
-                return NULL;
-              // we do not prepend 0,1 or 2, why should we?
-              return PyString_FromString(QByteArray("2") + value);
-            static PyObject *PythonQt_SLOT(PyObject * /*type*/, PyObject *args)
-              const char* value;
-              if (!PyArg_ParseTuple(args, "s", &value)) {
-                return NULL;
-              // we do not prepend 0,1 or 2, why should we?
-              return PyString_FromString(QByteArray("1") + value);
-            static PyMethodDef PythonQt_Qt_methods[] = {
-            {"SIGNAL", (PyCFunction)PythonQt_SIGNAL, METH_VARARGS,
-            "Returns a signal string"
-            },
-            {"SLOT", (PyCFunction)PythonQt_SLOT, METH_VARARGS,
-            "Returns a slot string"
-            };
             PyObject* PythonQtPrivate::packageByName(const char* name)
             {
               if (name==NULL || name[0]==0) {
                 return _pythonQtModule;
               }
               PyObject* v = _packages.value(name);
               if (!v) {
                 v = PyImport_AddModule((QByteArray("PythonQt.") + name).constData());
-                if (strcmp(name,"Qt")==0 || strcmp(name,"QtCore")==0) {
-                  // add SIGNAL and SLOT functions
-                  PyModule_AddObject(v, "SIGNAL", PyCFunction_New(PythonQt_Qt_methods, v));
-                  PyModule_AddObject(v, "SLOT", PyCFunction_New(PythonQt_Qt_methods+1, v));
                 _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 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;
             }

src/PythonQt.h +3 0

             #ifndef _PYTHONQT_H
             #define _PYTHONQT_H
             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, 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 <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 PythonQtQFileImporter;
             typedef void  PythonQtQObjectWrappedCB(QObject* object);
             typedef void  PythonQtQObjectNoLongerWrappedCB(QObject* object);
             typedef void* PythonQtPolymorphicHandlerCB(const void *ptr, char **class_name);
             typedef void PythonQtShellSetInstanceWrapperCB(void* object, PythonQtInstanceWrapper* wrapper);
             template<class T> void PythonQtSetInstanceWrapperOnShell(void* object, PythonQtInstanceWrapper* wrapper) { ((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 (((char*)(static_cast<T2*>(reinterpret_cast<T1*>(0x100)))) - ((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
             class PYTHONQT_EXPORT PythonQt : public QObject {
               Q_OBJECT
             public:
               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
               };
               //! initialize the python qt binding (flags are a or combination of InitFlags)
               static void init(int flags = IgnoreSiteModule | RedirectStdOut);
               //! cleanup
               static void cleanup();
               //! get the singleton instance
               static PythonQt* self() { return _self; }
               //-----------------------------------------------------------------------------
               // Public API:
               //! defines the object types for introspection
               enum ObjectType {
                 Class,
                 Function,
                 Variable,
                 Module,
                 Anything,
                 CallOverloads
               };
               //! 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);
               //! get the __main__ module of python
               PythonQtObjectPtr getMainModule();
               //! 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);
               //! 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);
               //! 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();
               //@{ 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);
               //@}
               //@{ 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);
               //! returns the found callable object or NULL
               //! @return new reference
               PythonQtObjectPtr lookupCallable(PyObject* object, const QString& name);
               //@}
               //@{ Calling of python callables
               //! 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());
               //! call the given python object, returns the result converted to a QVariant
               QVariant call(PyObject* callable, const QVariantList& args = QVariantList());
               //@}
               //@{ 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);
               //@}
               //@{ Custom importer (to replace internal import implementation of python)
               //! 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 internal data (should not be used on the public API, but is used by some C functions)
               static PythonQtPrivate* priv() { return _self->_p; }
               //! get access to the file importer (if set)
               static PythonQtImportFileInterface* importInterface();
               //! 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();
               //! 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);
             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);
             public:
               //! 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);
             private:
               void initPythonQtModule(bool redirectStdOut);
               //! 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);
               ~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
               };
               //! 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);
               //! 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);
               //! 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 decorator object
               void addDecorators(QObject* o, int decoTypes);
               //! helper method that creates a PythonQtClassWrapper object  (returns a new reference)
               PythonQtClassWrapper* createNewPythonQtClassWrapper(PythonQtClassInfo* info, const char* package = NULL);
               //! 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);
             private:
               //! create a new pythonqt class wrapper and place it in the pythonqt module
               void createPythonQtClassWrapper(PythonQtClassInfo* info, const char* package);
               //! 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 importer interface (if set)
               PythonQtImportFileInterface* _importInterface;
               //! the default importer
               PythonQtQFileImporter* _defaultImporter;
               PythonQtQObjectNoLongerWrappedCB* _noLongerWrappedCB;
               PythonQtQObjectWrappedCB* _wrappedCB;
               QStringList _importIgnorePaths;
               //! the cpp object wrapper factories
               QList<PythonQtCppWrapperFactory*> _cppWrapperFactories;
               QHash<QByteArray, PyObject*> _packages;
               PythonQtClassInfo* _currentClassInfoForClassWrapperCreation;
               int _initFlags;
               int _PythonQtObjectPtr_metaId;
               friend class PythonQt;
             };
             #endif

src/PythonQtClassInfo.cpp +15 0

             /*
             *
             *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, 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 "PythonQtClassInfo.h"
             #include "PythonQtMethodInfo.h"
             #include "PythonQt.h"
             #include <QMetaMethod>
             #include <QMetaObject>
             #include <QMetaEnum>
             QHash<QByteArray, int> PythonQtMethodInfo::_parameterTypeDict;
             PythonQtClassInfo::PythonQtClassInfo() {
               _meta = NULL;
               _constructors = NULL;
               _destructor = NULL;
               _decoratorProvider = NULL;
               _decoratorProviderCB = NULL;
               _pythonQtClassWrapper = NULL;
               _shellSetInstanceWrapperCB = NULL;
               _metaTypeId = -1;
               _isQObject = false;
               _enumsCreated = false;
             }
             PythonQtClassInfo::~PythonQtClassInfo()
             {
               clearCachedMembers();
               if (_constructors) {
                 _constructors->deleteOverloadsAndThis();
               }
               if (_destructor) {
                 _destructor->deleteOverloadsAndThis();
               }
               foreach(PythonQtSlotInfo* info, _decoratorSlots) {
                 info->deleteOverloadsAndThis();
               }
             }
             void PythonQtClassInfo::setupQObject(const QMetaObject* meta)
             {
               // _wrappedClassName is already set earlier in the class setup
               _isQObject = true;
               _meta = meta;
             }
             void PythonQtClassInfo::setupCPPObject(const QByteArray& classname)
             {
               _isQObject = false;
               _wrappedClassName = classname;
               _metaTypeId = QMetaType::type(classname);
             }
             void PythonQtClassInfo::clearCachedMembers()
             {
               QHashIterator<QByteArray, PythonQtMemberInfo> i(_cachedMembers);
               while (i.hasNext()) {
                 PythonQtMemberInfo member = i.next().value();
                 if (member._type== PythonQtMemberInfo::Slot) {
                   PythonQtSlotInfo* info = member._slot;
                   while (info) {
                     PythonQtSlotInfo* next = info->nextInfo();
                     delete info;
                     info = next;
                   }
                 }
               }
             }
             int PythonQtClassInfo::findCharOffset(const char* sigStart, char someChar)
             {
               const char* sigEnd = sigStart;
               char c;
               do {
                 c = *sigEnd++;
               } while (c!=someChar && c!=0);
               return sigEnd-sigStart-1;
             }
             bool PythonQtClassInfo::lookForPropertyAndCache(const char* memberName)
             {
               bool found = false;
               bool nameMapped = false;
               const char* attributeName = memberName;
               // look for properties
               int i = _meta->indexOfProperty(attributeName);
               if (i==-1) {
                 // try to map name to objectName
                 if (qstrcmp(attributeName, "name")==0) {
                   attributeName = "objectName";
                   nameMapped = true;
                   i = _meta->indexOfProperty(attributeName);
                 }
               }
               if (i!=-1) {
                 PythonQtMemberInfo newInfo(_meta->property(i));
                 _cachedMembers.insert(attributeName, newInfo);
                 if (nameMapped) {
                   _cachedMembers.insert(memberName, newInfo);
                 }
               #ifdef PYTHONQT_DEBUG
                 std::cout << "caching property " << memberName << " on " << _meta->className() << std::endl;
               #endif
                 found = true;
               }
               return found;
             }
             PythonQtSlotInfo* PythonQtClassInfo::recursiveFindDecoratorSlotsFromDecoratorProvider(const char* memberName, PythonQtSlotInfo* inputInfo, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset)
             {
               inputInfo = findDecoratorSlotsFromDecoratorProvider(memberName, inputInfo, found, memberCache, upcastingOffset);
               foreach(const ParentClassInfo& info, _parentClasses) {
                 inputInfo = info._parent->recursiveFindDecoratorSlotsFromDecoratorProvider(memberName, inputInfo, found, memberCache, upcastingOffset+info._upcastingOffset);
               }
               return inputInfo;
             }
             PythonQtSlotInfo* PythonQtClassInfo::findDecoratorSlotsFromDecoratorProvider(const char* memberName, PythonQtSlotInfo* tail, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset) {
               QObject* decoratorProvider = decorator();
               int memberNameLen = strlen(memberName);
               if (decoratorProvider) {
                 //qDebug()<< "looking " << decoratorProvider->metaObject()->className() << " " << memberName << " " << upcastingOffset;
                 const QMetaObject* meta = decoratorProvider->metaObject();
                 int numMethods = meta->methodCount();
                 int startFrom = QObject::staticMetaObject.methodCount();
                 for (int i = startFrom; i < numMethods; i++) {
                   QMetaMethod m = meta->method(i);
                   if ((m.methodType() == QMetaMethod::Method ||
                        m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                     const char* sigStart = m.signature();
                     bool isClassDeco = false;
                     if (qstrncmp(sigStart, "static_", 7)==0) {
                       // skip the static_classname_ part of the string
                       sigStart += 7 + 1 + strlen(className());
                       isClassDeco = true;
                     } else if (qstrncmp(sigStart, "new_", 4)==0) {
                       isClassDeco = true;
                     } else if (qstrncmp(sigStart, "delete_", 7)==0) {
                       isClassDeco = true;
                     }
                     // find the first '('
                     int offset = findCharOffset(sigStart, '(');
                     // XXX no checking is currently done if the slots have correct first argument or not...
                     // check if same length and same name
                     if (memberNameLen == offset && qstrncmp(memberName, sigStart, offset)==0) {
                       found = true;
                       PythonQtSlotInfo* info = new PythonQtSlotInfo(this, m, i, decoratorProvider, isClassDeco?PythonQtSlotInfo::ClassDecorator:PythonQtSlotInfo::InstanceDecorator);
                       info->setUpcastingOffset(upcastingOffset);
                       //qDebug()<< "adding " << decoratorProvider->metaObject()->className() << " " << memberName << " " << upcastingOffset;
                       if (tail) {
                         tail->setNextInfo(info);
                       } else {
                         PythonQtMemberInfo newInfo(info);
                         memberCache.insert(memberName, newInfo);
                       }
                       tail = info;
                     }
                   }
                 }
               }
               tail = findDecoratorSlots(memberName, memberNameLen, tail, found, memberCache, upcastingOffset);
               return tail;
             }
             bool PythonQtClassInfo::lookForMethodAndCache(const char* memberName)
             {
               bool found = false;
               int memberNameLen = strlen(memberName);
               PythonQtSlotInfo* tail = NULL;
               if (_meta) {
                 int numMethods = _meta->methodCount();
                 for (int i = 0; i < numMethods; i++) {
                   QMetaMethod m = _meta->method(i);
                   if ((m.methodType() == QMetaMethod::Method ||
                        m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                     const char* sigStart = m.signature();
                     // find the first '('
                     int offset = findCharOffset(sigStart, '(');
                     // check if same length and same name
                     if (memberNameLen == offset && qstrncmp(memberName, sigStart, offset)==0) {
                       found = true;
                       PythonQtSlotInfo* info = new PythonQtSlotInfo(this, m, i);
                       if (tail) {
                         tail->setNextInfo(info);
                       } else {
                         PythonQtMemberInfo newInfo(info);
                         _cachedMembers.insert(memberName, newInfo);
                       }
                       tail = info;
                     }
                   }
                 }
               }
               // look for dynamic decorators in this class and in derived classes
               tail = recursiveFindDecoratorSlotsFromDecoratorProvider(memberName, tail, found, _cachedMembers, 0);
               return found;
             }
             bool PythonQtClassInfo::lookForEnumAndCache(const QMetaObject* meta, const char* memberName)
             {
               bool found = false;
               // look for enum values
               int enumCount = meta->enumeratorCount();
               for (int i=0;i<enumCount; i++) {
                 QMetaEnum e = meta->enumerator(i);
                 // we do not want flags, they will cause our values to appear two times
                 if (e.isFlag()) continue;
                 for (int j=0; j < e.keyCount(); j++) {
                   if (qstrcmp(e.key(j), memberName)==0) {
                     PyObject* enumType = findEnumWrapper(e.name());
                     if (enumType) {
                       PythonQtObjectPtr enumValuePtr;
                       enumValuePtr.setNewRef(PythonQtPrivate::createEnumValueInstance(enumType, e.value(j)));
                       PythonQtMemberInfo newInfo(enumValuePtr);
                       _cachedMembers.insert(memberName, newInfo);
               #ifdef PYTHONQT_DEBUG
                       std::cout << "caching enum " << memberName << " on " << meta->className() << std::endl;
               #endif
                       found = true;
                       break;
                     } else {
                       std::cout << "enum " << e.name() << " not found on " << className() << std::endl;
                     }
                   }
                 }
               }
               return found;
             }
             PythonQtMemberInfo PythonQtClassInfo::member(const char* memberName)
             {
               PythonQtMemberInfo info = _cachedMembers.value(memberName);
               if (info._type != PythonQtMemberInfo::Invalid) {
                 return info;
               } else {
                 bool found = false;
                 found = lookForPropertyAndCache(memberName);
                 if (!found) {
                   found = lookForMethodAndCache(memberName);
                 }
                 if (!found) {
                   if (_meta) {
                     // check enums in our meta object directly
                     found = lookForEnumAndCache(_meta, memberName);
                   }
                   if (!found) {
                     // check enums in the class hierachy of CPP classes
                     // look for dynamic decorators in this class and in derived classes
                     QList<QObject*> decoObjects;
                     recursiveCollectDecoratorObjects(decoObjects);
                     foreach(QObject* deco, decoObjects) {
                       // call on ourself for caching, but with different metaObject():
                       found = lookForEnumAndCache(deco->metaObject(), memberName);
                       if (found) {
                         break;
                       }
                     }
                   }
                 }
                 if (!found) {
+                  // maybe it is an enum wrapper?
                   PyObject* p = findEnumWrapper(memberName);
                   if (p) {
                     info._type = PythonQtMemberInfo::EnumWrapper;
                     info._enumWrapper = p;
                     _cachedMembers.insert(memberName, info);
                     found = true;
                   }
                 }
                 if (!found) {
+                  // since python keywords can not be looked up, we check if the name contains a single trailing _
+                  // and remove that and look again, so that we e.g. find exec on an exec_ lookup
+                  QByteArray mbrName(memberName);
+                  if ((mbrName.length()>2) &&
+                      (mbrName.at(mbrName.length()-1) == '_') &&
+                      (mbrName.at(mbrName.length()-2) != '_')) {
+                    mbrName = mbrName.mid(0,mbrName.length()-1);
+                    found = lookForMethodAndCache(mbrName.constData());
+                    if (found) {
+                      return _cachedMembers.value(mbrName);
+                    }
+                  }
+                }
+                if (!found) {
                   // we store a NotFound member, so that we get a quick result for non existing members (e.g. operator_equal lookup)
                   info._type = PythonQtMemberInfo::NotFound;
                   _cachedMembers.insert(memberName, info);
                 }
               }
               return _cachedMembers.value(memberName);
             }
             void PythonQtClassInfo::recursiveCollectDecoratorObjects(QList<QObject*>& decoratorObjects) {
               QObject* deco = decorator();
               if (deco) {
                 decoratorObjects.append(deco);
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 info._parent->recursiveCollectDecoratorObjects(decoratorObjects);
               }
             }
             void PythonQtClassInfo::recursiveCollectClassInfos(QList<PythonQtClassInfo*>& classInfoObjects) {
               classInfoObjects.append(this);
               foreach(const ParentClassInfo& info, _parentClasses) {
                 info._parent->recursiveCollectClassInfos(classInfoObjects);
               }
             }
             PythonQtSlotInfo* PythonQtClassInfo::findDecoratorSlots(const char* memberName, int memberNameLen, PythonQtSlotInfo* tail, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset)
             {
               QListIterator<PythonQtSlotInfo*> it(_decoratorSlots);
               while (it.hasNext()) {
                 PythonQtSlotInfo* infoOrig = it.next();
                 const char* sigStart = infoOrig->metaMethod()->signature();
                 if (qstrncmp("static_", sigStart, 7)==0) {
                   sigStart += 7;
                   sigStart += findCharOffset(sigStart, '_')+1;
                 }
                 int offset = findCharOffset(sigStart, '(');
                 if (memberNameLen == offset && qstrncmp(memberName, sigStart, offset)==0) {
                   //make a copy, otherwise we will have trouble on overloads!
                   PythonQtSlotInfo* info = new PythonQtSlotInfo(*infoOrig);
                   info->setUpcastingOffset(upcastingOffset);
                   found = true;
                   if (tail) {
                     tail->setNextInfo(info);
                   } else {
                     PythonQtMemberInfo newInfo(info);
                     memberCache.insert(memberName, newInfo);
                   }
                   tail = info;
                 }
               }
               return tail;
             }
             void PythonQtClassInfo::listDecoratorSlotsFromDecoratorProvider(QStringList& list, bool metaOnly) {
               QObject* decoratorProvider = decorator();
               if (decoratorProvider) {
                 const QMetaObject* meta = decoratorProvider->metaObject();
                 int numMethods = meta->methodCount();
                 int startFrom = QObject::staticMetaObject.methodCount();
                 for (int i = startFrom; i < numMethods; i++) {
                   QMetaMethod m = meta->method(i);
                   if ((m.methodType() == QMetaMethod::Method ||
                        m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                     const char* sigStart = m.signature();
                     bool isClassDeco = false;
                     if (qstrncmp(sigStart, "static_", 7)==0) {
                       // skip the static_classname_ part of the string
                       sigStart += 7 + 1 + strlen(className());
                       isClassDeco = true;
                     } else if (qstrncmp(sigStart, "new_", 4)==0) {
                       continue;
                     } else if (qstrncmp(sigStart, "delete_", 7)==0) {
                       continue;
                     }
                     // find the first '('
                     int offset = findCharOffset(sigStart, '(');
                     // XXX no checking is currently done if the slots have correct first argument or not...
                     if (!metaOnly || isClassDeco) {
                       list << QString::fromLatin1(sigStart, offset);
                     }
                   }
                 }
               }
               // look for global decorator slots
               QListIterator<PythonQtSlotInfo*> it(_decoratorSlots);
               while (it.hasNext()) {
                 PythonQtSlotInfo* slot = it.next();
                 if (metaOnly) {
                   if (slot->isClassDecorator()) {
                     QByteArray first = slot->slotName();
                     if (first.startsWith("static_")) {
                       int idx = first.indexOf('_');
                       idx = first.indexOf('_', idx+1);
                       first = first.mid(idx+1);
                     }
                     list << first;
                   }
                 } else {
                   list << slot->slotName();
                 }
               }
             }
             QStringList PythonQtClassInfo::propertyList()
             {
               QStringList l;
               if (_isQObject && _meta) {
                 int i;
                 int numProperties = _meta->propertyCount();
                 for (i = 0; i < numProperties; i++) {
                   QMetaProperty p = _meta->property(i);
                   l << QString(p.name());
                 }
               }
               return l;
             }
             QStringList PythonQtClassInfo::memberList(bool metaOnly)
             {
               decorator();
               QStringList l;
               QString h;
               if (_isQObject && _meta && !metaOnly) {
                 l = propertyList();
               }
               // normal slots of QObject (or wrapper QObject)
               if (!metaOnly && _meta) {
                 int numMethods = _meta->methodCount();
                 bool skipQObj = !_isQObject;
                 for (int i = skipQObj?QObject::staticMetaObject.methodCount():0; i < numMethods; i++) {
                   QMetaMethod m = _meta->method(i);
                   if ((m.methodType() == QMetaMethod::Method ||
                     m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                     QByteArray signa(m.signature());
                     signa = signa.left(signa.indexOf('('));
                     l << signa;
                   }
                 }
               }
               {
                 // look for dynamic decorators in this class and in derived classes
                 QList<PythonQtClassInfo*> infos;
                 recursiveCollectClassInfos(infos);
                 foreach(PythonQtClassInfo* info, infos) {
                   info->listDecoratorSlotsFromDecoratorProvider(l, metaOnly);
                 }
               }
               // List enumerator keys...
               QList<const QMetaObject*> enumMetaObjects;
               if (_meta) {
                 enumMetaObjects << _meta;
               }
               // check enums in the class hierachy of CPP classes
               QList<QObject*> decoObjects;
               recursiveCollectDecoratorObjects(decoObjects);
               foreach(QObject* deco, decoObjects) {
                 enumMetaObjects << deco->metaObject();
               }
               foreach(const QMetaObject* meta, enumMetaObjects) {
                 for (int i = 0; i<meta->enumeratorCount(); i++) {
                   QMetaEnum e = meta->enumerator(i);
                   l << e.name();
                   // we do not want flags, they will cause our values to appear two times
                   if (e.isFlag()) continue;
                   for (int j=0; j < e.keyCount(); j++) {
                     l << QString(e.key(j));
                   }
                 }
               }
               return QSet<QString>::fromList(l).toList();
             }
             const char* PythonQtClassInfo::className()
             {
               return _wrappedClassName.constData();
             }
             void* PythonQtClassInfo::castTo(void* ptr, const char* classname)
             {
               if (ptr==NULL) {
                 return NULL;
               }
               if (_wrappedClassName == classname) {
                 return ptr;
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 void* result = info._parent->castTo((char*)ptr + info._upcastingOffset, classname);
                 if (result) {
                   return result;
                 }
               }
               return NULL;
             }
             bool PythonQtClassInfo::inherits(const char* name)
             {
               if (_wrappedClassName == name) {
                 return true;
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 if (info._parent->inherits(name)) {
                   return true;
                 }
               }
               return false;
             }
             bool PythonQtClassInfo::inherits(PythonQtClassInfo* classInfo)
             {
               if (classInfo == this) {
                 return true;
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 if (info._parent->inherits(classInfo)) {
                   return true;
                 }
               }
               return false;
             }
             QString PythonQtClassInfo::help()
             {
               decorator();
               QString h;
               h += QString("--- ") + QString(className()) + QString(" ---\n");
               if (_isQObject) {
                 h += "Properties:\n";
                 int i;
                 int numProperties = _meta->propertyCount();
                 for (i = 0; i < numProperties; i++) {
                   QMetaProperty p = _meta->property(i);
                   h += QString(p.name()) + " (" + QString(p.typeName()) + " )\n";
                 }
               }
               if (constructors()) {
                 h += "Constructors:\n";
                 PythonQtSlotInfo* constr = constructors();
                 while (constr) {
                   h += constr->fullSignature() + "\n";
                   constr = constr->nextInfo();
                 }
               }
               h += "Slots:\n";
               h += "QString help()\n";
               h += "QString className()\n";
               if (_meta) {
                 int numMethods = _meta->methodCount();
                 for (int i = 0; i < numMethods; i++) {
                   QMetaMethod m = _meta->method(i);
                   if ((m.methodType() == QMetaMethod::Method ||
                     m.methodType() == QMetaMethod::Slot) && m.access() == QMetaMethod::Public) {
                     PythonQtSlotInfo slot(this, m, i);
                     h += slot.fullSignature()+ "\n";
                   }
                 }
               }
               // TODO xxx : decorators and enums from decorator() are missing...
               // maybe we can reuse memberlist()?
               if (_meta && _meta->enumeratorCount()) {
                 h += "Enums:\n";
                 for (int i = 0; i<_meta->enumeratorCount(); i++) {
                   QMetaEnum e = _meta->enumerator(i);
                   h += QString(e.name()) + " {";
                   for (int j=0; j < e.keyCount(); j++) {
                     if (j) { h+= ", "; }
                     h += e.key(j);
                   }
                   h += " }\n";
                 }
               }
               if (_isQObject && _meta) {
                 int numMethods = _meta->methodCount();
                 if (numMethods>0) {
                   h += "Signals:\n";
                   for (int i = 0; i < numMethods; i++) {
                     QMetaMethod m = _meta->method(i);
                     if (m.methodType() == QMetaMethod::Signal) {
                       h += QString(m.signature()) + "\n";
                     }
                   }
                 }
               }
               return h;
             }
             PythonQtSlotInfo* PythonQtClassInfo::constructors()
             {
               if (!_constructors) {
                 // force creation of lazy decorator, which will register the decorators
                 decorator();
               }
               return _constructors;
             }
             PythonQtSlotInfo* PythonQtClassInfo::destructor()
             {
               if (!_destructor) {
                 // force creation of lazy decorator, which will register the decorators
                 decorator();
               }
               return _destructor;
             }
             void PythonQtClassInfo::addConstructor(PythonQtSlotInfo* info)
             {
               PythonQtSlotInfo* prev = constructors();
               if (prev) {
                 info->setNextInfo(prev->nextInfo());
                 prev->setNextInfo(info);
               } else {
                 _constructors = info;
               }
             }
             void PythonQtClassInfo::addDecoratorSlot(PythonQtSlotInfo* info)
             {
               _decoratorSlots.append(info);
             }
             void PythonQtClassInfo::setDestructor(PythonQtSlotInfo* info)
             {
               if (_destructor) {
                 _destructor->deleteOverloadsAndThis();
               }
               _destructor = info;
             }
             void PythonQtClassInfo::setMetaObject(const QMetaObject* meta)
             {
               _meta = meta;
               clearCachedMembers();
             }
             QObject* PythonQtClassInfo::decorator()
             {
               if (!_decoratorProvider && _decoratorProviderCB) {
                 _decoratorProvider = (*_decoratorProviderCB)();
                 if (_decoratorProvider) {
                   _decoratorProvider->setParent(PythonQt::priv());
                   // setup enums early, since they might be needed by the constructor decorators:
                   if (!_enumsCreated) {
                     createEnumWrappers();
                   }
                   PythonQt::priv()->addDecorators(_decoratorProvider, PythonQtPrivate::ConstructorDecorator | PythonQtPrivate::DestructorDecorator);
                 }
               }
               // check if enums need to be created and create them if they are not yet created
               if (!_enumsCreated) {
                 createEnumWrappers();
               }
               return _decoratorProvider;
             }
             bool PythonQtClassInfo::hasOwnerMethodButNoOwner(void* object)
             {
               PythonQtMemberInfo info = member("hasOwner");
               if (info._type == PythonQtMemberInfo::Slot) {
                 void* obj = object;
                 bool result = false;
                 void* args[2];
                 args[0] = &result;
                 args[1] = &obj;
                 info._slot->decorator()->qt_metacall(QMetaObject::InvokeMetaMethod, info._slot->slotIndex(), args);
                 return !result;
               } else {
                 return false;
               }
             }
             void* PythonQtClassInfo::recursiveCastDownIfPossible(void* ptr, char** resultClassName)
             {
               if (!_polymorphicHandlers.isEmpty()) {
                 foreach(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
                   void* resultPtr = (*cb)(ptr, resultClassName);
                   if (resultPtr) {
                     return resultPtr;
                   }
                 }
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 if (!info._parent->isQObject()) {
                   void* resultPtr = info._parent->recursiveCastDownIfPossible((char*)ptr + info._upcastingOffset, resultClassName);
                   if (resultPtr) {
                     return resultPtr;
                   }
                 }
               }
               return NULL;
             }
             void* PythonQtClassInfo::castDownIfPossible(void* ptr, PythonQtClassInfo** resultClassInfo)
             {
               char* className;
               // this would do downcasting recursively...
               // void* resultPtr = recursiveCastDownIfPossible(ptr, &className);
               // we only do downcasting on the base object, not on the whole inheritance tree...
               void* resultPtr = NULL;
               if (!_polymorphicHandlers.isEmpty()) {
                 foreach(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
                   resultPtr = (*cb)(ptr, &className);
                   if (resultPtr) {
                     break;
                   }
                 }
               }
               if (resultPtr) {
                 *resultClassInfo = PythonQt::priv()->getClassInfo(className);
               } else {
                 *resultClassInfo = this;
                 resultPtr = ptr;
               }
               return resultPtr;
             }
             PyObject* PythonQtClassInfo::findEnumWrapper(const QByteArray& name, PythonQtClassInfo* localScope, bool* isLocalEnum)
             {
               if (isLocalEnum) {
                 *isLocalEnum = true;
               }
               int scopePos = name.lastIndexOf("::");
               if (scopePos != -1) {
                 if (isLocalEnum) {
                   *isLocalEnum = false;
                 }
                 // split into scope and enum name
                 QByteArray enumScope = name.mid(0,scopePos);
                 QByteArray enumName = name.mid(scopePos+2);
                 PythonQtClassInfo* info = PythonQt::priv()->getClassInfo(enumScope);
                 if (info) {
                   return info->findEnumWrapper(enumName);
                 } else{
                   return NULL;
                 }
               }
               if (localScope) {
                 return localScope->findEnumWrapper(name);
               } else {
                 return NULL;
               }
             }
             void PythonQtClassInfo::createEnumWrappers(const QMetaObject* meta)
             {
               for (int i = meta->enumeratorOffset();i<meta->enumeratorCount();i++) {
                 QMetaEnum e = meta->enumerator(i);
                 PythonQtObjectPtr p;
                 p.setNewRef(PythonQtPrivate::createNewPythonQtEnumWrapper(e.name(), _pythonQtClassWrapper));
                 _enumWrappers.append(p);
               }
             }
             void PythonQtClassInfo::createEnumWrappers()
             {
               if (!_enumsCreated) {
                 _enumsCreated = true;
                 if (_meta) {
                   createEnumWrappers(_meta);
                 }
                 if (decorator()) {
                   createEnumWrappers(decorator()->metaObject());
                 }
                 foreach(const ParentClassInfo& info, _parentClasses) {
                   info._parent->createEnumWrappers();
                 }
               }
             }
             PyObject* PythonQtClassInfo::findEnumWrapper(const char* name) {
               // force enum creation
               if (!_enumsCreated) {
                 createEnumWrappers();
               }
               foreach(const PythonQtObjectPtr& p, _enumWrappers) {
                 const char* className = ((PyTypeObject*)p.object())->tp_name;
                 if (qstrcmp(className, name)==0) {
                   return p.object();
                 }
               }
               foreach(const ParentClassInfo& info, _parentClasses) {
                 PyObject* p = info._parent->findEnumWrapper(name);
                 if (p) return p;
               }
               return NULL;
             }

src/PythonQtDoc.h +1 -1

             #ifndef _PYTHONQTDOC_H
             #define _PYTHONQTDOC_H
             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtDoc.h
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-10
             */
             //----------------------------------------------------------------------------------
             /*!
               \if USE_GLOBAL_DOXYGEN_DOC
               \page PythonQtPage PythonQt Overview
               \else
               \mainpage PythonQt Overview
               \endif
              \section Introduction
              \b PythonQt is a dynamic Python (http://www.python.org) binding for Qt (http://www.qtsoftware.com).
              It offers an easy way to embed the Python scripting language into
              your Qt applications. It makes heavy use of the QMetaObject system and thus requires Qt4.x.
              The focus of PythonQt is on embedding Python into an existing C++ application, not on writing the whole
              application completely in Python. If you want to write your whole application in Python,
              you should use <a href="http://www.riverbankcomputing.co.uk/pyqt/">PyQt</a> instead.
              If you are looking for a simple way to embed Python objects into your C++/Qt Application
              and to script parts of your application via Python, PythonQt is the way to go!
              PythonQt is a stable library that was developed to make the
              Image Processing and Visualization platform MeVisLab (http://www.mevislab.de)
              scriptable from Python.
              \section Download
              PythonQt is hosted on SourceForge at http://sourceforge.net/projects/pythonqt , you can access it via SVN
              or download a tarball.
              \section Licensing
              PythonQt is distributed under the LGPL license, so it pairs well with the LGPL of the Qt 4.5 release and allows
              to be used in commercial applications when following the LGPL 2.1 obligations.
              \section LicensingWrapper Licensing of Wrapper Generator
              The build system of PythonQt makes use of a modified version of the GPL'ed QtScript generator,
              located in the "generator" directory.
              See http://labs.trolltech.com/page/Projects/QtScript/Generator for details on the original project.
              Thanks a lot to the QtJambi guys and the QtScript Generator project for the C++ parser and
              Qt typesystem files!
              The PythonQt wrappers generated by the generator located in the "generated_cpp" directory are distributed under the LGPL,
              they are not restriced by the GPL.
              The generated wrappers are pre-generated and checked-in for Qt 4.4.3, so you only need to build and run the
              generator when you want to build additional wrappers or you want to upgrade/downgrade to an newer Qt version.
              You may use the generator to generate C++ bindings for your own C++ classes (e.g. to make them deriveable in Python),
              , but this is currently not documented and involves creating your own typesystem files.
              \section Features
              The following are the built-in features of the PythonQt library:
              - Access all \b slots, \b properties, children and registered enums of any QObject derived class from Python
              - Connecting Qt Signals to Python functions (both from within Python and from C++)
              - Easy wrapping of Python objects from C++ with smart, reference-counting PythonQtObjectPtr.
              - Convenient conversions to/from QVariant for PythonQtObjectPtr.
              - Wrapping of C++ objects (which are not derived from QObject) via PythonQtCppWrapperFactory
              - Extending C++ and QObject derived classes with additional slots, static methods and constructors (see Decorators)
              - StdOut/Err redirection to Qt signals instead of cout
              - Interface for creating your own \c import replacement, so that Python scripts can be e.g. signed/verified before they are executed (PythonQtImportFileInterface)
              - Mapping of plain-old-datatypes and ALL QVariant types to and from Python
              - Support for wrapping of user QVariant types which are registerd via QMetaType
              - Support for Qt namespace (with all enumerators)
              - All PythonQt wrapped objects support the dir() statement, so that you can see easily which attributes a QObject, CPP object or QVariant has
              - No preprocessing/wrapping tool needs to be started, PythonQt can script any QObject without prior knowledge about it (except for the MetaObject information from the \b moc)
              - Multiple inheritance for C++ objects (e.g. a QWidget is derived from QObject and QPaintDevice, PythonQt will automatically cast a QWidget to a QPaintDevice when needed)
              - Polymorphic downcasting (if e.g. PythonQt sees a QEvent, it can downcast it depending on the type(), so the Python e.g. sees a QPaintEvent instead of a plain QEvent)
              - Deriving C++ objects from Python and overwriting virtual method with a Python implementation (requires usage of wrapper generator or manual work!)
              - Extensible handler for Python/C++ conversion of complex types, e.g. mapping of QVector<SomeObject> to/from a Python array
              \section FeaturesQtAll Features (with PythonQt_QtAll linked in)
              Thanks to the new wrapper generator, PythonQt now offers the additional PythonQt_QtAll library which wraps the complete Qt API, including all C++ classes and all non-slots on QObject derived classes.
              This offers the following features:
              - Complete Qt API wrapped and accessible
              - The following modules are available as submodule of the PythonQt module:
               - QtCore
               - QtGui
               - QtNetwork
               - QtOpenGL
               - QtSql
               - QtSvg
               - QtUiTools
               - QtWebKit
               - QtXml
               - QtXmlPatterns
               - (phonon, QtHelp, assistant, designer are currently not supported, this would require some additional effort on the code generator)
              - For convenience, all classes are also available in the PythonQt.Qt module, for people who do not care in which module a class is located
              - Any Qt class that has virtual methods can be easily derived from Python and the virtual methods can be reimplemented in Python
              - Polymorphic downcasting on QEvent, QGraphicsItem, QStyleOption, ...
              - Multiple inheritance support (e.g. QGraphicsTextItem is a QObject AND a QGraphicsItem, PythonQt will handle this well)
              \section Comparision Comparision with PyQt
              - PythonQt is not as Pythonic as PyQt in many details (e.g. operator mapping, pickling, translation support, ...) and it is mainly thought for embedding and intercommunication between Qt/Cpp and Python
              - PythonQt allows to communicate in both directions, e.g. calling a Python object from C++ AND calling a C++ method from Python, while PyQt only handles the Python->C++ direction
              - PythonQt offers properties as Python attributes, while PyQt offers them as setter/getter methods (e.g. QWidget.width is a property in PythonQt and a method in PyQt)
              - PythonQt does not support instanceof checks for Qt classes, except for the exact match and derived Python classes
-             - QObject.emit to emit Qt signals from Python is not yet implemented
+             - QObject.emit to emit Qt signals from Python is not yet implemented but PythonQt allows to just emit a signal by calling it
              - PythonQt does not offer to add new signals to Python/C++ objects
              - Ownership of objects is a bit different in PythonQt, currently Python classes derived from a C++ class need to be manually references in PythonQt to not get deleted too early (this will be fixed)
              - Probably there are lots of details that differ, I do not know PyQt that well to list them all.
              \section Interface
              The main interface to PythonQt is the PythonQt singleton.
              PythonQt needs to be initialized via PythonQt::init() once.
              Afterwards you communicate with the singleton via PythonQt::self().
              PythonQt offers a complete Qt binding, which
              needs to be enabled via PythonQt_QtAll::init().
              \section Datatype Datatype Mapping
               The following table shows the mapping between Python and Qt objects:
               <table>
               <tr><th>Qt/C++</th><th>Python</th></tr>
               <tr><td>bool</td><td>bool</td></tr>
               <tr><td>double</td><td>float</td></tr>
               <tr><td>float</td><td>float</td></tr>
               <tr><td>char/uchar,int/uint,short,ushort,QChar</td><td>integer</td></tr>
               <tr><td>long</td><td>integer</td></tr>
               <tr><td>ulong,longlong,ulonglong</td><td>long</td></tr>
               <tr><td>QString</td><td>unicode string</td></tr>
               <tr><td>QByteArray</td><td>str</td></tr>
               <tr><td>char*</td><td>str</td></tr>
               <tr><td>QStringList</td><td>tuple of unicode strings</td></tr>
               <tr><td>QVariantList</td><td>tuple of objects</td></tr>
               <tr><td>QVariantMap</td><td>dict of objects</td></tr>
               <tr><td>QVariant</td><td>depends on type, see below</td></tr>
               <tr><td>QSize, QRect and all other standard Qt QVariants</td><td>variant wrapper that supports complete API of the respective Qt classes</td></tr>
               <tr><td>OwnRegisteredMetaType</td><td>C++ wrapper, optionally with additional information/wrapping provided by registerCPPClass()</td></tr>
               <tr><td>QList<AnyObject*></td><td>converts to a list of CPP wrappers</td></tr>
               <tr><td>EnumType</td><td>integer (all enums that are known via the moc and the Qt namespace are supported)</td></tr>
               <tr><td>QObject (and derived classes)</td><td>QObject wrapper</td></tr>
               <tr><td>C++ object</td><td>CPP wrapper, either wrapped via PythonQtCppWrapperFactory or just decorated with decorators</td></tr>
               <tr><td>PyObject</td><td>PyObject</td></tr>
               </table>
               PyObject is passed as simple pointer, which allows to pass/return any Python Object directly to/from
               a Qt slot.
               QVariants are mapped recursively as given above, e.g. a dictionary can
               contain lists of dictionaries of doubles.
               For example a QVariant of type "String" is mapped to a python unicode string.
               All Qt QVariant types are implemented, PythonQt supports the complete Qt API for these object.
              \section QObject QObject Wrapping
              All classes derived from QObject are automatically wrapped with a python wrapper class
              when they become visible to the Python interpreter. This can happen via
              - the PythonQt::addObject() method
              - when a Qt \b slot returns a QObject derived object to python
              - when a Qt \b signal contains a QObject and is connected to a python function
              It is important that you call PythonQt::registerClass() for any QObject derived class
              that may become visible to Python, except when you add it via PythonQt::addObject().
              This will register the complete parent hierachy of the registered class, so that
              when you register e.g. a QPushButton, QWidget will be registered as well (and all intermediate
              parents).
              From Python, you can talk to the returned QObjects in a natural way by calling
              their slots and receiving the return values. You can also read/write all
              properties of the objects as if they where normal python properties.
              In addition to this, the wrapped objects support
              - className() - returns a string that reprents the classname of the QObject
              - help() - shows all properties, slots, enums, decorator slots and constructors of the object, in a printable form
              - delete() - deletes the object (use with care, especially if you passed the ownership to C++)
              - connect(signal, function) - connect the signal of the given object to a python function
              - connect(signal, qobject, slot) - connect the signal of the given object to a slot of another QObject
              - disconnect(signal, function) - disconnect the signal of the given object from a python function
              - disconnect(signal, qobject, slot) - disconnect the signal of the given object from a slot of another QObject
              - children() - returns the children of the object
              - setParent(QObject) - set the parent
              - QObject* parent() - get the parent
              The below example shows how to connect signals in Python:
              \code
              # define a signal handler function
              def someFunction(flag):
                print flag
              # button1 is a QPushButton that has been added to Python via addObject()
              # connect the clicked signal to a python function:
              button1.connect("clicked(bool)", someFunction)
              \endcode
             \section CPP CPP Wrapping
             You can create dedicated wrapper QObjects for any C++ class. This is done by deriving from PythonQtCppWrapperFactory
             and adding your factory via addWrapperFactory().
             Whenever PythonQt encounters a CPP pointer (e.g. on a slot or signal)
             and it does not known it as a QObject derived class, it will create a generic CPP wrapper. So even unknown C++ objects
             can be passed through Python. If the wrapper factory supports the CPP class, a QObject wrapper will be created for each
             instance that enters Python. An alternative to a complete wrapper via the wrapper factory are decorators, see \ref Decorators
             \section MetaObject Meta Object/Class access
             For each known C++ class, PythonQt provides a Python class. These classes are visible
             inside of the "PythonQt" python module or in subpackages if a package is given when the class is registered.
             A Meta class supports:
             - access to all declared enum values
             - constructors
             - static methods
             - unbound non-static methods
             - help() and className()
             From within Python, you can import the module "PythonQt" to access these classes and the Qt namespace.
             \code
             from PythonQt import QtCore
             # namespace access:
             print QtCore.Qt.AlignLeft
             # constructors
             a = QtCore.QSize(12,13)
             b = QtCore.QFont()
             # static method
             QtCore.QDate.currentDate()
             # enum value
             QtCore.QFont.UltraCondensed
             \endcode
             \section Decorators Decorator slots
             PythonQt introduces a new generic approach to extend any wrapped QObject or CPP object with
             - constructors
             - destructors (for CPP objects)
             - additional slots
             - static slots (callable on both the Meta object and the instances)
             The idea behind decorators is that we wanted to make it as easy as possible to extend
             wrapped objects. Since we already have an implementation for invoking any Qt Slot from
             Python, it looked promising to use this approach for the extension of wrapped objects as well.
             This avoids that the PythonQt user needs to care about how Python arguments are mapped from/to
             Qt when he wants to create static methods, constructors and additional member functions.
             The basic idea about decorators is to create a QObject derived class that implements slots
             which take one of the above roles (e.g. constructor, destructor etc.) via a naming convention.
             These slots are then assigned to other classes via the naming convention.
             - SomeClassName* new_SomeClassName(...) - defines a constructor for "SomeClassName" that returns a new object of type SomeClassName (where SomeClassName can be any CPP class, not just QObject classes)
             - void delete_SomeClassName(SomeClassName* o) - defines a destructor, which should delete the passed in object o
             - anything static_SomeClassName_someMethodName(...) - defines a static method that is callable on instances and the meta class
             - anything someMethodName(SomeClassName* o, ...) - defines a slot that will be available on SomeClassName instances (and derived instances). When such a slot is called the first argument is the pointer to the instance and the rest of the arguments can be used to make a call on the instance.
             The below example shows all kinds of decorators in action:
             \code
             // an example CPP object
             class YourCPPObject {
             public:
               YourCPPObject(int arg1, float arg2) { a = arg1; b = arg2; }
               float doSomething(int arg1) { return arg1*a*b; };
               private:
               int a;
               float b;
             };
             // an example decorator
             class ExampleDecorator : public QObject
             {
               Q_OBJECT
             public slots:
               // add a constructor to QSize that takes a QPoint
               QSize* new_QSize(const QPoint& p) { return new QSize(p.x(), p.y()); }
               // add a constructor for QPushButton that takes a text and a parent widget
               QPushButton* new_QPushButton(const QString& text, QWidget* parent=NULL) { return new QPushButton(text, parent); }
               // add a constructor for a CPP object
               YourCPPObject* new_YourCPPObject(int arg1, float arg2) { return new YourCPPObject(arg1, arg2); }
               // add a destructor for a CPP object
               void delete_YourCPPObject(YourCPPObject* obj) { delete obj; }
               // add a static method to QWidget
               QWidget* static_QWidget_mouseGrabber() { return QWidget::mouseGrabber(); }
               // add an additional slot to QWidget (make move() callable, which is not declared as a slot in QWidget)
               void move(QWidget* w, const QPoint& p) { w->move(p); }
               // add an additional slot to QWidget, overloading the above move method
               void move(QWidget* w, int x, int y) { w->move(x,y); }
               // add a method to your own CPP object
               int doSomething(YourCPPObject* obj, int arg1) { return obj->doSomething(arg1); }
             };
             ...
             PythonQt::self()->addDecorators(new ExampleDecorator());
             PythonQt::self()->registerCPPClass("YourCPPObject");
             \endcode
             After you have registered an instance of the above ExampleDecorator, you can do the following from Python
             (all these calls are mapped to the above decorator slots):
             \code
             from PythonQt import QtCore, QtGui, YourCPPObject
             # call our new constructor of QSize
             size = QtCore.QSize(QPoint(1,2));
             # call our new QPushButton constructor
             button = QtGui.QPushButton("sometext");
             # call the move slot (overload1)
             button.move(QPoint(0,0))
             # call the move slot (overload2)
             button.move(0,0)
             # call the static method
             grabber = QtGui.QWidget.mouseWrapper();
             # create a CPP object via constructor
             yourCpp = YourCPPObject(1,11.5)
             # call the wrapped method on CPP object
             print yourCpp.doSomething(1);
             # destructor will be called:
             yourCpp = None
             \endcode
              \section Building
              PythonQt requires at least Qt 4.2.2 (or higher) and Python 2.3, 2.4, 2.5 or 2.6 on Windows, Linux and MacOS X. It has not yet been tested with Python 3.x, but it should only require minor changes.
              To compile PythonQt, you will need a python developer installation which includes Python's header files and
             the python2x.[lib | dll | so | dynlib].
              The build scripts a currently set to use Python 2.5.
              You may need to tweak the \b build/python.prf file to set the correct Python includes and libs on your system.
              \subsection Windows
              On Windows, the (non-source) Python Windows installer can be used.
              Make sure that you use the same compiler, the current Python distribution is built
              with Visual Studio 2003. If you want to use another compiler, you will need to build
              Python yourself, using your compiler.
              To build PythonQt, you need to set the environment variable \b PYTHON_PATH to point to the root
              dir of the python installation and \b PYTHON_LIB to point to
              the directory where the python lib file is located.
              When using the prebuild Python installer, this will be:
              \code
              > set PYTHON_PATH = c:\Python25
              > set PYTHON_LIB  = c:\Python25\libs
              \endcode
              When using the python sources, this will be something like:
              \code
               > set PYTHON_PATH = c:\yourDir\Python-2.5.1\
               > set PYTHON_LIB  = c:\yourDir\Python-2.5.1\PCbuild8\Win32
              \endcode
              To build all, do the following (after setting the above variables):
              \code
              > cd PythonQtRoot
              > vcvars32
              > qmake
              > nmake
              \endcode
              This should build everything. If Python can not be linked or include files can not be found,
              you probably need to tweak \b build/python.prf
              The tests and examples are located in PythonQt/lib.
              \subsection Linux
              On Linux, you need to install a Python-dev package.
              If Python can not be linked or include files can not be found,
              you probably need to tweak \b build/python.prf
              To build PythonQt, just do a:
              \code
              > cd PythonQtRoot
              > qmake
              > make all
              \endcode
              The tests and examples are located in PythonQt/lib.
              You should add PythonQt/lib to your LD_LIBRARY_PATH so that the runtime
              linker can find the *.so files.
              \subsection MacOsX
              On Mac, Python is installed as a Framework, so you should not need to install it.
              To build PythonQt, just do a:
              \code
              > cd PythonQtRoot
              > qmake
              > make all
              \endcode
              \section Tests
              There is a unit test that tests most features of PythonQt, see the \b tests subdirectory for details.
              \section Examples
              Examples are available in the \b examples directory. The PyScriptingConsole implements a simple
              interactive scripting console that shows how to script a simple application.
              The following shows how to integrate PythonQt into you Qt application:
              \code
              #include "PythonQt.h"
              #include <QApplication>
              ...
              int main( int argc, char **argv )
              {
               QApplication qapp(argc, argv);
               // init PythonQt and Python itself
               PythonQt::init(PythonQt::IgnoreSiteModule | PythonQt::RedirectStdOut);
               // get a smart pointer to the __main__ module of the Python interpreter
               PythonQtObjectPtr mainContext = PythonQt::self()->getMainModule();
               // add a QObject as variable of name "example" to the namespace of the __main__ module
               PyExampleObject example;
               PythonQt::self()->addObject(mainContext, "example", &example);
               // do something
               PythonQt::self()->runScript(mainContext, "print example\n");
               PythonQt::self()->runScript(mainContext, "def multiply(a,b):\n  return a*b;\n");
               QVariantList args;
               args << 42 << 47;
               QVariant result = PythonQt::self()->call(mainContext,"multiply", args);
               ...
              \endcode
             */

src/PythonQtMethodInfo.cpp +30 -7

             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtMethodInfo.cpp
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtMethodInfo.h"
             #include "PythonQtClassInfo.h"
             #include <iostream>
             QHash<QByteArray, PythonQtMethodInfo*> PythonQtMethodInfo::_cachedSignatures;
             QHash<QByteArray, QByteArray> PythonQtMethodInfo::_parameterNameAliases;
             PythonQtMethodInfo::PythonQtMethodInfo(const QMetaMethod& meta, PythonQtClassInfo* classInfo)
             {
             #ifdef PYTHONQT_DEBUG
               QByteArray sig(meta.signature());
               sig = sig.mid(sig.indexOf('('));
               QByteArray fullSig = QByteArray(meta.typeName()) + " " + sig;
               std::cout << "caching " << fullSig.data() << std::endl;
             #endif
               ParameterInfo type;
               fillParameterInfo(type, QByteArray(meta.typeName()), classInfo);
               _parameters.append(type);
-              QByteArray name;
               QList<QByteArray> names = meta.parameterTypes();
-              foreach (name, names) {
+              foreach (const QByteArray& name, names) {
                 fillParameterInfo(type, name, classInfo);
                 _parameters.append(type);
               }
             }
+            PythonQtMethodInfo::PythonQtMethodInfo(const QByteArray& typeName, const QList<QByteArray>& args)
+            {
+              ParameterInfo type;
+              fillParameterInfo(type, typeName, NULL);
+              _parameters.append(type);
+              foreach (const QByteArray& name, args) {
+                fillParameterInfo(type, name, NULL);
+                _parameters.append(type);
+              }
+            }
             const PythonQtMethodInfo* PythonQtMethodInfo::getCachedMethodInfo(const QMetaMethod& signal, PythonQtClassInfo* classInfo)
             {
               QByteArray sig(signal.signature());
               sig = sig.mid(sig.indexOf('('));
               QByteArray fullSig = QByteArray(signal.typeName()) + " " + sig;
               PythonQtMethodInfo* result = _cachedSignatures.value(fullSig);
               if (!result) {
                 result = new PythonQtMethodInfo(signal, classInfo);
                 _cachedSignatures.insert(fullSig, result);
               }
               return result;
             }
-            const PythonQtMethodInfo* PythonQtMethodInfo::getCachedMethodInfoFromMetaObjectAndSignature(const QMetaObject* metaObject, const char* signature)
+            const PythonQtMethodInfo* PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(int numArgs, const char** args)
             {
-              QByteArray sig = QMetaObject::normalizedSignature(signature);
+              QByteArray typeName = args[0];
-              int idx = metaObject->indexOfMethod(sig);
+              QList<QByteArray> arguments;
-              QMetaMethod meta = metaObject->method(idx);
+              QByteArray fullSig = typeName;
-              return PythonQtMethodInfo::getCachedMethodInfo(meta, NULL);
+              fullSig += "(";
+              for (int i =1;i<numArgs; i++) {
+                if (i>1) {
+                  fullSig += ",";
+                }
+                arguments << QByteArray(args[i]);
+              }
+              fullSig += ")";
+              PythonQtMethodInfo* result = _cachedSignatures.value(fullSig);
+              if (!result) {
+                result = new PythonQtMethodInfo(typeName, arguments);
+                _cachedSignatures.insert(fullSig, result);
+              }
+              return result;
             }
             void PythonQtMethodInfo::fillParameterInfo(ParameterInfo& type, const QByteArray& orgName, PythonQtClassInfo* classInfo)
             {
               QByteArray name = orgName;
               type.enumWrapper = NULL;
               int len = name.length();
               if (len>0) {
                 if (strncmp(name.constData(), "const ", 6)==0) {
                   name = name.mid(6);
                   len -= 6;
                   type.isConst = true;
                 } else {
                   type.isConst = false;
                 }
                 bool hadPointer   = false;
                 bool hadReference = false;
                 // remove * and & from the end of the string, handle & and * the same way
                 while (name.at(len-1) == '*') {
                   len--;
                   hadPointer = true;
                 }
                 while (name.at(len-1) == '&') {
                   len--;
                   hadReference = true;
                 }
                 if (len!=name.length()) {
                   name = name.left(len);
                 }
                 type.isPointer = hadPointer;
                 QByteArray alias = _parameterNameAliases.value(name);
                 if (!alias.isEmpty()) {
                   name = alias;
                 }
                 type.typeId = nameToType(name);
                 if (!type.isPointer && type.typeId == Unknown) {
                   type.typeId = QMetaType::type(name.constData());
                   if (type.typeId == QMetaType::Void) {
                     type.typeId = Unknown;
                   }
                 }
                 type.name = name;
                 if (type.typeId == PythonQtMethodInfo::Unknown || type.typeId >= QMetaType::User) {
                   bool isLocalEnum;
                   // TODOXXX: make use of this flag!
                   type.enumWrapper = PythonQtClassInfo::findEnumWrapper(type.name, classInfo, &isLocalEnum);
                 }
               } else {
                 type.typeId = QMetaType::Void;
                 type.isPointer = false;
                 type.isConst = false;
               }
             }
             int PythonQtMethodInfo::nameToType(const char* name)
             {
               if (_parameterTypeDict.isEmpty()) {
                 // we could also use QMetaType::nameToType, but that does a string compare search
                 // and does not support QVariant
                 // QMetaType names
                 _parameterTypeDict.insert("long", QMetaType::Long);
                 _parameterTypeDict.insert("int", QMetaType::Int);
                 _parameterTypeDict.insert("short", QMetaType::Short);
                 _parameterTypeDict.insert("char", QMetaType::Char);
                 _parameterTypeDict.insert("ulong", QMetaType::ULong);
                 _parameterTypeDict.insert("unsigned long", QMetaType::ULong);
                 _parameterTypeDict.insert("uint", QMetaType::UInt);
                 _parameterTypeDict.insert("unsigned int", QMetaType::UInt);
                 _parameterTypeDict.insert("ushort", QMetaType::UShort);
                 _parameterTypeDict.insert("unsigned short", QMetaType::UShort);
                 _parameterTypeDict.insert("uchar", QMetaType::UChar);
                 _parameterTypeDict.insert("unsigned char", QMetaType::UChar);
                 _parameterTypeDict.insert("bool", QMetaType::Bool);
                 _parameterTypeDict.insert("float", QMetaType::Float);
                 _parameterTypeDict.insert("double", QMetaType::Double);
                 _parameterTypeDict.insert("qreal", QMetaType::Double);
                 _parameterTypeDict.insert("QChar", QMetaType::QChar);
                 _parameterTypeDict.insert("QByteArray", QMetaType::QByteArray);
                 _parameterTypeDict.insert("Q3CString", QMetaType::QByteArray);
                 _parameterTypeDict.insert("QString", QMetaType::QString);
                 _parameterTypeDict.insert("", QMetaType::Void);
                 _parameterTypeDict.insert("void", QMetaType::Void);
                 // QVariant names
                 _parameterTypeDict.insert("Q_LLONG", QMetaType::LongLong);
                 _parameterTypeDict.insert("Q_ULLONG", QMetaType::ULongLong);
                 _parameterTypeDict.insert("qlonglong", QMetaType::LongLong);
                 _parameterTypeDict.insert("qulonglong", QMetaType::ULongLong);
                 _parameterTypeDict.insert("qint64", QMetaType::LongLong);
                 _parameterTypeDict.insert("quint64", QMetaType::ULongLong);
                 _parameterTypeDict.insert("QIconSet", QMetaType::QIcon);
                 _parameterTypeDict.insert("QVariantMap", QMetaType::QVariantMap);
                 _parameterTypeDict.insert("QVariantList", QMetaType::QVariantList);
                 _parameterTypeDict.insert("QMap<QString,QVariant>", QMetaType::QVariantMap);
                 _parameterTypeDict.insert("QList<QVariant>", QMetaType::QVariantList);
                 _parameterTypeDict.insert("QStringList", QMetaType::QStringList);
                 _parameterTypeDict.insert("QBitArray", QMetaType::QBitArray);
                 _parameterTypeDict.insert("QDate", QMetaType::QDate);
                 _parameterTypeDict.insert("QTime", QMetaType::QTime);
                 _parameterTypeDict.insert("QDateTime", QMetaType::QDateTime);
                 _parameterTypeDict.insert("QUrl", QMetaType::QUrl);
                 _parameterTypeDict.insert("QLocale", QMetaType::QLocale);
                 _parameterTypeDict.insert("QRect", QMetaType::QRect);
                 _parameterTypeDict.insert("QRectf", QMetaType::QRectF);
                 _parameterTypeDict.insert("QSize", QMetaType::QSize);
                 _parameterTypeDict.insert("QSizef", QMetaType::QSizeF);
                 _parameterTypeDict.insert("QLine", QMetaType::QLine);
                 _parameterTypeDict.insert("QLinef", QMetaType::QLineF);
                 _parameterTypeDict.insert("QPoint", QMetaType::QPoint);
                 _parameterTypeDict.insert("QPointf", QMetaType::QPointF);
                 _parameterTypeDict.insert("QRegExp", QMetaType::QRegExp);
             //    _parameterTypeDict.insert("QColorGroup", QMetaType::QColorGroup);
                 _parameterTypeDict.insert("QFont", QMetaType::QFont);
                 _parameterTypeDict.insert("QPixmap", QMetaType::QPixmap);
                 _parameterTypeDict.insert("QBrush", QMetaType::QBrush);
                 _parameterTypeDict.insert("QColor", QMetaType::QColor);
                 _parameterTypeDict.insert("QCursor", QMetaType::QCursor);
                 _parameterTypeDict.insert("QPalette", QMetaType::QPalette);
                 _parameterTypeDict.insert("QIcon", QMetaType::QIcon);
                 _parameterTypeDict.insert("QImage", QMetaType::QPolygon);
                 _parameterTypeDict.insert("QRegion", QMetaType::QRegion);
                 _parameterTypeDict.insert("QBitmap", QMetaType::QBitmap);
                 _parameterTypeDict.insert("QSizePolicy", QMetaType::QSizePolicy);
                 _parameterTypeDict.insert("QKeySequence", QMetaType::QKeySequence);
                 _parameterTypeDict.insert("QPen", QMetaType::QPen);
                 _parameterTypeDict.insert("QTextLength", QMetaType::QTextLength);
                 _parameterTypeDict.insert("QTextFormat", QMetaType::QTextFormat);
                 _parameterTypeDict.insert("QMatrix", QMetaType::QMatrix);
                 _parameterTypeDict.insert("QVariant", PythonQtMethodInfo::Variant);
                 // own special types... (none so far, could be e.g. ObjectList
               }
               QHash<QByteArray, int>::const_iterator it = _parameterTypeDict.find(name);
               if (it!=_parameterTypeDict.end()) {
                 return it.value();
               } else {
                 return PythonQtMethodInfo::Unknown;
               }
             }
             void PythonQtMethodInfo::cleanupCachedMethodInfos()
             {
               QHashIterator<QByteArray, PythonQtMethodInfo *> i(_cachedSignatures);
               while (i.hasNext()) {
                 delete i.next().value();
               }
             }
             void PythonQtMethodInfo::addParameterTypeAlias(const QByteArray& alias, const QByteArray& name)
             {
               _parameterNameAliases.insert(alias, name);
             }
             //-------------------------------------------------------------------------------------------------
             void PythonQtSlotInfo::deleteOverloadsAndThis()
             {
               PythonQtSlotInfo* cur = this;
               while(cur->nextInfo()) {
                 PythonQtSlotInfo* next = cur->nextInfo();
                 delete cur;
                 cur = next;
               }
             }
             QString PythonQtSlotInfo::fullSignature()
             {
               bool skipFirstArg = isInstanceDecorator();
               QString result = _meta.typeName();
               QByteArray sig = slotName();
               QList<QByteArray> names = _meta.parameterNames();
               bool isStatic = false;
               bool isConstructor = false;
               bool isDestructor = false;
               if (_type == ClassDecorator) {
                 if (sig.startsWith("new_")) {
                   sig = sig.mid(strlen("new_"));
                   isConstructor = true;
                 } else if (sig.startsWith("delete_")) {
                   sig = sig.mid(strlen("delete_"));
                   isDestructor = true;
                 } else if(sig.startsWith("static_")) {
                   isStatic = true;
                   sig = sig.mid(strlen("static_"));
                   int idx = sig.indexOf("_");
                   if (idx>=0) {
                     sig = sig.mid(idx+1);
                   }
                 }
               }
               result += QByteArray(" ") + sig;
               result += "(";
               int lastEntry = _parameters.count()-1;
               for (int i = skipFirstArg?2:1; i<_parameters.count(); i++) {
                 if (_parameters.at(i).isConst) {
                   result += "const ";
                 }
                 result += _parameters.at(i).name;
                 if (_parameters.at(i).isPointer) {
                   result += "*";
                 }
                 if (!names.at(i-1).isEmpty()) {
                   result += " ";
                   result += names.at(i-1);
                 }
                 if (i!=lastEntry) {
                   result += ", ";
                 }
               }
               result += ")";
               if (isStatic) {
                 result = QString("static ") + result;
               }
               if (isConstructor) {
             //    result = QString("constructor ") + result;
               }
               if (isDestructor) {
                 result = QString("~") + result;
               }
               return result;
             }
             QByteArray PythonQtSlotInfo::slotName()
             {
               QByteArray sig(_meta.signature());
               int idx = sig.indexOf('(');
               sig = sig.left(idx);
               return sig;
             }

src/PythonQtMethodInfo.h +3 -2

             #ifndef _PYTHONQTMETHODINFO_H
             #define _PYTHONQTMETHODINFO_H
             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtMethodInfo.h
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtSystem.h"
             #include <QByteArray>
             #include <QHash>
             #include <QList>
             #include <QMetaMethod>
             class PythonQtClassInfo;
             struct _object;
             typedef struct _object PyObject;
             //! stores information about a specific signal/slot/method
             class PYTHONQT_EXPORT PythonQtMethodInfo
             {
             public:
               enum ParameterType {
                 Unknown = -1,
                 Variant = -2
               };
               //! stores the QVariant id (if available) and the name of the type
               struct ParameterInfo {
                 QByteArray name;
                 PyObject*  enumWrapper; // if it is an enum, a pointer to the enum wrapper
                 int typeId; // a mixture from QMetaType and ParameterType
                 bool isPointer;
                 bool isConst;
               };
               PythonQtMethodInfo() {};
               ~PythonQtMethodInfo() {};
               PythonQtMethodInfo(const QMetaMethod& meta, PythonQtClassInfo* classInfo);
+              PythonQtMethodInfo(const QByteArray& typeName, const QList<QByteArray>& args);
               PythonQtMethodInfo(const PythonQtMethodInfo& other) {
                 _parameters = other._parameters;
               }
               //! returns the method info of the signature, uses a cache internally to speed up
               //! multiple requests for the same method, classInfo is passed to allow local enum resolution (if NULL is passed, no local enums are recognized)
               static const PythonQtMethodInfo* getCachedMethodInfo(const QMetaMethod& method, PythonQtClassInfo* classInfo);
-              //! get the cached method info by finding the meta method on the meta object via its signature, enums are only supported with leading namespace::
+              //! get the cached method info using the passed in list of return value and arguments, return value needs to be passed as first arg
-              static const PythonQtMethodInfo* getCachedMethodInfoFromMetaObjectAndSignature(const QMetaObject* metaObject, const char* signature);
+              static const PythonQtMethodInfo* getCachedMethodInfoFromArgumentList(int numArgs, const char** args);
               //! cleanup the cache
               static void cleanupCachedMethodInfos();
               //! returns the number of parameters including the return value
               int  parameterCount() const { return _parameters.size(); };
               //! returns the id for the given type (using an internal dictionary)
               static int nameToType(const char* name);
               //! get the parameter infos
               const QList<ParameterInfo>& parameters() const { return _parameters; }
               //! add an alias for a typename, e.g. QObjectList and QList<QObject*>.
               static void addParameterTypeAlias(const QByteArray& alias, const QByteArray& name);
               protected:
               static void fillParameterInfo(ParameterInfo& type, const QByteArray& name, PythonQtClassInfo* classInfo);
               static QHash<QByteArray, int> _parameterTypeDict;
               static QHash<QByteArray, QByteArray> _parameterNameAliases;
               //! stores the cached signatures of methods to speedup mapping from Qt to Python types
               static QHash<QByteArray, PythonQtMethodInfo*> _cachedSignatures;
               QList<ParameterInfo> _parameters;
             };
             //! stores information about a slot, including a next pointer to overloaded slots
             class PythonQtSlotInfo : public PythonQtMethodInfo
             {
             public:
               enum Type {
                 MemberSlot, InstanceDecorator, ClassDecorator
               };
               PythonQtSlotInfo(const PythonQtSlotInfo& info):PythonQtMethodInfo() {
                 _meta = info._meta;
                 _parameters = info._parameters;
                 _slotIndex = info._slotIndex;
                 _next = NULL;
                 _decorator = info._decorator;
                 _type = info._type;
                 _upcastingOffset = 0;
               }
               PythonQtSlotInfo(PythonQtClassInfo* classInfo, const QMetaMethod& meta, int slotIndex, QObject* decorator = NULL, Type type = MemberSlot ):PythonQtMethodInfo()
               {
                 const PythonQtMethodInfo* info = getCachedMethodInfo(meta, classInfo);
                 _meta = meta;
                 _parameters = info->parameters();
                 _slotIndex = slotIndex;
                 _next = NULL;
                 _decorator = decorator;
                 _type = type;
                 _upcastingOffset = 0;
               }
             public:
               void deleteOverloadsAndThis();
               const QMetaMethod* metaMethod() const { return &_meta; }
               void setUpcastingOffset(int upcastingOffset) { _upcastingOffset = upcastingOffset; }
               int upcastingOffset() const { return _upcastingOffset; }
               //! get the index of the slot (needed for qt_metacall)
               int slotIndex() const { return _slotIndex; }
               //! get next overloaded slot (which has the same name)
               PythonQtSlotInfo* nextInfo()  const { return _next; }
               //! set the next overloaded slot
               void setNextInfo(PythonQtSlotInfo* next) { _next = next; }
               //! returns if the slot is a decorator slot
               bool isInstanceDecorator() { return _decorator!=NULL && _type == InstanceDecorator; }
               //! returns if the slot is a constructor slot
               bool isClassDecorator() { return _decorator!=NULL && _type == ClassDecorator; }
               QObject* decorator() { return _decorator; }
               //! get the full signature including return type
               QString fullSignature();
               //! get the short slot name
               QByteArray slotName();
             private:
               int               _slotIndex;
               PythonQtSlotInfo* _next;
               QObject*          _decorator;
               Type              _type;
               QMetaMethod       _meta;
               int               _upcastingOffset;
             };
             #endif

src/PythonQtSignalReceiver.cpp +2 -9

             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtSignalReceiver.cpp
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2006-05
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtSignalReceiver.h"
             #include "PythonQtClassInfo.h"
             #include "PythonQtMethodInfo.h"
             #include "PythonQtConversion.h"
             #include <QMetaObject>
             #include <QMetaMethod>
             #include "funcobject.h"
             void PythonQtSignalTarget::call(void **arguments) const {
-              PyObject* result = call(_callable, methodInfo(), arguments, false);
+              PyObject* result = call(_callable, methodInfo(), arguments);
               if (result) {
                 Py_DECREF(result);
               }
             }
             PyObject* PythonQtSignalTarget::call(PyObject* callable, const PythonQtMethodInfo* methodInfos, void **arguments, bool skipFirstArgumentOfMethodInfo)
             {
               // Note: we check if the callable is a PyFunctionObject and has a fixed number of arguments
               // if that is the case, we only pass these arguments to python and skip the additional arguments from the signal
               int numPythonArgs = -1;
               if (PyFunction_Check(callable)) {
                 PyObject* o = callable;
                 PyFunctionObject* func = (PyFunctionObject*)o;
                 PyCodeObject* code = (PyCodeObject*)func->func_code;
                 if (!(code->co_flags & 0x04)) {
                   numPythonArgs = code->co_argcount;
                 } else {
                   // variable numbers of arguments allowed
                 }
               } else if (PyMethod_Check(callable)) {
                 PyObject* o = callable;
                 PyMethodObject* method = (PyMethodObject*)o;
                 if (PyFunction_Check(method->im_func)) {
                   PyFunctionObject* func = (PyFunctionObject*)method->im_func;
                   PyCodeObject* code = (PyCodeObject*)func->func_code;
                   if (!(code->co_flags & 0x04)) {
                     numPythonArgs = code->co_argcount - 1; // we subtract one because the first is "self"
                   } else {
                     // variable numbers of arguments allowed
                   }
                 }
               }
               const PythonQtMethodInfo* m = methodInfos;
               // parameterCount includes return value:
               int count = m->parameterCount();
-              if (skipFirstArgumentOfMethodInfo) {
-                count--;
               if (numPythonArgs!=-1) {
                 if (count>numPythonArgs+1) {
                   // take less arguments
                   count = numPythonArgs+1;
                 }
               }
               PyObject* pargs = NULL;
               if (count>1) {
                 pargs = PyTuple_New(count-1);
               }
               bool err = false;
               // transform Qt values to Python
               const QList<PythonQtMethodInfo::ParameterInfo>& params = m->parameters();
-              int skipFirstOffset = 0;
-              if (skipFirstArgumentOfMethodInfo) {
-                skipFirstOffset = 1;
               for (int i = 1; i < count; i++) {
-                const PythonQtMethodInfo::ParameterInfo& param = params.at(i + skipFirstOffset);
+                const PythonQtMethodInfo::ParameterInfo& param = params.at(i);
                 PyObject* arg = PythonQtConv::ConvertQtValueToPython(param, arguments[i]);
                 if (arg) {
                   // steals reference, no unref
                   PyTuple_SetItem(pargs, i-1,arg);
                 } else {
                   err = true;
                   break;
                 }
               }
               PyObject* result = NULL;
               if (!err) {
                 PyErr_Clear();
                 result = PyObject_CallObject(callable, pargs);
                 if (result) {
                   // ok
                 } else {
                   PythonQt::self()->handleError();
                 }
               }
               if (pargs) {
                 // free the arguments again
                 Py_DECREF(pargs);
               }
               return result;
             }
             //------------------------------------------------------------------------------
             PythonQtSignalReceiver::PythonQtSignalReceiver(QObject* obj):PythonQtSignalReceiverBase(obj)
             {
               _obj = obj;
               // fetch the class info for object, since we will need to for correct enum resolution in
               // signals
               _objClassInfo = PythonQt::priv()->getClassInfo(obj->metaObject());
               if (!_objClassInfo || !_objClassInfo->isQObject()) {
                 PythonQt::self()->registerClass(obj->metaObject());
                 _objClassInfo = PythonQt::priv()->getClassInfo(obj->metaObject());
               }
               // force decorator/enum creation
               _objClassInfo->decorator();
               _slotCount = staticMetaObject.methodOffset();
             }
             PythonQtSignalReceiver::~PythonQtSignalReceiver()
             {
               PythonQt::priv()->removeSignalEmitter(_obj);
             }
             bool PythonQtSignalReceiver::addSignalHandler(const char* signal, PyObject* callable)
             {
               bool flag = false;
               int sigId = getSignalIndex(signal);
               if (sigId>=0) {
                 // create PythonQtMethodInfo from signal
                 QMetaMethod meta = _obj->metaObject()->method(sigId);
                 const PythonQtMethodInfo* signalInfo = PythonQtMethodInfo::getCachedMethodInfo(meta, _objClassInfo);
                 PythonQtSignalTarget t(sigId, signalInfo, _slotCount, callable);
                 _targets.append(t);
                 // now connect to ourselves with the new slot id
                 QMetaObject::connect(_obj, sigId, this, _slotCount, Qt::AutoConnection, 0);
                 _slotCount++;
                 flag = true;
               }
               return flag;
             }
             bool PythonQtSignalReceiver::removeSignalHandler(const char* signal, PyObject* callable)
             {
               bool found = false;
               int sigId = getSignalIndex(signal);
               if (sigId>=0) {
                 QMutableListIterator<PythonQtSignalTarget> i(_targets);
                 while (i.hasNext()) {
                   if (i.next().isSame(sigId, callable)) {
                     i.remove();
                     found = true;
                     break;
                   }
                 }
               }
               return found;
             }
             void PythonQtSignalReceiver::removeSignalHandlers()
             {
               _targets.clear();
             }
             int PythonQtSignalReceiver::getSignalIndex(const char* signal)
             {
               int sigId = _obj->metaObject()->indexOfSignal(signal+1);
               if (sigId<0) {
                 QByteArray tmpSig = QMetaObject::normalizedSignature(signal+1);
                 sigId = _obj->metaObject()->indexOfSignal(tmpSig);
               }
               return sigId;
             }
             int PythonQtSignalReceiver::qt_metacall(QMetaObject::Call c, int id, void **arguments)
             {
             //  mlabDebugConst("PythonQt", "PythonQtSignalReceiver invoke " << _obj->className() << " " << _obj->name() << " " << id);
               if (c != QMetaObject::InvokeMetaMethod) {
                 QObject::qt_metacall(c, id, arguments);
               }
               bool found = false;
               foreach(const PythonQtSignalTarget& t, _targets) {
                 if (t.slotId() == id) {
                   found = true;
                   t.call(arguments);
                   break;
                 }
               }
               return 0;
             }

src/PythonQtStdDecorators.h +22 0

             #ifndef _PYTHONQTSTDDECORATORS_H
             #define _PYTHONQTSTDDECORATORS_H
             /*
              *
              *  Copyright (C) 2006 MeVis Research GmbH 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 Research GmbH, Universitaetsallee 29,
              *  28359 Bremen, Germany or:
              *
              *  http://www.mevis.de
              *
              */
             //----------------------------------------------------------------------------------
             /*!
             // \file    PythonQtStdDecorators.h
             // \author  Florian Link
             // \author  Last changed by $Author: florian $
             // \date    2007-04
             */
             //----------------------------------------------------------------------------------
             #include "PythonQtSystem.h"
             #include <Python.h>
             #include <QObject>
             #include <QVariantList>
             #include <QTextDocument>
             #include <QColor>
             #include <QDateTime>
             #include <QDate>
             #include <QTime>
             class PYTHONQT_EXPORT PythonQtStdDecorators : public QObject
             {
               Q_OBJECT
             public slots:
               bool connect(QObject* sender, const QByteArray& signal, PyObject* callable);
               bool connect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
               bool disconnect(QObject* sender, const QByteArray& signal, PyObject* callable);
               bool disconnect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
             #undef emit
               void emit(QObject* sender, const QByteArray& signal, PyObject* arg1 = NULL,PyObject* arg2 = NULL,
                         PyObject* arg3 = NULL,PyObject* arg4 = NULL,PyObject* arg5 = NULL,PyObject* arg6 = NULL,PyObject* arg7 = NULL);
             #define emit
               QObject* parent(QObject* o);
               void setParent(QObject* o, QObject* parent);
               QVariantList children(QObject* o);
+              double static_Qt_qAbs(double a) { return qAbs(a); }
+              double static_Qt_qBound(double a,double b,double c) { return qBound(a,b,c); }
+              void static_Qt_qDebug(const QByteArray& msg) { qDebug(msg.constData()); }
+              // TODO: multi arg qDebug...
+              void static_Qt_qWarning(const QByteArray& msg) { qWarning(msg.constData()); }
+              // TODO: multi arg qWarning...
+              void static_Qt_qCritical(const QByteArray& msg) { qCritical(msg.constData()); }
+              // TODO: multi arg qCritical...
+              void static_Qt_qFatal(const QByteArray& msg) { qFatal(msg.constData()); }
+              // TODO: multi arg qFatal...
+              bool static_Qt_qFuzzyCompare(double a, double b) { return qFuzzyCompare(a, b); }
+              double static_Qt_qMax(double a, double b) { return qMax(a, b); }
+              double static_Qt_qMin(double a, double b) { return qMin(a, b); }
+              int static_Qt_qRound(double a) { return qRound(a); }
+              qint64 static_Qt_qRound64(double a) { return qRound64(a); }
+              const char* static_Qt_qVersion() { return qVersion(); }
+              int static_Qt_qrand() { return qrand(); }
+              void static_Qt_qsrand(uint a) { qsrand(a); }
+              QByteArray static_Qt_SIGNAL(const QByteArray& s) { return QByteArray("2") + s; }
+              QByteArray static_Qt_SLOT(const QByteArray& s) { return QByteArray("1") + s; }
               //TODO: add findChild/findChildren/children/...
             };
             #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