Drop Qt2 obsolete classes

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/14/head
Michele Calgaro 1 year ago
parent e4e0bb8ca8
commit dcffc0bc39
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1836,7 +1836,6 @@ sub cplusplusToJava
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/
|| $cplusplusType =~ /TQMemArray<TQRect>/ || $cplusplusType =~ /TQMemArray<TQRect>/
|| $cplusplusType =~ /TQArray<TQRect>/
|| kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) {
return "ArrayList" return "ArrayList"
} elsif ( $cplusplusType =~ /uchar\s*\*/ ) { } elsif ( $cplusplusType =~ /uchar\s*\*/ ) {
@ -2247,8 +2246,6 @@ sub jniToReturnValue($$$)
$returnCall .= "\treturn (jobject) QtSupport::arrayWithTQIconDragItemList(env, (TQValueList<TQIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQIconDragItemList(env, (TQValueList<TQIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n";
} elsif ( $cplusplusType =~ /TQMemArray<TQRect>\s*([\*\&])?\s*$/ ) { } elsif ( $cplusplusType =~ /TQMemArray<TQRect>\s*([\*\&])?\s*$/ ) {
$returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQMemArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; $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\[\]/ ) { } elsif ( $javaType =~ /String\[\]/ ) {
; # Do nothing, string arrays are ArrayLists as return values ; # Do nothing, string arrays are ArrayLists as return values
@ -2835,7 +2832,7 @@ sub writeClassDoc
my @ancestor_nodes = (); my @ancestor_nodes = ();
Iter::Ancestors( $node, $rootnode, undef, undef, sub { Iter::Ancestors( $node, $rootnode, undef, undef, sub {
my ( $ances, $name, $type, $template ) = @_; 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 @ancestor_nodes, $ances;
push @ancestors, $name; push @ancestors, $name;
} }

@ -1467,7 +1467,6 @@ BEGIN
'TQActionGroup*' => 'qt_QActionGroup*', 'TQActionGroup*' => 'qt_QActionGroup*',
'TQApplication*' => 'qt_QApplication*' , 'TQApplication*' => 'qt_QApplication*' ,
'TQArabicCodec*' => 'qt_QArabicCodec*', 'TQArabicCodec*' => 'qt_QArabicCodec*',
'TQArray*' => 'qt_QArray*',
'TQAsciiBucket*' => 'qt_QAsciiBucket*', 'TQAsciiBucket*' => 'qt_QAsciiBucket*',
'TQAsciiCache*' => 'qt_QAsciiCache*', 'TQAsciiCache*' => 'qt_QAsciiCache*',
'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*', 'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*',
@ -1541,10 +1540,6 @@ BEGIN
'TQCleanupHandler*' => 'qt_QCleanupHandler*', 'TQCleanupHandler*' => 'qt_QCleanupHandler*',
'TQClipboard*' => 'qt_QClipboard*', 'TQClipboard*' => 'qt_QClipboard*',
'TQCloseEvent*' => 'qt_QCloseEvent*' , 'TQCloseEvent*' => 'qt_QCloseEvent*' ,
'TQCollection&' => 'qt_QCollection*' ,
'TQCollection*' => 'qt_QCollection*',
'TQCollection::Item&' => 'void*' ,
'TQCollection::Item' => 'void*' ,
'TQColor &' => 'qt_QColor*', 'TQColor &' => 'qt_QColor*',
'TQColor&' => 'qt_QColor*', 'TQColor&' => 'qt_QColor*',
'TQColor&fillColor::white' => 'int' , 'TQColor&fillColor::white' => 'int' ,
@ -1951,7 +1946,6 @@ BEGIN
'TQPtrStack*' => 'qt_QPtrStack*', 'TQPtrStack*' => 'qt_QPtrStack*',
'TQPtrVector*' => 'qt_QPtrVector*', 'TQPtrVector*' => 'qt_QPtrVector*',
'TQPushButton*' => 'qt_QPushButton*', 'TQPushButton*' => 'qt_QPushButton*',
'TQQueue*' => 'qt_QQueue*',
'TQRESULT' => 'long', 'TQRESULT' => 'long',
'TQRadioButton*' => 'qt_QRadioButton*', 'TQRadioButton*' => 'qt_QRadioButton*',
'TQRangeControl*' => 'qt_QRangeControl*', 'TQRangeControl*' => 'qt_QRangeControl*',

@ -4,7 +4,6 @@ ntqaccessible.h
ntqaction.h ntqaction.h
ntqapp.h ntqapp.h
ntqapplication.h ntqapplication.h
ntqarray.h
ntqasciicache.h ntqasciicache.h
ntqasciidict.h ntqasciidict.h
ntqassistantclient.h ntqassistantclient.h
@ -28,7 +27,6 @@ ntqcleanuphandler.h
ntqclipboard.h ntqclipboard.h
ntqclipbrd.h ntqclipbrd.h
ntqcollect.h ntqcollect.h
ntqcollection.h
ntqcolordialog.h ntqcolordialog.h
ntqcolor.h ntqcolor.h
ntqcombobox.h ntqcombobox.h
@ -204,7 +202,6 @@ ntqptrstack.h
ntqptrvector.h ntqptrvector.h
ntqpushbt.h ntqpushbt.h
ntqpushbutton.h ntqpushbutton.h
ntqqueue.h
ntqradiobt.h ntqradiobt.h
ntqradiobutton.h ntqradiobutton.h
ntqrangecontrol.h ntqrangecontrol.h

@ -4,7 +4,6 @@ ntqaccessible.h
ntqaction.h ntqaction.h
ntqapp.h ntqapp.h
ntqapplication.h ntqapplication.h
ntqarray.h
ntqasciicache.h ntqasciicache.h
ntqasciidict.h ntqasciidict.h
ntqassistantclient.h ntqassistantclient.h
@ -28,7 +27,6 @@ ntqcleanuphandler.h
ntqclipboard.h ntqclipboard.h
ntqclipbrd.h ntqclipbrd.h
ntqcollect.h ntqcollect.h
ntqcollection.h
ntqcolordialog.h ntqcolordialog.h
ntqcolor.h ntqcolor.h
ntqcombobox.h ntqcombobox.h
@ -204,7 +202,6 @@ ntqptrstack.h
ntqptrvector.h ntqptrvector.h
ntqpushbt.h ntqpushbt.h
ntqpushbutton.h ntqpushbutton.h
ntqqueue.h
ntqradiobt.h ntqradiobt.h
ntqradiobutton.h ntqradiobutton.h
ntqrangecontrol.h ntqrangecontrol.h

Loading…
Cancel
Save