diff generator/dgenerator.cpp @ 284:1f6923c8cba0

consistent emit syntax.
author eldar
date Fri, 16 Oct 2009 12:23:12 +0000
parents 519befd5a5d1
children f9559a957be9
line wrap: on
line diff
--- a/generator/dgenerator.cpp	Fri Oct 16 05:32:23 2009 +0000
+++ b/generator/dgenerator.cpp	Fri Oct 16 12:23:12 2009 +0000
@@ -983,10 +983,10 @@
     if (!(d_function->isEmptyFunction() || d_function->isNormal() || d_function->isSignal()))
         option = Option(option | SkipReturnType);
     writeFunctionAttributes(s, d_function, included_attributes, excluded_attributes, option);
-
+/*
     if(d_function->isSignal())
         functionName += "_emit";
-
+*/
     s << functionName << "(";
     writeFunctionArguments(s, d_function, argument_count, option);
     s << ")";
@@ -1771,7 +1771,7 @@
                 s << endl;
             }
 //            s << INDENT << "Stdout(\"" << d_class->name() << "\", \"" << signal->name() << "\").newline;" << endl;
-            s << INDENT << "d_object." << signal->name() << ".emit(";
+            s << INDENT << "d_object." << signal->name() << "_emit(";
             for (int j = 0; j<sz; ++j) {
                 AbstractMetaArgument *argument = arguments.at(j);
                 QString arg_name = argument->indexedName();
@@ -2817,7 +2817,7 @@
     AbstractMetaArgumentList arguments = d_function->arguments();
     int sz = arguments.count();
 
-    s << INDENT << "mixin Signal!(\"" << d_function->name() << "\"";
+    s << INDENT << "mixin BindQtSignal!(\"" << d_function->name() << "\"";
 
     if (sz > 0) {
         for (int i=0; i<sz; ++i) {