diff options
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 12 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 8 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 8 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToSmoke.pm | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 95a36cb..22585aa 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; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 50d3885..a84fad1 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; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index d3e63c7..1e6bdc4 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -545,7 +545,7 @@ sub cplusplusToCSharp return "out double"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /^\s*(unsigned )?short\s*\*/ ) { return "out short"; - } elsif ( $cplusplusType =~ /KCmdLineOptions/ ) { + } elsif ( $cplusplusType =~ /TDECmdLineOptions/ ) { return "string[][]"; } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) { return "string[]"; @@ -3498,8 +3498,8 @@ sub printCSharpdocComment($$$$) $line =~ s/(const )?TQTime([^r])/DateTime$1/g; $line =~ s/TQString::null/null/g; $line =~ s/(const )?QC?String(\s*&)?/string/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; @@ -3601,7 +3601,7 @@ sub printCSharpdocComment($$$$) $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; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 80b35d2..b76f2fd 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -329,7 +329,7 @@ sub preParseClass $className eq 'TQWidgetList' || $className eq 'TQObjectList' || $className eq 'TQStrList' || - $className eq 'KCmdLineOptions' || + $className eq 'TDECmdLineOptions' || # Those are template related $className eq 'TQTSManip' || # cause compiler errors with several gcc versions $className eq 'TQGDict' || |