diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:45:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:45:01 -0600 |
| commit | fb7e279ef21733ca91caad571e63263b1f947f85 (patch) | |
| tree | cd03e2405d1f6eddd9fd50d4a29faa6d4b990796 /kalyptus/kalyptusCxxToJNI.pm | |
| parent | 18896070bf8c173783628a31da969042bddd2867 (diff) | |
| download | tdebindings-fb7e279ef21733ca91caad571e63263b1f947f85.tar.gz tdebindings-fb7e279ef21733ca91caad571e63263b1f947f85.zip | |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index d400ef93..a5b603e9 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -1815,7 +1815,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[]"; @@ -2066,8 +2066,8 @@ sub jniArgTocplusplus } } } elsif ( $javaType =~ /String\[\]\[\]/ ) { - if ( $cplusplusType =~ /KCmdLineOptions/ ) { - $jniArg = "(KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, $argName)"; + if ( $cplusplusType =~ /TDECmdLineOptions/ ) { + $jniArg = "(TDECmdLineOptions*) KDESupport::toTDECmdLineOptions(env, $argName)"; } } elsif ( $javaType =~ /String\[\]/ ) { if ( $cplusplusType =~ /TQStringList/ ) { @@ -5466,8 +5466,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; @@ -5572,7 +5572,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; |