diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:50:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:50:32 -0600 |
| commit | 5538de896d91beba2d934e4d218f1d2bb52e937b (patch) | |
| tree | 166367146432517fcc404376de628b5505f2f5fd /kalyptus/kalyptusCxxToJNI.pm | |
| parent | ddde3d2db1a481c6fd3fd3e4273176b75d17c5e8 (diff) | |
| download | tdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.tar.gz tdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index b3512c6e..47f8266a 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -2239,7 +2239,7 @@ sub jniToReturnValue($$$) $returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, (DOM::$1 *) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /(QCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /(KTrader::OfferList)\s*([\*\&])?\s*$/ ) { + } elsif ( $cplusplusType =~ /(TDETrader::OfferList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithOfferList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /(KURL::List)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithKURLList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; @@ -5460,7 +5460,7 @@ sub printJavadocComment($$$$) } else { $line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g; } - $line =~ s/NodeList|KTrader::OfferList/ArrayList/g; + $line =~ s/NodeList|TDETrader::OfferList/ArrayList/g; $line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g; $line =~ s/(const )?TQTime([^r])/Date$1/g; $line =~ s/TQString::null/null/g; |