From 076ec834048d2465420b6e09599552ad3f9dc9df Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 3 Jun 2023 11:49:23 +0900 Subject: Drop Qt2 obsolete classes Signed-off-by: Michele Calgaro --- kalyptus/kalyptusCxxToJNI.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'kalyptus/kalyptusCxxToJNI.pm') diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 7d57f37..1b2ba38 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -1836,7 +1836,6 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/ || $cplusplusType =~ /TQMemArray/ - || $cplusplusType =~ /TQArray/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { @@ -2247,8 +2246,6 @@ sub jniToReturnValue($$$) $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQIconDragItemList(env, (TQValueList*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /TQMemArray\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQMemArray*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /TQArray\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQArray*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } } elsif ( $javaType =~ /String\[\]/ ) { ; # Do nothing, string arrays are ArrayLists as return values @@ -2835,7 +2832,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "TQMemArray" and $name ne "TQArray" and $name ne "TQSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } -- cgit v1.2.1