improved signature normalization

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

Author: florianlink

generator/abstractmetalang.cpp

@@ -329,7 +329,7 @@ QStringList AbstractMetaFunction::introspectionCompatibleSignatures(const QStrin
 {
     AbstractMetaArgumentList arguments = this->arguments();
     if (arguments.size() == resolvedArguments.size()) {
-        return (QStringList() << QMetaObject::normalizedSignature((name() + "(" + resolvedArguments.join(",") + ")").toUtf8().constData()));
+        return (QStringList() << TypeSystem::normalizedSignature((name() + "(" + resolvedArguments.join(",") + ")").toUtf8().constData()));
     } else {
         QStringList returned;
 
@@ -656,7 +656,7 @@ QString AbstractMetaFunction::minimalSignature() const
     if (isConstant())
         minimalSignature += "const";
 
-    minimalSignature = QMetaObject::normalizedSignature(minimalSignature.toLocal8Bit().constData());
+    minimalSignature = TypeSystem::normalizedSignature(minimalSignature.toLocal8Bit().constData());
     m_cached_minimal_signature = minimalSignature;
 
     return minimalSignature;
@@ -1497,10 +1497,10 @@ void AbstractMetaClass::addInterface(AbstractMetaClass *interface)
             *cpy += AbstractMetaAttributes::InterfaceFunction;
 
             // Copy the modifications in interface into the implementing classes.
-            FunctionModificationList mods = function->modifications(interface);
-            foreach  (const FunctionModification &mod, mods) {
-                m_type_entry->addFunctionModification(mod);
-            }
+            //FunctionModificationList mods = function->modifications(interface);
+            //foreach  (const FunctionModification &mod, mods) {
+            //    m_type_entry->addFunctionModification(mod);
+            //}
 
             // It should be mostly safe to assume that when we implement an interface
             // we don't "pass on" pure virtual functions to our sublcasses...

generator/shellheadergenerator.cpp

@@ -150,9 +150,9 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
           s << ", ";
         s << args.at(i)->argumentName();
       }
-      s << "),_wrapper(NULL) { ";
+      s << "),_wrapper(NULL) {";
       writeInjectedCode(s, meta_class, TypeSystem::PyInheritShellConstructorCode, true);
-      s << " };" << endl;
+      s << "};" << endl;
     }
     s << endl;
     s << "   ~" << shellClassName(meta_class) << "();" << endl;

generator/typesystem.cpp

@@ -1131,7 +1131,7 @@ bool Handler::startElement(const QString &, const QString &n,
                 }
                 QString signature = attributes["signature"];
 
-                signature = QMetaObject::normalizedSignature(signature.toLocal8Bit().constData());
+                signature = TypeSystem::normalizedSignature(signature.toLocal8Bit().constData());
                 if (signature.isEmpty()) {
                     m_error = "No signature for modified function";
                     return false;
@@ -1901,7 +1901,7 @@ QString FunctionModification::toString() const
 static void removeFunction(ComplexTypeEntry *e, const char *signature)
 {
     FunctionModification mod;
-    mod.signature = QMetaObject::normalizedSignature(signature);
+    mod.signature = TypeSystem::normalizedSignature(signature);
     mod.removal = TypeSystem::All;
 
     e->addFunctionModification(mod);
@@ -1922,7 +1922,7 @@ static void injectCode(ComplexTypeEntry *e,
     snip.argumentMap = args;
 
     FunctionModification mod;
-    mod.signature = QMetaObject::normalizedSignature(signature);
+    mod.signature = TypeSystem::normalizedSignature(signature);
     mod.snips << snip;
     mod.modifiers = Modification::CodeInjection;
     e->addFunctionModification(mod);
@@ -2018,3 +2018,16 @@ static void addRemoveFunctionToTemplates(TypeDatabase *db)
     }
 
 }
+
+QByteArray TypeSystem::normalizedSignature(const char* signature)
+{
+  QByteArray result = QMetaObject::normalizedSignature(signature);
+  result.replace("unsigned ", "u");
+  result.replace("qreal", "double");
+  result.replace("long long", "longlong");
+  result.replace("qlonglong", "longlong");
+  result.replace("qulonglong", "ulonglong");
+  result.replace("qint64", "longlong");
+  result.replace("quint64", "ulonglong");
+  return result;
+}

generator/typesystem.h

@@ -130,6 +130,9 @@ namespace TypeSystem {
         CppOwnership,
         TargetLangThisOwnership
     };
+
+    //! A better normalized signature, which takes care of PODs with the same name
+    QByteArray normalizedSignature(const char* signature);
 };
 
 struct ReferenceCount