comparison generator/cppimplgenerator.cpp @ 303:98b211f3ee34 signals

fix for #19
author eldar_ins@eldar-laptop
date Sat, 12 Dec 2009 16:01:55 +0500
parents 4d8481385c71
children 04b52676b45f
comparison
equal deleted inserted replaced
302:55ee4603365d 303:98b211f3ee34
504 s << " " << function->marshalledName() << "_dispatch = " 504 s << " " << function->marshalledName() << "_dispatch = "
505 "(pf" << function->marshalledName() << "_dispatch) virts[" << pos << "];" << endl; 505 "(pf" << function->marshalledName() << "_dispatch) virts[" << pos << "];" << endl;
506 } 506 }
507 } 507 }
508 // D-side signal callbacks 508 // D-side signal callbacks
509 if (java_class->isQObject()) 509 if (java_class->isQObject()) {
510 s << " qtd_" << java_class->name() << "_qt_metacall_dispatch = (QtMetacallCallback)sigs[0];" << endl; 510 s << " qtd_" << java_class->name() << "_qt_metacall_dispatch = (QtMetacallCallback)sigs[0];" << endl
511 << " qtd_" << java_class->name() << "_metaObject_dispatch = (MetaObjectCallback)sigs[1];" << endl;
512 }
511 s << "}" << endl; 513 s << "}" << endl;
512 } 514 }
513 515
514 516
515 void CppImplGenerator::write(QTextStream &s, const AbstractMetaClass *java_class) 517 void CppImplGenerator::write(QTextStream &s, const AbstractMetaClass *java_class)
1348 << " return -1;" << endl 1350 << " return -1;" << endl
1349 << "}" << endl << endl; 1351 << "}" << endl << endl;
1350 */ 1352 */
1351 1353
1352 if(cpp_shared) 1354 if(cpp_shared)
1353 s << "QtMetacallCallback qtd_" << java_class->name() << "_qt_metacall_dispatch;" << endl; 1355 s << "MetaObjectCallback qtd_" << java_class->name() << "_metaObject_dispatch;" << endl
1356 << "QtMetacallCallback qtd_" << java_class->name() << "_qt_metacall_dispatch;" << endl;
1354 else 1357 else
1355 s << "extern \"C\" int qtd_" << java_class->name() << "_qt_metacall_dispatch(void *d_entity, QMetaObject::Call _c, int _id, void **_a);" << endl << endl; 1358 s << "extern \"C\" const QMetaObject* qtd_" << java_class->name() << "_metaObject_dispatch(void *d_entity);" << endl
1356 1359 << "extern \"C\" int qtd_" << java_class->name() << "_qt_metacall_dispatch(void *d_entity, QMetaObject::Call _c, int _id, void **_a);" << endl;
1357 s << "int " << shellClassName(java_class) << "::qt_metacall(QMetaObject::Call _c, int _id, void **_a)" << endl 1360
1361 s << endl
1362 << "const QMetaObject * " << shellClassName(java_class) << "::metaObject() const" << endl
1363 << "{" << endl
1364 << " return qtd_" << java_class->name() << "_metaObject_dispatch(this->dId);" << endl
1365 << "}" << endl << endl
1366 << "int " << shellClassName(java_class) << "::qt_metacall(QMetaObject::Call _c, int _id, void **_a)" << endl
1358 << "{" << endl 1367 << "{" << endl
1359 << " return qtd_" << java_class->name() << "_qt_metacall_dispatch(this->dId, _c, _id, _a);" << endl 1368 << " return qtd_" << java_class->name() << "_qt_metacall_dispatch(this->dId, _c, _id, _a);" << endl
1360 << "}" << endl << endl 1369 << "}" << endl << endl
1361 1370
1362 << "int " << shellClassName(java_class) << "::__override_qt_metacall(QMetaObject::Call _c, int _id, void **_a)" << endl 1371 << "int " << shellClassName(java_class) << "::__override_qt_metacall(QMetaObject::Call _c, int _id, void **_a)" << endl