improved handling of qualified virtual calls

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@402 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

src/PythonQtClassWrapper.cpp

@@ -512,8 +512,19 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
       Py_INCREF(enumWrapper);
       return enumWrapper;
     } else if (member._type == PythonQtMemberInfo::Slot) {
-      // we return all slots, even the instance slots, since they are callable as unbound slots with self argument
-      return PythonQtSlotFunction_New(member._slot, obj, NULL);
+      // NOTE: this does an extra lookup and string copy, it might be better to move this to
+      //       PythonQtClassInfo and add a new cache for qualified class methods...
+      QByteArray qualifiedMemberName = "py_q_";
+      qualifiedMemberName += attributeName;
+      PythonQtMemberInfo qualifiedMember = wrapper->classInfo()->member(qualifiedMemberName);
+      if (qualifiedMember._type == PythonQtMemberInfo::Slot) {
+        // return the qualified member, so that virtual calls on classes call the qualified member
+        return PythonQtSlotFunction_New(qualifiedMember._slot, obj, NULL);
+      }
+      else {
+        // we return all slots, even the instance slots, since they are callable as unbound slots with self argument
+        return PythonQtSlotFunction_New(member._slot, obj, NULL);
+      }
     } else if (member._type == PythonQtMemberInfo::Signal) {
       // we return all signals, even the instance signals, since they are callable as unbound signals with self argument
       return PythonQtSignalFunction_New(member._slot, obj, NULL);

src/PythonQtMethodInfo.cpp

@@ -401,7 +401,11 @@ QString PythonQtSlotInfo::fullSignature(bool skipReturnValue, int optionalArgsIn
     if (sig.startsWith("new_")) {
       sig = sig.mid(4);
       isConstructor = true;
-    } else if (sig.startsWith("delete_")) {
+    }
+    else if (sig.startsWith("py_q_")) {
+      sig = sig.mid(5);
+    }
+    else if (sig.startsWith("delete_")) {
       sig = sig.mid(7);
       isDestructor = true;
     } else if(sig.startsWith("static_")) {
@@ -471,6 +475,9 @@ QByteArray PythonQtSlotInfo::slotName(bool removeDecorators) const
 {
   QByteArray name = PythonQtUtils::methodName(_meta);
   if (removeDecorators) {
+    if (name.startsWith("py_q_")) {
+      name = name.mid(5);
+    } else 
     if (name.startsWith("static_")) {
       name = name.mid(7);
       int idx = name.indexOf("_");