From fb7e279ef21733ca91caad571e63263b1f947f85 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 6 Feb 2013 19:45:01 -0600
Subject: Rename KCmd to avoid conflicts with KDE4

---
 kalyptus/kalyptusCxxToJava.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kalyptus/kalyptusCxxToJava.pm')

diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 866295c3..fc932e54 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -549,7 +549,7 @@ sub cplusplusToJava
 		return "double[]";
 	} elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /^\s*(unsigned )?short\s*\*/ ) {
 		return "short[]";
-	} elsif ( $cplusplusType =~ /KCmdLineOptions/ ) {
+	} elsif ( $cplusplusType =~ /TDECmdLineOptions/ ) {
 		return "String[][]";	
 	} elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) {
 		return "String[]";
@@ -3305,8 +3305,8 @@ sub printJavadocComment($$$$)
 		$line =~ s/TQString::null/null/g;
 		$line =~ s/(const )?QC?String(\s*&)?/String/g;
 		$line =~ s/TQByteArray/byte[]/g;
-		$line =~ s/(const )?KCmdLineOptions\s*(\w+)\[\]/String[][] $2/;
-		$line =~ s/KCmdLineLastOption//g;
+		$line =~ s/(const )?TDECmdLineOptions\s*(\w+)\[\]/String[][] $2/;
+		$line =~ s/TDECmdLineLastOption//g;
 		$line =~ s/virtual //g;
 		$line =~ s/~\w+\(\)((\s*{\s*})|;)//g;
 		$line =~ s/0L/null/g;
@@ -3411,7 +3411,7 @@ sub printJavadocComment($$$$)
 	$returntext =~ s/TQStringList/ArrayList/g;
 	$returntext =~ s/([Aa]) ArrayList/$1n ArrayList/g;
 	$returntext =~ s/TQString/String/g;
-	$returntext =~ s/KCmdLineOptions/String[][]/;
+	$returntext =~ s/TDECmdLineOptions/String[][]/;
 	$returntext =~ s!\\note!<b>Note:<\b>!g;
 	$returntext =~ s!\\(code|verbatim)!<pre>!g;
 	$returntext =~ s!\\(endcode|endverbatim)!</pre>!g;
-- 
cgit v1.2.1