summaryrefslogtreecommitdiffstats
path: root/src/moc
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-05-23 22:57:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-05-23 22:57:29 +0900
commitcfc76de73cecd5c569cbec280fe8aaa680956df3 (patch)
tree294561f215a17658f23eac128312542ab30721f1 /src/moc
parente9567cacadf2fdc305f3ddbebce43ef395368c51 (diff)
downloadtqt3-cfc76de73cecd5c569cbec280fe8aaa680956df3.tar.gz
tqt3-cfc76de73cecd5c569cbec280fe8aaa680956df3.zip
Removed dummy int parameter from TQVariant(bool, int).
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/moc')
-rw-r--r--src/moc/moc.y10
-rw-r--r--src/moc/moc_yacc.cpp10
2 files changed, 8 insertions, 12 deletions
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 49fcc61f7..cfd8af0cb 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -3441,16 +3441,14 @@ void generateClass() // generate C++ source code for a class
}
if ( it.current()->getfunc ) {
if ( it.current()->gspec == Property::Pointer )
- fprintf( out, "\tcase 1: if ( this->%s() ) *v = TQVariant( %s*%s()%s ); break;\n",
+ fprintf( out, "\tcase 1: if ( this->%s() ) *v = TQVariant( %s*%s() ); break;\n",
it.current()->getfunc->name.data(),
!isVariantType( it.current()->type ) ? "(int)" : "",
- it.current()->getfunc->name.data(),
- it.current()->type == "bool" ? ", 0" : "" );
+ it.current()->getfunc->name.data());
else
- fprintf( out, "\tcase 1: *v = TQVariant( %sthis->%s()%s ); break;\n",
+ fprintf( out, "\tcase 1: *v = TQVariant( %sthis->%s() ); break;\n",
!isVariantType( it.current()->type ) ? "(int)" : "",
- it.current()->getfunc->name.data(),
- it.current()->type == "bool" ? ", 0" : "" );
+ it.current()->getfunc->name.data());
} else if ( it.current()->override ) {
flag_propagate |= 1<< (1+1);
}
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index f2a5c53b1..f5c59d84a 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -6316,16 +6316,14 @@ void generateClass() // generate C++ source code for a class
}
if ( it.current()->getfunc ) {
if ( it.current()->gspec == Property::Pointer )
- fprintf( out, "\tcase 1: if ( this->%s() ) *v = TQVariant( %s*%s()%s ); break;\n",
+ fprintf( out, "\tcase 1: if ( this->%s() ) *v = TQVariant( %s*%s() ); break;\n",
it.current()->getfunc->name.data(),
!isVariantType( it.current()->type ) ? "(int)" : "",
- it.current()->getfunc->name.data(),
- it.current()->type == "bool" ? ", 0" : "" );
+ it.current()->getfunc->name.data());
else
- fprintf( out, "\tcase 1: *v = TQVariant( %sthis->%s()%s ); break;\n",
+ fprintf( out, "\tcase 1: *v = TQVariant( %sthis->%s() ); break;\n",
!isVariantType( it.current()->type ) ? "(int)" : "",
- it.current()->getfunc->name.data(),
- it.current()->type == "bool" ? ", 0" : "" );
+ it.current()->getfunc->name.data());
} else if ( it.current()->override ) {
flag_propagate |= 1<< (1+1);
}