From 60933ac14a69fb2b361c06761bb0c877f76130f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 16:23:22 -0600 Subject: Rename TQCStringList --- kalyptus/kalyptusCxxToJNI.pm | 10 +++++----- kalyptus/kalyptusDataDict.pm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kalyptus') diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 7dfae765..2da2cc7e 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -2050,12 +2050,12 @@ sub jniArgTocplusplus } else { $jniArg = "($cplusplusType)*(TQStrList*) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; } - } elsif ( $cplusplusType =~ /TQCStringList/ ) { - $jniLocal ="static TQCStringList* _qlist_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /QCStringList/ ) { + $jniLocal ="static QCStringList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(TQCStringList*) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(QCStringList*) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; } } elsif ( $cplusplusType =~ /KURL::List/ ) { $jniLocal ="static KURL::List* _qlist_$argName = 0;\n"; @@ -2237,7 +2237,7 @@ sub jniToReturnValue($$$) $returnCall .= "\treturn (jobject) QtSupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /DOM::(NodeList|StyleSheetList|MediaList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, (DOM::$1 *) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /(TQCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) { + } 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*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithOfferList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index d9b48831..586ddf3e 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1507,7 +1507,7 @@ BEGIN 'TQCString' => 'qt_QCString*' , 'TQCString*' => 'qt_QCString*' , 'TQCStringLess*' => 'qt_QCStringLess*' , -'TQCStringList' => 'kde_QCStringList*' , +'QCStringList' => 'kde_QCStringList*' , 'TQCache*' => 'qt_QCache*', 'TQCacheIterator*' => 'qt_QCacheIterator*', 'TQCanvas*' => 'qt_QCanvas*' , -- cgit v1.2.1