comparison generator/dgenerator.cpp @ 279:519befd5a5d1

Fix for windows build, thanks Rainer. Fix for signals.
author eldar
date Fri, 09 Oct 2009 06:17:51 +0000
parents 49bfc86ff583
children 1f6923c8cba0
comparison
equal deleted inserted replaced
278:5df570e79cfc 279:519befd5a5d1
2563 } 2563 }
2564 2564
2565 // write static constructor 2565 // write static constructor
2566 if (staticInit) { 2566 if (staticInit) {
2567 QString initArgs; 2567 QString initArgs;
2568 if (cpp_shared) 2568 if (cpp_shared && d_class->generateShellClass())
2569 { 2569 {
2570 initArgs = "void* virtuals"; 2570 initArgs = "void* virtuals";
2571 if (d_class->isQObject()) 2571 if (d_class->isQObject())
2572 initArgs += ", void* signals"; 2572 initArgs += ", void* signals";
2573 2573
2580 if (d_class->isQObject()) { 2580 if (d_class->isQObject()) {
2581 s << INDENT << "if (!" << d_class->name() << "._staticMetaObject) " << endl 2581 s << INDENT << "if (!" << d_class->name() << "._staticMetaObject) " << endl
2582 << INDENT << " " << d_class->name() << ".createStaticMetaObject;" << endl << endl; 2582 << INDENT << " " << d_class->name() << ".createStaticMetaObject;" << endl << endl;
2583 } 2583 }
2584 2584
2585 if (cpp_shared) { 2585 if (cpp_shared && d_class->generateShellClass()) {
2586 // virtual functions 2586 // virtual functions
2587 s << INDENT << "void*[" << virtualFunctions.size() << "] virt_arr;" << endl; 2587 s << INDENT << "void*[" << virtualFunctions.size() << "] virt_arr;" << endl;
2588 for (int pos = 0; pos<virtualFunctions.size(); ++pos) { 2588 for (int pos = 0; pos<virtualFunctions.size(); ++pos) {
2589 const AbstractMetaFunction *function = virtualFunctions.at(pos); 2589 const AbstractMetaFunction *function = virtualFunctions.at(pos);
2590 if (!notWrappedYet(function)) // qtd2 2590 if (!notWrappedYet(function)) // qtd2