|
|
@ -903,7 +903,7 @@ sub preParseClass
|
|
|
|
|| ($name eq 'qt_property')
|
|
|
|
|| ($name eq 'qt_property')
|
|
|
|
|| ($name eq 'staticMetaObject')
|
|
|
|
|| ($name eq 'staticMetaObject')
|
|
|
|
|| ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
|
|
|
|
|| ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
|
|
|
|
# Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro
|
|
|
|
# Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro
|
|
|
|
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|
|
|
|
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
|
|
|
|
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
|
|
|
|
|| ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
|
|
|
|
|| $m->{Deprecated} ) {
|
|
|
|
|| $m->{Deprecated} ) {
|
|
|
@ -3317,7 +3317,7 @@ sub printJavadocComment($$$$)
|
|
|
|
$line =~ s/bool/boolean/g;
|
|
|
|
$line =~ s/bool/boolean/g;
|
|
|
|
$line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g;
|
|
|
|
$line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g;
|
|
|
|
$line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g;
|
|
|
|
$line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g;
|
|
|
|
$line =~ s/Q_OBJECT\n//g;
|
|
|
|
$line =~ s/TQ_OBJECT\n//g;
|
|
|
|
$line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g;
|
|
|
|
$line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g;
|
|
|
|
$line =~ s/public\s*(slots)?:\n/public /g;
|
|
|
|
$line =~ s/public\s*(slots)?:\n/public /g;
|
|
|
|
$line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g;
|
|
|
|
$line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g;
|
|
|
|