GIT_REPOSITORIES/LPP/PythonQt Commit - r93:7b53f64eae84

added builtin support for variants etc., this will replace the direct includes in PythonQt...

florianlink -

r93:7b53f64eae84

parent child

Context file:

r93:7b53f64eae84

Collapse all files

generator/generator.pro +2 -6

             TARGET = pythonqt_generator
             CONFIG -= debug
             CONFIG += release
             DESTDIR = .
             include(generator.pri)
             # Input
             HEADERS += \
                     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

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "generatorsetqtscript.h"
             #include "reporthandler.h"
-            #include "classgenerator.h"
             #include "shellheadergenerator.h"
             #include "shellimplgenerator.h"
-            #include "docgenerator.h"
             GeneratorSet *GeneratorSet::getInstance() {
                 return new GeneratorSetQtScript();
             }
             GeneratorSetQtScript::GeneratorSetQtScript()
             {}
             QString GeneratorSetQtScript::usage() {
                 QString usage =
                     "QtScript:\n"
                     "  --nothing-to-report-yet                   \n";
                 return usage;
             }
             bool GeneratorSetQtScript::readParameters(const QMap<QString, QString> args) {
                 return GeneratorSet::readParameters(args);
             }
             void GeneratorSetQtScript::buildModel(const QString pp_file) {
                 // Building the code inforamation...
                 ReportHandler::setContext("MetaJavaBuilder");
                 builder.setFileName(pp_file);
                 builder.build();
             }
             void GeneratorSetQtScript::dumpObjectTree() {
             }
             QString GeneratorSetQtScript::generate() {
                 AbstractMetaClassList classes = builder.classesTopologicalSorted();
                 QSet<QString> declaredTypeNames = builder.qtMetaTypeDeclaredTypeNames();
                 PriGenerator priGenerator;
                 priGenerator.setOutputDirectory(outDir);
                 SetupGenerator setupGenerator;
                 setupGenerator.setOutputDirectory(outDir);
                 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);
                 shellImplGenerator.setQtMetaTypeDeclaredTypeNames(declaredTypeNames);
                 shellImplGenerator.generate();
                 ShellHeaderGenerator shellHeaderGenerator(&priGenerator, &setupGenerator);
                 shellHeaderGenerator.setOutputDirectory(outDir);
                 shellHeaderGenerator.setClasses(classes);
                 shellHeaderGenerator.generate();
-                //DocGenerator docGenerator;
-                //docGenerator.setOutputDirectory(outDir);
-                //docGenerator.setClasses(classes);
-                //docGenerator.generate();
                 priGenerator.generate();
                 setupGenerator.generate();
                 return QString("Classes in typesystem: %1\n"
                                "Generated:\n"
                                "  - header....: %4 (%5)\n"
                                "  - impl......: %6 (%7)\n"
                                "  - modules...: %8 (%9)\n"
                                "  - pri.......: %10 (%11)\n"
                                )
                     .arg(builder.classes().size())
                     .arg(shellHeaderGenerator.numGenerated())
                     .arg(shellHeaderGenerator.numGeneratedAndWritten())
                     .arg(shellImplGenerator.numGenerated())
                     .arg(shellImplGenerator.numGeneratedAndWritten())
                     .arg(setupGenerator.numGenerated())
                     .arg(setupGenerator.numGeneratedAndWritten())
                     .arg(priGenerator.numGenerated())
                     .arg(priGenerator.numGeneratedAndWritten());
             }

generator/prigenerator.cpp +7 -2

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "prigenerator.h"
             #include "shellgenerator.h"
             #include "reporthandler.h"
             #include "fileout.h"
             void PriGenerator::addHeader(const QString &folder, const QString &header)
             {
                 priHash[folder].headers << header;
             }
             void PriGenerator::addSource(const QString &folder, const QString &source)
             {
                 priHash[folder].sources << source;
             }
             static void collectAndRemoveFile(QTextStream& stream, const QString& file) {
               QFile f(file);
               if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
                 QString s = QString::fromLatin1(f.readAll());
                 if (file.endsWith(".cpp")) {
                   // remove first line include
                   s = s.mid(s.indexOf('\n')+1);
                 }
                 stream << s;
                 f.close();
                 QFile::remove(file);
               }
             }
             static QString combineIncludes(const QString& text) {
               QStringList lines = text.split('\n');
               QSet<QString> includes;
               QString result;
               foreach(QString line, lines) {
                 if (line.startsWith("#include")) {
                   includes.insert(line);
                 } else if (line.startsWith("#")) {
                   // skip preprocessor stuff
                 } else {
                   result += line + "\n";
                 }
               }
               QStringList includeList = includes.toList();
               qSort(includeList);
               result = includeList.join("\n") + result;
               return result;
             }
             static QStringList compactFiles(const QStringList& list, const QString& ext, const QString& dir, const QString& prefix) {
               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);
                 if (ext == ".cpp") {
                   file.stream << "#include \"" + prefix + QString::number(fileNum) + ".h\"\n";
                 }
                 outList << 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);
                 file.stream << allText;
                 fileNum++;
               }
               return outList;
             }
             void PriGenerator::generate()
             {
                 QHashIterator<QString, Pri> pri(priHash);
                 while (pri.hasNext()) {
                     pri.next();
                     QStringList list = pri.value().headers;
                     if (list.isEmpty())
                         continue;
                     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());
                     // strange idea to do the file compacting so late, but it is the most effective way without patching the generator a lot
                     bool compact = true;
                     if (compact) {
                       list = compactFiles(list, ".h", m_out_dir + "/generated_cpp/" + folder, folder);
                     }
                     file.stream << "HEADERS += \\\n";
                     foreach (const QString &entry, list) {
                       file.stream << "           $$PWD/" << entry << " \\\n";
                     }
                     file.stream << "\n";
                     file.stream << "SOURCES += \\\n";
                     list = pri.value().sources;
                     qSort(list.begin(), list.end());
                     if (compact) {
                       list = compactFiles(list, ".cpp", m_out_dir + "/generated_cpp/" + folder, folder);
                     }
                     foreach (const QString &entry, list) {
                         file.stream << "           $$PWD/" << entry << " \\\n";
                     }
                     file.stream << "           $$PWD/" << folder << "_init.cpp\n";
                     if (file.done())
                         ++m_num_generated_written;
                     ++m_num_generated;
                 }
             }

generator/setupgenerator.cpp +12 -7

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "setupgenerator.h"
             #include "shellgenerator.h"
             #include "reporthandler.h"
             #include "fileout.h"
             //#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,
                                       QSet<QString> &registeredTypeNames);
             bool hasDefaultConstructor(const AbstractMetaClass *meta_class);
             void SetupGenerator::generate()
             {
               AbstractMetaClassList classes_with_polymorphic_id;
               {
                 QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
                 while (pack.hasNext()) {
                   pack.next();
                   QList<const AbstractMetaClass*> list = pack.value();
                   foreach (const AbstractMetaClass *cls, list) {
                     if (cls->typeEntry()->isPolymorphicBase()) {
                       classes_with_polymorphic_id.append((AbstractMetaClass*)cls);
                     }
                   }
                 }
               }
               QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
               while (pack.hasNext()) {
                 pack.next();
                 QList<const AbstractMetaClass*> list = pack.value();
                 if (list.isEmpty())
                   continue;
                 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) {
                   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 == "QtOpengl") {
                   shortPackName = "QtOpenGL";
                 } else if (shortPackName == "QtUitools") {
                   shortPackName = "QtUiTools";
                 }
                 {
                   FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");
                   QTextStream &s = initFile.stream;
                   s << "#include <PythonQt.h>" << endl;
                   for (int i=0; i<(list.count()+MAX_CLASSES_PER_FILE-1) / MAX_CLASSES_PER_FILE; i++) {
                     s << "#include \"" << packKey << QString::number(i) << ".h\"" << endl;
                   }
                   s << endl;
-                  QStringList polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id);
+                  QStringList polymorphicHandlers;
+                  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()) {
                       shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";
                     }
                     if (cls->isQObject()) {
                       s << "PythonQt::self()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
                     } else {
                       QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
                       s << "PythonQt::self()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
                     }
                     foreach(AbstractMetaClass* interface, cls->interfaces()) {
                       // the interface might be our own class... (e.g. QPaintDevice)
                       if (interface->qualifiedCppName() != cls->qualifiedCppName()) {
                         s << "PythonQt::self()->addParentClass(\""<< cls->qualifiedCppName() << "\", \"" << interface->qualifiedCppName() << "\",PythonQtUpcastingOffset<" << cls->qualifiedCppName() <<","<<interface->qualifiedCppName()<<">());" << endl;
                       }
                     }
                   }
                   s << endl;
                   foreach (QString handler, polymorphicHandlers) {
                     s << "PythonQt::self()->addPolymorphicHandler(\""<< handler << "\", polymorphichandler_" << handler << ");" << endl;
                   }
                   s << "}";
                   s << endl;
                 }
               }
             }
             QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QString &package,
                                                                 const AbstractMetaClassList &classes)
             {
               QStringList handlers;
               foreach (AbstractMetaClass *cls, classes) {
                 const ComplexTypeEntry *centry = cls->typeEntry();
                 if (!centry->isPolymorphicBase())
                   continue;
                 bool isGraphicsItem = (cls->qualifiedCppName()=="QGraphicsItem");
                 AbstractMetaClassList classList = this->classes();
                 bool first = true;
                 foreach (AbstractMetaClass *clazz, classList) {
                   bool inherits = false;
                   if (isGraphicsItem) {
                     foreach(AbstractMetaClass* interfaze, clazz->interfaces()) {
                       if (interfaze->qualifiedCppName()=="QGraphicsItem") {
                         inherits = true;
                         break;
                       }
                     }
                   } else {
                     inherits = clazz->inheritsFrom(cls);
                   }
                   if (clazz->package() == package && inherits) {
                     if (!clazz->typeEntry()->polymorphicIdValue().isEmpty() || isGraphicsItem) {
                       // On first find, open the function
                       if (first) {
                         first = false;
                         QString handler = cls->name();
                         handlers.append(handler);
                         s << "static void* polymorphichandler_" << handler
                           << "(const void *ptr, char **class_name)" << endl
                           << "{" << endl
                           << "    Q_ASSERT(ptr != 0);" << endl
                           << "    " << cls->qualifiedCppName() << " *object = ("
                           << cls->qualifiedCppName() << " *)ptr;" << endl;
                       }
                       // For each, add case label
                       QString polyId = clazz->typeEntry()->polymorphicIdValue();
                       if (isGraphicsItem) {
                         polyId = "%1->type() == " + clazz->qualifiedCppName() + "::Type";
                       }
                       s << "    if ("
                         << polyId.replace("%1", "object")
                         << ") {" << endl
                         << "        *class_name = \"" << clazz->name() << "\";" << endl
                         << "        return (" << clazz->qualifiedCppName() << "*)object;" << endl
                         << "    }" << endl;
                     } else {
                       QString warning = QString("class '%1' inherits from polymorphic class '%2', but has no polymorphic id set")
                         .arg(clazz->name())
                         .arg(cls->name());
                       ReportHandler::warning(warning);
                     }
                   }
                 }
                 // Close the function if it has been opened
                 if (!first) {
                   s << "    return NULL;" << endl
                     << "}" << endl;
                 }
               }
               return handlers;
             }

generator/setupgenerator.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef SETUPGENERATOR_H
             #define SETUPGENERATOR_H
             #include "generator.h"
             #include "metaqtscript.h"
             class SetupGenerator : public Generator
             {
                 Q_OBJECT
              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);
               static bool isSpecialStreamingOperator(const AbstractMetaFunction *fun);
              private:
                QStringList writePolymorphicHandler(QTextStream &s, const QString &package,
                  const AbstractMetaClassList &classes);
                QHash<QString, QList<const AbstractMetaClass*> > packHash;
             };
             #endif // SETUPGENERATOR_H

generator/shellgenerator.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef SHELLGENERATOR_H
             #define SHELLGENERATOR_H
             #include "generator.h"
             #include "metaqtscript.h"
             #include "prigenerator.h"
-            #define MAX_CLASSES_PER_FILE 20
+            #define MAX_CLASSES_PER_FILE 30
             class ShellGenerator : public Generator
             {
                 Q_OBJECT
             public:
                 virtual QString subDirectoryForClass(const AbstractMetaClass *cls) const
                 {
                     return "generated_cpp/" + cls->package().replace(".", "_") + "/";
                 }
                 static void writeTypeInfo(QTextStream &s, const AbstractMetaType *type, Option option = NoOption);
                 static void writeFunctionSignature(QTextStream &s, const AbstractMetaFunction *meta_function,
                                             const AbstractMetaClass *implementor = 0,
                                             const QString &name_prefix = QString(),
                                             Option option = NoOption,
                                             const QString &classname_prefix = QString(),
                                             const QStringList &extra_arguments = QStringList(),
                                             int numArguments = -1);
                 static void writeFunctionArguments(QTextStream &s, const AbstractMetaClass* owner, const AbstractMetaArgumentList &arguments,
                                             Option option = NoOption,
                                             int numArguments = -1);
                 bool shouldGenerate(const AbstractMetaClass *meta_class) const;
                 static QString shellClassName(const AbstractMetaClass *meta_class) {
                   return "PythonQtShell_" + meta_class->name();
                 }
                 static QString wrapperClassName(const AbstractMetaClass *meta_class) {
                   return "PythonQtWrapper_" + meta_class->name();
                 }
                 static QString promoterClassName(const AbstractMetaClass *meta_class) {
                   return "PythonQtPublicPromoter_" + meta_class->name();
                 }
                 static AbstractMetaFunctionList getFunctionsToWrap(const AbstractMetaClass* cls);
                 static AbstractMetaFunctionList getVirtualFunctionsForShell(const AbstractMetaClass* cls);
                 static AbstractMetaFunctionList getProtectedFunctionsThatNeedPromotion(const AbstractMetaClass* cls);
                 // PythonQt builtins..., dont put them in pri files and dont register them, but generate the code
                 static bool isBuiltIn(const QString& name);
                 static bool isSpecialStreamingOperator(const AbstractMetaFunction *fun);
                 static void writeInclude(QTextStream &stream, const Include &inc);
              protected:
                 PriGenerator *priGenerator;
             };
             #endif // SHELLGENERATOR_H

generator/shellheadergenerator.cpp +4 -14

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "shellheadergenerator.h"
             #include "fileout.h"
             #include <QtCore/QDir>
             #include <qdebug.h>
             QString ShellHeaderGenerator::fileNameForClass(const AbstractMetaClass *meta_class) const
             {
               return QString("PythonQtWrapper_%1.h").arg(meta_class->name());
             }
             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 << "#ifndef " << include_block << endl
                 << "#define " << include_block << endl << endl;
               Include inc = meta_class->typeEntry()->include();
               ShellGenerator::writeInclude(s, inc);
               s << "#include <QObject>" << endl << endl;
               s << "#include <PythonQt.h>" << endl << endl;
               IncludeList list = meta_class->typeEntry()->extraIncludes();
               qSort(list.begin(), list.end());
               foreach (const Include &inc, list) {
                 ShellGenerator::writeInclude(s, inc);
               }
               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);
               // Shell-------------------------------------------------------------------
               if (meta_class->generateShellClass()) {
                 AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);
                 s << "class " << shellClassName(meta_class)
                   << " : public " << meta_class->qualifiedCppName() << endl << "{" << endl;
                 s << "public:" << endl;
                 foreach(AbstractMetaFunction* fun, ctors) {
                   s << "    ";
                   writeFunctionSignature(s, fun, 0,"PythonQtShell_",
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << ":" << meta_class->qualifiedCppName() << "(";
                   QString scriptFunctionName = fun->originalName();
                   AbstractMetaArgumentList args = fun->arguments();
                   for (int i = 0; i < args.size(); ++i) {
                     if (i > 0)
                       s << ", ";
                     s << args.at(i)->argumentName();
                   }
                   s << "),_wrapper(NULL) {};" << endl;
                 }
                 s << endl;
                 foreach(AbstractMetaFunction* fun, virtualsForShell) {
                   s << "virtual ";
                   writeFunctionSignature(s, fun, 0, QString(),
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << ";" << endl;
                 }
                 s << endl;
                 s << "  PythonQtInstanceWrapper* _wrapper; " << endl;
                 s << "};" << endl << endl;
               }
               // Promoter-------------------------------------------------------------------
               AbstractMetaFunctionList promoteFunctions = getProtectedFunctionsThatNeedPromotion(meta_class);
               if (!promoteFunctions.isEmpty()) {
                 s << "class " << promoterClassName(meta_class)
                   << " : public " << meta_class->qualifiedCppName() << endl << "{ public:" << endl;
                 foreach(AbstractMetaFunction* fun, promoteFunctions) {
                   s << "inline ";
                   writeFunctionSignature(s, fun, 0, "promoted_",
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << " { ";
                   QString scriptFunctionName = fun->originalName();
                   AbstractMetaArgumentList args = fun->arguments();
                   if (fun->type())
                     s << "return ";
                   s << meta_class->qualifiedCppName() << "::";
                   s << fun->originalName() << "(";
                   for (int i = 0; i < args.size(); ++i) {
                     if (i > 0)
                       s << ", ";
                     s << args.at(i)->argumentName();
                   }
                   s << "); }" << endl;
                 }
                 s << "};" << endl << endl;
               }
               // Wrapper-------------------------------------------------------------------
               s << "class " << wrapperClassName(meta_class)
                 << " : public QObject" << endl
                 << "{ Q_OBJECT" << endl;
               s << "public:" << endl;
               AbstractMetaEnumList enums1 = meta_class->enums();
               AbstractMetaEnumList enums;
               QList<FlagsTypeEntry*> flags;
               foreach(AbstractMetaEnum* enum1, enums1) {
                 // catch gadgets and enums that are not exported on QObjects...
                 if (enum1->wasPublic() && (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration())) {
                   enums << enum1;
                   if (enum1->typeEntry()->flags()) {
                     flags << enum1->typeEntry()->flags();
                   }
                 }
               }
               if (enums.count()) {
                 s << "Q_ENUMS(";
                 foreach(AbstractMetaEnum* enum1, enums) {
                   s << enum1->name() << " ";
                 }
                 s << ")" << endl;
                 if (flags.count()) {
                   s << "Q_FLAGS(";
                   foreach(FlagsTypeEntry* flag1, flags) {
                     QString origName = flag1->originalName();
                     int idx = origName.lastIndexOf("::");
                     if (idx!= -1) {
                       origName = origName.mid(idx+2);
                     }
                     s << origName << " ";
                   }
                   s << ")" << endl;
                 }
                 foreach(AbstractMetaEnum* enum1, enums) {
                   s << "enum " << enum1->name() << "{" << endl;
                   bool first = true;
                   foreach(AbstractMetaEnumValue* value, enum1->values()) {
                     if (first) { first = false; }
                     else { s << ", "; }
                     s << "  " << value->name() << " = " << meta_class->qualifiedCppName() << "::" << value->name();
                   }
                   s << "};" << endl;
                 }
                 if (flags.count()) {
                   foreach(AbstractMetaEnum* enum1, enums) {
                     if (enum1->typeEntry()->flags()) {
                       QString origName = enum1->typeEntry()->flags()->originalName();
                       int idx = origName.lastIndexOf("::");
                       if (idx!= -1) {
                         origName = origName.mid(idx+2);
                       }
                       s << "Q_DECLARE_FLAGS("<< origName << ", " << enum1->name() <<")"<<endl;
                     }
                   }
                 }
               }
               s << "public slots:" << endl;
               if (meta_class->generateShellClass() || !meta_class->isAbstract()) {
                 bool copyConstructorSeen = false;
                 bool defaultConstructorSeen = false;
                 foreach (const AbstractMetaFunction *fun, ctors) {
                   if (!fun->isPublic() || fun->isAbstract()) { continue; }
                   s << meta_class->qualifiedCppName() << "* ";
                   writeFunctionSignature(s, fun, 0, "new_",
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic));
                   s << ";" << endl;
                   if (fun->arguments().size()==1 && meta_class->qualifiedCppName() == fun->arguments().at(0)->type()->typeEntry()->qualifiedCppName()) {
                     copyConstructorSeen = true;
                   }
                   if (fun->arguments().size()==0) {
                     defaultConstructorSeen = true;
                   }
                 }
                 if (meta_class->typeEntry()->isValue()
                     && !copyConstructorSeen && defaultConstructorSeen) {
                   QString className = meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName();
                   s << meta_class->qualifiedCppName() << "* new_" << meta_class->name() << "(const " << meta_class->qualifiedCppName() << "& other) {" << endl;
                   s << className << "* a = new " << className << "();" << endl;
                   s << "*((" << meta_class->qualifiedCppName() << "*)a) = other;" << endl;
                   s << "return a; }" << endl;
                 }
               }
               if (meta_class->hasPublicDestructor() && !meta_class->isNamespace()) {
                 s << "void delete_" << meta_class->name() << "(" << meta_class->qualifiedCppName() << "* obj) { delete obj; } ";
                 s << endl;
               }
               if (meta_class->name()=="QTreeWidgetItem") {
                 s << "bool hasOwner(QTreeWidgetItem* theWrappedObject) { return theWrappedObject->treeWidget()!=NULL || theWrappedObject->parent()!=NULL; }" << endl;
               } else if (meta_class->name()=="QGraphicsItem") {
                 s << "bool hasOwner(QGraphicsItem* theWrappedObject) { return theWrappedObject->scene()!=NULL || theWrappedObject->parentItem()!=NULL; }" << endl;
               }
               AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);
               foreach (const AbstractMetaFunction *function, functions) {
                 if (!function->isSlot()) {
                   s << "   ";
                   writeFunctionSignature(s, function, 0, QString(),
                     Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << ";" << endl;
                 }
               }
               if (!meta_class->hasDefaultToStringFunction() && meta_class->hasToStringCapability()) {
                 s << "    QString toString(" << meta_class->qualifiedCppName() << "*);" << endl;
               }
               //    writeInjectedCode(s, meta_class);
               //  s  << endl << "    QScriptValue __qtscript_self;" << endl;
               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)
             {
               CodeSnipList code_snips = meta_class->typeEntry()->codeSnips();
               foreach (const CodeSnip &cs, code_snips) {
                 if (cs.language == TypeSystem::ShellDeclaration) {
                   s << cs.code() << endl;
                 }
               }
             }

generator/shellimplgenerator.cpp +2 -5

             /****************************************************************************
             **
             ** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
             ** All rights reserved.
             ** Contact: Nokia Corporation (qt-info@nokia.com)
             **
             ** This file is part of the Qt Script Generator project on Qt Labs.
             **
             ** $QT_BEGIN_LICENSE:LGPL$
             ** No Commercial Usage
             ** This file contains pre-release code and may not be distributed.
             ** You may use this file in accordance with the terms and conditions
             ** contained in the Technology Preview License Agreement accompanying
             ** this package.
             **
             ** GNU Lesser General Public License Usage
             ** Alternatively, this file may be used under the terms of the GNU Lesser
             ** General Public License version 2.1 as published by the Free Software
             ** Foundation and appearing in the file LICENSE.LGPL included in the
             ** packaging of this file.  Please review the following information to
             ** ensure the GNU Lesser General Public License version 2.1 requirements
             ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
             **
             ** In addition, as a special exception, Nokia gives you certain additional
             ** rights.  These rights are described in the Nokia Qt LGPL Exception
             ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
             **
             ** If you have questions regarding the use of this file, please contact
             ** Nokia at qt-info@nokia.com.
             **
             **
             **
             **
             **
             **
             **
             **
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "shellimplgenerator.h"
             #include "reporthandler.h"
             #include "fileout.h"
             extern void declareFunctionMetaTypes(QTextStream &stream,
                                                  const AbstractMetaFunctionList &functions,
                                                  QSet<QString> &registeredTypeNames);
             QString ShellImplGenerator::fileNameForClass(const AbstractMetaClass *meta_class) const
             {
               return QString("PythonQtWrapper_%1.cpp").arg(meta_class->name());
             }
             static bool include_less_than(const Include &a, const Include &b)
             {
               return a.name < b.name;
             }
             static void writeHelperCode(QTextStream &s, const AbstractMetaClass *)
             {
             }
             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";
-              if (!ShellGenerator::isBuiltIn(meta_class->name())) {
               priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
               s << "#include \"PythonQtWrapper_" << meta_class->name() << ".h\"" << endl << endl;
               s << "#include <PythonQtSignalReceiver.h>" << endl;
               s << "#include <PythonQtMethodInfo.h>" << endl;
               s << "#include <PythonQtConversion.h>" << endl;
               //if (!meta_class->generateShellClass())
               //    return;
               IncludeList list = meta_class->typeEntry()->extraIncludes();
               qSort(list.begin(), list.end());
               foreach (const Include &inc, list) {
                 ShellGenerator::writeInclude(s, inc);
               }
               s << endl;
               writeHelperCode(s, meta_class);
               // find constructors
               AbstractMetaFunctionList ctors;
               ctors = meta_class->queryFunctions(AbstractMetaClass::Constructors
                 | AbstractMetaClass::WasVisible
                 | AbstractMetaClass::NotRemovedFromTargetLang);
               // find member functions
               AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);
               // write metatype declarations
               {
                 //    QSet<QString> registeredTypeNames = m_qmetatype_declared_typenames;
                 //    declareFunctionMetaTypes(s, functions, registeredTypeNames);
                 //    s << endl;
               }
               if (meta_class->generateShellClass()) {
                 AbstractMetaFunctionList virtualsForShell = getVirtualFunctionsForShell(meta_class);
                 foreach (const AbstractMetaFunction *fun, virtualsForShell) {
                   bool hasReturnValue = (fun->type());
                   writeFunctionSignature(s, fun, meta_class, QString(),
                     Option(OriginalName | ShowStatic | UnderscoreSpaces),
                     "PythonQtShell_");
                   s << endl << "{" << endl;
                   Option typeOptions = Option(OriginalName | UnderscoreSpaces | SkipName);
                   AbstractMetaArgumentList args = fun->arguments();
                   s << "if (_wrapper) {" << endl;
                   s << "  PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, \"" << fun->name() << "\");" << endl;
                   s << "  PyErr_Clear();" << endl;
                   s << "  if (obj && !PythonQtSlotFunction_Check(obj)) {" << endl;
                   s << "    static const char* argumentList[] ={\"";
                   if (hasReturnValue) {
                     // write the arguments, return type first
                     writeTypeInfo(s, fun->type(), typeOptions);
                   }
                   s << "\"";
                   for (int i = 0; i < args.size(); ++i) {
                     s << " , \"";
                     writeTypeInfo(s, args.at(i)->type(), typeOptions);
                     s << "\"";
                   }
                   s << "};" << endl;
                   s << "    static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(" << QString::number(args.size()+1) << ", argumentList);" << endl;
                   if (hasReturnValue) {
                     s << "      ";
                     writeTypeInfo(s, fun->type(), typeOptions);
                     s << " returnValue;" << endl;
                     // TODO: POD init to default is missing...
                   }
                   s << "    void* args[" << QString::number(args.size()+1) << "] = {NULL";
                   for (int i = 0; i < args.size(); ++i) {
                     s << ", (void*)&" << args.at(i)->argumentName();
                   }
                   s << "};" << endl;
                   s << "    PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);" << endl;
                   if (hasReturnValue) {
                     s << "    if (result) {" << endl;
                     s << "      args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue);" << endl;
                     s << "      if (args[0]!=&returnValue) {" << endl;
                     s << "        if (args[0]==NULL) {" << endl;
                     s << "          PythonQt::priv()->handleVirtualOverloadReturnError(\"" << fun->name() << "\", methodInfo, result);" << endl;
                     s << "        } else {" << endl;
                     s << "          returnValue = *((";
                     writeTypeInfo(s, fun->type(), typeOptions);
                     s << "*)args[0]);" << endl;
                     s << "        }" << endl;
                     s << "      }" << endl;
                     s << "    }" << endl;
                   }
                   s << "    if (result) { Py_DECREF(result); } " << endl;
                   s << "    Py_DECREF(obj);" << endl;
                   if (hasReturnValue) {
                     s << "    return returnValue;" << endl;
                   } else {
                     s << "    return;" << endl;
                   }
                   s << "  }" << endl;
                   s << "}" << endl;
                   s << "  ";
                   if (fun->isAbstract()) {
                     if (fun->type()) {
                       // return empty default object
                       writeTypeInfo(s, fun->type(), typeOptions);
                       s << " result;" << endl;
                       s << "return result";
                       s << ";";
                     }
                   } else {
                     if (fun->type()) {
                       s << "return ";
                     }
                     s << meta_class->qualifiedCppName() << "::";
                     s << fun->originalName() << "(";
                     for (int i = 0; i < args.size(); ++i) {
                       if (i > 0)
                         s << ", ";
                       s << args.at(i)->argumentName();
                     }
                     s << ");";
                   }
                   s << endl << "}" << endl;
                 }
               }
               if (meta_class->generateShellClass() || !meta_class->isAbstract()) {
                 // write constructors
                 foreach (const AbstractMetaFunction *ctor, ctors) {
                   if (!ctor->isPublic() || ctor->isAbstract()) { continue; }
                   s << meta_class->qualifiedCppName() << "* ";
                   s << "PythonQtWrapper_" << meta_class->name() << "::";
                   writeFunctionSignature(s, ctor, 0, "new_", Option(OriginalName | ShowStatic));
                   s << endl;
                   s << "{ " << endl;
                   s << "return new " << (meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName()) << "(";
                   AbstractMetaArgumentList args = ctor->arguments();
                   for (int i = 0; i < args.size(); ++i) {
                     if (i > 0)
                       s << ", ";
                     s << args.at(i)->argumentName();
                   }
                   s << ");" << " }" << endl << endl;
                 }
               }
               QString wrappedObject = " (*theWrappedObject)";
               // write member functions
               for (int i = 0; i < functions.size(); ++i) {
                 AbstractMetaFunction *fun = functions.at(i);
                 if (fun->isSlot()) continue;
                 writeFunctionSignature(s, fun, meta_class, QString(),
                   Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
                   "PythonQtWrapper_");
                 s << endl << "{" << endl;
                 s << "  ";
                 if (ShellGenerator::isSpecialStreamingOperator(fun)) {
                   s << fun->arguments().at(0)->argumentName();
                   if (fun->originalName().startsWith("operator>>")) {
                     s << " >> ";
                   } else {
                     s << " << ";
                   }
                   s << wrappedObject;
                 } else {
                   QString scriptFunctionName = fun->originalName();
                   AbstractMetaArgumentList args = fun->arguments();
                   // call the C++ implementation
                   if (fun->type()) {
                     s << "return ";
                     // call the C++ implementation
                     if (fun->type()->isReference()) {
                       s << "&";
                     }
                   }
                   s << "(";
                   if (scriptFunctionName.startsWith("operator>>")) {
                     s << wrappedObject << " >>" << args.at(0)->argumentName();
                   } else if (scriptFunctionName.startsWith("operator<<")) {
                     s << wrappedObject << " <<" << args.at(0)->argumentName();
                   } else if (scriptFunctionName.startsWith("operator[]")) {
                     s << wrappedObject << "[" << args.at(0)->argumentName() << "]";
                   } else if (scriptFunctionName.startsWith("operator") && args.size()==1) {
                     QString op = scriptFunctionName.mid(8);
                     s << wrappedObject << op << " " << args.at(0)->argumentName();
                   } else {
                     if (fun->isStatic()) {
                       s << meta_class->qualifiedCppName() << "::";
                     } else {
                       if (!fun->isPublic() || fun->isVirtual()) {
                         s << " (("  << promoterClassName(meta_class) << "*)theWrappedObject)->promoted_";
                       } else {
                         s << " theWrappedObject->";
                       }
                     }
                     s  << fun->originalName() << "(";
                     for (int i = 0; i < args.size(); ++i) {
                       if (i > 0)
                         s << ", ";
                       s << args.at(i)->argumentName();
                     }
                     s << ")";
                   }
                   s << ")";
                 }
                 s << ";" << endl;
                 s << "}" << endl << endl;
               }
               if (!meta_class->hasDefaultToStringFunction() && meta_class->hasToStringCapability()) {
                 FunctionModelItem fun = meta_class->hasToStringCapability();
                 int indirections = fun->arguments().at(1)->type().indirections();
                 QString deref = QLatin1String(indirections == 0 ? "*" : "");
                 s << "QString PythonQtWrapper_" << meta_class->name() << "::toString(" << meta_class->qualifiedCppName() << "* obj) {" << endl;
                 s << "  QString result;" << endl;
                 s << "  QDebug d(&result);" << endl;
                 s << "  d << " << deref  << "obj;" << endl;
                 s << "  return result;" << endl;
                 s << "}" << endl << endl;
               }
             }
             void ShellImplGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)
             {
               CodeSnipList code_snips = meta_class->typeEntry()->codeSnips();
               foreach (const CodeSnip &cs, code_snips) {
                 if (cs.language == TypeSystem::ShellCode) {
                   s << cs.code() << 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

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