GIT_REPOSITORIES/LPP/PythonQt Commit - r29:fa33440a60c5

- upgraded generator to generate polymorphic handlers for downcasting...

florianlink -

r29:fa33440a60c5

parent child

Context file:

r29:fa33440a60c5

Collapse all files

generator/abstractmetalang.h +2 0

                 FunctionType functionType() const { return m_function_type; }
                 void setFunctionType(FunctionType type) { m_function_type = type; }
+                bool isVirtual() { return !(isFinal() || isSignal() || isStatic()); }
                 QStringList introspectionCompatibleSignatures(const QStringList &resolvedArguments = QStringList()) const;
                 QString signature() const;
                 QString targetLangSignature(bool minimal = false) const;

generator/generatorsetqtscript.cpp +1 0

                 SetupGenerator setupGenerator;
                 setupGenerator.setOutputDirectory(outDir);
                 setupGenerator.setQtMetaTypeDeclaredTypeNames(declaredTypeNames);
+                setupGenerator.setClasses(classes);
                 /*
                 ClassGenerator classGenerator(&priGenerator, &setupGenerator);

generator/setupgenerator.cpp +158 -66

@@ -30,7 +30,7
30		30
31	void SetupGenerator::addClass(const AbstractMetaClass *cls)	31	void SetupGenerator::addClass(const AbstractMetaClass *cls)
32	{	32	{
33	packHash[cls->package()].append(cls);	33	packHash[cls->package()].append(cls);
34	}	34	}
35		35
36	void writeQtScriptQtBindingsLicense(QTextStream &stream);	36	void writeQtScriptQtBindingsLicense(QTextStream &stream);
@@ -41,83 +41,175 bool hasDefaultConstructor(const AbstractMetaClass *meta_class);
41		41
42	void SetupGenerator::generate()	42	void SetupGenerator::generate()
43	{	43	{
		44	AbstractMetaClassList classes_with_polymorphic_id;
		45	{
44	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);	46	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
45	while (pack.hasNext()) {	47	while (pack.hasNext()) {
46	pack.next();	48	pack.next();
47	QList<const AbstractMetaClass*> list = pack.value();	49	QList<const AbstractMetaClass*> list = pack.value();
48	if (list.isEmpty())	50	foreach (const AbstractMetaClass *cls, list) {
49	continue;	51	if (cls->typeEntry()->isPolymorphicBase()) {
50		52	classes_with_polymorphic_id.append((AbstractMetaClass*)cls);
51	QString packKey = pack.key();
52	QString packName = pack.key();
53	QStringList components = packName.split(".");
54	if ((components.size() > 2) && (components.at(0) == "com")
55	&& (components.at(1) == "trolltech")) {
56	// kill com.trolltech in key
57	components.removeAt(0);
58	components.removeAt(0);
59	}	53	}
60	packName.replace(".", "_");	54	}
61	packKey.replace(".", "_");	55	}
		56	}
		57
		58	QHashIterator<QString, QList<const AbstractMetaClass*> > pack(packHash);
		59	while (pack.hasNext()) {
		60	pack.next();
		61	QList<const AbstractMetaClass*> list = pack.value();
		62	if (list.isEmpty())
		63	continue;
		64
		65	QString packKey = pack.key();
		66	QString packName = pack.key();
		67	QStringList components = packName.split(".");
		68	if ((components.size() > 2) && (components.at(0) == "com")
		69	&& (components.at(1) == "trolltech")) {
		70	// kill com.trolltech in key
		71	components.removeAt(0);
		72	components.removeAt(0);
		73	}
		74	packName.replace(".", "_");
		75	packKey.replace(".", "_");
62		76
63	QString shortPackName;	77	QString shortPackName;
64	foreach (QString comp, components) {	78	foreach (QString comp, components) {
65	comp[0] = comp[0].toUpper();	79	comp[0] = comp[0].toUpper();
66	shortPackName += comp;	80	shortPackName += comp;
67	}	81	}
68	// add missing camel case (workaround..)	82	// add missing camel case (workaround..)
69	if (shortPackName == "QtWebkit") {	83	if (shortPackName == "QtWebkit") {
70	shortPackName = "QtWebKit";	84	shortPackName = "QtWebKit";
71	} else if (shortPackName == "QtXmlpatterns") {	85	} else if (shortPackName == "QtXmlpatterns") {
72	shortPackName = "QtXmlPatterns";	86	shortPackName = "QtXmlPatterns";
73	} else if (shortPackName == "QtOpengl") {	87	} else if (shortPackName == "QtOpengl") {
74	shortPackName = "QtOpenGL";	88	shortPackName = "QtOpenGL";
75	} else if (shortPackName == "QtUitools") {	89	} else if (shortPackName == "QtUitools") {
76	shortPackName = "QtUiTools";	90	shortPackName = "QtUiTools";
77	}	91	}
78		92
79		93
80	{	94	{
81	FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");	95	FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");
82	QTextStream &s = initFile.stream;	96	QTextStream &s = initFile.stream;
83		97
84	if (FileOut::license)	98	if (FileOut::license)
85	writeQtScriptQtBindingsLicense(s);	99	writeQtScriptQtBindingsLicense(s);
86		100
87	s << "#include <PythonQt.h>" << endl;	101	s << "#include <PythonQt.h>" << endl;
		102
		103	foreach (const AbstractMetaClass *cls, list) {
		104	s << "#include \"" << ShellGenerator::wrapperClassName(cls) << ".h\"" << endl;
		105	}
		106	s << endl;
		107
		108	QStringList polymorphicHandlers = writePolymorphicHandler(s, list.at(0)->package(), classes_with_polymorphic_id);
		109	s << endl;
		110
		111	// declare individual class creation functions
		112	s << "void PythonQt_init_" << shortPackName << "() {" << endl;
		113	QStringList cppClassNames;
		114	foreach (const AbstractMetaClass *cls, list) {
		115	if (ShellGenerator::isBuiltIn(cls->name())) { continue; }
		116
		117	QString shellCreator;
		118	if (cls->generateShellClass()) {
		119	shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";
		120	}
		121	if (cls->isQObject()) {
		122	s << "PythonQt::self()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
		123	} else {
		124	QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
		125	s << "PythonQt::self()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
		126	}
		127	foreach(AbstractMetaClass* interface, cls->interfaces()) {
		128	// the interface might be our own class... (e.g. QPaintDevice)
		129	if (interface->qualifiedCppName() != cls->qualifiedCppName()) {
		130	s << "PythonQt::self()->addParentClass(\""<< cls->qualifiedCppName() << "\", \"" << interface->qualifiedCppName() << "\",PythonQtUpcastingOffset<" << cls->qualifiedCppName() <<","<<interface->qualifiedCppName()<<">());" << endl;
		131	}
		132	}
		133	}
		134	s << endl;
		135	foreach (QString handler, polymorphicHandlers) {
		136	s << "PythonQt::self()->addPolymorphicHandler(\""<< handler << "\", polymorphichandler_" << handler << ");" << endl;
		137	}
		138
		139	s << "}";
		140	s << endl;
		141	}
		142	}
		143	}
88		144
89	foreach (const AbstractMetaClass *cls, list) {	145	QStringList SetupGenerator::writePolymorphicHandler(QTextStream &s, const QString &package,
90	s << "#include \"" << ShellGenerator::wrapperClassName(cls) << ".h\"" << endl;	146	const AbstractMetaClassList &classes)
		147	{
		148	QStringList handlers;
		149	foreach (AbstractMetaClass *cls, classes) {
		150	const ComplexTypeEntry *centry = cls->typeEntry();
		151	if (!centry->isPolymorphicBase())
		152	continue;
		153	bool isGraphicsItem = (cls->qualifiedCppName()=="QGraphicsItem");
		154
		155	AbstractMetaClassList classList = this->classes();
		156	bool first = true;
		157	foreach (AbstractMetaClass *clazz, classList) {
		158	bool inherits = false;
		159	if (isGraphicsItem) {
		160	foreach(AbstractMetaClass* interfaze, clazz->interfaces()) {
		161	if (interfaze->qualifiedCppName()=="QGraphicsItem") {
		162	inherits = true;
		163	break;
91	}	164	}
92	s << endl;	165	}
93		166	} else {
94	// declare individual class creation functions	167	inherits = clazz->inheritsFrom(cls);
95	s << "void PythonQt_init_" << shortPackName << "() {" << endl;	168	}
96	QStringList cppClassNames;	169	if (clazz->package() == package && inherits) {
97	foreach (const AbstractMetaClass *cls, list) {	170	if (!clazz->typeEntry()->polymorphicIdValue().isEmpty() \|\| isGraphicsItem) {
98	if (ShellGenerator::isBuiltIn(cls->name())) { continue; }	171	// On first find, open the function
99		172	if (first) {
100	QString shellCreator;	173	first = false;
101	if (cls->generateShellClass()) {	174
102	shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";	175	QString handler = cls->name();
103	}	176	handlers.append(handler);
104	if (cls->isQObject()) {	177
105	s << "PythonQt::self()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;	178	s << "static void* polymorphichandler_" << handler
106	} else {	179	<< "(const void ptr, char *class_name)" << endl
107	QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";	180	<< "{" << endl
108	s << "PythonQt::self()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;	181	<< " Q_ASSERT(ptr != 0);" << endl
109	}	182	<< " " << cls->qualifiedCppName() << " *object = ("
110	foreach(AbstractMetaClass* interface, cls->interfaces()) {	183	<< cls->qualifiedCppName() << " *)ptr;" << endl;
111	// the interface might be our own class... (e.g. QPaintDevice)
112	if (interface->qualifiedCppName() != cls->qualifiedCppName()) {
113	s << "PythonQt::self()->addParentClass(\""<< cls->qualifiedCppName() << "\", \"" << interface->qualifiedCppName() << "\",PythonQtUpcastingOffset<" << cls->qualifiedCppName() <<","<<interface->qualifiedCppName()<<">());" << endl;
114	}
115	}
116	}	184	}
117	s << endl;
118		185
119	s << "}";	186	// For each, add case label
120	s << endl;	187	QString polyId = clazz->typeEntry()->polymorphicIdValue();
		188	if (isGraphicsItem) {
		189	polyId = "%1->type() == " + clazz->qualifiedCppName() + "::Type";
		190	}
		191	s << " if ("
		192	<< polyId.replace("%1", "object")
		193	<< ") {" << endl
		194	<< " *class_name = \"" << clazz->name() << "\";" << endl
		195	<< " return (" << clazz->qualifiedCppName() << "*)object;" << endl
		196	<< " }" << endl;
		197	} else {
		198	QString warning = QString("class '%1' inherits from polymorphic class '%2', but has no polymorphic id set")
		199	.arg(clazz->name())
		200	.arg(cls->name());
		201
		202	ReportHandler::warning(warning);
121	}	203	}
		204	}
122	}	205	}
		206
		207	// Close the function if it has been opened
		208	if (!first) {
		209	s << " return NULL;" << endl
		210	<< "}" << endl;
		211	}
		212	}
		213
		214	return handlers;
123	}	215	}

generator/setupgenerator.h +4 -1

                 void addClass(const AbstractMetaClass *cls);
              private:
-                QHash<QString, QList<const AbstractMetaClass*> > packHash;
+               QStringList writePolymorphicHandler(QTextStream &s, const QString &package,
+                 const AbstractMetaClassList &classes);
+               QHash<QString, QList<const AbstractMetaClass*> > packHash;
             };
             #endif // SETUPGENERATOR_H

generator/shellgenerator.cpp +1 -1

               AbstractMetaFunctionList functions;
               AbstractMetaFunctionList functions1 = getFunctionsToWrap(meta_class);
               foreach(AbstractMetaFunction* func, functions1) {
-                if (!func->wasPublic()) {
+                if (!func->isPublic() || func->isVirtual()) {
                   functions << func;
                 }
               }

generator/shellheadergenerator.cpp +1 -1

                 foreach(AbstractMetaFunction* fun, promoteFunctions) {
                   s << "inline ";
-                  writeFunctionSignature(s, fun, 0, QString(),
+                  writeFunctionSignature(s, fun, 0, "promoted_",
                     Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << " { ";
                   QString scriptFunctionName = fun->originalName();

generator/shellimplgenerator.cpp +9 -8

                 }
               }
+              QString wrappedObject = " (*theWrappedObject)";
               // write member functions
               for (int i = 0; i < functions.size(); ++i) {
                 AbstractMetaFunction *fun = functions.at(i);
                   Option(FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
                   "PythonQtWrapper_");
                 s << endl << "{" << endl;
-                QString wrappedObject;
+                s << "  ";
-                if (fun->wasPublic()) {
-                  wrappedObject = " (*theWrappedObject)";
-                } else {
-                  wrappedObject = " (*((" + promoterClassName(meta_class) + "*)theWrappedObject))";
                 if (ShellGenerator::isSpecialStreamingOperator(fun)) {
                   s << fun->arguments().at(0)->argumentName();
                   if (fun->originalName().startsWith("operator>>")) {
                     if (fun->isStatic()) {
                       s << meta_class->qualifiedCppName() << "::";
                     } else {
-                      s << wrappedObject << ".";
+                      if (!fun->isPublic() || fun->isVirtual()) {
+                        s << " (("  << promoterClassName(meta_class) << "*)theWrappedObject)->promoted_";
+                      } else {
+                        s << " theWrappedObject->";
+                      }
                     }
-                    s << fun->originalName() << "(";
+                    s  << fun->originalName() << "(";
                     for (int i = 0; i < args.size(); ++i) {
                       if (i > 0)
                         s << ", ";

generator/typesystem_gui.xml +5 -5

                     <access modifier="private"/>
                 </modify-function>
                 <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)">
-            	    <remove/>
+                  <remove/>
                 </modify-function>
                 <modify-function signature="bits()const">
                     <remove/>
               <interface-type name="QLayoutItem"/>
               <interface-type name="QPaintDevice"/>
-              <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
+              <interface-type name="QGraphicsItem" delete-in-main-thread="yes"  polymorphic-base="yes">
                 <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
                 <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
                     <modify-argument index="1" invalidate-after-use="yes"/>
                 </modify-function>
                 <modify-function signature="children()const" remove="all"/>
                 <modify-function signature="installSceneEventFilter(QGraphicsItem *)">
                     <modify-argument index="1">
                         <!-- Safe to ignore because items in a scene are memory managed by the scene -->
                     <access modifier="private"/>
                 </modify-function>
                 <modify-function signature="QApplication(int &amp;, char **, QApplication::Type, int)">
-            	    <remove/>
+                  <remove/>
                 </modify-function>
                 <modify-function signature="QApplication(int &amp;, char **, bool, int)">
-            	    <remove/>
+                  <remove/>
                 </modify-function>
                 <modify-function signature="font(const char*)">

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