diff options
Diffstat (limited to 'kalyptus')
| -rw-r--r-- | kalyptus/kalyptusCxxToDcopIDL.pm | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 8 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 8 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/kalyptus/kalyptusCxxToDcopIDL.pm b/kalyptus/kalyptusCxxToDcopIDL.pm index 3dd00fc..cb1f40c 100644 --- a/kalyptus/kalyptusCxxToDcopIDL.pm +++ b/kalyptus/kalyptusCxxToDcopIDL.pm @@ -736,7 +736,7 @@ sub generateMethod($$$) my $methodCode = ""; - my $tagType = ($flags !~ /z/) ? "FUNC" : "SIGNAL"; + my $tagType = ($flags !~ /z/) ? "FUNC" : "TQ_SIGNAL"; my $tagAttr = ""; $tagAttr .= " hidden=\"yes\"" if $flags =~ /y/; diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 45e2af6..9deaca3 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -536,12 +536,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, ' '); } @@ -5476,8 +5476,8 @@ 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/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; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 3ad3d6e..b75b9fb 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, ' '); } @@ -3315,8 +3315,8 @@ 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/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; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 174bc5f..4f4804c 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -386,11 +386,11 @@ EOF public static TQApplication tqApp = null; - public static string SIGNAL(string signal) { + public static string TQ_SIGNAL(string signal) { return "2"+ signal; } - public static string SLOT(string slot) { + public static string TQ_SLOT(string slot) { return "1" + slot; } EOF @@ -3497,8 +3497,8 @@ sub printCSharpdocComment($$$$) $line =~ s/const char/string/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/bool/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/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/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; |