Remove work-around for package spelling

by putting the correct spelling in the package name in the typesystem
files

Author: usiems

generator/setupgenerator.cpp

@@ -52,10 +52,6 @@ void SetupGenerator::addClass(const QString& package, const AbstractMetaClass *c
   packHash[package].append(cls);
 }
 
-void maybeDeclareMetaType(QTextStream &stream, const QString &typeName,
-                          QSet<QString> &registeredTypeNames);
-bool hasDefaultConstructor(const AbstractMetaClass *meta_class);
-
 static QStringList getOperatorCodes(const AbstractMetaClass* cls) {
   QSet<QString> operatorCodes;
   AbstractMetaFunctionList returned;
@@ -247,34 +243,11 @@ void SetupGenerator::generate()
       continue;
     std::stable_sort(list.begin(), list.end(), AbstractMetaClass::less_than);
 
-    QString packKey = pack.key();
-    QString packName = pack.key();
-    QStringList components = packName.split("_");
-    if ((components.size() > 2) && (components.at(0) == "com")
-      && (components.at(1) == "trolltech")) {
-        // kill com.trolltech in key
-        components.removeAt(0);
-        components.removeAt(0);
-    }
-
-    QString shortPackName;
-    foreach (QString comp, components) {
-      comp[0] = comp[0].toUpper();
-      shortPackName += comp;
-    }
-    // add missing camel case (workaround..)
-    if (shortPackName == "QtWebkit") {
-      shortPackName = "QtWebKit";
-    } else if (shortPackName == "QtXmlpatterns") {
-      shortPackName = "QtXmlPatterns";
-    } else if (shortPackName == "QtWebenginewidgets") {
-      shortPackName = "QtWebEngineWidgets";
-    } else if (shortPackName == "QtOpengl") {
-      shortPackName = "QtOpenGL";
-    } else if (shortPackName == "QtUitools") {
-      shortPackName = "QtUiTools";
-    }
-
+    QString packKey = ShellGenerator::toFileNameBase(pack.key());
+    QString packName = packKey;
+    QString qtPackageName = "Qt" + pack.key().split('.').back().split('_').front();
+    bool isBuiltin = packKey.endsWith("_builtin");
+    QString initName = qtPackageName + (isBuiltin ? "Builtin" : "");
 
     {
       QString fileName(packName + "/" + packKey + "_init.cpp");
@@ -291,7 +264,7 @@ void SetupGenerator::generate()
       s << endl;
 
       QStringList polymorphicHandlers;
-      if (!packName.endsWith("_builtin")) {
+      if (!isBuiltin) {
         polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id, list);
         s << endl;
       }
@@ -328,11 +301,7 @@ void SetupGenerator::generate()
       s << endl;
 
       // declare individual class creation functions
-      s << "void PythonQt_init_" << shortPackName << "(PyObject* module) {" << endl;
-
-      if (shortPackName.endsWith("Builtin")) {
-        shortPackName = shortPackName.mid(0, shortPackName.length()-strlen("builtin"));
-      }
+      s << "void PythonQt_init_" << initName << "(PyObject* module) {" << endl;
 
       foreach (const AbstractMetaClass *cls, list) {
         if (cls->qualifiedCppName().contains("Ssl")) {
@@ -367,10 +336,10 @@ void SetupGenerator::generate()
           operatorCodes = "0";
         }
         if (cls->isQObject()) {
-          s << "PythonQt::priv()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module, " << operatorCodes <<");" << endl;
+          s << "PythonQt::priv()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << qtPackageName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module, " << operatorCodes <<");" << endl;
         } else {
           QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
-          s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module, " << operatorCodes <<");" << endl;
+          s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << qtPackageName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module, " << operatorCodes <<");" << endl;
         }
         for (AbstractMetaClass* interface :  cls->interfaces()) {
           // the interface might be our own class... (e.g. QPaintDevice)

generator/shellgenerator.h

@@ -53,7 +53,7 @@ class ShellGenerator : public Generator
 public:
     virtual QString subDirectoryForClass(const AbstractMetaClass *cls) const
     {
-        return "generated_cpp/" + cls->package().replace(".", "_") + "/";
+        return "generated_cpp/" + toFileNameBase(cls->package()) + "/";
     }
 
     void writeTypeInfo(QTextStream &s, const AbstractMetaType *type, Option option = NoOption, TypeSystem::Ownership ownership = TypeSystem::InvalidOwnership);
@@ -95,7 +95,9 @@ class ShellGenerator : public Generator
     static bool isBuiltIn(const QString& name);
 
     static bool isSpecialStreamingOperator(const AbstractMetaFunction *fun);
-    
+
+    static QString toFileNameBase(QString packageName) { return packageName.replace('.', '_').toLower(); }
+
     static void writeInclude(QTextStream &stream, const Include &inc);
 
     // this scope is used in writeFunctionArguments

generator/shellheadergenerator.cpp

@@ -102,9 +102,10 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
 {
   setCurrentScope(meta_class);
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name()) ? "_builtin" : "";
-  QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
+  QString fileBaseName = toFileNameBase(meta_class->package() + builtIn);
+  QString pro_file_name = fileBaseName + "/" + fileBaseName + ".pri";
   priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
-  setupGenerator->addClass(meta_class->package().replace(".", "_") + builtIn, meta_class);
+  setupGenerator->addClass(meta_class->package() + builtIn, meta_class);
 
   QString include_block = "PYTHONQTWRAPPER_" + meta_class->name().toUpper() + "_H";
 

generator/shellimplgenerator.cpp

@@ -73,7 +73,8 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
   setCurrentScope(meta_class);
 
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
-  QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
+  QString fileBaseName = toFileNameBase(meta_class->package() + builtIn);
+  QString pro_file_name = fileBaseName + "/" + fileBaseName + ".pri";
   priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
 
   s << "#include \"PythonQtWrapper_" << meta_class->name() << ".h\"" << endl << endl;

generator/typesystem_core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.core">
+<typesystem package="com.trolltech.qt.Core">
 
   <rejection class="QSysInfo" enum-name="WinVersion"/>
   <rejection class="QSysInfo" enum-name="MacVersion"/>

generator/typesystem_gui.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.gui">
+<typesystem package="com.trolltech.qt.Gui">
   <rejection class="QColormap"/>
   <rejection class="QIconEngineV2"/>
   <rejection class="QTextBlock::iterator"/>

generator/typesystem_multimedia.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.multimedia">
+<typesystem package="com.trolltech.qt.Multimedia">
 
 <rejection class="QAbstractVideoBuffer" function-name="mapPlanes"/>
 <rejection class="QAbstractPlanarVideoBuffer"/>

generator/typesystem_network.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.network">
+<typesystem package="com.trolltech.qt.Network">
   <namespace-type name="QSsl">
     <include file-name="qssl.h" location="global"/>
   </namespace-type>

generator/typesystem_opengl.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/>
-
- 
+<typesystem package="com.trolltech.qt.OpenGL">
+  <rejection class="QGL"/>
 
   <rejection class="QGLColormap::QGLColormapData"/>
   <rejection class="QGLWidget" function-name="setMouseTracking"/>

generator/typesystem_qml.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.qml">
+<typesystem package="com.trolltech.qt.Qml">
 
 <rejection class="QQmlEngine" function-name="singletonInstance&lt;QJSValue&gt;"/>