GIT_REPOSITORIES/LPP/PythonQt Commit - r93:7b53f64eae84

generator/generator.pro +2 -6

                     generatorsetqtscript.h \
                     metaqtscriptbuilder.h \
                     metaqtscript.h \
-                    classgenerator.h \
                     shellgenerator.h \
                     shellimplgenerator.h \
                     shellheadergenerator.h \
-                    setupgenerator.h \
+                    setupgenerator.h
-                    docgenerator.h
             SOURCES += \
                     generatorsetqtscript.cpp \
                     metaqtscriptbuilder.cpp \
                     metaqtscript.cpp \
-                    classgenerator.cpp \
                     shellgenerator.cpp \
                     shellimplgenerator.cpp \
                     shellheadergenerator.cpp \
-                    setupgenerator.cpp \
+                    setupgenerator.cpp
-                    docgenerator.cpp

generator/generatorsetqtscript.cpp 0 -14

             #include "generatorsetqtscript.h"
             #include "reporthandler.h"
-            #include "classgenerator.h"
             #include "shellheadergenerator.h"
             #include "shellimplgenerator.h"
-            #include "docgenerator.h"
             GeneratorSet *GeneratorSet::getInstance() {
                 return new GeneratorSetQtScript();
                 setupGenerator.setQtMetaTypeDeclaredTypeNames(declaredTypeNames);
                 setupGenerator.setClasses(classes);
-                /*
-                ClassGenerator classGenerator(&priGenerator, &setupGenerator);
-                classGenerator.setOutputDirectory(outDir);
-                classGenerator.setClasses(classes);
-                classGenerator.setQtMetaTypeDeclaredTypeNames(declaredTypeNames);
-                classGenerator.generate();
-            */
                 ShellImplGenerator shellImplGenerator(&priGenerator);
                 shellImplGenerator.setOutputDirectory(outDir);
                 shellImplGenerator.setClasses(classes);
                 shellHeaderGenerator.setClasses(classes);
                 shellHeaderGenerator.generate();
-                //DocGenerator docGenerator;
-                //docGenerator.setOutputDirectory(outDir);
-                //docGenerator.setClasses(classes);
-                //docGenerator.generate();
                 priGenerator.generate();
                 setupGenerator.generate();

generator/prigenerator.cpp +7 -2

               QStringList outList;
               int count = list.count();
               int fileNum = 0;
+              QString srcDir = dir;
+              if (dir.endsWith("_builtin")) {
+                srcDir = dir.left(dir.length()-strlen("_builtin"));
+              }
               while (count>0) {
                 QString outFileName = prefix + QString::number(fileNum) + ext;
                 FileOut file(dir + "/" + outFileName);
                 QString allText;
                 QTextStream ts(&allText);
                 for (int i = 0; i<MAX_CLASSES_PER_FILE && count>0; i++) {
-                  collectAndRemoveFile(ts,  dir + "/" + list.at(list.length()-count));
+                  collectAndRemoveFile(ts,  srcDir + "/" + list.at(list.length()-count));
                   count--;
                 }
                 allText = combineIncludes(allText);
                     QString folder = pri.key();
                     folder.replace('\\','/');
-                    folder = folder.left(folder.indexOf('/'));
+                    int idx = folder.indexOf('/');
+                    folder = folder.left(idx);
                     qSort(list.begin(), list.end());
                     FileOut file(m_out_dir + "/generated_cpp/" + pri.key());

generator/setupgenerator.cpp +14 -9

             //#define Q_SCRIPT_LAZY_GENERATOR
-            void SetupGenerator::addClass(const AbstractMetaClass *cls)
+            void SetupGenerator::addClass(const QString& package, const AbstractMetaClass *cls)
             {
-              packHash[cls->package()].append(cls);
+              packHash[package].append(cls);
             }
             void maybeDeclareMetaType(QTextStream &stream, const QString &typeName,
                 QString packKey = pack.key();
                 QString packName = pack.key();
-                QStringList components = packName.split(".");
+                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);
                 }
-                packName.replace(".", "_");
-                packKey.replace(".", "_");
                 QString shortPackName;
                 foreach (QString comp, components) {
                   }
                   s << endl;
-                  QStringList polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id);
+                  QStringList polymorphicHandlers;
-                  s << endl;
+                  if (!packName.endsWith("_builtin")) {
+                    polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id);
+                    s << endl;
+                  }
                   // declare individual class creation functions
                   s << "void PythonQt_init_" << shortPackName << "() {" << endl;
+                  if (shortPackName.endsWith("Builtin")) {
+                    shortPackName = shortPackName.mid(shortPackName.length()-strlen("builtin"));
+                  }
                   QStringList cppClassNames;
                   foreach (const AbstractMetaClass *cls, list) {
-                    if (ShellGenerator::isBuiltIn(cls->name())) { continue; }
                     QString shellCreator;
                     if (cls->generateShellClass()) {

generator/setupgenerator.h +1 -1

              public:
                 virtual void generate();
-                void addClass(const AbstractMetaClass *cls);
+                void addClass(const QString& package, const AbstractMetaClass *cls);
               static void writeInclude(QTextStream &stream, const Include &inc);

generator/shellgenerator.h +1 -1

             #include "metaqtscript.h"
             #include "prigenerator.h"
-            #define MAX_CLASSES_PER_FILE 20
+            #define MAX_CLASSES_PER_FILE 30
             class ShellGenerator : public Generator
             {

generator/shellheadergenerator.cpp +4 -14

             void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
             {
-              if (!ShellGenerator::isBuiltIn(meta_class->name())) {
+              QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
-                setupGenerator->addClass(meta_class);
+              QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
+              priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
+              setupGenerator->addClass(meta_class->package().replace(".", "_") + builtIn, meta_class);
               QString include_block = "PYTHONQTWRAPPER_" + meta_class->name().toUpper() + "_H";
               }
               s << endl;
-              QString pro_file_name = meta_class->package().replace(".", "_") + "/" + meta_class->package().replace(".", "_") + ".pri";
-              //    if (!meta_class->generateShellClass()) {
-              //        s << "#endif" << endl << endl;
-              //        priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
-              //        return ;
-              //    }
               AbstractMetaFunctionList ctors = meta_class->queryFunctions(AbstractMetaClass::Constructors
                 | AbstractMetaClass::WasVisible
                 | AbstractMetaClass::NotRemovedFromTargetLang);
               s  << "};" << endl << endl
                 << "#endif // " << include_block << endl;
-              if (!ShellGenerator::isBuiltIn(meta_class->name())) {
-                priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
             }
             void ShellHeaderGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)

generator/shellimplgenerator.cpp +3 -6

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

generator/classgenerator.cpp removed 0 -1842

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1842 lines changed) Show them Hide them

generator/classgenerator.h removed 0 -75

NO CONTENT: file was removed

generator/docgenerator.cpp removed 0 -347

NO CONTENT: file was removed

generator/docgenerator.h removed 0 -59

NO CONTENT: file was removed

	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