Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 3ad3d6e3..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, ' ');
 	}
 	
@@ -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;