diff options
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 5 | ||||
| -rw-r--r-- | kalyptus/kalyptusDataDict.pm | 6 | ||||
| -rw-r--r-- | smoke/tqt/header_list | 3 |
3 files changed, 1 insertions, 13 deletions
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<TQRect>/ - || $cplusplusType =~ /TQArray<TQRect>/ || 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<TQIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /TQMemArray<TQRect>\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQMemArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /TQArray<TQRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQArray<TQRect>*) " . ($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; } diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index b42f721..a72faae 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1467,7 +1467,6 @@ BEGIN 'TQActionGroup*' => 'qt_QActionGroup*', 'TQApplication*' => 'qt_QApplication*' , 'TQArabicCodec*' => 'qt_QArabicCodec*', -'TQArray*' => 'qt_QArray*', 'TQAsciiBucket*' => 'qt_QAsciiBucket*', 'TQAsciiCache*' => 'qt_QAsciiCache*', 'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*', @@ -1541,10 +1540,6 @@ BEGIN 'TQCleanupHandler*' => 'qt_QCleanupHandler*', 'TQClipboard*' => 'qt_QClipboard*', 'TQCloseEvent*' => 'qt_QCloseEvent*' , -'TQCollection&' => 'qt_QCollection*' , -'TQCollection*' => 'qt_QCollection*', -'TQCollection::Item&' => 'void*' , -'TQCollection::Item' => 'void*' , 'TQColor &' => 'qt_QColor*', 'TQColor&' => 'qt_QColor*', 'TQColor&fillColor::white' => 'int' , @@ -1951,7 +1946,6 @@ BEGIN 'TQPtrStack*' => 'qt_QPtrStack*', 'TQPtrVector*' => 'qt_QPtrVector*', 'TQPushButton*' => 'qt_QPushButton*', -'TQQueue*' => 'qt_QQueue*', 'TQRESULT' => 'long', 'TQRadioButton*' => 'qt_QRadioButton*', 'TQRangeControl*' => 'qt_QRangeControl*', diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list index e923ddd..82731f8 100644 --- a/smoke/tqt/header_list +++ b/smoke/tqt/header_list @@ -4,7 +4,6 @@ ntqaccessible.h ntqaction.h ntqapp.h ntqapplication.h -ntqarray.h ntqasciicache.h ntqasciidict.h ntqassistantclient.h @@ -28,7 +27,6 @@ ntqcleanuphandler.h ntqclipboard.h ntqclipbrd.h ntqcollect.h -ntqcollection.h ntqcolordialog.h ntqcolor.h ntqcombobox.h @@ -203,7 +201,6 @@ ntqptrstack.h ntqptrvector.h ntqpushbt.h ntqpushbutton.h -ntqqueue.h ntqradiobt.h ntqradiobutton.h ntqrangecontrol.h |