diff generator/dgenerator.cpp @ 322:7c2cf27391c4 signals

A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
author eldar_ins@eldar-laptop
date Sun, 27 Dec 2009 21:13:38 +0500
parents d458ed66e871
children 1defd6a98364
line wrap: on
line diff
--- a/generator/dgenerator.cpp	Sat Dec 26 05:10:16 2009 +0500
+++ b/generator/dgenerator.cpp	Sun Dec 27 21:13:38 2009 +0500
@@ -2791,11 +2791,9 @@
       {
           AbstractMetaFunction *fn = signal_funcs.at(i);
   s << "        index = _staticMetaObject.indexOfMethod_Cpp(__signalSignatures[" << staticId << "]);" << endl
-    << "        _staticMetaObject.addMethod(new QMetaSignal(signature!(\"" << fn->name() << "\"";
-          if(fn->arguments().size()-j > 0)
-              s << ", ";
+    << "        _staticMetaObject.addMethod(new QMetaSignal(signature!(";
           writeMetaMethodArguments(s, fn, j);
-  s << "), index));" << endl << endl;
+  s << ")(\"" << fn->name() << "\"), index));" << endl << endl;
           AbstractMetaArgumentList args = fn->arguments();
           if(args.size() && j<args.size())
               hasDefault = !args.at(args.size() - 1 - j)->defaultValueExpression().isEmpty();
@@ -2815,11 +2813,9 @@
       {
           AbstractMetaFunction *fn = slot_funcs.at(i);
   s << "        index = _staticMetaObject.indexOfMethod_Cpp(__slotSignatures[" << staticId << "]);" << endl
-    << "        _staticMetaObject.addMethod(new QMetaSlot(signature!(\"" << fn->name() << "\"";
-          if(fn->arguments().size()-j > 0)
-              s << ", ";
+    << "        _staticMetaObject.addMethod(new QMetaSlot(signature!(";
           writeMetaMethodArguments(s, fn, j);
-  s << "), index));" << endl << endl;
+  s << ")(\"" << fn->name() << "\"), index));" << endl << endl;
           AbstractMetaArgumentList args = fn->arguments();
           if(args.size() && j<args.size())
               hasDefault = !args.at(args.size() - 1 - j)->defaultValueExpression().isEmpty();