diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:47:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:47:56 -0600 |
| commit | ea4d7d39f76dc8aa3216380287e9391b6b6a44a0 (patch) | |
| tree | ce0a22266a51ae821653746785286af900f1d8cb /kalyptus/kalyptusCxxToJNI.pm | |
| parent | f848c7a5deb2e7fbd346e9651203aa8c2bf1b314 (diff) | |
| download | libtqt-perl-ea4d7d39f76dc8aa3216380287e9391b6b6a44a0.tar.gz libtqt-perl-ea4d7d39f76dc8aa3216380287e9391b6b6a44a0.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 7db0fdd..d95daec 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; |