diff options
Diffstat (limited to 'kalyptus/kalyptusCxxToJava.pm')
-rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 59a5444d..b75b9fb2 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -331,12 +331,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -903,7 +903,7 @@ sub preParseClass || ($name eq 'qt_property') || ($name eq 'staticMetaObject') || ($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 'trUtf8') || $m->{Deprecated} ) { @@ -3315,9 +3315,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; |