diff options
Diffstat (limited to 'kalyptus')
| -rw-r--r-- | kalyptus/ChangeLog | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptus | 57 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToCSharp.pm | 4 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 17 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 12 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 23 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToSmoke.pm | 13 | ||||
| -rw-r--r-- | kalyptus/kalyptusDataDict.pm | 11 |
8 files changed, 58 insertions, 81 deletions
diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index f1729b0d..73c69c35 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -119,7 +119,7 @@ 2004-05-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Added the correct macro expansion for Q_OBJECT with Qt/E 2.3.x + * Added the correct macro expansion for TQ_OBJECT with Qt/E 2.3.x * kalyptus can now generate the SMOKE library for Qt Embedded 2004-05-22 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 21b0a519..ad897365 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -27,7 +27,7 @@ use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $a $libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin $Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe %formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode - @classStack $cNode $globalSpaceClassName + @classStack $cNode $globalSpaceClassName $have_tdehw_lib $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded $inExtern $inNamespace %stats %definitions @inputqueue @codeqobject @qt4_codeqobject @qte_codeqobject /; @@ -131,10 +131,9 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_PLATINUM => '', _STYLE_SGI => '', _STYLE_WINDOWS => '', - QT_STATIC_CONST => 'static const', - Q_EXPORT => '', + TQ_EXPORT => '', Q_EXPORT_CODECS_BIG5 => '', - Q_REFCOUNT => '', + TQ_REFCOUNT => '', TQM_EXPORT_CANVAS => '', TQM_EXPORT_DNS => '', TQM_EXPORT_ICONVIEW => '', @@ -143,11 +142,11 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); TQM_EXPORT_WORKSPACE => '', TQT_NO_REMOTE => 'TQT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', - Q_WS_X11 => 'Q_WS_X11', + TQ_WS_X11 => 'TQ_WS_X11', TQ_DISABLE_COPY => 'TQ_DISABLE_COPY', - Q_WS_QWS => 'undef', - Q_WS_MAC => 'undef', - Q_OBJECT => <<'CODE', + TQ_WS_QWS => 'undef', + TQ_WS_MAC => 'undef', + TQ_OBJECT => <<'CODE', public: virtual TQMetaObject *metaObject() const; virtual const char *className() const; @@ -230,6 +229,18 @@ if ( $#includes >= 0 && !$cpp ) { die "$exe: --includedir requires --cpp\n"; } +# Check for tdehw lib headers presence +if (-e "$ENV{KDE_PREFIX}/include/tdehardwaredevices.h") +{ + $have_tdehw_lib = 1; + print "kalyptus: tdehw headers found in $ENV{KDE_PREFIX}/include\n"; +} +else +{ + $have_tdehw_lib = 0; + print "kalyptus: tdehw headers not found in $ENV{KDE_PREFIX}/include\n"; +} + # Check output formats. HTML is the default if( $#formats_wanted < 0 ) { push @formats_wanted, "java"; @@ -364,7 +375,7 @@ sub parseFiles || croak "Can't preprocess $currentfile"; } else { - open( INPUT, "tqt-replace-stream $currentfile |" ) + open( INPUT, "$currentfile" ) || croak "Can't read from $currentfile"; } @@ -456,7 +467,7 @@ sub readSourceLine =head2 readCxxLine Reads a C++ source line, skipping comments, blank lines, - preprocessor tokens and the Q_OBJECT macro + preprocessor tokens and the TQ_OBJECT macro =cut @@ -484,7 +495,7 @@ LOOP: } } - if ( $p =~ /^\s*Q_OBJECT/ ) { + if ( $p =~ /^\s*TQ_OBJECT/ ) { if ($qt_embedded) { push @inputqueue, @qte_codeqobject; } elsif ($qt4) { @@ -496,14 +507,12 @@ LOOP: } # Hack, waiting for real handling of preprocessor defines $p =~ s/QT_MODULE\(\w+\)//; - $p =~ s/QT_STATIC_CONST/static const/; $p =~ s/QT_WEAK_SYMBOL//; $p =~ s/QT_MOC_COMPAT//; $p =~ s/Q_EXPORT_CODECS_BIG5//; $p =~ s/QT_COMPAT / /; $p =~ s/TQ_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/; $p =~ s/TQWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck! - $p =~ s/Q_SIGNALS/signals/; $p =~ s/ASYNC/void/; $p =~ s/[A-Z_]*_EXPORT_DEPRECATED//; $p =~ s/[A-Z_]*_EXPORT\s/ /; @@ -533,7 +542,7 @@ LOOP: next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # TQObject macro +# || $p =~ /^\s*TQ_OBJECT/ # TQObject macro # ); # @@ -546,7 +555,7 @@ LOOP: || $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE || $p =~ /^\s*TQ_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + || $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -577,13 +586,13 @@ LOOP: else { # Skip platform-specific stuff, or #if 0 stuff # or #else of something we parsed (e.g. for TQKeySequence) - if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_WS_/ or + if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or ($p =~ m/^#\s*ifndef\s+TQT_NO_MIMECLIPBOARD/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_X11_/ and $qt_embedded) or - ($p =~ m/^#\s*if\s+defined\(Q_WS_X11_/ and $qt_embedded) or - ($p =~ m/^#\s*if\s+defined\(Q_WS_WIN_/ and $qt_embedded) or + ($p =~ m/^#\s*if\s+defined\(TQ_WS_X11_/ and $qt_embedded) or + ($p =~ m/^#\s*if\s+defined\(TQ_WS_WIN_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(_WS_MAC_/ and $qt_embedded) or ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or $p =~ m/^#\s*ifndef\s+TQT_NO_STL/ or @@ -602,6 +611,7 @@ LOOP: $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or $p =~ m/^#\s*ifndef\s+TQT_NO_MEMBER_TEMPLATES/ or $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or + (not $have_tdehw_lib and $p =~ m/^#\s*ifdef\s+__TDE_HAVE_TDEHWLIB/) or &$match_qt_defines( $p ) or $p =~ m/^#\s*if\s+0\s+/ ) { my $if_depth = 1; @@ -864,7 +874,7 @@ sub identifyDecl (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? (?:\s*TQ_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TQ_REFCOUNT)? \s+([\w_]+ # 3 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) @@ -942,7 +952,10 @@ sub identifyDecl \( (.*?) \) # parameters \s*((?:const)?)\s* (?:throw\s*\(.*?\))? - \s*((?:=\s*0(?:L?))?)\s* # Pureness. is "0L" allowed? + \s*((?:=\s*(?: + 0(?:L?)| # Pureness. is "0L" allowed? + default # Default method + ))?) \s*[;{]+/xs ) { # rest my $tpn = $1; # type + name @@ -954,7 +967,7 @@ sub identifyDecl } my $const = $3 eq "" ? 0 : 1; - my $pure = $4 eq "" ? 0 : 1; + my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1); $tpn =~ s/\s+/ /g; $tpn =~ s/operator\s+([^\w])/operator$1/g; $params =~ s/\s+/ /g; diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm index 6c8ce4cb..d077fb59 100644 --- a/kalyptus/kalyptusCxxToCSharp.pm +++ b/kalyptus/kalyptusCxxToCSharp.pm @@ -117,7 +117,7 @@ sub cplusplusToCSharp return "IntPtr"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "IntPtr"; @@ -223,7 +223,7 @@ sub cplusplusToPInvoke return "RawObject"; } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { + } elsif ( $cplusplusType =~ /^TQ_REFCOUNT/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^EventRef/ ) { return "RawObject"; diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 7d57f377..332b44de 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -536,12 +536,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -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 @@ -2628,7 +2625,7 @@ sub preParseClass || ($name eq 'qt_cast') || ($name eq 'qt_property') || ($name eq 'staticMetaObject') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || $name eq 'trUtf8' @@ -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; } @@ -5476,9 +5473,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 59a5444d..b75b9fb2 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -331,12 +331,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -903,7 +903,7 @@ sub preParseClass || ($name eq 'qt_property') || ($name eq 'staticMetaObject') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || $m->{Deprecated} ) { @@ -3315,9 +3315,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 089cec92..4f4804c2 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -82,10 +82,7 @@ BEGIN 'TQ_UINT64' => '$', 'TQ_INT64' => '$', 'TQ_LLONG' => '$', - 'tquint64' => '$', - 'qint64' => '$', 'long long' => '$', - 'qulonglong' => '$', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -147,21 +144,13 @@ BEGIN 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', 'TQ_INT16' => 'short', - 'qint16' => 'short', 'TQ_INT32' => 'int', - 'qint32' => 'int', - 'qint32&' => 'int&', 'TQ_INT8' => 'char', - 'qint8' => 'char', 'TQ_LONG' => 'long', 'TQ_UINT16' => 'ushort', - 'tquint16' => 'ushort', 'TQ_UINT32' => 'uint', - 'tquint32' => 'uint', 'TQ_UINT8' => 'uchar', - 'tquint8' => 'uchar', 'TQ_ULONG' => 'long', - 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -397,11 +386,11 @@ EOF public static TQApplication tqApp = null; - public static string SIGNAL(string signal) { + public static string TQ_SIGNAL(string signal) { return "2"+ signal; } - public static string SLOT(string slot) { + public static string TQ_SLOT(string slot) { return "1" + slot; } EOF @@ -952,7 +941,7 @@ sub preParseClass || ($name eq 'type') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') || ($classNode->{astNodeName} eq 'TQApplication' and $name eq 'TQApplication') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') @@ -3508,9 +3497,9 @@ sub printCSharpdocComment($$$$) $line =~ s/const char/string/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/bool/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; $line =~ s/^(\s*)\*/$1/g; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index a33f74a7..3ea44e58 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -75,10 +75,7 @@ BEGIN 'TQ_UINT64' => '$', 'TQ_INT64' => '$', 'TQ_LLONG' => '$', - 'tquint64' => '$', - 'qint64' => '$', 'long long' => '$', - 'qulonglong' => '$', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -141,21 +138,13 @@ BEGIN 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', 'TQ_INT16' => 'short', - 'qint16' => 'short', 'TQ_INT32' => 'int', - 'qint32' => 'int', - 'qint32&' => 'int&', 'TQ_INT8' => 'char', - 'qint8' => 'char', 'TQ_LONG' => 'long', 'TQ_UINT16' => 'ushort', - 'tquint16' => 'ushort', 'TQ_UINT32' => 'uint', - 'tquint32' => 'uint', 'TQ_UINT8' => 'uchar', - 'tquint8' => 'uchar', 'TQ_ULONG' => 'long', - 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -637,7 +626,7 @@ sub preParseClass || ($name eq 'hack_strchr') || ($name eq 'hack_strstr') ) ) - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 935395fc..6f3e7535 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*', @@ -1976,7 +1970,6 @@ BEGIN 'TQScrollBar*' => 'qt_QScrollBar*' , 'TQScrollView*' => 'qt_QScrollView*', 'TQSemaphore*' => 'qt_QSemaphore*', -'TQSemiModal*' => 'qt_QSemiModal*', 'TQSenderObject*' => 'qt_QSenderObject*', 'TQServerSocket*' => 'qt_QServerSocket*', 'TQSessionManager&' => 'qt_QSessionManager*' , @@ -2012,7 +2005,6 @@ BEGIN 'TQSocketDevice*' => 'qt_QSocketDevice*' , 'TQSocketNotifier*' => 'qt_QSocketNotifier*', 'TQSocketNotifier::Type' => 'int', -'TQSortedList*' => 'qt_QSortedList*', 'TQSound*' => 'qt_QSound*', 'TQSpacerItem*' => 'qt_QSpacerItem*' , 'TQSpinBox*' => 'qt_QSpinBox*', @@ -2296,9 +2288,6 @@ BEGIN 'TQt::RasterOp' => 'int' , 'TQt::UIEffect' => 'int' , 'TQt::WFlags' => 'int' , -'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*', -'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*', -'QtTableView*' => 'qt_QtTableView*', 'QwAbsSpriteFieldView*' => 'qt_QwAbsSpriteFieldView*' , 'QwClusterizer*' => 'qt_QwClusterizer*' , 'QwEllipse*' => 'qt_QwEllipse*', |