diff options
Diffstat (limited to 'kalyptus')
-rw-r--r-- | kalyptus/ChangeLog | 30 | ||||
-rw-r--r-- | kalyptus/README | 2 | ||||
-rwxr-xr-x | kalyptus/findperl | 2 | ||||
-rw-r--r-- | kalyptus/kalyptus | 94 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToCSharp.pm | 58 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToDcopIDL.pm | 168 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToECMA.pm | 4 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 896 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 384 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 552 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToSmoke.pm | 456 | ||||
-rw-r--r-- | kalyptus/kalyptusCxxToSwig.pm | 82 | ||||
-rw-r--r-- | kalyptus/kalyptusDataDict.pm | 1724 | ||||
-rw-r--r-- | kalyptus/kdocAstUtil.pm | 2 | ||||
-rw-r--r-- | kalyptus/kdocLib.pm | 2 | ||||
-rw-r--r-- | kalyptus/kdocParseDoc.pm | 4 | ||||
-rw-r--r-- | kalyptus/kdocUtil.pm | 2 |
17 files changed, 2231 insertions, 2231 deletions
diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index f2119248..fd2235be 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -17,7 +17,7 @@ 2004-10-02 Richard Dale <[email protected]> - * Fixed problem where a call to super in java QWidet.polish() caused a loop + * Fixed problem where a call to super in java TQWidet.polish() caused a loop * DCOPArg and DCOPReply are ignored for java bindings generation 2004-09-10 Richard Dale <[email protected]> @@ -28,8 +28,8 @@ * Removed forward declarations for classes embedded in method return types. For instance: - virtual class View *createView ( QWidget *parent, const char *name = 0 ) = 0; - virtual QPtrList<class View> views () const = 0; + virtual class View *createView ( TQWidget *parent, const char *name = 0 ) = 0; + virtual TQPtrList<class View> views () const = 0; * Added kate as a KDE include header subdirectory @@ -38,7 +38,7 @@ * Added kontact to the expected KDE header subdirectory names * Fixed a bug in the code generation for this method: - virtual QValueList<Kontact::Plugin*> pluginList() const = 0; + virtual TQValueList<Kontact::Plugin*> pluginList() const = 0; It was being incorrectly treated as a pointer type, because it contained as asterisk. @@ -49,7 +49,7 @@ 2004-07-26 Richard Dale <[email protected]> - * QMap and QPair template types such as 'QMap<QCString, DCOPRef>' with an + * TQMap and TQPair template types such as 'TQMap<TQCString, DCOPRef>' with an embedded comma, were not being correctly normalised. A space was left in the smoke type. @@ -67,12 +67,12 @@ 2004-07-07 Richard Dale <[email protected]> - * After discussion with Germain Garand, QChars have been returned to + * After discussion with Germain Garand, TQChars have been returned to the Smoke runtime as first class members. 2004-07-07 Richard Dale <[email protected]> - * The QChar class is now treated as a primitive type just like QString. + * The TQChar class is now treated as a primitive type just like TQString. 2004-06-30 Richard Dale <[email protected]> @@ -103,8 +103,8 @@ 2004-06-07 Richard Dale <[email protected]> - * Added patch from Michal Ceresna to fix code generation for QImage.bits() and - QImage.colorTable() + * Added patch from Michal Ceresna to fix code generation for TQImage.bits() and + TQImage.colorTable() * Fixed bug reported by Maik Schulz caused by unwanted KListViewItem copy constructor. An 'enhancement' was added for KDE 3.2 - for any class which didn't have a copy constructor, but which could still be copied, a copy constructor was generated. @@ -113,7 +113,7 @@ 2004-05-27 Richard Dale <[email protected]> - * The methods QPainter::pos() and QFontInfo::font() are skipped for + * The methods TQPainter::pos() and TQFontInfo::font() are skipped for Qt2 embedded as they don't link to the ARM version of Qt/E * Thanks to Fabien Renaud for testing QtJava/E on an ARM box @@ -143,8 +143,8 @@ * The java '-fjni' option now generates correct java code with Qt/E 2.3.4 * KMainWindow.toolBar() and KMainWindow.menuBar() rename ktoolBar() and kmenuBar(). This is because java doesn't have covariant return types - and the methods with the same names in QMainWindow return a QToolBar - and QMenuBar, rather than their KDE equivalent subclasses. + and the methods with the same names in TQMainWindow return a TQToolBar + and TQMenuBar, rather than their KDE equivalent subclasses. 2004-05-19 Richard Dale <[email protected]> @@ -264,7 +264,7 @@ * Fixed parsing of casts inside enums in kfileitem.h: enum { Unknown = (mode_t) - 1 }; Hmm, not sure what that's up to anyway.. - * Added a special Source property to method nodes in QGlobalSpace. + * Added a special Source property to method nodes in TQGlobalSpace. In java, this allows Qt friend methods to be grouped under the Qt.java class, and KDE ones under KDE.java according to which source file they originated from. @@ -304,7 +304,7 @@ 2003-08-30 Richard Dale <[email protected]> * Applied Germain Garand's patch to no longer rename operator methods - in the QGlobalSpace pseudo class + in the TQGlobalSpace pseudo class 2003-08-21 Alexander Kellett <[email protected]> @@ -344,7 +344,7 @@ * Added C# P/Invoke bindings generation option from Adam Treat 2002-02-10 Richard Dale <[email protected]> * Improved C destructor code generation - * QCanvasItemList mapped onto java.util.ArrayList + * TQCanvasItemList mapped onto java.util.ArrayList * 'bool *' type converted to java 'boolean[]' type. 2002-02-03 Richard Dale <[email protected]> diff --git a/kalyptus/README b/kalyptus/README index a966384d..8ceb90a5 100644 --- a/kalyptus/README +++ b/kalyptus/README @@ -8,7 +8,7 @@ directly from the headers. Documentation embedded in special doc comments in the source is translated to an appropriate format for the target language. -REQUIREMENTS +RETQUIREMENTS You need perl 5.005 or greater to run kalyptus. diff --git a/kalyptus/findperl b/kalyptus/findperl index 451758d7..53c2f62f 100755 --- a/kalyptus/findperl +++ b/kalyptus/findperl @@ -6,7 +6,7 @@ for p in `echo $PATH | tr ":" " "` do if [ -x $p/perl ] then - if $p/perl -e 'require 5.000;' + if $p/perl -e 'retquire 5.000;' then echo $p/perl > perlbin exit 0 diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index f021fdf4..1cd0f857 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -7,7 +7,7 @@ # All files in this project are distributed under the GNU General # Public License. This is Free Software. -require 5.000; +retquire 5.000; use Carp; use Getopt::Long; @@ -23,7 +23,7 @@ use kdocParseDoc; use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $allow_k_dcop_accessors @includeclasses $includeclasses $skipInternal %defines $defines $match_qt_defines $libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin - $Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe + $Version $tquiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe %formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode @classStack $cNode $globalSpaceClassName $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded @@ -52,11 +52,11 @@ $includeclasses = ""; $doPrivate = 0; $Version = "0.9"; -$quiet = 0; +$tquiet = 0; $debug = 0; $debuggen = 0; $parseonly = 0; -$globalSpaceClassName = "QGlobalSpace"; +$globalSpaceClassName = "TQGlobalSpace"; $currentfile = ""; @@ -69,38 +69,38 @@ $exe = basename $0; @inputqueue = (); @codeqobject = split "\n", <<CODE; public: - virtual QMetaObject *metaObject() const; + virtual TQMetaObject *metaObject() const; virtual const char *className() const; virtual void* qt_cast( const char* ); - virtual bool qt_invoke( int, QUObject* ); - virtual bool qt_emit( int, QUObject* ); - virtual bool qt_property( int, int, QVariant* ); - static QMetaObject* staticMetaObject(); - QObject* qObject(); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + virtual bool qt_invoke( int, TQUObject* ); + virtual bool qt_emit( int, TQUObject* ); + virtual bool qt_property( int, int, TQVariant* ); + static TQMetaObject* staticMetaObject(); + TQObject* qObject(); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE @qt4_codeqobject = split "\n", <<CODE; public: - static const QMetaObject staticMetaObject; - virtual const QMetaObject *metaObject() const; + static const TQMetaObject staticMetaObject; + virtual const TQMetaObject *metaObject() const; virtual void *qt_metacast(const char *); - static inline QString tr(const char *s, const char *c = 0) + static inline TQString tr(const char *s, const char *c = 0) { return staticMetaObject.tr(s, c); } - virtual int qt_metacall(QMetaObject::Call, int, void **); + virtual int qt_metacall(TQMetaObject::Call, int, void **); private: CODE @qte_codeqobject = split "\n", <<CODE; public: - QMetaObject *metaObject() const { + TQMetaObject *metaObject() const { return staticMetaObject(); } const char *className() const; - static QMetaObject* staticMetaObject(); - static QString tr( const char *, const char * = 0 ); + static TQMetaObject* staticMetaObject(); + static TQString tr( const char *, const char * = 0 ); protected: void initMetaObject(); private: @@ -133,12 +133,12 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); Q_EXPORT => '', Q_EXPORT_CODECS_BIG5 => '', Q_REFCOUNT => '', - QM_EXPORT_CANVAS => '', - QM_EXPORT_DNS => '', - QM_EXPORT_ICONVIEW => '', - QM_EXPORT_NETWORK => '', - QM_EXPORT_SQL => '', - QM_EXPORT_WORKSPACE => '', + TQM_EXPORT_CANVAS => '', + TQM_EXPORT_DNS => '', + TQM_EXPORT_ICONVIEW => '', + TQM_EXPORT_NETWORK => '', + TQM_EXPORT_SQL => '', + TQM_EXPORT_WORKSPACE => '', QT_NO_REMOTE => 'QT_NO_REMOTE', QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', Q_WS_X11 => 'Q_WS_X11', @@ -147,12 +147,12 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); Q_WS_MAC => 'undef', Q_OBJECT => <<'CODE', public: - virtual QMetaObject *metaObject() const; + virtual TQMetaObject *metaObject() const; virtual const char *className() const; - virtual bool qt_invoke( int, QUObject* ); - virtual bool qt_emit( int, QUObject* ); - static QString tr( const char *, const char * = 0 ); - static QString trUtf8( const char *, const char * = 0 ); + virtual bool qt_invoke( int, TQUObject* ); + virtual bool qt_emit( int, TQUObject* ); + static TQString tr( const char *, const char * = 0 ); + static TQString trUtf8( const char *, const char * = 0 ); private: CODE }; @@ -201,7 +201,7 @@ GetOptions( \%options, "define=s", \%defines, # define a single preprocessing symbol "defines=s", \$defines, # file containing preprocessing symbols, one per line - "quiet|q", \$quiet, + "tquiet|q", \$tquiet, "debug|D", \$debug, # debug the parsing "debuggen", \$debuggen, # debug the file generation "parse-only", \$parseonly ) @@ -221,11 +221,11 @@ else { if ($#includeclasses>=0) { $includeclasses = join (" ", @includeclasses); - print "Using Classes: $includeclasses\n" unless $quiet; + print "Using Classes: $includeclasses\n" unless $tquiet; } if ( $#includes >= 0 && !$cpp ) { - die "$exe: --includedir requires --cpp\n"; + die "$exe: --includedir retquires --cpp\n"; } # Check output formats. HTML is the default @@ -284,7 +284,7 @@ else checkFileArgs(); # work out libdir. This is created by kdocLib:writeDoc when -# required. +# retquired. $libdir = $ENV{HOME}."/.kalyptus" unless $libdir ne ""; @@ -328,9 +328,9 @@ sub readLibraries { return if $#libs < 0; - require kdocLib; + retquire kdocLib; foreach my $lib ( @libs ) { - print "$exe: reading lib: $lib\n" unless $quiet; + print "$exe: reading lib: $lib\n" unless $tquiet; my $relpath = exists $options{url} ? $options{url} : $outputdir; @@ -356,7 +356,7 @@ sub parseFiles $cmd .= " -I $dir "; } - $cmd .= " -DQOBJECTDEFS_H $currentfile"; + $cmd .= " -DTQOBJECTDEFS_H $currentfile"; open( INPUT, "$cmd |" ) || croak "Can't preprocess $currentfile"; @@ -366,7 +366,7 @@ sub parseFiles || croak "Can't read from $currentfile"; } - print STDERR "$exe: processing $currentfile\n" unless $quiet; + print STDERR "$exe: processing $currentfile\n" unless $tquiet; # reset vars $rootNode = getRoot( $lang ); @@ -412,10 +412,10 @@ sub writeDocumentation no strict "refs"; foreach my $format ( @formats_wanted ) { my $pack = $formats{ $format }; - require $pack.".pm"; + retquire $pack.".pm"; print STDERR "Generating bindings for $format ", - "language...\n" unless $quiet; + "language...\n" unless $tquiet; my $f = "$pack\::writeDoc"; &$f( $libname, $node, $outputdir, \%options ); @@ -426,7 +426,7 @@ sub writeDocumentation sub writeLibrary { if( $libname ne "" and !exists $options{'no-cache'} ) { - require kdocLib; + retquire kdocLib; foreach my $lang ( keys %rootNodes ) { my $node = $rootNodes{ $lang }; kdocLib::writeDoc( $libname, $node, $lang, $libdir, @@ -500,7 +500,7 @@ LOOP: $p =~ s/Q_EXPORT_CODECS_BIG5//; $p =~ s/QT_COMPAT / /; $p =~ s/Q_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/; - $p =~ s/QWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck! + $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//; @@ -531,7 +531,7 @@ LOOP: next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # QObject macro +# || $p =~ /^\s*Q_OBJECT/ # TQObject macro # ); # @@ -540,7 +540,7 @@ LOOP: || $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS || $p =~ /^\s*Q_DECLARE_FLAGS/ # and Q_DECLARE_FLAGS || ( !$qt4 && $p =~ /^\s*Q_PROPERTY/ ) # and Q_PROPERTY - || $p =~ /^\s*QDOC_PROPERTY/ + || $p =~ /^\s*TQDOC_PROPERTY/ || $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE || $p =~ /^\s*Q_SETS/ @@ -574,7 +574,7 @@ LOOP: } else { # Skip platform-specific stuff, or #if 0 stuff - # or #else of something we parsed (e.g. for QKeySequence) + # 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 ($p =~ m/^#\s*ifdef\s+_WS_QWS_/ and $qt_embedded) or @@ -946,7 +946,7 @@ sub identifyDecl my $params = $2; # Remove constructor initializer, that's not in the params if ( $params =~ /\s*\)\s*:\s*/ ) { - # Hack: first .* made non-greedy for QSizePolicy using a?(b):c in ctor init + # Hack: first .* made non-greedy for TQSizePolicy using a?(b):c in ctor init $params =~ s/(.*?)\s*\)\s*:\s*.*$/$1/; } @@ -1639,7 +1639,7 @@ sub newMethod This property contains a list of nodes, one for each parameter. Each parameter node has the following properties: - * ArgType the type of the argument, e.g. const QString& + * ArgType the type of the argument, e.g. const TQString& * ArgName the name of the argument - optionnal * DefaultValue the default value of the argument - optionnal diff --git a/kalyptus/kalyptusCxxToCSharp.pm b/kalyptus/kalyptusCxxToCSharp.pm index 419c0bef..400611e2 100644 --- a/kalyptus/kalyptusCxxToCSharp.pm +++ b/kalyptus/kalyptusCxxToCSharp.pm @@ -31,7 +31,7 @@ no strict "subs"; use vars qw/ @clist $host $who $now $gentext %functionId $docTop $lib $rootnode $outputdir $opt $debug $typeprefix $eventHandlerCount - $pastaccess $pastname $pastreturn $pastparams $nullctor $constructorCount *CLASS *HEADER *QTCTYPES *KDETYPES /; + $pastaccess $pastname $pastreturn $pastparams $nullctor $constructorCount *CLASS *HEADER *TQTCTYPES *KDETYPES /; BEGIN { @@ -75,7 +75,7 @@ sub cplusplusToCSharp return "double[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /\s*short\s*\*/ ) { return "short[]"; - } elsif ( $cplusplusType =~ /QByteArray/ || $cplusplusType =~ /QBitArray/ ) { + } elsif ( $cplusplusType =~ /TQByteArray/ || $cplusplusType =~ /TQBitArray/ ) { return "byte[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /\s*char\s*\*\*/ ) { return "string[]"; @@ -95,27 +95,27 @@ sub cplusplusToCSharp return "string"; } elsif ( $cplusplusType =~ /^_NPStream/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QPtrCollection/ ) { + } elsif ( $cplusplusType =~ /^TQPtrCollection/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QStyleHintReturn/ ) { + } elsif ( $cplusplusType =~ /^TQStyleHintReturn/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^type/i ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^Key/ || $cplusplusType =~ /^key_type/ || $cplusplusType =~ /^K/) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QUnknownInterface/ ) { + } elsif ( $cplusplusType =~ /^TQUnknownInterface/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^GDHandle/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QTextParag/ ) { + } elsif ( $cplusplusType =~ /^TQTextParag/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QDiskFont/ ) { + } elsif ( $cplusplusType =~ /^TQDiskFont/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QDomNodePrivate/ ) { + } elsif ( $cplusplusType =~ /^TQDomNodePrivate/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^Display/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QUuid/ ) { + } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { return "IntPtr"; @@ -123,17 +123,17 @@ sub cplusplusToCSharp return "IntPtr"; } elsif ( $cplusplusType =~ /^MSG/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QWSEvent/ ) { + } elsif ( $cplusplusType =~ /^TQWSEvent/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^XEvent/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^CGContextRef/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QWSDecoration/ ) { + } elsif ( $cplusplusType =~ /^TQWSDecoration/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QTextFormat/ || $cplusplusType =~ /^QTextDocument/ || $cplusplusType =~ /^QTextCursor/ ) { + } elsif ( $cplusplusType =~ /^TQTextFormat/ || $cplusplusType =~ /^TQTextDocument/ || $cplusplusType =~ /^TQTextCursor/ ) { return "IntPtr"; - } elsif ( $cplusplusType =~ /^QSqlRecordPrivate/ ) { + } elsif ( $cplusplusType =~ /^TQSqlRecordPrivate/ ) { return "IntPtr"; } elsif ( $cplusplusType =~ /^Text/ ) { return "IntPtr"; @@ -181,7 +181,7 @@ sub cplusplusToPInvoke return "double[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /\s*short\s*\*/ ) { return "short[]"; - } elsif ( $cplusplusType =~ /QByteArray/ || $cplusplusType =~ /QBitArray/ ) { + } elsif ( $cplusplusType =~ /TQByteArray/ || $cplusplusType =~ /TQBitArray/ ) { return "byte[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /\s*char\s*\*\*/ ) { return "string[]"; @@ -201,27 +201,27 @@ sub cplusplusToPInvoke return "string"; } elsif ( $cplusplusType =~ /^_NPStream/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QPtrCollection/ ) { + } elsif ( $cplusplusType =~ /^TQPtrCollection/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QStyleHintReturn/ ) { + } elsif ( $cplusplusType =~ /^TQStyleHintReturn/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^type/i ) { return "RawObject"; } elsif ( $cplusplusType =~ /^Key/ || $cplusplusType =~ /^key_type/ || $cplusplusType =~ /^K/) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QUnknownInterface/ ) { + } elsif ( $cplusplusType =~ /^TQUnknownInterface/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^GDHandle/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QTextParag/ ) { + } elsif ( $cplusplusType =~ /^TQTextParag/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QDiskFont/ ) { + } elsif ( $cplusplusType =~ /^TQDiskFont/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QDomNodePrivate/ ) { + } elsif ( $cplusplusType =~ /^TQDomNodePrivate/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^Display/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QUuid/ ) { + } elsif ( $cplusplusType =~ /^TQUuid/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^Q_REFCOUNT/ ) { return "RawObject"; @@ -229,17 +229,17 @@ sub cplusplusToPInvoke return "RawObject"; } elsif ( $cplusplusType =~ /^MSG/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QWSEvent/ ) { + } elsif ( $cplusplusType =~ /^TQWSEvent/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^XEvent/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^CGContextRef/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QWSDecoration/ ) { + } elsif ( $cplusplusType =~ /^TQWSDecoration/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QTextFormat/ || $cplusplusType =~ /^QTextDocument/ || $cplusplusType =~ /^QTextCursor/ ) { + } elsif ( $cplusplusType =~ /^TQTextFormat/ || $cplusplusType =~ /^TQTextDocument/ || $cplusplusType =~ /^TQTextCursor/ ) { return "RawObject"; - } elsif ( $cplusplusType =~ /^QSqlRecordPrivate/ ) { + } elsif ( $cplusplusType =~ /^TQSqlRecordPrivate/ ) { return "RawObject"; } elsif ( $cplusplusType =~ /^Text/ ) { return "RawObject"; @@ -385,14 +385,14 @@ sub writeClassDoc foreach $ancestor ( @ancestors ) { if ( kalyptusDataDict::interfacemap($ancestor) eq () ) { if ( $ancestor eq ("Qt") ){ - print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : QNameSpace "; + print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : TQNameSpace "; } else { print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : $ancestor"; } last; } elsif ($ancestor eq @ancestors[$#ancestors] ) { if ( $ancestor eq ("Qt") ){ - print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : QNameSpace "; + print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : TQNameSpace "; } else { print CLASS "\n\n\tpublic class ", $node->{astNodeName}, " : "; } @@ -493,8 +493,8 @@ sub listMember if( $type eq "method" && $m->{Access} ne "private" && $m->{Access} ne "private_slots" && $m->{Access} ne "signals" ) { if ( $m->{ReturnType} =~ /[<>]/ || $m->{Params} =~ /[<>]/ || $m->{Params} =~ /\.\.\./ || $m->{Params} =~ /Impl/ - || $m->{ReturnType} =~ /QAuBucket/ || $m->{Params} =~ /QAuBucket/ - || $m->{ReturnType} =~ /QMember/ || $m->{Params} =~ /QMember/ ) { + || $m->{ReturnType} =~ /TQAuBucket/ || $m->{Params} =~ /TQAuBucket/ + || $m->{ReturnType} =~ /TQMember/ || $m->{Params} =~ /TQMember/ ) { return; } diff --git a/kalyptus/kalyptusCxxToDcopIDL.pm b/kalyptus/kalyptusCxxToDcopIDL.pm index 1e6540a4..ad7e3eee 100644 --- a/kalyptus/kalyptusCxxToDcopIDL.pm +++ b/kalyptus/kalyptusCxxToDcopIDL.pm @@ -61,18 +61,18 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', - 'QByteArray' => '$', - 'QByteArray&' => '$', - 'QByteArray*' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', + 'TQByteArray' => '$', + 'TQByteArray&' => '$', + 'TQByteArray*' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -91,46 +91,46 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', -# 'QStyleHintReturn*' => 'void*', +# 'TQStyleHintReturn*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', # 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQRgb' => 'uint', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'Q_INT32' => 'int', 'Q_INT8' => 'char', @@ -151,10 +151,10 @@ sub writeDoc $debug = $main::debuggen; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -232,28 +232,28 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QByteArray' || - $className eq 'QBitArray' || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQByteArray' || + $className eq 'TQBitArray' || + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -286,7 +286,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -339,20 +339,20 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think ) { $m->{NodeType} = 'deleted'; } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (x_QSessionManager doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (x_QSessionManager doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -377,7 +377,7 @@ sub preParseClass } elsif( $m->{NodeType} eq 'var' ) { my $varType = $m->{Type}; - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $varType =~ s/static\s+// && $m->{Access} ne 'private' ) { $varType =~ s/const\s+(.*)\s*&/$1/; @@ -513,7 +513,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -529,7 +529,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -557,7 +557,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "{*($type *)}"; } else { $cast = "$type"; @@ -645,18 +645,18 @@ sub generateMethod($$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -814,7 +814,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -1071,7 +1071,7 @@ sub writeSmokeDataFile($) { # First write the name print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; print OUT "$classidx{$realType}, "; } diff --git a/kalyptus/kalyptusCxxToECMA.pm b/kalyptus/kalyptusCxxToECMA.pm index 987e81c1..5b419732 100644 --- a/kalyptus/kalyptusCxxToECMA.pm +++ b/kalyptus/kalyptusCxxToECMA.pm @@ -74,7 +74,7 @@ sub preParseClass } if( $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || $className eq 'KJS' || $className eq 'KSVG' || # namespaces $className =~ /^KSVG::KSVG/ || $className eq 'KSVG::CachedGlyph' || # Not DOM classes @@ -83,7 +83,7 @@ sub preParseClass $className eq 'KSVG::SVGLoader' || $className eq 'KSVG::SVGElementImpl::MouseEvent' || $className eq 'KSVG::SVGRegisteredEventListener' || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className "; #if ($debug); diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 65c6fa41..7dfae765 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -73,18 +73,18 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', - 'QByteArray' => '$', - 'QByteArray&' => '$', - 'QByteArray*' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', + 'TQByteArray' => '$', + 'TQByteArray&' => '$', + 'TQByteArray*' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -104,47 +104,47 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', # 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QStyleHintReturn*' => 'void*', - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQStyleHintReturn*' => 'void*', + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'Q_INT32' => 'int', 'Q_INT64' => 'long', @@ -204,18 +204,18 @@ BEGIN %skippedJniMethods = ( - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QApplication_args__' => 1, - 'Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QPixmap_2' => 1, - 'Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QImage_2' => 1, + 'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2' => 1, + 'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2' => 1, 'Java_org_kde_qt_QListView_itemList' => 1, 'Java_org_kde_qt_QListViewItem_itemList' => 1, 'Java_org_kde_qt_Qt_color0' => 1, @@ -321,36 +321,36 @@ EOF static jobjectArray _args = 0; JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args))); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args), (bool) GUIenabled)); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args), (bool) GUIenabled)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args), (QApplication::Type) arg1)); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args), (TQApplication::Type) arg1)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -367,39 +367,39 @@ Java_org_kde_qt_QApplication_args(JNIEnv *env, jobject obj) EOF $qbitmapExtras = <<EOF; - public QBitmap(QPixmap arg1) { + public TQBitmap(TQPixmap arg1) { super((Class) null); - newQBitmap(arg1); + newTQBitmap(arg1); } - private native void newQBitmap(QPixmap arg1); - public QBitmap(QImage arg1) { + private native void newTQBitmap(TQPixmap arg1); + public TQBitmap(TQImage arg1) { super((Class) null); - newQBitmap(arg1); + newTQBitmap(arg1); } - private native void newQBitmap(QImage arg1); + private native void newTQBitmap(TQImage arg1); EOF $qbitmapjniExtras = <<EOF; JNIEXPORT void JNICALL -Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1) +Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1) { if (QtSupport::getQt(env, obj) == 0) { - QBitmap temp; - temp = (QPixmap&) *(QPixmap *) QtSupport::getQt(env, arg1); - QtSupport::setQt(env, obj, new QBitmapJBridge(temp)); + TQBitmap temp; + temp = (TQPixmap&) *(TQPixmap *) QtSupport::getQt(env, arg1); + QtSupport::setQt(env, obj, new TQBitmapJBridge(temp)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1) +Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1) { if (QtSupport::getQt(env, obj) == 0) { - QBitmap temp; - temp = (QImage&) *(QImage *) QtSupport::getQt(env, arg1); - QtSupport::setQt(env, obj, new QBitmapJBridge(temp)); + TQBitmap temp; + temp = (TQImage&) *(TQImage *) QtSupport::getQt(env, arg1); + QtSupport::setQt(env, obj, new TQBitmapJBridge(temp)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -416,8 +416,8 @@ EOF JNIEXPORT jobject JNICALL Java_org_kde_qt_QListView_itemList(JNIEnv *env, jobject obj) { - QListViewItemIterator iterator((QListView*) QtSupport::getQt(env, obj)); - return QtSupport::arrayWithQListViewItemList(env, &iterator); + TQListViewItemIterator iterator((TQListView*) QtSupport::getQt(env, obj)); + return QtSupport::arrayWithTQListViewItemList(env, &iterator); } EOF @@ -430,8 +430,8 @@ EOF JNIEXPORT jobject JNICALL Java_org_kde_qt_QListViewItem_itemList(JNIEnv *env, jobject obj) { - QListViewItemIterator iterator((QListViewItem*) QtSupport::getQt(env, obj)); - return QtSupport::arrayWithQListViewItemList(env, &iterator); + TQListViewItemIterator iterator((TQListViewItem*) QtSupport::getQt(env, obj)); + return QtSupport::arrayWithTQListViewItemList(env, &iterator); } EOF @@ -463,48 +463,48 @@ EOF } } - public static native QColor color0(); - public static native QColor color1(); - public static native QColor black(); - public static native QColor white(); - public static native QColor darkGray(); - public static native QColor gray(); - public static native QColor lightGray(); - public static native QColor red(); - public static native QColor green(); - public static native QColor blue(); - public static native QColor cyan(); - public static native QColor magenta(); - public static native QColor yellow(); - public static native QColor darkRed(); - public static native QColor darkGreen(); - public static native QColor darkBlue(); - public static native QColor darkCyan(); - public static native QColor darkMagenta(); - public static native QColor darkYellow(); + public static native TQColor color0(); + public static native TQColor color1(); + public static native TQColor black(); + public static native TQColor white(); + public static native TQColor darkGray(); + public static native TQColor gray(); + public static native TQColor lightGray(); + public static native TQColor red(); + public static native TQColor green(); + public static native TQColor blue(); + public static native TQColor cyan(); + public static native TQColor magenta(); + public static native TQColor yellow(); + public static native TQColor darkRed(); + public static native TQColor darkGreen(); + public static native TQColor darkBlue(); + public static native TQColor darkCyan(); + public static native TQColor darkMagenta(); + public static native TQColor darkYellow(); // Global cursors - public static native QCursor arrowCursor(); // standard arrow cursor - public static native QCursor upArrowCursor(); // upwards arrow - public static native QCursor crossCursor(); // crosshair - public static native QCursor waitCursor(); // hourglass/watch - public static native QCursor ibeamCursor(); // ibeam/text entry - public static native QCursor sizeVerCursor(); // vertical resize - public static native QCursor sizeHorCursor(); // horizontal resize - public static native QCursor sizeBDiagCursor(); // diagonal resize (/) - public static native QCursor sizeFDiagCursor(); // diagonal resize (\) - public static native QCursor sizeAllCursor(); // all directions resize - public static native QCursor blankCursor(); // blank/invisible cursor - public static native QCursor splitVCursor(); // vertical bar with left-right + public static native TQCursor arrowCursor(); // standard arrow cursor + public static native TQCursor upArrowCursor(); // upwards arrow + public static native TQCursor crossCursor(); // crosshair + public static native TQCursor waitCursor(); // hourglass/watch + public static native TQCursor ibeamCursor(); // ibeam/text entry + public static native TQCursor sizeVerCursor(); // vertical resize + public static native TQCursor sizeHorCursor(); // horizontal resize + public static native TQCursor sizeBDiagCursor(); // diagonal resize (/) + public static native TQCursor sizeFDiagCursor(); // diagonal resize (\) + public static native TQCursor sizeAllCursor(); // all directions resize + public static native TQCursor blankCursor(); // blank/invisible cursor + public static native TQCursor splitVCursor(); // vertical bar with left-right // arrows - public static native QCursor splitHCursor(); // horizontal bar with up-down + public static native TQCursor splitHCursor(); // horizontal bar with up-down // arrows - public static native QCursor pointingHandCursor(); // pointing hand - public static native QCursor forbiddenCursor(); // forbidden cursor (slashed circle) - public static native QCursor whatsThisCursor(); // arrow with a question mark + public static native TQCursor pointingHandCursor(); // pointing hand + public static native TQCursor forbiddenCursor(); // forbidden cursor (slashed circle) + public static native TQCursor whatsThisCursor(); // arrow with a question mark - public static native QApplication qApp(); + public static native TQApplication qApp(); public static native void qDebug(String message); public static void qDebug(String pattern, Object[] arguments) { @@ -545,7 +545,7 @@ EOF return "1" + sqeezeOut(slot, ' '); } - /** Convert from a UTF-8 string to Unicode - the java equivalent to QString::fromUtf8() */ + /** Convert from a UTF-8 string to Unicode - the java equivalent to TQString::fromUtf8() */ public String fromUtf8(byte[] bytes) { String result = null; @@ -569,258 +569,258 @@ JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_color0(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::color0, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color0, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_color1(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::color1, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color1, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_black(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::black, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::black, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_white(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::white, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::white, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkGray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkGray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_lightGray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::lightGray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::lightGray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_gray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::gray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::gray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_red(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::red, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::red, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_green(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::green, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::green, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_blue(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::blue, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blue, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_cyan(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::cyan, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::cyan, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_magenta(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::magenta, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::magenta, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_yellow(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::yellow, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::yellow, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkRed(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkRed, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkRed, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkGreen(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkGreen, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGreen, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkBlue(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkBlue, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkBlue, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkCyan(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkCyan, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkCyan, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkMagenta(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkMagenta, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkMagenta, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkYellow(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkYellow, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkYellow, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_arrowCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::arrowCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::arrowCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_upArrowCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::upArrowCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::upArrowCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_crossCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::crossCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::crossCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_waitCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::waitCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::waitCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_ibeamCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::ibeamCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::ibeamCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeVerCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeVerCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeVerCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeHorCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeHorCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeHorCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeBDiagCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeBDiagCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeBDiagCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeFDiagCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeFDiagCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeFDiagCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeAllCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeAllCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeAllCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_blankCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::blankCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blankCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_splitVCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::splitVCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitVCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_splitHCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::splitHCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitHCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_pointingHandCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::pointingHandCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::pointingHandCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_forbiddenCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::forbiddenCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::forbiddenCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_whatsThisCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::whatsThisCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::whatsThisCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_qApp(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, qApp, "org.kde.qt.QApplication"); + return (jobject) QtSupport::objectForQtKey(env, qApp, "org.kde.qt.TQApplication"); } JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qDebug(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -829,7 +829,7 @@ static QCString * _qstring_message = 0; JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qWarning(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -838,7 +838,7 @@ static QCString * _qstring_message = 0; JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qFatal(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -1065,7 +1065,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QWidget_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice*)(QWidget*) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice*)(TQWidget*) QtSupport::getQt(env, obj); } EOF @@ -1075,8 +1075,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kde_qt_QImage_bits(JNIEnv *env, jobject obj) { static uchar * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->bits(); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes(); + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->bits(); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numBytes(); jbyteArray result = env->NewByteArray(len); env->SetByteArrayRegion(result, 0, len, (jbyte *) ptr); return result; @@ -1086,8 +1086,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kde_qt_QImage_scanLine(JNIEnv *env, jobject obj, jint arg1) { static uchar * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->scanLine(arg1); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes() / ((QImageJBridge*) QtSupport::getQt(env, obj))->height(); + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->scanLine(arg1); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numBytes() / ((TQImageJBridge*) QtSupport::getQt(env, obj))->height(); jbyteArray result = env->NewByteArray(len); env->SetByteArrayRegion(result, 0, len, (jbyte *) ptr); return result; @@ -1096,9 +1096,9 @@ static uchar * ptr = 0; JNIEXPORT jintArray JNICALL Java_org_kde_qt_QImage_colorTable(JNIEnv *env, jobject obj) { -static QRgb * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->colorTable(); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numColors(); +static TQRgb * ptr = 0; + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->colorTable(); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numColors(); jintArray result = env->NewIntArray(len); env->SetIntArrayRegion(result, 0, len, (jint *) ptr); return result; @@ -1118,14 +1118,14 @@ EOF JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPixmap_loadFromData___3C(JNIEnv *env, jobject obj, jcharArray data) { -static QByteArray * _qbyteArray_data = 0; - return (jboolean) ((QPixmapJBridge*) QtSupport::getQt(env, obj))->loadFromData((uchar *) QtSupport::toUcharArray(env, data, &_qbyteArray_data), env->GetArrayLength(data), 0, 0); +static TQByteArray * _qbyteArray_data = 0; + return (jboolean) ((TQPixmapJBridge*) QtSupport::getQt(env, obj))->loadFromData((uchar *) QtSupport::toUcharArray(env, data, &_qbyteArray_data), env->GetArrayLength(data), 0, 0); } JNIEXPORT jlong JNICALL Java_org_kde_qt_QPixmap_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice*)(QPixmap*) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice*)(TQPixmap*) QtSupport::getQt(env, obj); } EOF @@ -1140,7 +1140,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QPaintDevice_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice *) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice *) QtSupport::getQt(env, obj); } EOF @@ -1155,7 +1155,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QDragObject_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource*) (QDragObject*) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource*) (TQDragObject*) QtSupport::getQt(env, obj); } EOF @@ -1170,7 +1170,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QDropEvent_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource*) (QDropEvent*) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource*) (TQDropEvent*) QtSupport::getQt(env, obj); } EOF @@ -1185,7 +1185,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QMimeSource_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource *) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource *) QtSupport::getQt(env, obj); } EOF @@ -1241,7 +1241,7 @@ EOF public native boolean truncate( int pos); public native int begin(); public native int end(); - public native QPoint at(int index); + public native TQPoint at(int index); EOF @@ -1251,7 +1251,7 @@ Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jin { int argx; int argy; - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->point((uint) i, &argx, &argy); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->point((uint) i, &argx, &argy); env->SetIntArrayRegion(x, 0, 1, (jint *) &argx); env->SetIntArrayRegion(y, 0, 1, (jint *) &argy); return; @@ -1260,13 +1260,13 @@ Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jin JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, jshortArray points) { - if (!((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint)nPoints)) { + if (!((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint)nPoints)) { return JNI_FALSE; } short * shortArray = QtSupport::toShortPtr(env, points); for (int index = 0; index < nPoints; index++) { - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(index, shortArray[index * 2], shortArray[(index * 2) + 1]); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(index, shortArray[index * 2], shortArray[(index * 2) + 1]); } return JNI_TRUE; } @@ -1274,15 +1274,15 @@ Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, js JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint index, jint nPoints, jshortArray points) { - if ( ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->size() < (uint) nPoints - && !((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) nPoints) ) + if ( ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size() < (uint) nPoints + && !((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) nPoints) ) { return JNI_FALSE; } short * shortArray = QtSupport::toShortPtr(env, points); for (int i = (int) index; nPoints > 0; i++, nPoints--) { - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(i, shortArray[i * 2], shortArray[(i * 2) + 1]); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(i, shortArray[i * 2], shortArray[(i * 2) + 1]); } return JNI_TRUE; } @@ -1290,43 +1290,43 @@ Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint inde JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_size(JNIEnv* env, jobject obj) { - return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->size(); + return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size(); } JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_count(JNIEnv* env, jobject obj) { - return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->count(); + return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->count(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isEmpty(JNIEnv* env, jobject obj) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->isEmpty(); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isEmpty(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isNull(JNIEnv* env, jobject obj) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->isNull(); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isNull(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_resize(JNIEnv* env, jobject obj, jint size) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) size); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) size); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_truncate(JNIEnv *env, jobject obj, jint pos) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos); } JNIEXPORT jobject JNICALL Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index) { - QPoint _p= ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index); - return (jobject) QtSupport::objectForQtKey(env, (void *)new QPoint(_p.x(),_p.y()), "org.kde.qt.QPoint", TRUE); + TQPoint _p= ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index); + return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.kde.qt.TQPoint", TRUE); } EOF @@ -1356,7 +1356,7 @@ Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2L JNIEXPORT jint JNICALL Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member); @@ -1386,7 +1386,7 @@ Java_org_kde_qt_QPopupMenu_connectItem(JNIEnv *env, jobject obj, jint identifier { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QPopupMenuJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQPopupMenuJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1401,7 +1401,7 @@ Java_org_kde_qt_QPopupMenu_disconnectItem(JNIEnv *env, jobject obj, jint identif { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QPopupMenuJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQPopupMenuJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1438,7 +1438,7 @@ Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lj JNIEXPORT jint JNICALL Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member); @@ -1468,7 +1468,7 @@ Java_org_kde_qt_QMenuData_connectItem(JNIEnv *env, jobject obj, jint identifier, { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuDataJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQMenuDataJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1483,7 +1483,7 @@ Java_org_kde_qt_QMenuData_disconnectItem(JNIEnv *env, jobject obj, jint identifi { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuDataJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQMenuDataJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1520,7 +1520,7 @@ Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lja JNIEXPORT jint JNICALL Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member); @@ -1550,7 +1550,7 @@ Java_org_kde_qt_QMenuBar_connectItem(JNIEnv *env, jobject obj, jint identifier, { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuBarJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQMenuBarJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1565,7 +1565,7 @@ Java_org_kde_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifie { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuBarJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQMenuBarJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1579,9 +1579,9 @@ Java_org_kde_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifie EOF $quridragExtras = <<EOF; - public static native boolean decode(QMimeSourceInterface e, ArrayList i); - public static native boolean decodeToUnicodeUris(QMimeSourceInterface e, ArrayList i); - public static native boolean decodeLocalFiles(QMimeSourceInterface e, ArrayList i); + public static native boolean decode(TQMimeSourceInterface e, ArrayList i); + public static native boolean decodeToUnicodeUris(TQMimeSourceInterface e, ArrayList i); + public static native boolean decodeLocalFiles(TQMimeSourceInterface e, ArrayList i); EOF @@ -1589,39 +1589,39 @@ EOF JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decode(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStrList * _qlist_i = 0; +static TQStrList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStrList(); + _qlist_i = new TQStrList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decode(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStrList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decode(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStrList(env, _qlist_i, i); return result; } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decodeToUnicodeUris(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStringList * _qlist_i = 0; +static TQStringList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStringList(); + _qlist_i = new TQStringList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decodeToUnicodeUris(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStringList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decodeToUnicodeUris(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStringList(env, _qlist_i, i); return result; } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decodeLocalFiles(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStringList * _qlist_i = 0; +static TQStringList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStringList(); + _qlist_i = new TQStringList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decodeLocalFiles(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStringList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decodeLocalFiles(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStringList(env, _qlist_i, i); return result; } @@ -1688,10 +1688,10 @@ JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version) { (void) cls; -static QCString* _qstring__appname = 0; -static QCString* _qstring_programName = 0; -static QCString* _qstring__description = 0; -static QCString* _qstring__version = 0; +static TQCString* _qstring__appname = 0; +static TQCString* _qstring_programName = 0; +static TQCString* _qstring__description = 0; +static TQCString* _qstring__version = 0; int argc = (int) env->GetArrayLength(args); KCmdLineArgsJBridge::init((int) argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version)); return; @@ -1701,10 +1701,10 @@ JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp) { (void) cls; -static QCString* _qstring__appname = 0; -static QCString* _qstring_programName = 0; -static QCString* _qstring__description = 0; -static QCString* _qstring__version = 0; +static TQCString* _qstring__appname = 0; +static TQCString* _qstring_programName = 0; +static TQCString* _qstring__description = 0; +static TQCString* _qstring__version = 0; int argc = (int) env->GetArrayLength(args); KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noKApp); return; @@ -1736,8 +1736,8 @@ Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lj { (void) cls; JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - QString qtSignalName(javaSlot->javaToQtSignalName(env, signal, 0)); - jboolean xret = (jboolean) SchedulerJBridge::connect((const char*) qtSignalName, (const QObject*) javaSlot, javaSlot->javaToQtSlotName(env, member, qtSignalName)); + TQString qtSignalName(javaSlot->javaToQtSignalName(env, signal, 0)); + jboolean xret = (jboolean) SchedulerJBridge::connect((const char*) qtSignalName, (const TQObject*) javaSlot, javaSlot->javaToQtSlotName(env, member, qtSignalName)); return xret; } @@ -1796,9 +1796,9 @@ sub cplusplusToJava my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|QGfx|^Display\s*\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QIconDragItem>|QValueList<QCString>|QValueList<QVariant>|QValueList<QPixmap>|QValueListConstIterator<QString>|QMap|EditMode|QPtrList<QPixmap>|QPtrList<QPoint>|QTextFormat|QTextCursor|QTextDocument|QNetworkProtocolFactoryBase|QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldInfoList|QObjectUserData|QUObject|QTextParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ ) { + if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|TQGfx|^Display\s*\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type - } elsif ( $cplusplusType =~ /QSignal\s*\*|QMenuItem|QWSEvent|QWSDisplay|QWSSocket|QPaintDeviceX11Data|QWindowsMime|QDirectPainter|QMember|QDiskFont|QGCache|QRichText|QWSDecoration/ && $main::qt_embedded ) { + } elsif ( $cplusplusType =~ /TQSignal\s*\*|TQMenuItem|TQWSEvent|TQWSDisplay|TQWSSocket|TQPaintDeviceX11Data|TQWindowsMime|TQDirectPainter|TQMember|TQDiskFont|TQGCache|TQRichText|TQWSDecoration/ && $main::qt_embedded ) { return ""; # Unsupported Qt/E type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "boolean"; @@ -1817,7 +1817,7 @@ sub cplusplusToJava return "short[]"; } elsif ( $cplusplusType =~ /KCmdLineOptions/ ) { return "String[][]"; - } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /QStringList/|| $cplusplusType =~ /QStrList/) { + } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) { return "String[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QUrlInfoValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/ @@ -1835,25 +1835,25 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/ - || $cplusplusType =~ /QMemArray<QRect>/ - || $cplusplusType =~ /QArray<QRect>/ + || $cplusplusType =~ /TQMemArray<TQRect>/ + || $cplusplusType =~ /TQArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { return "char[]"; } elsif ( $cplusplusType =~ /QC?String/ and !$isConst ) { return "StringBuffer" - } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /QString/ || $cplusplusType =~ /QCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { + } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /TQString/ || $cplusplusType =~ /TQCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { return "String" - } elsif ( $cplusplusType =~ /QChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { + } elsif ( $cplusplusType =~ /TQChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { return "char" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QTime\s*\*/ ) { return "Date" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDateTime\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDate\s*\*/ ) { return "Calendar" - } elsif ( $cplusplusType =~ /QPaintDevice/ ) { - return "QPaintDeviceInterface" - } elsif ( $cplusplusType =~ /QByteArray/ ) { + } elsif ( $cplusplusType =~ /TQPaintDevice/ ) { + return "TQPaintDeviceInterface" + } elsif ( $cplusplusType =~ /TQByteArray/ ) { return "byte[]" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { if ( kalyptusDataDict::interfacemap($1) ne () ) { @@ -2028,7 +2028,7 @@ sub jniArgTocplusplus my $jniType = cplusplusToJNI( $cplusplusType ); if ( $javaType =~ /^Calendar$/ ) { - my $dateclass = $cplusplusType =~ /QDateTime/ ? "QDateTime" : "QDate"; + my $dateclass = $cplusplusType =~ /TQDateTime/ ? "TQDateTime" : "TQDate"; $jniLocal = "static $dateclass* _qdate_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) QtSupport::to$dateclass(env, $argName, &_qdate_$argName)"; @@ -2036,11 +2036,11 @@ sub jniArgTocplusplus $jniArg = "($cplusplusType)*($dateclass*) QtSupport::to$dateclass(env, $argName, &_qdate_$argName)"; } } elsif ( $javaType =~ /^Date$/ ) { - $jniLocal = "static QTime* _qtime_$argName = 0;\n"; + $jniLocal = "static TQTime* _qtime_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQTime(env, $argName, &_qtime_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQTime(env, $argName, &_qtime_$argName)"; } else { - $jniArg = "($cplusplusType)*(QTime*) QtSupport::toQTime(env, $argName, &_qtime_$argName)"; + $jniArg = "($cplusplusType)*(TQTime*) QtSupport::toTQTime(env, $argName, &_qtime_$argName)"; } } elsif ( $javaType =~ /ArrayList/ ) { if ( $cplusplusType =~ /KFileItemList/ ) { @@ -2048,14 +2048,14 @@ sub jniArgTocplusplus if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStrList*) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStrList*) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; } - } elsif ( $cplusplusType =~ /QCStringList/ ) { - $jniLocal ="static QCStringList* _qlist_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQCStringList/ ) { + $jniLocal ="static TQCStringList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QCStringList*) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQCStringList*) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; } } elsif ( $cplusplusType =~ /KURL::List/ ) { $jniLocal ="static KURL::List* _qlist_$argName = 0;\n"; @@ -2070,58 +2070,58 @@ sub jniArgTocplusplus $jniArg = "(KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, $argName)"; } } elsif ( $javaType =~ /String\[\]/ ) { - if ( $cplusplusType =~ /QStringList/ ) { - $jniLocal ="static QStringList* _qlist_$argName = 0;\n"; + if ( $cplusplusType =~ /TQStringList/ ) { + $jniLocal ="static TQStringList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStringList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStringList*) QtSupport::toQStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStringList*) QtSupport::toTQStringList(env, $argName, &_qlist_$argName)"; } - } elsif ( $cplusplusType =~ /QStrList/ ) { - $jniLocal ="static QStrList* _qlist_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQStrList/ ) { + $jniLocal ="static TQStrList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStrList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStrList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStrList*) QtSupport::toQStrList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStrList*) QtSupport::toTQStrList(env, $argName, &_qlist_$argName)"; } } elsif ( $cplusplusType =~ /char\s*\*\*/ ) { $jniArg = "($cplusplusType) QtSupport::toStringArray(env, $argName)"; } } elsif ( $javaType =~ /StringBuffer/ ) { - if ( $cplusplusType =~ /QCString/ ) { - $jniLocal = "static QCString* _qcstring_$argName = 0;\n"; + if ( $cplusplusType =~ /TQCString/ ) { + $jniLocal = "static TQCString* _qcstring_$argName = 0;\n"; $jniLocal .= "\tif (_qcstring_$argName == 0) {\n"; - $jniLocal .= "\t\t_qcstring_$argName = new QCString();\n"; + $jniLocal .= "\t\t_qcstring_$argName = new TQCString();\n"; $jniLocal .= "\t}\n"; if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) _qcstring_$argName"; } else { - $jniArg = "($cplusplusType)*(QCString*) _qcstring_$argName"; + $jniArg = "($cplusplusType)*(TQCString*) _qcstring_$argName"; } - $jniCleanup = "\tQtSupport::fromQCStringToStringBuffer(env, _qcstring_$argName, $argName);\n"; + $jniCleanup = "\tQtSupport::fromTQCStringToStringBuffer(env, _qcstring_$argName, $argName);\n"; } else { - $jniLocal ="static QString* _qstring_$argName = 0;\n"; + $jniLocal ="static TQString* _qstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QString*) QtSupport::toQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; } - $jniCleanup = "\tQtSupport::fromQStringToStringBuffer(env, _qstring_$argName, $argName);\n"; + $jniCleanup = "\tQtSupport::fromTQStringToStringBuffer(env, _qstring_$argName, $argName);\n"; } } elsif ( $javaType =~ /^String$/ ) { - if ( $cplusplusType =~ /QString/ ) { - $jniLocal ="static QString* _qstring_$argName = 0;\n"; + if ( $cplusplusType =~ /TQString/ ) { + $jniLocal ="static TQString* _qstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQString(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQString(env, $argName, &_qstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QString*) QtSupport::toQString(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType)*(TQString*) QtSupport::toTQString(env, $argName, &_qstring_$argName)"; } - } elsif ( $cplusplusType =~ /QCString/ ) { - $jniLocal ="static QCString* _qcstring_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQCString/ ) { + $jniLocal ="static TQCString* _qcstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQCString(env, $argName, &_qcstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQCString(env, $argName, &_qcstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QCString*) QtSupport::toQCString(env, $argName, &_qcstring_$argName)"; + $jniArg = "($cplusplusType)*(TQCString*) QtSupport::toTQCString(env, $argName, &_qcstring_$argName)"; } } elsif ( $cplusplusType =~ /DOMString/ ) { $jniLocal ="static DOM::DOMString* _domstring_$argName = 0;\n"; @@ -2131,7 +2131,7 @@ sub jniArgTocplusplus $jniArg = "(DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, $argName, &_domstring_$argName)"; } } else { - $jniLocal ="static QCString* _qstring_$argName = 0;\n"; + $jniLocal ="static TQCString* _qstring_$argName = 0;\n"; $jniArg = "($cplusplusType) ". ($cplusplusType =~ /[\&]/ ? "*(char*)" : "") . "QtSupport::toCharString(env, $argName, &_qstring_$argName)"; } } elsif ( $javaType =~ /boolean\[\]/ ) { @@ -2139,23 +2139,23 @@ sub jniArgTocplusplus $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_bool_$argName"; $jniCleanup = "\tenv->SetBooleanArrayRegion($argName, 0, 1, (jboolean*) _bool_$argName);\n"; } elsif ( $javaType =~ /char\[\]/ ) { - $jniLocal ="static QByteArray* _qbytearray_$argName = 0;\n"; + $jniLocal ="static TQByteArray* _qbytearray_$argName = 0;\n"; $jniArg = "($cplusplusType) QtSupport::toUcharArray(env, $argName, &_qbytearray_$argName)"; } elsif ( $javaType =~ /byte\[\]/ ) { - $jniLocal = "static QByteArray* _qbyteArray_$argName = 0;\n"; + $jniLocal = "static TQByteArray* _qbyteArray_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQByteArray(env, $argName, &_qbyteArray_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQByteArray(env, $argName, &_qbyteArray_$argName)"; } else { - $jniArg = "($cplusplusType)*(QByteArray*) QtSupport::toQByteArray(env, $argName, &_qbyteArray_$argName)"; + $jniArg = "($cplusplusType)*(TQByteArray*) QtSupport::toTQByteArray(env, $argName, &_qbyteArray_$argName)"; } } elsif ( $javaType =~ /short\[\]/ ) { $jniLocal ="\tshort* _short_$argName = QtSupport::toShortPtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_short_$argName"; $jniCleanup = "\tenv->SetShortArrayRegion($argName, 0, 1, (jshort*) _short_$argName);\n"; } elsif ( $javaType =~ /int\[\]/ ) { - if ( $cplusplusType =~ /QValueList/ ) { - $jniLocal = "static QValueList<int>* _qlist_$argName = 0;\n"; - $jniArg = "($cplusplusType) QtSupport::toQIntValueList(env, $argName, &_qlist_$argName)"; + if ( $cplusplusType =~ /TQValueList/ ) { + $jniLocal = "static TQValueList<int>* _qlist_$argName = 0;\n"; + $jniArg = "($cplusplusType) QtSupport::toTQIntValueList(env, $argName, &_qlist_$argName)"; } else { $jniLocal ="\tint* _int_$argName = QtSupport::toIntPtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_int_$argName"; @@ -2165,9 +2165,9 @@ sub jniArgTocplusplus $jniLocal ="\tdouble* _double_$argName = QtSupport::toDoublePtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_double_$argName"; $jniCleanup = "\tenv->SetDoubleArrayRegion($argName, 0, 1, (jdouble*) _double_$argName);\n"; - } elsif ( $javaType =~ /^QPaintDeviceInterface$/ ) { + } elsif ( $javaType =~ /^TQPaintDeviceInterface$/ ) { $jniArg = "($cplusplusType) QtSupport::paintDevice(env, $argName)"; - } elsif ( $javaType =~ /^QMimeSourceInterface$/ ) { + } elsif ( $javaType =~ /^TQMimeSourceInterface$/ ) { $jniArg = "($cplusplusType) QtSupport::mimeSource(env, $argName)"; } elsif ( $javaType =~ /^[A-Z]/ ) { ( my $className = $cplusplusType ) =~ s/[&*]//g; @@ -2177,12 +2177,12 @@ sub jniArgTocplusplus } elsif ( $javaType =~ /^byte\s*/ ) { $jniArg = "($cplusplusType) $argName"; } elsif ( $javaType =~ /^char\s*/ ) { - if ( $cplusplusType =~ /QChar/ ) { - $jniLocal = "static QChar* _qchar_$argName = 0;\n"; + if ( $cplusplusType =~ /TQChar/ ) { + $jniLocal = "static TQChar* _qchar_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQChar(env, $argName, &_qchar_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQChar(env, $argName, &_qchar_$argName)"; } else { - $jniArg = "($cplusplusType)*(QChar*) QtSupport::toQChar(env, $argName, &_qchar_$argName)"; + $jniArg = "($cplusplusType)*(TQChar*) QtSupport::toTQChar(env, $argName, &_qchar_$argName)"; } } else { $jniArg = "($cplusplusType) $argName"; @@ -2217,15 +2217,15 @@ sub jniToReturnValue($$$) $returnCall = "\t$functionCall;\n\treturn;\n"; $returnCall = "\t$functionCall;\n$jniCleanups\treturn;\n"; } elsif ( $javaType =~ /^Calendar$/ ) { - $cplusplusType =~ /(QDateTime|QDate)\s*(\*)?&?\s*$/; + $cplusplusType =~ /(TQDateTime|TQDate)\s*(\*)?&?\s*$/; $jniLocal = "\t$1 $2 _qdate;\n"; $returnCall = "\t_qdate = $functionCall;\n$jniCleanups"; $returnCall .= "\treturn (jobject) QtSupport::from$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qdate);\n"; } elsif ( $javaType =~ /^Date$/ ) { - $cplusplusType =~ /(QTime)\s*(\*)?&?\s*$/; + $cplusplusType =~ /(TQTime)\s*(\*)?&?\s*$/; $jniLocal = "\t$1 $2 _qtime;\n"; $returnCall = "\t_qtime = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn (jobject) QtSupport::fromQTime(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qtime);\n"; + $returnCall .= "\treturn (jobject) QtSupport::fromTQTime(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qtime);\n"; } elsif ( $javaType =~ /ArrayList/ || $javaType =~ /String\[\]/ ) { if ( $cplusplusType !~ /\*/ ) { $const = ""; @@ -2233,34 +2233,34 @@ sub jniToReturnValue($$$) $cplusplusType =~ /(const )?([^\&]*)(\*)?&?/; $jniLocal = "\t$const$2 $3 _qlist;\n"; $returnCall = "\t_qlist = $functionCall;\n$jniCleanups"; - if ( $cplusplusType =~ /(QStrList|QStringList|QCanvasItemList|QWidgetList|QDomNodeList|QObjectList)\s*([\*\&])?\s*$/ ) { + if ( $cplusplusType =~ /(TQStrList|TQStringList|TQCanvasItemList|TQWidgetList|TQDomNodeList|TQObjectList)\s*([\*\&])?\s*$/ ) { $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 =~ /(QCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) { + } elsif ( $cplusplusType =~ /(TQCStringList|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"; } elsif ( $cplusplusType =~ /(KURL::List)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithKURLList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QValueList<QIconDragItem>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQIconDragItemList(env, (QValueList<QIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QMemArray<QRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQRectList(env, (QMemArray<QRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QArray<QRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQRectList(env, (QArray<QRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; + } elsif ( $cplusplusType =~ /TQValueList<TQIconDragItem>\s*([\*\&])?\s*$/ ) { + $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 } elsif ( $javaType =~ /String/ || $javaType =~ /StringBuffer/ ) { - if ( $cplusplusType =~ /QString(\s*\*)?/ ) { - $jniLocal = "\tQString $1 _qstring;\n"; + if ( $cplusplusType =~ /TQString(\s*\*)?/ ) { + $jniLocal = "\tTQString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; - } elsif ($cplusplusType =~ /QCString(\s*\*)?/) { - $jniLocal = "\tQCString $1 _qstring;\n"; + $returnCall .= "\treturn QtSupport::fromTQString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; + } elsif ($cplusplusType =~ /TQCString(\s*\*)?/) { + $jniLocal = "\tTQCString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQCString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; + $returnCall .= "\treturn QtSupport::fromTQCString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; } elsif ($cplusplusType =~ /DOM::DOMString(\s*\*)?/) { $jniLocal = "\tDOM::DOMString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; @@ -2277,20 +2277,20 @@ sub jniToReturnValue($$$) } elsif ( $javaType =~ /char\[\]/ ) { ; } elsif ( $javaType =~ /byte\[\]/ ) { - $jniLocal = "\tQByteArray " . ($cplusplusType =~ /\*/ ? "*" : "") . "_qbyteArray;\n"; + $jniLocal = "\tTQByteArray " . ($cplusplusType =~ /\*/ ? "*" : "") . "_qbyteArray;\n"; $returnCall = "\t_qbyteArray = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQByteArray(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qbyteArray);\n"; + $returnCall .= "\treturn QtSupport::fromTQByteArray(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qbyteArray);\n"; } elsif ( $javaType =~ /short\[\]/ ) { ; } elsif ( $javaType =~ /int\[\]/ && $cplusplusType !~ /\&/ ) { - if ( $cplusplusType =~ /(int\*|QRgb\*)/ ) { + if ( $cplusplusType =~ /(int\*|TQRgb\*)/ ) { $jniLocal = "\t$1 _qint;\n"; $returnCall = "\t_qint = $functionCall;\n$jniCleanups"; $returnCall .= "\treturn QtSupport::fromIntPtr(env, (int*)_qint);\n"; } else { - $jniLocal = "\tQValueList<int> _qintArray;\n"; + $jniLocal = "\tTQValueList<int> _qintArray;\n"; $returnCall = "\t_qintArray = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQIntValueList(env, &_qintArray);\n"; + $returnCall .= "\treturn QtSupport::fromTQIntValueList(env, &_qintArray);\n"; } } elsif ( $javaType =~ /double\[\]/ ) { ; @@ -2308,10 +2308,10 @@ sub jniToReturnValue($$$) } $returnCall .= "$jniCleanups\treturn xret;\n"; } elsif ( $javaType =~ /^char\s*/ ) { - if ( $cplusplusType =~ /(QChar)(\s*\*)?\s*$/ ) { + if ( $cplusplusType =~ /(TQChar)(\s*\*)?\s*$/ ) { $jniLocal = "\t$const$1 $2 _qchar;\n"; $returnCall = "\t_qchar = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn (jchar) QtSupport::fromQChar(env, (QChar*) " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qchar);\n"; + $returnCall .= "\treturn (jchar) QtSupport::fromTQChar(env, (TQChar*) " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qchar);\n"; } else { $returnCall = "\tjchar xret = (jchar) $functionCall;\n$jniCleanups"; $returnCall .= "\treturn xret;\n"; @@ -2337,10 +2337,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -2377,33 +2377,33 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QIconFactory' || - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QByteArray' || - $className eq 'QBitArray' || - $className eq 'QWExtra' || - $className eq 'QTLWExtra' || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQIconFactory' || + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQByteArray' || + $className eq 'TQBitArray' || + $className eq 'TQWExtra' || + $className eq 'TQTLWExtra' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || $className eq 'KBookmarkMenu::DynMenuInfo' || $className eq 'KCompletionMatches' || $className eq 'KDEDesktopMimeType::Service' || @@ -2462,7 +2462,7 @@ sub preParseClass $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || # $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -2496,7 +2496,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -2590,18 +2590,18 @@ sub preParseClass # Various methods to skip in Qt/E (Qt 2.3.x) || ($main::qt_embedded - && ( ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) - || ($classNode->{astNodeName} eq 'QApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) - || ($classNode->{astNodeName} eq 'QPrinter' and $name =~ /^setIdle$|^setActive$/) - || ($classNode->{astNodeName} eq 'QDragObject' and $name eq 'dragLink') - || ($classNode->{astNodeName} eq 'QFont' and $name eq 'qwsRenderToDisk') - || ($classNode->{astNodeName} eq 'QFontInfo' and $name eq 'font') - || ($classNode->{astNodeName} eq 'QLineEdit' and $name eq 'getSelection') - || ($classNode->{astNodeName} eq 'QMainWindow' and $name eq 'toolBars') - || ($classNode->{astNodeName} eq 'QMovie' and $name eq 'setDisplayWidget') - || ($classNode->{astNodeName} eq 'QMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) - || ($classNode->{astNodeName} eq 'QPainter' and $name eq 'pos') - || ($classNode->{astNodeName} eq 'QPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) + && ( ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} eq 'TQApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) + || ($classNode->{astNodeName} eq 'TQPrinter' and $name =~ /^setIdle$|^setActive$/) + || ($classNode->{astNodeName} eq 'TQDragObject' and $name eq 'dragLink') + || ($classNode->{astNodeName} eq 'TQFont' and $name eq 'qwsRenderToDisk') + || ($classNode->{astNodeName} eq 'TQFontInfo' and $name eq 'font') + || ($classNode->{astNodeName} eq 'TQLineEdit' and $name eq 'getSelection') + || ($classNode->{astNodeName} eq 'TQMainWindow' and $name eq 'toolBars') + || ($classNode->{astNodeName} eq 'TQMovie' and $name eq 'setDisplayWidget') + || ($classNode->{astNodeName} eq 'TQMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) + || ($classNode->{astNodeName} eq 'TQPainter' and $name eq 'pos') + || ($classNode->{astNodeName} eq 'TQPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) || ($name eq 'handle') || ($name eq 'resetInputContext') || ($name eq 'propagateUpdates') @@ -2646,12 +2646,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # ) { @@ -2659,8 +2659,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (QSessionManagerJBridge doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (TQSessionManagerJBridge doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -2693,7 +2693,7 @@ sub preParseClass } elsif( $m->{NodeType} eq 'var' ) { my $varType = $m->{Type}; - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $varType =~ s/static\s+// && $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -2747,14 +2747,14 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor # && !$hasPrivatePureVirtual - && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'QValidator') + && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'TQValidator') && !($classNode->{NodeType} eq 'namespace') && ($classNode->{astNodeName} !~ /^DrawContentsEvent$|^MouseEvent$|^MouseDoubleClickEvent$|^MouseMoveEvent$|^MouseReleaseEvent$|^MousePressEvent$/) - && ($classNode->{astNodeName} !~ /QMetaObject|QDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); + && ($classNode->{astNodeName} !~ /TQMetaObject|TQDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); # We will derive from the class only if it has public or protected constructors. # (_Even_ if it has pure virtuals. But in that case the *.cpp class can't be instantiated either.) @@ -2763,9 +2763,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -2835,7 +2835,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "QMemArray" and $name ne "QArray" and $name ne "QSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } @@ -2885,7 +2885,7 @@ sub writeClassDoc print CLASS "import java.text.MessageFormat;\n"; print CLASS "import java.lang.reflect.*;\n"; } else { - if ( $className eq 'QListView' or $className eq 'QListViewItem' or $className eq 'QUriDrag' ) { + if ( $className eq 'TQListView' or $className eq 'TQListViewItem' or $className eq 'TQUriDrag' ) { # Special case these two classes as they have methods that use ArrayList added as 'extras' print CLASS "import java.util.ArrayList;\n"; } @@ -3014,67 +3014,67 @@ sub writeClassDoc if ( $className eq 'Qt' ) { if ($main::qt_embedded) { - $qtExtras =~ s/public static native QCursor whatsThisCursor\(\);//; + $qtExtras =~ s/public static native TQCursor whatsThisCursor\(\);//; $qtjniExtras =~ s/JNIEXPORT jobject JNICALL\nJava_org_kde_qt_Qt_whatsThisCursor[^}]*}//; } print CLASS $qtExtras; $jniCode .= $qtjniExtras; - } elsif ( $className eq 'QApplication' ) { + } elsif ( $className eq 'TQApplication' ) { print CLASS $qapplicationExtras; $jniCode .= $qapplicationjniExtras; - } elsif ( $className eq 'QBitmap' ) { + } elsif ( $className eq 'TQBitmap' ) { print CLASS $qbitmapExtras; $jniCode .= $qbitmapjniExtras; - } elsif ( $className eq 'QDropEvent' ) { + } elsif ( $className eq 'TQDropEvent' ) { print CLASS $qdropeventExtras; $jniCode .= $qdropeventjniExtras; - } elsif ( $className eq 'QDragObject' ) { + } elsif ( $className eq 'TQDragObject' ) { print CLASS $qdragobjectExtras; $jniCode .= $qdragobjectjniExtras; - } elsif ( $className eq 'QObject' ) { + } elsif ( $className eq 'TQObject' ) { print CLASS $qobjectExtras; $jniCode .= $qobjectjniExtras; - } elsif ( $className eq 'QImage' ) { + } elsif ( $className eq 'TQImage' ) { $jniCode .= $qimagejniExtras; - } elsif ( $className eq 'QListView' ) { + } elsif ( $className eq 'TQListView' ) { print CLASS $qlistviewExtras; $jniCode .= $qlistviewjniExtras; - } elsif ( $className eq 'QListViewItem' ) { + } elsif ( $className eq 'TQListViewItem' ) { print CLASS $qlistviewitemExtras; $jniCode .= $qlistviewitemjniExtras; - } elsif ( $className eq 'QMenuBar' ) { + } elsif ( $className eq 'TQMenuBar' ) { if ($main::qt_embedded) { $qmenubarjniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qmenubarjniExtras; - } elsif ( $className eq 'QMenuData' ) { + } elsif ( $className eq 'TQMenuData' ) { if ($main::qt_embedded) { $qmenudatajniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qmenudatajniExtras; - } elsif ( $className eq 'QMimeSource' ) { + } elsif ( $className eq 'TQMimeSource' ) { print CLASS $qmimesourceExtras; $jniCode .= $qmimesourcejniExtras; - } elsif ( $className eq 'QPopupMenu' ) { + } elsif ( $className eq 'TQPopupMenu' ) { if ($main::qt_embedded) { $qpopupmenujniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qpopupmenujniExtras; - } elsif ( $className eq 'QWidget' ) { + } elsif ( $className eq 'TQWidget' ) { print CLASS $qwidgetExtras; $jniCode .= $qwidgetjniExtras; - } elsif ( $className eq 'QPaintDevice' ) { + } elsif ( $className eq 'TQPaintDevice' ) { print CLASS $qpaintdeviceExtras; $jniCode .= $qpaintdevicejniExtras; - } elsif ( $className eq 'QPixmap' ) { + } elsif ( $className eq 'TQPixmap' ) { print CLASS $qpixmapExtras; $jniCode .= $qpixmapjniExtras; - } elsif ( $className eq 'QIODevice' ) { + } elsif ( $className eq 'TQIODevice' ) { print CLASS $qiodeviceExtras; - } elsif ( $className eq 'QPointArray' ) { + } elsif ( $className eq 'TQPointArray' ) { print CLASS $qpointarrayExtras; $jniCode .= $qpointarrayjniExtras; - } elsif ( $className eq 'QUriDrag' ) { + } elsif ( $className eq 'TQUriDrag' ) { print CLASS $quridragExtras; $jniCode .= $quridragjniExtras; } elsif ( $className eq 'KCmdLineArgs' ) { @@ -3289,7 +3289,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -3305,7 +3305,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -3337,7 +3337,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -3575,8 +3575,8 @@ sub generateMethod($$$$$$$$$) @heritage = kdocAstUtil::heritage($mainClassNode); my $mainClassName = join( "::", @heritage ); - # The javaClassName might be 'QWidget', while currentClassName is 'QRangeControl' - # and the QRangeControl methods are being copied into QWidget. + # The javaClassName might be 'TQWidget', while currentClassName is 'TQRangeControl' + # and the TQRangeControl methods are being copied into TQWidget. my $javaClassName = $mainClassNode->{astNodeName}; my $currentClassName = $classNode->{astNodeName}; @@ -3614,7 +3614,7 @@ sub generateMethod($$$$$$$$$) if ($classNode->{astNodeName} eq $main::globalSpaceClassName) { my $sourcename = $m->{Source}->{astNodeName}; # Only put Global methods which came from sources beginning with q into class Qt - # Skip any methods in qstring.h/qcstring.h apart from QByteArray compress/uncompress + # Skip any methods in qstring.h/qcstring.h apart from TQByteArray compress/uncompress if ($javaClassName eq 'Qt' and ( $sourcename !~ /\/q[^\/]*$/ or ($sourcename =~ /string.h$/ and $name !~ /[Cc]ompress/) )) { return; @@ -3649,18 +3649,18 @@ sub generateMethod($$$$$$$$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -3721,7 +3721,7 @@ sub generateMethod($$$$$$$$$) checkIncludesForObject( $argType, $addInclude ); } - if ( $name eq 'QApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { + if ( $name eq 'TQApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { # Junk the 'int argc' parameter shift @javaArgTypeList; shift @javaArgList; @@ -3796,8 +3796,8 @@ sub generateMethod($$$$$$$$$) # $jniCode .= "x_$methodNumber(args);"; # $jniCode .= "\tbreak;\n"; - if ($name eq 'find' and $javaClassName eq 'QButtonGroup') { - # Can't override a static method find() in QWidget + if ($name eq 'find' and $javaClassName eq 'TQButtonGroup') { + # Can't override a static method find() in TQWidget $name = "findButton"; } elsif ( $name eq 'null' ) { $name = "nil"; @@ -3807,7 +3807,7 @@ sub generateMethod($$$$$$$$$) $name = "waitThread"; } elsif ( $name eq 'finalize' and $javaClassName eq 'KMD5' ) { $name = "finalizeDigest"; - } elsif ( $name eq 'icon' and $javaClassName eq 'QMessageBox' ) { + } elsif ( $name eq 'icon' and $javaClassName eq 'TQMessageBox' ) { $name = "iconId"; } elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) { $name = "iconName"; @@ -3835,7 +3835,7 @@ sub generateMethod($$$$$$$$$) $name = "kstatusBar"; } elsif ($javaSignature eq "menuBar()" and $javaClassName =~ /^K/ ) { $name = "kmenuBar"; - } elsif ( $name eq 'addLabel' and $javaClassName eq 'QTableHeader' ) { + } elsif ( $name eq 'addLabel' and $javaClassName eq 'TQTableHeader' ) { $name = "addHeaderLabel"; } @@ -3873,9 +3873,9 @@ sub generateMethod($$$$$$$$$) $jniCode .= join( "", @jniCleanups ); $jniCode .= "\t}\n\treturn;\n}\n\n"; - # Look for args which are are a QQbject/slot string pair and replace with a java proxy slot + # Look for args which are are a TQQbject/slot string pair and replace with a java proxy slot if ($jniCode =~ s/QtSupport::getQt\(env, (receiver|recvr|pObjSlot)\), \(const char\*\) QtSupport::toCharString\(env, (member|slot|psMethodSlot), \&_qstring_(member|slot|psMethodSlot)\)/QtSupport::slotForReceiver(env, $1, $2), "1invoke()"/) { - $jniCode =~ s/static QCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; + $jniCode =~ s/static TQCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; } $jniSignature =~ /^([^\)]*)\(.*/; @@ -3910,9 +3910,9 @@ sub generateMethod($$$$$$$$$) if ($name =~ /^xForm$/ ) { $javaReturnType = "Object"; } elsif ($javaSignature eq "layout()" and $javaReturnType ne 'void') { - $altReturnType = "QLayout"; - } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'QSqlEditorFactory') { - $javaReturnType = "QEditorFactory"; + $altReturnType = "TQLayout"; + } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'TQSqlEditorFactory') { + $javaReturnType = "TQEditorFactory"; } elsif ($javaSignature =~ /^bits|^scanLine/) { $javaReturnType = "byte[]"; } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { @@ -3933,7 +3933,7 @@ sub generateMethod($$$$$$$$$) } my $methodName = $m->{astNodeName}; - # Hack to stop calling super for QWidget::polish() from looping + # Hack to stop calling super for TQWidget::polish() from looping if ( $m->{Access} =~ /public/ && $returnType eq '' && $m->{Flags} =~ "v" @@ -3985,16 +3985,16 @@ sub generateMethod($$$$$$$$$) if ($name eq 'insertAnimatedWidget' or $name eq 'connectStatus' or $name eq 'disconnectStatus') { $slotArgType = 'int'; } elsif ($name eq 'connectResize' or $name eq 'disconnectResize') { - $slotArgType = 'const QSize&'; + $slotArgType = 'const TQSize&'; } elsif ($name eq 'connectUpdate' or $name eq 'disconnectUpdate') { - $slotArgType = 'const QRect&'; + $slotArgType = 'const TQRect&'; } - # Look for args which are are a QQbject/slot string pair and replace with a java proxy slot + # Look for args which are are a TQQbject/slot string pair and replace with a java proxy slot $locals .= join( "", @jniArgLocals ); if ($fcall =~ s/QtSupport::getQt\(env, (receiver|recvr|pObjSlot)\), \(const char\*\) QtSupport::toCharString\(env, (member|slot|psMethodSlot), \&_qstring_(member|slot|psMethodSlot)\)/QtSupport::slotForReceiver(env, $1, $2), "1invoke($slotArgType)"/) { - $locals =~ s/static QCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; + $locals =~ s/static TQCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; } $jniCode .= $locals; @@ -4005,10 +4005,10 @@ sub generateMethod($$$$$$$$$) $jniCode =~ s/jstring/jobject/; $jniCode =~ /(jlong|jint) (\w+)\)/; my $arg2 = $2; - $jniCode =~ s/_qstring_(\w+) = 0;\n/_qstring_$1 = 0;\n\tif \(_qstring_$1 == 0\) { _qstring_$1 = new QCString\(\); }\n\t_qstring_$1->resize\(\(uint\) $arg2\);\n/; + $jniCode =~ s/_qstring_(\w+) = 0;\n/_qstring_$1 = 0;\n\tif \(_qstring_$1 == 0\) { _qstring_$1 = new TQCString\(\); }\n\t_qstring_$1->resize\(\(uint\) $arg2\);\n/; my $arg1 = $1; $fcall =~ s/QtSupport::toCharString\([^\)]*\)/_qstring_$arg1->data()/; - $fcall =~ s/return xret;/QtSupport::fromQCStringToStringBuffer(env, _qstring_$arg1, $arg1);\n\treturn xret;/; + $fcall =~ s/return xret;/QtSupport::fromTQCStringToStringBuffer(env, _qstring_$arg1, $arg1);\n\treturn xret;/; } $jniCode .= $fcall; @@ -4149,8 +4149,8 @@ sub generateAllMethods($$$$$$$$) my $javaClassName = $mainClassNode->{astNodeName}; my $jniClassName = ($classNode->{astNodeName} =~ /^Q/ ? "Java_org_kde_qt_" : "Java_org_kde_koala_") . $classNode->{astNodeName}; # If the C++ class had multiple inheritance, then the code for all but one of the - # parents must be copied into the code for javaClassName. Hence, for QWidget current - # classname might be QPaintDevice, as its methods are needed in QWidget. + # parents must be copied into the code for javaClassName. Hence, for TQWidget current + # classname might be TQPaintDevice, as its methods are needed in TQWidget. my $currentClassName = join( ".", kdocAstUtil::heritage($classNode) ); my $sourcename = $classNode->{Source}->{astNodeName}; @@ -4247,33 +4247,33 @@ sub generateAllMethods($$$$$$$$) $jniSignature = $jniClassName . "_finalize"; $jniCode = "JNIEXPORT void JNICALL\n$jniSignature(JNIEnv* env, jobject obj)\n{"; - if ( is_kindof($classNode, 'QCheckListItem') ) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QCheckListItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((QCheckListItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; + if ( is_kindof($classNode, 'TQCheckListItem') ) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQCheckListItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQCheckListItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; } elsif ( $classNode->{astNodeName} =~ /^KFileTreeViewToolTip$/ ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QTableItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QTableItem*)($className*)QtSupport::getQt(env, obj))->table() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QPopupMenu')) { + } elsif ( is_kindof($classNode, 'TQTableItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQTableItem*)($className*)QtSupport::getQt(env, obj))->table() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQPopupMenu')) { if ($main::qt_embedded) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; } else { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n"; } - } elsif ( is_kindof($classNode, 'QListViewItem') ) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((QListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QIconViewItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QIconViewItem*)($className*)QtSupport::getQt(env, obj))->iconView() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QLayoutItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->layout() == 0 && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->widget() == 0 && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->spacerItem() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQListViewItem') ) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQIconViewItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQIconViewItem*)($className*)QtSupport::getQt(env, obj))->iconView() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQLayoutItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->layout() == 0 && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->widget() == 0 && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->spacerItem() == 0) {\n"; } elsif ( $classNode->{astNodeName} =~ /^KSpell$|^KReplace$/ ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj)) {\n"; - } elsif ( $classNode->{astNodeName} =~ /^QWidget$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parentWidget" ) ) { + } elsif ( $classNode->{astNodeName} =~ /^TQWidget$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parentWidget" ) ) { if ($main::qt_embedded) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; } else { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n"; } - } elsif ( $classNode->{astNodeName} =~ /^QObject$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) { + } elsif ( $classNode->{astNodeName} =~ /^TQObject$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parent() == 0) {\n"; } else { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj)) {\n"; @@ -4322,7 +4322,7 @@ sub virtualMethodCallbacks my $m; my $name; - my $isQObject = is_kindof($node, 'QObject'); + my $isTQObject = is_kindof($node, 'TQObject'); kdocAstUtil::allMembers( \%allmem, $node ); @@ -4355,7 +4355,7 @@ sub virtualMethodCallbacks $qobjectType =~ s/^(Q.*)/org.kde.qt.$1/; if( $m->{ReturnType} eq 'void' && $#argTypeList eq 0 && cplusplusToJNISignature( @argTypeList[0] ) =~ /Lorg_kde/ - && $isQObject ) + && $isTQObject ) { @castedArgList = makeCastedArgList( @argTypeList ); my $eventType = cplusplusToJava( @argTypeList[0] ); @@ -4367,29 +4367,29 @@ sub virtualMethodCallbacks $jbridgeCode .= "\t\t\t" . $parent->{astNodeName} . "::" . "$name(arg1);\n"; $jbridgeCode .= "\t\t}\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( $name =~ /eventFilter$/ and $isQObject and $#argTypeList eq 1) { - $jbridgeCode .= "\tbool eventFilter(QObject* object,QEvent* event) {\n"; + } elsif( $name =~ /eventFilter$/ and $isTQObject and $#argTypeList eq 1) { + $jbridgeCode .= "\tbool eventFilter(TQObject* object,TQEvent* event) {\n"; $jbridgeCode .= "\t\tif (!QtSupport::eventFilterDelegate(this,\"$qobjectType\",object,event)) {\n"; $jbridgeCode .= "\t\t\treturn " . $parent->{astNodeName} . "::eventFilter(object,event);\n"; $jbridgeCode .= "\t\t} else {\n"; $jbridgeCode .= "\t\t\treturn TRUE;\n"; $jbridgeCode .= "\t\t}\n\t}\n"; - } elsif( $name =~ /^fixup$/ and $node->{astNodeName} eq 'QValidator' ) { - $jbridgeCode .= "\tQValidator::State validate(QString& input,int& pos) const\n"; + } elsif( $name =~ /^fixup$/ and $node->{astNodeName} eq 'TQValidator' ) { + $jbridgeCode .= "\tTQValidator::State validate(TQString& input,int& pos) const\n"; $jbridgeCode .= "\t{\n"; - $jbridgeCode .= "\t\treturn (QValidator::State) QtSupport::validateDelegate((QValidator*)this,input,pos);\n"; + $jbridgeCode .= "\t\treturn (TQValidator::State) QtSupport::validateDelegate((TQValidator*)this,input,pos);\n"; $jbridgeCode .= "\t}\n"; - $jbridgeCode .= "\tvoid fixup(QString& input) const\n"; + $jbridgeCode .= "\tvoid fixup(TQString& input) const\n"; $jbridgeCode .= "\t{\n"; - $jbridgeCode .= "\t\tQtSupport::fixupDelegate((QValidator*) this, input);\n"; + $jbridgeCode .= "\t\tQtSupport::fixupDelegate((TQValidator*) this, input);\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( $m->{ReturnType} eq 'void' and $#argTypeList eq -1 and $isQObject) { + } elsif( $m->{ReturnType} eq 'void' and $#argTypeList eq -1 and $isTQObject) { $jbridgeCode .= "\tvoid $name() {\n"; $jbridgeCode .= "\t\tif (!QtSupport::voidDelegate(this,\"$qobjectType\",\"$name\")) {\n"; $jbridgeCode .= "\t\t\t" . $parent->{astNodeName} . "::$name();\n"; $jbridgeCode .= "\t\t}\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( cplusplusToJava( $m->{ReturnType} ) eq 'boolean' and $#argTypeList eq -1 and $isQObject ) { + } elsif( cplusplusToJava( $m->{ReturnType} ) eq 'boolean' and $#argTypeList eq -1 and $isTQObject ) { $jbridgeCode .= "\t" . $m->{ReturnType} . " $name() {\n"; $jbridgeCode .= "\t\treturn QtSupport::booleanDelegate(this,\"$name\");\n"; $jbridgeCode .= "\t}\n"; @@ -4530,7 +4530,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -4593,7 +4593,7 @@ sub direct_superclass_list($) Iter::Ancestors( $classNode, $rootnode, undef, undef, sub { ( $direct_ancestor, $name ) = @_; - if ($name =~ /QMemArray|QSqlFieldInfoList/) { + if ($name =~ /TQMemArray|TQSqlFieldInfoList/) { # Template classes, give up for now.. $has_ancestor = 1; } elsif (kalyptusDataDict::interfacemap($name) eq "") { @@ -4700,8 +4700,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -4955,7 +4955,7 @@ sub writeSmokeDataFile($) { # First write the name # print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; # print OUT "$classidx{$realType}, "; } @@ -5461,11 +5461,11 @@ sub printJavadocComment($$$$) $line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g; } $line =~ s/NodeList|KTrader::OfferList/ArrayList/g; - $line =~ s/(const )?QDate(Time)?(\s*&)?/Calendar/g; - $line =~ s/(const )?QTime([^r])/Date$1/g; - $line =~ s/QString::null/null/g; + $line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g; + $line =~ s/(const )?TQTime([^r])/Date$1/g; + $line =~ s/TQString::null/null/g; $line =~ s/(const )?QC?String(\s*&)?/String/g; - $line =~ s/QByteArray/byte[]/g; + $line =~ s/TQByteArray/byte[]/g; $line =~ s/(const )?KCmdLineOptions\s*(\w+)\[\]/String[][] $2/; $line =~ s/KCmdLineLastOption//g; $line =~ s/virtual //g; @@ -5527,7 +5527,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{Returns} ) { my $text = $docnode->{Returns}; - $text =~ s/QString::null/null/g; + $text =~ s/TQString::null/null/g; $returntext .= "\t\t\@return $text\n"; } @@ -5549,7 +5549,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { - next if ($text =~ /QString|^\s*and\s*$|^\s*$|^[^\w]*$/); + next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); $text =~ s/KIO:://g; $text =~ s/KParts:://g; $text =~ s/bool/boolean/g; @@ -5568,10 +5568,10 @@ sub printJavadocComment($$$$) $returntext =~ s/KIO#([A-Z])/$1/g; $returntext =~ s/KParts#([A-Z])/$1/g; $returntext =~ s/const\s+(\w+)\s*\&/$1/g; - $returntext =~ s/QChar/char/g; - $returntext =~ s/QStringList/ArrayList/g; + $returntext =~ s/TQChar/char/g; + $returntext =~ s/TQStringList/ArrayList/g; $returntext =~ s/([Aa]) ArrayList/$1n ArrayList/g; - $returntext =~ s/QString/String/g; + $returntext =~ s/TQString/String/g; $returntext =~ s/KCmdLineOptions/String[][]/; $returntext =~ s!\\note!<b>Note:<\b>!g; $returntext =~ s!\\(code|verbatim)!<pre>!g; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 524b5f0f..fa518cf1 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -71,18 +71,18 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', - 'QByteArray' => '$', - 'QByteArray&' => '$', - 'QByteArray*' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', + 'TQByteArray' => '$', + 'TQByteArray&' => '$', + 'TQByteArray*' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -102,47 +102,47 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', # 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QStyleHintReturn*' => 'void*', - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQStyleHintReturn*' => 'void*', + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'Q_INT32' => 'int', 'Q_INT64' => 'long', @@ -207,16 +207,16 @@ EOF $qbitmapExtras = <<EOF; -// public QBitmap(QPixmap arg1) { +// public TQBitmap(TQPixmap arg1) { // super((Class) null); -// newQBitmap(arg1); +// newTQBitmap(arg1); // } -// private native void newQBitmap(QPixmap arg1); -// public QBitmap(QImage arg1) { +// private native void newTQBitmap(TQPixmap arg1); +// public TQBitmap(TQImage arg1) { // super((Class) null); -// newQBitmap(arg1); +// newTQBitmap(arg1); // } -// private native void newQBitmap(QImage arg1); +// private native void newTQBitmap(TQImage arg1); EOF @@ -259,47 +259,47 @@ EOF } /* - public static native QColor color0(); - public static native QColor color1(); - public static native QColor black(); - public static native QColor white(); - public static native QColor darkGray(); - public static native QColor gray(); - public static native QColor lightGray(); - public static native QColor red(); - public static native QColor green(); - public static native QColor blue(); - public static native QColor cyan(); - public static native QColor magenta(); - public static native QColor yellow(); - public static native QColor darkRed(); - public static native QColor darkGreen(); - public static native QColor darkBlue(); - public static native QColor darkCyan(); - public static native QColor darkMagenta(); - public static native QColor darkYellow(); + public static native TQColor color0(); + public static native TQColor color1(); + public static native TQColor black(); + public static native TQColor white(); + public static native TQColor darkGray(); + public static native TQColor gray(); + public static native TQColor lightGray(); + public static native TQColor red(); + public static native TQColor green(); + public static native TQColor blue(); + public static native TQColor cyan(); + public static native TQColor magenta(); + public static native TQColor yellow(); + public static native TQColor darkRed(); + public static native TQColor darkGreen(); + public static native TQColor darkBlue(); + public static native TQColor darkCyan(); + public static native TQColor darkMagenta(); + public static native TQColor darkYellow(); // Global cursors - public static native QCursor arrowCursor(); // standard arrow cursor - public static native QCursor upArrowCursor(); // upwards arrow - public static native QCursor crossCursor(); // crosshair - public static native QCursor waitCursor(); // hourglass/watch - public static native QCursor ibeamCursor(); // ibeam/text entry - public static native QCursor sizeVerCursor(); // vertical resize - public static native QCursor sizeHorCursor(); // horizontal resize - public static native QCursor sizeBDiagCursor(); // diagonal resize (/) - public static native QCursor sizeFDiagCursor(); // diagonal resize (\) - public static native QCursor sizeAllCursor(); // all directions resize - public static native QCursor blankCursor(); // blank/invisible cursor - public static native QCursor splitVCursor(); // vertical bar with left-right + public static native TQCursor arrowCursor(); // standard arrow cursor + public static native TQCursor upArrowCursor(); // upwards arrow + public static native TQCursor crossCursor(); // crosshair + public static native TQCursor waitCursor(); // hourglass/watch + public static native TQCursor ibeamCursor(); // ibeam/text entry + public static native TQCursor sizeVerCursor(); // vertical resize + public static native TQCursor sizeHorCursor(); // horizontal resize + public static native TQCursor sizeBDiagCursor(); // diagonal resize (/) + public static native TQCursor sizeFDiagCursor(); // diagonal resize (\) + public static native TQCursor sizeAllCursor(); // all directions resize + public static native TQCursor blankCursor(); // blank/invisible cursor + public static native TQCursor splitVCursor(); // vertical bar with left-right // arrows - public static native QCursor splitHCursor(); // horizontal bar with up-down + public static native TQCursor splitHCursor(); // horizontal bar with up-down // arrows - public static native QCursor pointingHandCursor(); // pointing hand - public static native QCursor forbiddenCursor(); // forbidden cursor (slashed circle) + public static native TQCursor pointingHandCursor(); // pointing hand + public static native TQCursor forbiddenCursor(); // forbidden cursor (slashed circle) */ -// public static native QApplication qApp(); +// public static native TQApplication qApp(); public static native void qDebug(String message); public static void qDebug(String pattern, Object[] arguments) { @@ -340,7 +340,7 @@ EOF return "1" + sqeezeOut(slot, ' '); } - /** Convert from a UTF-8 string to Unicode - the java equivalent to QString::fromUtf8() */ + /** Convert from a UTF-8 string to Unicode - the java equivalent to TQString::fromUtf8() */ public String fromUtf8(byte[] bytes) { String result = null; @@ -445,14 +445,14 @@ EOF // public native boolean truncate( int pos); // public native int begin(); // public native int end(); -// public native QPoint at(int index); +// public native TQPoint at(int index); EOF $quridragExtras = <<EOF; -// public static native boolean decode(QMimeSourceInterface e, ArrayList i); -// public static native boolean decodeToUnicodeUris(QMimeSourceInterface e, ArrayList i); -// public static native boolean decodeLocalFiles(QMimeSourceInterface e, ArrayList i); +// public static native boolean decode(TQMimeSourceInterface e, ArrayList i); +// public static native boolean decodeToUnicodeUris(TQMimeSourceInterface e, ArrayList i); +// public static native boolean decodeLocalFiles(TQMimeSourceInterface e, ArrayList i); EOF @@ -532,7 +532,7 @@ sub cplusplusToJava my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QIconDragItem>|QValueList<QCString>|QValueList<QVariant>|QValueList<QPixmap>|QValueListConstIterator<QString>|QMap|EditMode|QPtrList<QPixmap>|QPtrList<QPoint>|QTextFormat|QTextCursor|QTextDocument|QNetworkProtocolFactoryBase|QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldInfoList|QObjectUserData|QUObject|QTextParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ ) { + if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "boolean"; @@ -551,7 +551,7 @@ sub cplusplusToJava return "short[]"; } elsif ( $cplusplusType =~ /KCmdLineOptions/ ) { return "String[][]"; - } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /QStringList/|| $cplusplusType =~ /QStrList/) { + } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) { return "String[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QUrlInfoValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/ @@ -569,24 +569,24 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/ - || $cplusplusType =~ /QMemArray<QRect>/ + || $cplusplusType =~ /TQMemArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { return "char[]"; } elsif ( $cplusplusType =~ /QC?String/ and !$isConst ) { return "StringBuffer" - } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /QString/ || $cplusplusType =~ /QCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { + } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /TQString/ || $cplusplusType =~ /TQCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { return "String" - } elsif ( $cplusplusType =~ /QChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { + } elsif ( $cplusplusType =~ /TQChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { return "char" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QTime\s*\*/ ) { return "Date" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDateTime\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDate\s*\*/ ) { return "Calendar" - } elsif ( $cplusplusType =~ /QPaintDevice/ ) { - return "QPaintDeviceInterface" - } elsif ( $cplusplusType =~ /QByteArray/ ) { + } elsif ( $cplusplusType =~ /TQPaintDevice/ ) { + return "TQPaintDeviceInterface" + } elsif ( $cplusplusType =~ /TQByteArray/ ) { return "byte[]" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { if ( kalyptusDataDict::interfacemap($1) ne () ) { @@ -644,10 +644,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -684,33 +684,33 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QIconFactory' || - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QByteArray' || - $className eq 'QBitArray' || - $className eq 'QWExtra' || - $className eq 'QTLWExtra' || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQIconFactory' || + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQByteArray' || + $className eq 'TQBitArray' || + $className eq 'TQWExtra' || + $className eq 'TQTLWExtra' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || $className eq 'KBookmarkMenu::DynMenuInfo' || $className eq 'KCompletionMatches' || $className eq 'KDEDesktopMimeType::Service' || @@ -769,7 +769,7 @@ sub preParseClass $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || # $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -803,7 +803,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -891,7 +891,7 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KSimpleFileFilter' and $name eq 'nameFilters') || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'isTabReorderingEnabled') || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton') - || ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) || ($name eq 'virtual_hook') || ($name =~ /_KShared_/) || ($name eq 'qObject') @@ -920,12 +920,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # ) { @@ -933,8 +933,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (QSessionManagerJBridge doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (TQSessionManagerJBridge doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -967,7 +967,7 @@ sub preParseClass } elsif( $m->{NodeType} eq 'var' ) { my $varType = $m->{Type}; - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $varType =~ s/static\s+// && $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -1021,14 +1021,14 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor # && !$hasPrivatePureVirtual - && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'QValidator') + && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'TQValidator') && !($classNode->{NodeType} eq 'namespace') && ($classNode->{astNodeName} !~ /^DrawContentsEvent$|^MouseEvent$|^MouseDoubleClickEvent$|^MouseMoveEvent$|^MouseReleaseEvent$|^MousePressEvent$/) - && ($classNode->{astNodeName} !~ /QMetaObject|QDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); + && ($classNode->{astNodeName} !~ /TQMetaObject|TQDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); # We will derive from the class only if it has public or protected constructors. # (_Even_ if it has pure virtuals. But in that case the *.cpp class can't be instantiated either.) @@ -1037,9 +1037,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -1123,7 +1123,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "QMemArray" and $name ne "QSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } @@ -1171,7 +1171,7 @@ sub writeClassDoc print CLASS "import java.text.MessageFormat;\n"; print CLASS "import java.lang.reflect.*;\n"; } else { - if ( $className eq 'QListView' or $className eq 'QListViewItem' or $className eq 'QUriDrag' ) { + if ( $className eq 'TQListView' or $className eq 'TQListViewItem' or $className eq 'TQUriDrag' ) { # Special case these two classes as they have methods that use ArrayList added as 'extras' print CLASS "import java.util.ArrayList;\n"; } @@ -1290,33 +1290,33 @@ sub writeClassDoc if ( $className eq 'Qt' ) { print CLASS $qtExtras; - } elsif ( $className eq 'QApplication' ) { + } elsif ( $className eq 'TQApplication' ) { print CLASS $qapplicationExtras; - } elsif ( $className eq 'QBitmap' ) { + } elsif ( $className eq 'TQBitmap' ) { print CLASS $qbitmapExtras; - } elsif ( $className eq 'QDropEvent' ) { + } elsif ( $className eq 'TQDropEvent' ) { print CLASS $qdropeventExtras; - } elsif ( $className eq 'QDragObject' ) { + } elsif ( $className eq 'TQDragObject' ) { print CLASS $qdragobjectExtras; - } elsif ( $className eq 'QObject' ) { + } elsif ( $className eq 'TQObject' ) { print CLASS $qobjectExtras; - } elsif ( $className eq 'QListView' ) { + } elsif ( $className eq 'TQListView' ) { print CLASS $qlistviewExtras; - } elsif ( $className eq 'QListViewItem' ) { + } elsif ( $className eq 'TQListViewItem' ) { print CLASS $qlistviewitemExtras; - } elsif ( $className eq 'QMimeSource' ) { + } elsif ( $className eq 'TQMimeSource' ) { print CLASS $qmimesourceExtras; - } elsif ( $className eq 'QWidget' ) { + } elsif ( $className eq 'TQWidget' ) { print CLASS $qwidgetExtras; - } elsif ( $className eq 'QPaintDevice' ) { + } elsif ( $className eq 'TQPaintDevice' ) { print CLASS $qpaintdeviceExtras; - } elsif ( $className eq 'QPixmap' ) { + } elsif ( $className eq 'TQPixmap' ) { print CLASS $qpixmapExtras; - } elsif ( $className eq 'QIODevice' ) { + } elsif ( $className eq 'TQIODevice' ) { print CLASS $qiodeviceExtras; - } elsif ( $className eq 'QPointArray' ) { + } elsif ( $className eq 'TQPointArray' ) { print CLASS $qpointarrayExtras; - } elsif ( $className eq 'QUriDrag' ) { + } elsif ( $className eq 'TQUriDrag' ) { print CLASS $quridragExtras; } elsif ( $className eq 'KApplication' ) { print CLASS $kapplicationExtras; @@ -1450,7 +1450,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -1466,7 +1466,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -1498,7 +1498,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -1694,8 +1694,8 @@ sub generateMethod($$$$$$$) @heritage = kdocAstUtil::heritage($mainClassNode); my $mainClassName = join( "::", @heritage ); - # The javaClassName might be 'QWidget', while currentClassName is 'QRangeControl' - # and the QRangeControl methods are being copied into QWidget. + # The javaClassName might be 'TQWidget', while currentClassName is 'TQRangeControl' + # and the TQRangeControl methods are being copied into TQWidget. my $javaClassName = $mainClassNode->{astNodeName}; my $currentClassName = $classNode->{astNodeName}; @@ -1755,18 +1755,18 @@ sub generateMethod($$$$$$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -1816,7 +1816,7 @@ sub generateMethod($$$$$$$) checkImportsForObject( $argType, $addImport ); } - if ( $name eq 'QApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { + if ( $name eq 'TQApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { # Junk the 'int argc' parameter shift @javaArgTypeList; shift @javaArgList; @@ -1877,8 +1877,8 @@ sub generateMethod($$$$$$$) } } else { - if ($name eq 'find' and $javaClassName eq 'QButtonGroup') { - # Can't override a static method find() in QWidget + if ($name eq 'find' and $javaClassName eq 'TQButtonGroup') { + # Can't override a static method find() in TQWidget $name = "findButton"; } elsif ( $name eq 'null' ) { $name = "nil"; @@ -1888,7 +1888,7 @@ sub generateMethod($$$$$$$) $name = "waitThread"; } elsif ( $name eq 'finalize' and $javaClassName eq 'KMD5' ) { $name = "finalizeDigest"; - } elsif ( $name eq 'icon' and $javaClassName eq 'QMessageBox' ) { + } elsif ( $name eq 'icon' and $javaClassName eq 'TQMessageBox' ) { $name = "iconId"; } elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) { $name = "iconName"; @@ -1968,13 +1968,13 @@ sub generateMethod($$$$$$$) if ($name =~ /^xForm$/ ) { $javaReturnType = "Object"; } elsif ($javaSignature eq "layout()" and $javaReturnType ne 'void') { - $altReturnType = "QLayout"; - } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'QSqlEditorFactory') { - $javaReturnType = "QEditorFactory"; + $altReturnType = "TQLayout"; + } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'TQSqlEditorFactory') { + $javaReturnType = "TQEditorFactory"; } elsif ($javaSignature eq "statusBar()") { - $altReturnType = "QStatusBar"; + $altReturnType = "TQStatusBar"; } elsif ($javaSignature eq "menuBar()") { - $altReturnType = "QMenuBar"; + $altReturnType = "TQMenuBar"; } elsif ($javaSignature =~ /^bits|^scanLine/) { $javaReturnType = "byte[]"; } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { @@ -2118,8 +2118,8 @@ sub generateAllMethods($$$$$$) my $className = join( "::", kdocAstUtil::heritage($classNode) ); my $javaClassName = $mainClassNode->{astNodeName}; # If the C++ class had multiple inheritance, then the code for all but one of the - # parents must be copied into the code for javaClassName. Hence, for QWidget current - # classname might be QPaintDevice, as its methods are needed in QWidget. + # parents must be copied into the code for javaClassName. Hence, for TQWidget current + # classname might be TQPaintDevice, as its methods are needed in TQWidget. my $currentClassName = join( ".", kdocAstUtil::heritage($classNode) ); my $sourcename = $classNode->{Source}->{astNodeName}; @@ -2369,7 +2369,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -2432,7 +2432,7 @@ sub direct_superclass_list($) Iter::Ancestors( $classNode, $rootnode, undef, undef, sub { ( $direct_ancestor, $name ) = @_; - if ($name =~ /QMemArray|QSqlFieldInfoList/) { + if ($name =~ /TQMemArray|TQSqlFieldInfoList/) { # Template classes, give up for now.. $has_ancestor = 1; } elsif (kalyptusDataDict::interfacemap($name) eq "") { @@ -2539,8 +2539,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -2794,7 +2794,7 @@ sub writeSmokeDataFile($) { # First write the name # print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; # print OUT "$classidx{$realType}, "; } @@ -3300,11 +3300,11 @@ sub printJavadocComment($$$$) $line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g; } $line =~ s/NodeList|KTrader::OfferList/ArrayList/g; - $line =~ s/(const )?QDate(Time)?(\s*&)?/Calendar/g; - $line =~ s/(const )?QTime([^r])/Date$1/g; - $line =~ s/QString::null/null/g; + $line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g; + $line =~ s/(const )?TQTime([^r])/Date$1/g; + $line =~ s/TQString::null/null/g; $line =~ s/(const )?QC?String(\s*&)?/String/g; - $line =~ s/QByteArray/byte[]/g; + $line =~ s/TQByteArray/byte[]/g; $line =~ s/(const )?KCmdLineOptions\s*(\w+)\[\]/String[][] $2/; $line =~ s/KCmdLineLastOption//g; $line =~ s/virtual //g; @@ -3366,7 +3366,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{Returns} ) { my $text = $docnode->{Returns}; - $text =~ s/QString::null/null/g; + $text =~ s/TQString::null/null/g; $returntext .= "\t\t\@return $text\n"; } @@ -3388,7 +3388,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { - next if ($text =~ /QString|^\s*and\s*$|^\s*$|^[^\w]*$/); + next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); $text =~ s/KIO:://g; $text =~ s/KParts:://g; $text =~ s/bool/boolean/g; @@ -3407,10 +3407,10 @@ sub printJavadocComment($$$$) $returntext =~ s/KIO#([A-Z])/$1/g; $returntext =~ s/KParts#([A-Z])/$1/g; $returntext =~ s/const\s+(\w+)\s*\&/$1/g; - $returntext =~ s/QChar/char/g; - $returntext =~ s/QStringList/ArrayList/g; + $returntext =~ s/TQChar/char/g; + $returntext =~ s/TQStringList/ArrayList/g; $returntext =~ s/([Aa]) ArrayList/$1n ArrayList/g; - $returntext =~ s/QString/String/g; + $returntext =~ s/TQString/String/g; $returntext =~ s/KCmdLineOptions/String[][]/; $returntext =~ s!\\note!<b>Note:<\b>!g; $returntext =~ s!\\(code|verbatim)!<pre>!g; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 7eedd967..77e0af85 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -70,19 +70,19 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', 'Q_UINT64' => '$', 'Q_INT64' => '$', 'Q_LLONG' => '$', - 'quint64' => '$', + 'tquint64' => '$', 'qint64' => '$', 'long long' => '$', 'qulonglong' => '$', @@ -105,47 +105,47 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', # 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QStyleHintReturn*' => 'void*', - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQStyleHintReturn*' => 'void*', + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'qint16' => 'short', 'Q_INT32' => 'int', @@ -155,11 +155,11 @@ BEGIN 'qint8' => 'char', 'Q_LONG' => 'long', 'Q_UINT16' => 'ushort', - 'quint16' => 'ushort', + 'tquint16' => 'ushort', 'Q_UINT32' => 'uint', - 'quint32' => 'uint', + 'tquint32' => 'uint', 'Q_UINT8' => 'uchar', - 'quint8' => 'uchar', + 'tquint8' => 'uchar', 'Q_ULONG' => 'long', 'qreal' => 'double', 'pid_t' => 'int', @@ -170,18 +170,18 @@ BEGIN 'signed long int' => 'long', 'unsigned long int' => 'ulong', 'unsigned short int' => 'ushort', - 'Qt::Alignment' => 'int', - 'Qt::Orientations' => 'int', - 'Qt::DockWidgetAreas' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::Alignment' => 'int', + 'TQt::Orientations' => 'int', + 'TQt::DockWidgetAreas' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'AutoFormatting' => 'int', 'DirtyFlags' => 'int', 'EditTriggers' => 'int', @@ -199,27 +199,27 @@ BEGIN 'Permissions' => 'int', 'PrintDialogOptions' => 'int', 'ProcessEventsFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QFile::Permissions' => 'int', - 'QGL::FormatOptions' => 'int', - 'QIODevice::OpenMode' => 'int', - 'QImageReader::ImageReaderError' => 'int', - 'QItemSelectionModel::SelectionFlags' => 'int', - 'QPaintEngine::DirtyFlags' => 'int', - 'QPainter::RenderHints' => 'int', - 'QSql::ParamType' => 'int', - 'QTextDocument::FindFlags' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQFile::Permissions' => 'int', + 'TQGL::FormatOptions' => 'int', + 'TQIODevice::OpenMode' => 'int', + 'TQImageReader::ImageReaderError' => 'int', + 'TQItemSelectionModel::SelectionFlags' => 'int', + 'TQPaintEngine::DirtyFlags' => 'int', + 'TQPainter::RenderHints' => 'int', + 'TQSql::ParamType' => 'int', + 'TQTextDocument::FindFlags' => 'int', 'Q_PID' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'RenderFlags' => 'int', 'RenderHints' => 'int', 'SortFlags' => 'int', @@ -227,14 +227,14 @@ BEGIN 'Sections' => 'int', 'Filters' => 'int', 'SortFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QStyle::State' => 'int', - 'QValidator::State' => 'int', - 'QAbstractSpinBox::StepEnabled' => 'int', - 'QDockWidget::DockWidgetFeatures' => 'int', - 'QStyle::SubControls' => 'int', - 'QSocket::State' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQStyle::State' => 'int', + 'TQValidator::State' => 'int', + 'TQAbstractSpinBox::StepEnabled' => 'int', + 'TQDockWidget::DockWidgetFeatures' => 'int', + 'TQStyle::SubControls' => 'int', + 'TQSocket::State' => 'int', ); %operatorNames = @@ -271,7 +271,7 @@ BEGIN $qapplicationExtras = <<EOF; /* Constructor #1 */ - public QApplication(string[] argv) : this((Type) null) { + public TQApplication(string[] argv) : this((Type) null) { Qyoto.Init_qyoto(); CreateProxy(); CreateSignalProxy(); @@ -281,19 +281,19 @@ BEGIN args[0] = System.Reflection.Assembly.GetExecutingAssembly().Location; argv.CopyTo(args, 1); - NewQApplication(args); + NewTQApplication(args); } - private void NewQApplication(string[] argv) { - ProxyQApplication().NewQApplication(argv.Length, argv); + private void NewTQApplication(string[] argv) { + ProxyTQApplication().NewTQApplication(argv.Length, argv); } - [SmokeMethod("QApplication(int&, char**)")] - private void NewQApplication(int argc, string[] argv) { - ProxyQApplication().NewQApplication(argc, argv); + [SmokeMethod("TQApplication(int&, char**)")] + private void NewTQApplication(int argc, string[] argv) { + ProxyTQApplication().NewTQApplication(argc, argv); } /* end Constructor #1 */ /* Constructor #2 */ - public QApplication(string[] argv, bool GUIenabled) : this((Type) null) { + public TQApplication(string[] argv, bool GUIenabled) : this((Type) null) { Qyoto.Init_qyoto(); CreateProxy(); CreateSignalProxy(); @@ -303,19 +303,19 @@ BEGIN args[0] = System.Reflection.Assembly.GetExecutingAssembly().Location; argv.CopyTo(args, 1); - NewQApplication(args,GUIenabled); + NewTQApplication(args,GUIenabled); } - private void NewQApplication(string[] argv, bool GUIenabled) { - ProxyQApplication().NewQApplication(argv.Length, argv,GUIenabled); + private void NewTQApplication(string[] argv, bool GUIenabled) { + ProxyTQApplication().NewTQApplication(argv.Length, argv,GUIenabled); } - [SmokeMethod("QApplication(int&, char**, bool)")] - private void NewQApplication(int argc, string[] argv, bool GUIenabled) { - ProxyQApplication().NewQApplication(argc, argv,GUIenabled); + [SmokeMethod("TQApplication(int&, char**, bool)")] + private void NewTQApplication(int argc, string[] argv, bool GUIenabled) { + ProxyTQApplication().NewTQApplication(argc, argv,GUIenabled); } /* end Constructor #2 */ /* Constructor #3 */ - public QApplication(string[] argv, int arg3) : this((Type) null) { + public TQApplication(string[] argv, int arg3) : this((Type) null) { Qyoto.Init_qyoto(); CreateProxy(); CreateSignalProxy(); @@ -325,14 +325,14 @@ BEGIN args[0] = System.Reflection.Assembly.GetExecutingAssembly().Location; argv.CopyTo(args, 1); - NewQApplication(args,arg3); + NewTQApplication(args,arg3); } - private void NewQApplication(string[] argv, int arg3) { - ProxyQApplication().NewQApplication(argv.Length,argv,arg3); + private void NewTQApplication(string[] argv, int arg3) { + ProxyTQApplication().NewTQApplication(argv.Length,argv,arg3); } - [SmokeMethod("QApplication(int&, char**, QApplication::Type)")] - private void NewQApplication(int argc, string[] argv, int arg3) { - ProxyQApplication().NewQApplication(argc,argv,arg3); + [SmokeMethod("TQApplication(int&, char**, TQApplication::Type)")] + private void NewTQApplication(int argc, string[] argv, int arg3) { + ProxyTQApplication().NewTQApplication(argc,argv,arg3); } /* end Constructor #3 */ @@ -342,16 +342,16 @@ EOF $qbitmapExtras = <<EOF; -// public QBitmap(QPixmap arg1) { +// public TQBitmap(TQPixmap arg1) { // super((Class) null); -// newQBitmap(arg1); +// newTQBitmap(arg1); // } -// private native void newQBitmap(QPixmap arg1); -// public QBitmap(QImage arg1) { +// private native void newTQBitmap(TQPixmap arg1); +// public TQBitmap(TQImage arg1) { // super((Class) null); -// newQBitmap(arg1); +// newTQBitmap(arg1); // } -// private native void newQBitmap(QImage arg1); +// private native void newTQBitmap(TQImage arg1); EOF @@ -395,7 +395,7 @@ EOF public const int IO_TimeOutError = 7; public const int IO_UnspecifiedError= 8; - public static QApplication qApp = null; + public static TQApplication qApp = null; public static string SIGNAL(string signal) { return "2"+ signal; @@ -453,7 +453,7 @@ EOF // public native bool truncate( int pos); // public native int begin(); // public native int end(); -// public native QPoint at(int index); +// public native TQPoint at(int index); EOF @@ -468,9 +468,9 @@ EOF EOF $quridragExtras = <<EOF; -// public static native bool decode(QMimeSourceInterface e, ArrayList i); -// public static native bool decodeToUnicodeUris(QMimeSourceInterface e, ArrayList i); -// public static native bool decodeLocalFiles(QMimeSourceInterface e, ArrayList i); +// public static native bool decode(TQMimeSourceInterface e, ArrayList i); +// public static native bool decodeToUnicodeUris(TQMimeSourceInterface e, ArrayList i); +// public static native bool decodeLocalFiles(TQMimeSourceInterface e, ArrayList i); EOF @@ -526,7 +526,7 @@ sub cplusplusToCSharp my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QIconDragItem>|QValueList<QCString>|QValueList<QVariant>|QValueList<QPixmap>|QValueListConstIterator<QString>|QMap|EditMode|QPtrList<QPixmap>|QPtrList<QPoint>|QTextFormat|QTextCursor|QTextDocument|QNetworkProtocolFactoryBase|QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldInfoList|QObjectUserData|QUObject|QTextParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ ) { + if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "bool"; @@ -547,7 +547,7 @@ sub cplusplusToCSharp return "out short"; } elsif ( $cplusplusType =~ /KCmdLineOptions/ ) { return "string[][]"; - } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /QStringList/|| $cplusplusType =~ /QStrList/) { + } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) { return "string[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QUrlInfoValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/ @@ -565,23 +565,23 @@ sub cplusplusToCSharp || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/ - || $cplusplusType =~ /QMemArray<QRect>/ + || $cplusplusType =~ /TQMemArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { return "char[]"; } elsif ( $cplusplusType =~ /QC?String/ and !$isConst ) { return "StringBuilder" - } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /QString/ || $cplusplusType =~ /QCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { + } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /TQString/ || $cplusplusType =~ /TQCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { return "string" - } elsif ( $cplusplusType =~ /QChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { + } elsif ( $cplusplusType =~ /TQChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { return "char" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QTime\s*\*/ ) { return "DateTime" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDateTime\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDate\s*\*/ ) { return "DateTime" - } elsif ( $cplusplusType =~ /QPaintDevice/ ) { - return "IQPaintDevice" + } elsif ( $cplusplusType =~ /TQPaintDevice/ ) { + return "ITQPaintDevice" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { if ( defined interfaceForClass($1) ) { return interfaceForClass($1); @@ -653,10 +653,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -693,44 +693,44 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QConstString' || - $className eq 'QCString' || - $className eq 'QLatin1String' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQConstString' || + $className eq 'TQCString' || + $className eq 'TQLatin1String' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QIconFactory' || - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QBitArray' || - $className eq 'QWExtra' || - $className eq 'QTLWExtra' || - ($className eq 'QAbstractUndoItem' and $main::qt4) || - ($className eq 'QDebug' and $main::qt4) || - ($className eq 'QNoDebug' and $main::qt4) || - ($className eq 'QObjectData' and $main::qt4) || - ($className eq 'QSysInfo' and $main::qt4) || - ($className eq 'QPNGImageWriter' and $main::qt4) || - ($className eq 'QPNGImagePacker' and $main::qt4) || - ($className eq 'QTextCodec::ConverterState' and $main::qt4) || - ($className eq 'QTextLayout::Selection' and $main::qt4) || - ($className eq 'QTextStreamManipulator' and $main::qt4) || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQIconFactory' || + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQBitArray' || + $className eq 'TQWExtra' || + $className eq 'TQTLWExtra' || + ($className eq 'TQAbstractUndoItem' and $main::qt4) || + ($className eq 'TQDebug' and $main::qt4) || + ($className eq 'TQNoDebug' and $main::qt4) || + ($className eq 'TQObjectData' and $main::qt4) || + ($className eq 'TQSysInfo' and $main::qt4) || + ($className eq 'TQPNGImageWriter' and $main::qt4) || + ($className eq 'TQPNGImagePacker' and $main::qt4) || + ($className eq 'TQTextCodec::ConverterState' and $main::qt4) || + ($className eq 'TQTextLayout::Selection' and $main::qt4) || + ($className eq 'TQTextStreamManipulator' and $main::qt4) || ($className eq 'iterator' and $main::qt4) || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || $className eq 'KBookmarkMenu::DynMenuInfo' || $className eq 'KCompletionMatches' || $className eq 'KDEDesktopMimeType::Service' || @@ -785,37 +785,37 @@ sub preParseClass $className eq 'KURL::List' || $className eq 'KWin::Info' || $className eq 'TerminalInterface' || - $className eq 'QForeachContainerBase' || # Qt4 - $className eq 'QInputMethodEvent::Attribute' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::PaintContext' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::Selection' || # Qt4 - $className eq 'QBrushData' || # Qt4 - $className eq 'QIPv6Address' || # Qt4 - $className eq 'QImageTextKeyLang' || # Qt4 - $className eq 'QMap' || # Qt4 - $className eq 'QMap::const_iterator' || # Qt4 - $className eq 'QMap::iterator' || # Qt4 - $className eq 'QMapData' || # Qt4 - $className eq 'QMapData::Node' || # Qt4 - $className eq 'QSharedData' || # Qt4 - $className eq 'QPainterPath::Element' || # Qt4 - $className eq 'QThreadStorageData' || # Qt4 - $className eq 'QVFbHeader' || # Qt4 - $className eq 'QStyleOptionQ3DockWindow' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QStyleOptionQ3ListViewItem' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QTextLayout::FormatRange' || # Qt4 - $className eq 'QVFbKeyData' || # Qt4 - $className eq 'QVariant::Handler' || # Qt4 - $className eq 'QVariant::PrivateShared' || # Qt4 - $className eq 'QVectorData' || # Qt4 - $className eq 'QWidgetData' || # Qt4 + $className eq 'TQForeachContainerBase' || # Qt4 + $className eq 'TQInputMethodEvent::Attribute' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::PaintContext' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::Selection' || # Qt4 + $className eq 'TQBrushData' || # Qt4 + $className eq 'TQIPv6Address' || # Qt4 + $className eq 'TQImageTextKeyLang' || # Qt4 + $className eq 'TQMap' || # Qt4 + $className eq 'TQMap::const_iterator' || # Qt4 + $className eq 'TQMap::iterator' || # Qt4 + $className eq 'TQMapData' || # Qt4 + $className eq 'TQMapData::Node' || # Qt4 + $className eq 'TQSharedData' || # Qt4 + $className eq 'TQPainterPath::Element' || # Qt4 + $className eq 'TQThreadStorageData' || # Qt4 + $className eq 'TQVFbHeader' || # Qt4 + $className eq 'TQStyleOptionQ3DockWindow' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQStyleOptionQ3ListViewItem' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQTextLayout::FormatRange' || # Qt4 + $className eq 'TQVFbKeyData' || # Qt4 + $className eq 'TQVariant::Handler' || # Qt4 + $className eq 'TQVariant::PrivateShared' || # Qt4 + $className eq 'TQVectorData' || # Qt4 + $className eq 'TQWidgetData' || # Qt4 $className =~ /.*Private$/ || # Ignore any classes which aren't for public consumption $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || # $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -849,7 +849,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -937,8 +937,8 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KSimpleFileFilter' and $name eq 'nameFilters') || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'isTabReorderingEnabled') || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton') - || ($classNode->{astNodeName} =~ /^QUrl/ and $name eq 'operator==') - || ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} =~ /^TQUrl/ and $name eq 'operator==') + || ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) || ($name eq 'virtual_hook') || ($name =~ /_KShared_/) || ($name eq 'qObject') @@ -951,27 +951,27 @@ sub preParseClass || ($name eq 'staticMetaObject') || ($name eq 'type') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') - || ($classNode->{astNodeName} eq 'QApplication' and $name eq 'QApplication') + || ($classNode->{astNodeName} eq 'TQApplication' and $name eq 'TQApplication') # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($main::qt4 - && ( ($classNode->{astNodeName} eq 'QWidgetListItem' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QColormap' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QMatrix' and $name eq 'operator*=') - || ($classNode->{astNodeName} eq 'QListWidget' and $name eq 'setItemPosition') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'QFontMetricsF' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const QFontMetrics&') - || ($classNode->{astNodeName} eq 'QHttp' and $name eq 'supportedOperations') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setX') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setY') - || ($classNode->{astNodeName} eq 'QTextObject' and $name eq 'formatType') - || ($classNode->{astNodeName} eq 'QUrl' and $name eq 'QUrl' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'QUrlPrivate&') - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/) - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /QVariant::Type/) + && ( ($classNode->{astNodeName} eq 'TQWidgetListItem' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQColormap' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQMatrix' and $name eq 'operator*=') + || ($classNode->{astNodeName} eq 'TQListWidget' and $name eq 'setItemPosition') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'TQFontMetricsF' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const TQFontMetrics&') + || ($classNode->{astNodeName} eq 'TQHttp' and $name eq 'supportedOperations') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setX') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setY') + || ($classNode->{astNodeName} eq 'TQTextObject' and $name eq 'formatType') + || ($classNode->{astNodeName} eq 'TQUrl' and $name eq 'TQUrl' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'TQUrlPrivate&') + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /TQDebug/) + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /TQVariant::Type/) || ($#{$m->{ParamList}} > 0 and $m->{ParamList}[0]->{ArgType} =~ /Private/) || ($m->{ReturnType} =~ /iterator/) || ($m->{ReturnType} =~ /QT3_SUPPORT/) ) ) @@ -990,12 +990,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # ) { @@ -1003,8 +1003,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (QSessionManagerJBridge doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (TQSessionManagerJBridge doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -1037,7 +1037,7 @@ sub preParseClass } elsif( $m->{NodeType} eq 'var' ) { my $varType = $m->{Type}; - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $varType =~ s/static\s+// && $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -1091,14 +1091,14 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor # && !$hasPrivatePureVirtual - && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'QValidator') + && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'TQValidator') && !($classNode->{NodeType} eq 'namespace') && ($classNode->{astNodeName} !~ /^DrawContentsEvent$|^MouseEvent$|^MouseDoubleClickEvent$|^MouseMoveEvent$|^MouseReleaseEvent$|^MousePressEvent$/) - && ($classNode->{astNodeName} !~ /QMetaObject|QDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); + && ($classNode->{astNodeName} !~ /TQMetaObject|TQDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); # We will derive from the class only if it has public or protected constructors. # (_Even_ if it has pure virtuals. But in that case the *.cpp class can't be instantiated either.) @@ -1107,9 +1107,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -1171,7 +1171,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "QMemArray" and $name ne "QSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } @@ -1210,7 +1210,7 @@ sub writeClassDoc if ( $className eq 'Qt' ) { ; } else { - if ( $className eq 'QListView' or $className eq 'QListViewItem' or $className eq 'QUriDrag' ) { + if ( $className eq 'TQListView' or $className eq 'TQListViewItem' or $className eq 'TQUriDrag' ) { # Special case these two classes as they have methods that use ArrayList added as 'extras' print CLASS "using System.Collections;\n"; } @@ -1313,37 +1313,37 @@ sub writeClassDoc if ( $className eq 'Qt' and ! $main::qt4 ) { print CLASS $qtExtras; - } elsif ( $className eq 'QApplication' and ! $main::qt4 ) { + } elsif ( $className eq 'TQApplication' and ! $main::qt4 ) { print CLASS $qapplicationExtras; - } elsif ( $className eq 'QBitmap' ) { + } elsif ( $className eq 'TQBitmap' ) { print CLASS $qbitmapExtras; - } elsif ( $className eq 'QByteArray' and ! $main::qt4) { + } elsif ( $className eq 'TQByteArray' and ! $main::qt4) { print CLASS $qbytearrayExtras; - } elsif ( $className eq 'QDropEvent' ) { + } elsif ( $className eq 'TQDropEvent' ) { print CLASS $qdropeventExtras; - } elsif ( $className eq 'QDragObject' ) { + } elsif ( $className eq 'TQDragObject' ) { print CLASS $qdragobjectExtras; - } elsif ( $className eq 'QObject' ) { + } elsif ( $className eq 'TQObject' ) { print CLASS $qobjectExtras; - } elsif ( $className eq 'QListView' ) { + } elsif ( $className eq 'TQListView' ) { print CLASS $qlistviewExtras; - } elsif ( $className eq 'QListViewItem' ) { + } elsif ( $className eq 'TQListViewItem' ) { print CLASS $qlistviewitemExtras; - } elsif ( $className eq 'QMimeSource' ) { + } elsif ( $className eq 'TQMimeSource' ) { print CLASS $qmimesourceExtras; - } elsif ( $className eq 'QWidget' ) { + } elsif ( $className eq 'TQWidget' ) { print CLASS $qwidgetExtras; - } elsif ( $className eq 'QPaintDevice' ) { + } elsif ( $className eq 'TQPaintDevice' ) { print CLASS $qpaintdeviceExtras; - } elsif ( $className eq 'QPixmap' ) { + } elsif ( $className eq 'TQPixmap' ) { print CLASS $qpixmapExtras; - } elsif ( $className eq 'QIODevice' ) { + } elsif ( $className eq 'TQIODevice' ) { print CLASS $qiodeviceExtras; - } elsif ( $className eq 'QPointArray' ) { + } elsif ( $className eq 'TQPointArray' ) { print CLASS $qpointarrayExtras; - } elsif ( $className eq 'QSizePolicy' ) { + } elsif ( $className eq 'TQSizePolicy' ) { print CLASS $qsizepolicyExtras; - } elsif ( $className eq 'QUriDrag' ) { + } elsif ( $className eq 'TQUriDrag' ) { print CLASS $quridragExtras; } elsif ( $className eq 'KApplication' ) { print CLASS $kapplicationExtras; @@ -1352,7 +1352,7 @@ sub writeClassDoc } - if ( is_kindof($node, "QObject") ) { + if ( is_kindof($node, "TQObject") ) { print CLASS "\t\tprotected new void CreateSignalProxy() {\n"; print CLASS "\t\t\tSignalInvocation realProxy = new SignalInvocation(typeof(I" . $csharpClassName . "Signals), this);\n"; print CLASS "\t\t\tQ_EMIT = (I" . $csharpClassName . "Signals) realProxy.GetTransparentProxy();\n"; @@ -1497,7 +1497,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -1513,7 +1513,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -1545,7 +1545,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -1748,8 +1748,8 @@ sub generateMethod($$$$$$$) @heritage = kdocAstUtil::heritage($mainClassNode); my $mainClassName = join( "::", @heritage ); - # The csharpClassName might be 'QWidget', while currentClassName is 'QRangeControl' - # and the QRangeControl methods are being copied into QWidget. + # The csharpClassName might be 'TQWidget', while currentClassName is 'TQRangeControl' + # and the TQRangeControl methods are being copied into TQWidget. my $csharpClassName = $mainClassNode->{astNodeName}; my $currentClassName = $classNode->{astNodeName}; @@ -1800,18 +1800,18 @@ sub generateMethod($$$$$$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -1865,7 +1865,7 @@ sub generateMethod($$$$$$$) checkImportsForObject( $argType, $addImport ); } - if ( $name eq 'QApplication' or ($csharpClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@csharpArgList) > 1) ) { + if ( $name eq 'TQApplication' or ($csharpClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@csharpArgList) > 1) ) { # Junk the 'int argc' parameter shift @csharpArgTypeList; shift @csharpArgList; @@ -1927,8 +1927,8 @@ sub generateMethod($$$$$$$) } } else { - if ($name eq 'find' and $csharpClassName eq 'QButtonGroup') { - # Can't override a static method find() in QWidget + if ($name eq 'find' and $csharpClassName eq 'TQButtonGroup') { + # Can't override a static method find() in TQWidget $name = "findButton"; } elsif ( $name eq 'null' ) { $name = "nil"; @@ -1936,7 +1936,7 @@ sub generateMethod($$$$$$$) $name = "formElement"; } elsif ( $name eq 'wait' and $csharpClassName eq 'KProcess' ) { $name = "waitThread"; - } elsif ( $name eq 'icon' and $csharpClassName eq 'QMessageBox' ) { + } elsif ( $name eq 'icon' and $csharpClassName eq 'TQMessageBox' ) { $name = "iconId"; } elsif ( $name eq 'icon' and $csharpClassName eq 'KURLBarItemDialog' ) { $name = "iconName"; @@ -1977,7 +1977,7 @@ sub generateMethod($$$$$$$) $methodCode .= "\t\tpublic $csharpClassName($csharpparams) : this((Type) null) {\n"; $methodCode .= "\t\t\tCreateProxy();\n"; - if ( is_kindof($classNode, "QObject") ) { + if ( is_kindof($classNode, "TQObject") ) { $methodCode .= "\t\t\tCreateSignalProxy();\n"; } @@ -2011,7 +2011,7 @@ sub generateMethod($$$$$$$) || $name eq 'operator>>' ) { # In C# an operator method must be in the same class as its first operand, - # so any operator methods in QGlobalSpace must be left as ordinary method + # so any operator methods in TQGlobalSpace must be left as ordinary method # calls. eg op_write() # 'operator<<' and 'operator>>' can only have int types as the second # arg in C#, so convert them to op_read() and op_write() calls @@ -2063,13 +2063,13 @@ sub generateMethod($$$$$$$) if ($name =~ /^xForm$/ ) { $csharpReturnType = "Object"; } elsif ($csharpSignature eq "layout()" and $csharpReturnType ne 'void') { - $altReturnType = "QLayout"; - } elsif ($csharpSignature eq "defaultFactory()" and $csharpReturnType eq 'QSqlEditorFactory') { - $csharpReturnType = "QEditorFactory"; + $altReturnType = "TQLayout"; + } elsif ($csharpSignature eq "defaultFactory()" and $csharpReturnType eq 'TQSqlEditorFactory') { + $csharpReturnType = "TQEditorFactory"; } elsif ($csharpSignature eq "statusBar()") { - $altReturnType = "QStatusBar"; + $altReturnType = "TQStatusBar"; } elsif ($csharpSignature eq "menuBar()") { - $altReturnType = "QMenuBar"; + $altReturnType = "TQMenuBar"; } elsif ($csharpSignature =~ /^bits|^scanLine/) { $csharpReturnType = "byte[]"; } elsif ($csharpSignature eq "at()" and $csharpClassName eq 'KFilterDev') { @@ -2089,7 +2089,7 @@ sub generateMethod($$$$$$$) $name = lc($1) . $2; } - if ($classNode->{astNodeName} eq 'QIODevice' and $name eq 'State') { + if ($classNode->{astNodeName} eq 'TQIODevice' and $name eq 'State') { $name = 'state'; } } @@ -2311,8 +2311,8 @@ sub generateAllMethods($$$$$$) my $className = join( "::", kdocAstUtil::heritage($classNode) ); my $csharpClassName = $mainClassNode->{astNodeName}; # If the C++ class had multiple inheritance, then the code for all but one of the - # parents must be copied into the code for csharpClassName. Hence, for QWidget current - # classname might be QPaintDevice, as its methods are needed in QWidget. + # parents must be copied into the code for csharpClassName. Hence, for TQWidget current + # classname might be TQPaintDevice, as its methods are needed in TQWidget. my $currentClassName = join( ".", kdocAstUtil::heritage($classNode) ); my $sourcename = $classNode->{Source}->{astNodeName}; @@ -2563,7 +2563,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -2626,7 +2626,7 @@ sub direct_superclass_list($) Iter::Ancestors( $classNode, $rootnode, undef, undef, sub { ( $direct_ancestor, $name ) = @_; - if ($name =~ /QMemArray|QSqlFieldInfoList/) { + if ($name =~ /TQMemArray|TQSqlFieldInfoList/) { # Template classes, give up for now.. $has_ancestor = 1; } elsif (!defined kalyptusDataDict::interfacemap($name)) { @@ -2733,8 +2733,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -2988,7 +2988,7 @@ sub writeSmokeDataFile($) { # First write the name # print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; # print OUT "$classidx{$realType}, "; } @@ -3494,9 +3494,9 @@ sub printCSharpdocComment($$$$) $line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g; } $line =~ s/NodeList|KTrader::OfferList/ArrayList/g; - $line =~ s/(const )?QDate(Time)?(\s*&)?/DateTime/g; - $line =~ s/(const )?QTime([^r])/DateTime$1/g; - $line =~ s/QString::null/null/g; + $line =~ s/(const )?TQDate(Time)?(\s*&)?/DateTime/g; + $line =~ s/(const )?TQTime([^r])/DateTime$1/g; + $line =~ s/TQString::null/null/g; $line =~ s/(const )?QC?String(\s*&)?/string/g; $line =~ s/(const )?KCmdLineOptions\s*(\w+)\[\]/string[][] $2/; $line =~ s/KCmdLineLastOption//g; @@ -3558,7 +3558,7 @@ sub printCSharpdocComment($$$$) if ( defined $docnode->{Returns} ) { my $text = $docnode->{Returns}; - $text =~ s/QString::null/null/g; + $text =~ s/TQString::null/null/g; $returntext .= "\t\t<return> $text</return>\n"; } @@ -3580,7 +3580,7 @@ sub printCSharpdocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { - next if ($text =~ /QString|^\s*and\s*$|^\s*$|^[^\w]*$/); + next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); $text =~ s/KIO:://g; $text =~ s/KParts:://g; while ($text =~ /((::)|(->))(.)/) { @@ -3597,10 +3597,10 @@ sub printCSharpdocComment($$$$) $returntext =~ s/KIO#([A-Z])/$1/g; $returntext =~ s/KParts#([A-Z])/$1/g; $returntext =~ s/const\s+(\w+)\s*\&/$1/g; - $returntext =~ s/QChar/char/g; - $returntext =~ s/QStringList/ArrayList/g; + $returntext =~ s/TQChar/char/g; + $returntext =~ s/TQStringList/ArrayList/g; $returntext =~ s/([Aa]) ArrayList/$1n ArrayList/g; - $returntext =~ s/QString/string/g; + $returntext =~ s/TQString/string/g; $returntext =~ s/KCmdLineOptions/string[][]/; $returntext =~ s!\\note!<b>Note:<\b>!g; $returntext =~ s!\\(code|verbatim)!<pre>!g; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index ec47ea31..8aa6897f 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -63,19 +63,19 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', 'Q_UINT64' => '$', 'Q_INT64' => '$', 'Q_LLONG' => '$', - 'quint64' => '$', + 'tquint64' => '$', 'qint64' => '$', 'long long' => '$', 'qulonglong' => '$', @@ -97,49 +97,49 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', -# 'QStyleHintReturn*' => 'void*', +# 'TQStyleHintReturn*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'void(* )()' => 'void*', 'void (*)(void* )' => 'void*', 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'qint16' => 'short', 'Q_INT32' => 'int', @@ -149,11 +149,11 @@ BEGIN 'qint8' => 'char', 'Q_LONG' => 'long', 'Q_UINT16' => 'ushort', - 'quint16' => 'ushort', + 'tquint16' => 'ushort', 'Q_UINT32' => 'uint', - 'quint32' => 'uint', + 'tquint32' => 'uint', 'Q_UINT8' => 'uchar', - 'quint8' => 'uchar', + 'tquint8' => 'uchar', 'Q_ULONG' => 'long', 'qreal' => 'double', 'pid_t' => 'int', @@ -164,18 +164,18 @@ BEGIN 'signed long int' => 'long', 'unsigned long int' => 'ulong', 'unsigned short int' => 'ushort', - 'Qt::Alignment' => 'int', - 'Qt::Orientations' => 'int', - 'Qt::DockWidgetAreas' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::Alignment' => 'int', + 'TQt::Orientations' => 'int', + 'TQt::DockWidgetAreas' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'AutoFormatting' => 'int', 'DirtyFlags' => 'int', 'EditTriggers' => 'int', @@ -193,27 +193,27 @@ BEGIN 'Permissions' => 'int', 'PrintDialogOptions' => 'int', 'ProcessEventsFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QFile::Permissions' => 'int', - 'QGL::FormatOptions' => 'int', - 'QIODevice::OpenMode' => 'int', - 'QImageReader::ImageReaderError' => 'int', - 'QItemSelectionModel::SelectionFlags' => 'int', - 'QPaintEngine::DirtyFlags' => 'int', - 'QPainter::RenderHints' => 'int', - 'QSql::ParamType' => 'int', - 'QTextDocument::FindFlags' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQFile::Permissions' => 'int', + 'TQGL::FormatOptions' => 'int', + 'TQIODevice::OpenMode' => 'int', + 'TQImageReader::ImageReaderError' => 'int', + 'TQItemSelectionModel::SelectionFlags' => 'int', + 'TQPaintEngine::DirtyFlags' => 'int', + 'TQPainter::RenderHints' => 'int', + 'TQSql::ParamType' => 'int', + 'TQTextDocument::FindFlags' => 'int', 'Q_PID' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'RenderFlags' => 'int', 'RenderHints' => 'int', 'SortFlags' => 'int', @@ -221,13 +221,13 @@ BEGIN 'Sections' => 'int', 'Filters' => 'int', 'SortFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QStyle::State' => 'int', - 'QValidator::State' => 'int', - 'QAbstractSpinBox::StepEnabled' => 'int', - 'QDockWidget::DockWidgetFeatures' => 'int', - 'QStyle::SubControls' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQStyle::State' => 'int', + 'TQValidator::State' => 'int', + 'TQAbstractSpinBox::StepEnabled' => 'int', + 'TQDockWidget::DockWidgetFeatures' => 'int', + 'TQStyle::SubControls' => 'int', ); $headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/|knewstuff/" @@ -244,10 +244,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) || $main::qt4 ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) || $main::qt4 ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -309,57 +309,57 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QStringData' || - $className eq 'QLatin1String' || - $className eq 'QTLWExtra' || - $className eq 'QWExtra' || - $className eq 'QBig5Codec' || - $className eq 'QBig5hkscsCodec' || - $className eq 'QPtrCollection' || - $className eq 'QGCache' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQStringData' || + $className eq 'TQLatin1String' || + $className eq 'TQTLWExtra' || + $className eq 'TQWExtra' || + $className eq 'TQBig5Codec' || + $className eq 'TQBig5hkscsCodec' || + $className eq 'TQPtrCollection' || + $className eq 'TQGCache' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || $className eq 'KCmdLineOptions' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGArray' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QBitArray' || - $className eq 'QMapData' || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || - ($className eq 'QMenuItem' and $main::qt_embedded) || - ($className eq 'QSignal' and $main::qt_embedded) || - ($className eq 'QWSEvent' and $main::qt_embedded) || - ($className eq 'QMetaObjectInit' and $main::qt_embedded) || - ($className eq 'QKoi8Codec' and $main::qt_embedded) || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGArray' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQBitArray' || + $className eq 'TQMapData' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || + ($className eq 'TQMenuItem' and $main::qt_embedded) || + ($className eq 'TQSignal' and $main::qt_embedded) || + ($className eq 'TQWSEvent' and $main::qt_embedded) || + ($className eq 'TQMetaObjectInit' and $main::qt_embedded) || + ($className eq 'TQKoi8Codec' and $main::qt_embedded) || $className eq 'KAccelGen' || - ($className eq 'QAbstractUndoItem' and $main::qt4) || - ($className eq 'QAbstractItemDelegate' and $main::qt4) || - ($className eq 'QDebug' and $main::qt4) || - ($className eq 'QNoDebug' and $main::qt4) || - ($className eq 'QObjectData' and $main::qt4) || - ($className eq 'QSysInfo' and $main::qt4) || - ($className eq 'QPNGImageWriter' and $main::qt4) || - ($className eq 'QPNGImagePacker' and $main::qt4) || - ($className eq 'QTextCodec::ConverterState' and $main::qt4) || - ($className eq 'QTextLayout::Selection' and $main::qt4) || - ($className eq 'QTextStreamManipulator' and $main::qt4) || + ($className eq 'TQAbstractUndoItem' and $main::qt4) || + ($className eq 'TQAbstractItemDelegate' and $main::qt4) || + ($className eq 'TQDebug' and $main::qt4) || + ($className eq 'TQNoDebug' and $main::qt4) || + ($className eq 'TQObjectData' and $main::qt4) || + ($className eq 'TQSysInfo' and $main::qt4) || + ($className eq 'TQPNGImageWriter' and $main::qt4) || + ($className eq 'TQPNGImagePacker' and $main::qt4) || + ($className eq 'TQTextCodec::ConverterState' and $main::qt4) || + ($className eq 'TQTextLayout::Selection' and $main::qt4) || + ($className eq 'TQTextStreamManipulator' and $main::qt4) || $className eq 'DCOPArg' || $className eq 'DCOPReply' || $className eq 'KBookmarkMenu::DynMenuInfo' || @@ -416,46 +416,46 @@ sub preParseClass $className eq 'KURL::List' || $className eq 'KWin::Info' || $className eq 'TerminalInterface' || - $className eq 'QForeachContainerBase' || # Qt4 - $className eq 'QInputMethodEvent::Attribute' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::PaintContext' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::Selection' || # Qt4 - $className eq 'QBrushData' || # Qt4 - $className eq 'QIPv6Address' || # Qt4 - $className eq 'QImageTextKeyLang' || # Qt4 - $className eq 'QMap' || # Qt4 - $className eq 'QMap::const_iterator' || # Qt4 - $className eq 'QMap::iterator' || # Qt4 - $className eq 'QMapData' || # Qt4 - $className eq 'QMapData::Node' || # Qt4 - $className eq 'QSharedData' || # Qt4 - $className eq 'QPainterPath::Element' || # Qt4 - $className eq 'QThreadStorageData' || # Qt4 - $className eq 'QVFbHeader' || # Qt4 - $className eq 'QStyleOptionQ3DockWindow' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QStyleOptionQ3ListViewItem' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QUpdateLaterEvent' || # Qt4 - $className eq 'QVFbKeyData' || # Qt4 - $className eq 'QVariant::Handler' || # Qt4 - $className eq 'QVariant::PrivateShared' || # Qt4 - $className eq 'QVectorData' || # Qt4 - $className eq 'QWidgetData' || # Qt4 - $className eq 'QThread' || # Qt4 - $className eq 'QThreadStorage' || # Qt4 - $className eq 'QMutex' || # Qt4 - $className eq 'QMutexLocker' || # Qt4 - $className eq 'QSemaphore' || # Qt4 - $className eq 'QWaitCondition' || # Qt4 - $className eq 'QReadWriteLock' || # Qt4 - $className eq 'QReadLocker' || # Qt4 - $className eq 'QWriteLocker' || + $className eq 'TQForeachContainerBase' || # Qt4 + $className eq 'TQInputMethodEvent::Attribute' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::PaintContext' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::Selection' || # Qt4 + $className eq 'TQBrushData' || # Qt4 + $className eq 'TQIPv6Address' || # Qt4 + $className eq 'TQImageTextKeyLang' || # Qt4 + $className eq 'TQMap' || # Qt4 + $className eq 'TQMap::const_iterator' || # Qt4 + $className eq 'TQMap::iterator' || # Qt4 + $className eq 'TQMapData' || # Qt4 + $className eq 'TQMapData::Node' || # Qt4 + $className eq 'TQSharedData' || # Qt4 + $className eq 'TQPainterPath::Element' || # Qt4 + $className eq 'TQThreadStorageData' || # Qt4 + $className eq 'TQVFbHeader' || # Qt4 + $className eq 'TQStyleOptionQ3DockWindow' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQStyleOptionQ3ListViewItem' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQUpdateLaterEvent' || # Qt4 + $className eq 'TQVFbKeyData' || # Qt4 + $className eq 'TQVariant::Handler' || # Qt4 + $className eq 'TQVariant::PrivateShared' || # Qt4 + $className eq 'TQVectorData' || # Qt4 + $className eq 'TQWidgetData' || # Qt4 + $className eq 'TQThread' || # Qt4 + $className eq 'TQThreadStorage' || # Qt4 + $className eq 'TQMutex' || # Qt4 + $className eq 'TQMutexLocker' || # Qt4 + $className eq 'TQSemaphore' || # Qt4 + $className eq 'TQWaitCondition' || # Qt4 + $className eq 'TQReadWriteLock' || # Qt4 + $className eq 'TQReadLocker' || # Qt4 + $className eq 'TQWriteLocker' || $className =~ /.*Private$/ || # Ignore any classes which aren't for public consumption $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -492,7 +492,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -604,23 +604,23 @@ sub preParseClass || ($name eq 'handle') # Obsolete - || ($classNode->{astNodeName} eq 'QTextStream' and $name eq 'QTextStream' - and @{$m->{ParamList}} == 2 and $m->{ParamList}[0]->{ArgType} eq 'QString&') + || ($classNode->{astNodeName} eq 'TQTextStream' and $name eq 'TQTextStream' + and @{$m->{ParamList}} == 2 and $m->{ParamList}[0]->{ArgType} eq 'TQString&') # Various methods to skip in Qt/E (Qt 2.3.x) || ($main::qt_embedded - && ( ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) - || ($classNode->{astNodeName} eq 'QApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) - || ($classNode->{astNodeName} eq 'QPrinter' and $name =~ /^setIdle$|^setActive$/) - || ($classNode->{astNodeName} eq 'QDragObject' and $name eq 'dragLink') - || ($classNode->{astNodeName} eq 'QFont' and $name eq 'qwsRenderToDisk') - || ($classNode->{astNodeName} eq 'QFontInfo' and $name eq 'font') - || ($classNode->{astNodeName} eq 'QLineEdit' and $name eq 'getSelection') - || ($classNode->{astNodeName} eq 'QMainWindow' and $name eq 'toolBars') - || ($classNode->{astNodeName} eq 'QMovie' and $name eq 'setDisplayWidget') - || ($classNode->{astNodeName} eq 'QMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) - || ($classNode->{astNodeName} eq 'QPainter' and $name eq 'pos') - || ($classNode->{astNodeName} eq 'QPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) + && ( ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} eq 'TQApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) + || ($classNode->{astNodeName} eq 'TQPrinter' and $name =~ /^setIdle$|^setActive$/) + || ($classNode->{astNodeName} eq 'TQDragObject' and $name eq 'dragLink') + || ($classNode->{astNodeName} eq 'TQFont' and $name eq 'qwsRenderToDisk') + || ($classNode->{astNodeName} eq 'TQFontInfo' and $name eq 'font') + || ($classNode->{astNodeName} eq 'TQLineEdit' and $name eq 'getSelection') + || ($classNode->{astNodeName} eq 'TQMainWindow' and $name eq 'toolBars') + || ($classNode->{astNodeName} eq 'TQMovie' and $name eq 'setDisplayWidget') + || ($classNode->{astNodeName} eq 'TQMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) + || ($classNode->{astNodeName} eq 'TQPainter' and $name eq 'pos') + || ($classNode->{astNodeName} eq 'TQPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) || ($name eq 'handle') || ($name eq 'resetInputContext') || ($name eq 'propagateUpdates') @@ -642,23 +642,23 @@ sub preParseClass || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($main::qt4 - && ( ($classNode->{astNodeName} eq 'QWidgetListItem' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QColormap' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QListWidget' and $name eq 'setItemPosition') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'QFontMetricsF' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const QFontMetrics&') - || ($classNode->{astNodeName} eq 'QHttp' and $name eq 'supportedOperations') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setX') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setY') - || ($classNode->{astNodeName} eq 'QTextObject' and $name eq 'formatType') - || ($classNode->{astNodeName} eq 'QUrl' and $name eq 'QUrl' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'QUrlPrivate&') - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/) - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /QVariant::Type/) + && ( ($classNode->{astNodeName} eq 'TQWidgetListItem' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQColormap' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQListWidget' and $name eq 'setItemPosition') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'TQFontMetricsF' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const TQFontMetrics&') + || ($classNode->{astNodeName} eq 'TQHttp' and $name eq 'supportedOperations') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setX') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setY') + || ($classNode->{astNodeName} eq 'TQTextObject' and $name eq 'formatType') + || ($classNode->{astNodeName} eq 'TQUrl' and $name eq 'TQUrl' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'TQUrlPrivate&') + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /TQDebug/) + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /TQVariant::Type/) || ($#{$m->{ParamList}} > 0 and $m->{ParamList}[0]->{ArgType} =~ /Private/) - || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'alignment') - || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'setAlignment') + || ($classNode->{astNodeName} eq 'TQScrollArea' and $name eq 'alignment') + || ($classNode->{astNodeName} eq 'TQScrollArea' and $name eq 'setAlignment') || ($m->{ReturnType} =~ /QT3_SUPPORT/) ) ) || $m->{Deprecated} ) { @@ -668,7 +668,7 @@ sub preParseClass # Hack for fixing up KDE 3.1 KLed where the no arg constructor was ambiguous if ($classNode->{astNodeName} eq 'KLed' and $name eq 'KLed' && $#{$m->{ParamList}} > 0) { - if ($m->{ParamList}[0]->{ArgType} =~ /QColor/ && defined $m->{ParamList}[0]->{DefaultValue}) { + if ($m->{ParamList}[0]->{ArgType} =~ /TQColor/ && defined $m->{ParamList}[0]->{DefaultValue}) { $m->{ParamList}[0]->{DefaultValue} = undef; if (defined $kledAmbiguousConstructor) { $kledAmbiguousConstructor->{ParamList}[0]->{DefaultValue} = undef; @@ -688,12 +688,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # or $arg->{ArgType} =~ /Node\s*\*/ # @@ -702,8 +702,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (x_QSessionManager doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (x_QSessionManager doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -734,7 +734,7 @@ sub preParseClass #print STDERR "$fullEnumName is an enum\n"; } elsif( $m->{NodeType} eq 'var' ) { - if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4') + if ( ($classNode->{astNodeName} eq 'TQUuid' and $name eq 'data4') || ($name eq 'd') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') ) @@ -750,7 +750,7 @@ sub preParseClass $varType =~ s/static\s+//; if ( $m->{Flags} =~ "s" ) { - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -830,8 +830,8 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor && !$hasPrivatePureVirtual ); # We will derive from the class only if it has public or protected constructors. @@ -841,9 +841,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -973,7 +973,7 @@ my $fhn =1; # static print $fh $switchCode; print $fh "}\n\n"; } - #if ( $className =~ /^(QBrush|QColor|QCursor|QFont|QImage|QPalette|QPixmap|QPoint|QPointArray|QRect|QRegion|QSize|QWMatrix)$/ ) { + #if ( $className =~ /^(TQBrush|TQColor|TQCursor|TQFont|TQImage|TQPalette|TQPixmap|TQPoint|TQPointArray|TQRect|TQRegion|TQSize|TQWMatrix)$/ ) { # print XCPPFILE " const char *{serial} operator << () const : pig_serialize(\$this);\n"; # print XCPPFILE " void operator >> (const char *{serial}) : pig_deserialize(\$this, \$1);\n"; #} @@ -1082,7 +1082,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -1098,7 +1098,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -1126,7 +1126,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -1338,18 +1338,18 @@ sub generateMethod($$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -1853,7 +1853,7 @@ sub registerType($$) { $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*' $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template types, such as - # 'QMap<QCString, DCOPRef>' + # 'TQMap<TQCString, DCOPRef>' return if ( $type eq 'void' or $type eq '' or $type eq '~' ); die if ( $type eq '...' ); # ouch @@ -1871,7 +1871,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -1912,7 +1912,7 @@ sub findTypeEntry($) { $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*' $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template types, such as - # 'QMap<QCString, DCOPRef>' + # 'TQMap<TQCString, DCOPRef>' return undef if ( $type =~ '~' or $type eq 'void' or $type eq '' ); @@ -2009,8 +2009,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -2283,7 +2283,7 @@ sub writeSmokeDataFile($) { # First write the name print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; print OUT "$classidx{$realType}, "; } diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm index bd01a125..f25387e7 100644 --- a/kalyptus/kalyptusCxxToSwig.pm +++ b/kalyptus/kalyptusCxxToSwig.pm @@ -15,7 +15,7 @@ no strict "subs"; use vars qw/ @clist $host $who $now $gentext %functionId $docTop %typedeflist $lib $rootnode $outputdir $opt $debug $typeprefix $eventHandlerCount - $constructorCount *CLASS *HEADER *QTCTYPES *KDETYPES /; + $constructorCount *CLASS *HEADER *TQTCTYPES *KDETYPES /; BEGIN { @@ -33,55 +33,55 @@ BEGIN 'unsigned int' => 'uint', 'signed long' => 'long', 'unsigned long' => 'ulong', - 'QWSEvent*' => 'void*', - 'QDiskFont*' => 'void*', + 'TQWSEvent*' => 'void*', + 'TQDiskFont*' => 'void*', 'XEvent*' => 'void*', - 'QStyleHintReturn*' => 'void*', + 'TQStyleHintReturn*' => 'void*', 'FILE*' => 'void*', - 'QUnknownInterface*' => 'void*', + 'TQUnknownInterface*' => 'void*', 'GDHandle' => 'void*', '_NPStream*' => 'void*', - 'QTextFormat*' => 'void*', - 'QTextDocument*' => 'void*', - 'QTextCursor*' => 'void*', - 'QTextParag**' => 'void*', - 'QTextParag* *' => 'void*', - 'QTextParag*' => 'void*', - 'QRemoteInterface*' => 'void*', - 'QSqlRecordPrivate*' => 'void*', - 'QTSMFI' => 'void*', # QTextStream's QTSManip + 'TQTextFormat*' => 'void*', + 'TQTextDocument*' => 'void*', + 'TQTextCursor*' => 'void*', + 'TQTextParag**' => 'void*', + 'TQTextParag* *' => 'void*', + 'TQTextParag*' => 'void*', + 'TQRemoteInterface*' => 'void*', + 'TQSqlRecordPrivate*' => 'void*', + 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip 'const GUID&' => 'void*', - 'QWidgetMapper*' => 'void*', - 'QWidgetMapper *' => 'void*', + 'TQWidgetMapper*' => 'void*', + 'TQWidgetMapper *' => 'void*', 'MSG*' => 'void*', - 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) + 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', - 'QRgb *' => 'uint*', - 'QRgb*' => 'uint*', - 'const QCOORD*' => 'const int*', - 'QCOORD*' => 'int*', - 'QCOORD' => 'int', - 'QCOORD &' => 'int&', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', - 'QStyleOption&' => 'int&', - 'const QStyleOption&' => 'const int&', + 'TQRgb' => 'uint', + 'TQRgb *' => 'uint*', + 'TQRgb*' => 'uint*', + 'const TQCOORD*' => 'const int*', + 'TQCOORD*' => 'int*', + 'TQCOORD' => 'int', + 'TQCOORD &' => 'int&', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', + 'TQStyleOption&' => 'int&', + 'const TQStyleOption&' => 'const int&', 'Q_INT16' => 'short', 'Q_INT32' => 'int', 'Q_INT8' => 'char', @@ -207,8 +207,8 @@ sub hasPublicConstructors($) # $child is the method node for which the code should be generated, # $parentName is the name of the parent for which the code should be generated, # this is one is tricky, the reason for it is that $child node belongs -# to some class e.g. QWidget and we want to generate a code for $child -# but in a class called QWidget_bridge therefore we need to pass tha name +# to some class e.g. TQWidget and we want to generate a code for $child +# but in a class called TQWidget_bridge therefore we need to pass tha name # $mangleProtected will mangle the name of the method to look like normalNameProtected # $definition - if set the code generated will be a definition (without the opening # and closing {} ) diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index e2725160..d9b48831 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -27,20 +27,20 @@ BEGIN { %interfacemap = ( -'QGL' => 'QGLInterface', -'QPaintDevice' => 'QPaintDeviceInterface', -'QMenuData' => 'QMenuDataInterface', -'QRangeControl' => 'QRangeControlInterface', -'QMimeSource' => 'QMimeSourceInterface', -'QLayoutItem' => 'QLayoutItemInterface', -'QUrl' => 'QUrlInterface', -'QIODevice' => 'QIODeviceInterface', -'QXmlContentHandler' => 'QXmlContentHandlerInterface', -'QXmlErrorHandler' => 'QXmlErrorHandlerInterface', -'QXmlDTDHandler' => 'QXmlDTDHandlerInterface', -'QXmlEntityResolver' => 'QXmlEntityResolverInterface', -'QXmlLexicalHandler' => 'QXmlLexicalHandlerInterface', -'QXmlDeclHandler' => 'QXmlDeclHandlerInterface', +'TQGL' => 'TQGLInterface', +'TQPaintDevice' => 'TQPaintDeviceInterface', +'TQMenuData' => 'TQMenuDataInterface', +'TQRangeControl' => 'TQRangeControlInterface', +'TQMimeSource' => 'TQMimeSourceInterface', +'TQLayoutItem' => 'TQLayoutItemInterface', +'TQUrl' => 'TQUrlInterface', +'TQIODevice' => 'TQIODeviceInterface', +'TQXmlContentHandler' => 'TQXmlContentHandlerInterface', +'TQXmlErrorHandler' => 'TQXmlErrorHandlerInterface', +'TQXmlDTDHandler' => 'TQXmlDTDHandlerInterface', +'TQXmlEntityResolver' => 'TQXmlEntityResolverInterface', +'TQXmlLexicalHandler' => 'TQXmlLexicalHandlerInterface', +'TQXmlDeclHandler' => 'TQXmlDeclHandlerInterface', 'KInstance' => 'KInstanceInterface', 'QwAbsSpriteFieldView' => 'QwAbsSpriteFieldViewInterface', 'PartBase' => 'PartBaseInterface', @@ -51,7 +51,7 @@ BEGIN 'KXMLGUIBuilder' => 'KXMLGUIBuilderInterface', 'DCOPObject' => 'DCOPObjectInterface', 'KDevCore' => 'KDevCoreInterface', -'QSqlQuery' => 'QSqlQueryInterface', +'TQSqlQuery' => 'TQSqlQueryInterface', ); @@ -1457,820 +1457,820 @@ BEGIN 'ProtocolInfo*' => 'kde_ProtocolInfo*', 'Ptr' => 'void*', 'PtyProcess*' => 'kde_PtyProcess*', -'QAccel*' => 'qt_QAccel*', -'QAccessible*' => 'qt_QAccessible*', -'QAccessibleFactoryInterface*' => 'qt_QAccessibleFactoryInterface*', -'QAccessibleInterface*' => 'qt_QAccessibleInterface*', -'QAccessibleInterface**' => 'qt_QAccessibleInterface**', -'QAccessibleObject*' => 'qt_QAccessibleObject*', -'QAction*' => 'qt_QAction*' , -'QActionGroup*' => 'qt_QActionGroup*', -'QApplication*' => 'qt_QApplication*' , -'QArabicCodec*' => 'qt_QArabicCodec*', -'QArray*' => 'qt_QArray*', -'QAsciiBucket*' => 'qt_QAsciiBucket*', -'QAsciiCache*' => 'qt_QAsciiCache*', -'QAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*', -'QAsciiDict*' => 'qt_QAsciiDict*', -'QAsciiDictIterator*' => 'qt_QAsciiDictIterator*', -'QAsyncIO*' => 'qt_QAsyncIO*', -'QAuBucket*' => 'qt_QAuBucket*' , -'QAuServer*' => 'qt_QAuServer*', -'QBaseBucket*' => 'qt_QBaseBucket*' , -'QBig5Codec*' => 'qt_QBig5Codec*', -'QBitArray&' => 'qt_QBitArray*' , -'QBitArray' => 'qt_QBitArray*' , -'QBitArray*' => 'qt_QBitArray*' , -'QBitVal&' => 'qt_QBitVal*' , -'QBitVal' => 'qt_QBitVal*' , -'QBitVal*' => 'qt_QBitVal*', -'QBitmap&' => 'qt_QBitmap*', -'QBitmap' => 'qt_QBitmap*', -'QBitmap*' => 'qt_QBitmap*', -'QBoxLayout*' => 'qt_QBoxLayout*', -'QBrush&' => 'qt_QBrush*', -'QBrush' => 'qt_QBrush*' , -'QBrush*' => 'qt_QBrush*' , -'QBrushData*' => 'qt_QBrushData*', -'QBuffer*' => 'qt_QBuffer*', -'QButton*' => 'qt_QButton*', -'QButtonGroup*' => 'qt_QButtonGroup*' , -'QByteArray& arr ()' => 'qt_QByteArray*', -'QByteArray&' => 'qt_QByteArray*' , -'QByteArray' => 'qt_QByteArray*', -'QByteArray*' => 'qt_QByteArray*', -'QCDEStyle*' => 'qt_QCDEStyle*', -'QCOORD&' => 'short', -'QCOORD' => 'short', -'QCOORD*' => 'short*', -'QCString&' => 'qt_QCString*' , -'QCString' => 'qt_QCString*' , -'QCString*' => 'qt_QCString*' , -'QCStringLess*' => 'qt_QCStringLess*' , -'QCStringList' => 'kde_QCStringList*' , -'QCache*' => 'qt_QCache*', -'QCacheIterator*' => 'qt_QCacheIterator*', -'QCanvas*' => 'qt_QCanvas*' , -'QCanvasEllipse*' => 'qt_QCanvasEllipse*', -'QCanvasItem*' => 'qt_QCanvasItem*' , -'QCanvasItemList' => 'qt_QCanvasItemList*' , -'QCanvasItemList*' => 'qt_QCanvasItemList*', -'QCanvasLine*' => 'qt_QCanvasLine*', -'QCanvasPixmap*' => 'qt_QCanvasPixmap*' , -'QCanvasPixmapArray*' => 'qt_QCanvasPixmapArray*' , -'QCanvasPolygon*' => 'qt_QCanvasPolygon*', -'QCanvasPolygonalItem*' => 'qt_QCanvasPolygonalItem*', -'QCanvasRectangle*' => 'qt_QCanvasRectangle*', -'QCanvasSpline*' => 'qt_QCanvasSpline*', -'QCanvasSprite*' => 'qt_QCanvasSprite*', -'QCanvasText*' => 'qt_QCanvasText*', -'QCanvasView*' => 'qt_QCanvasView*' , -'QChain*' => 'qt_QChain*' , -'QChar::Category' => 'int' , -'QChar::Decomposition' => 'int' , -'QChar::Direction' => 'int' , -'QChar::Joining' => 'int' , -'QCharRef&' => 'qt_QCharRef*' , -'QCharRef' => 'qt_QCharRef*' , -'QCharRef*' => 'qt_QCharRef*', -'QCheckBox*' => 'qt_QCheckBox*', -'QCheckListItem*' => 'qt_QCheckListItem*', -'QCheckTableItem*' => 'qt_QCheckTableItem*', -'QChildEvent*' => 'qt_QChildEvent*' , -'QClassInfo*' => 'qt_QClassInfo*' , -'QCleanupHandler*' => 'qt_QCleanupHandler*', -'QClipboard*' => 'qt_QClipboard*', -'QCloseEvent*' => 'qt_QCloseEvent*' , -'QCollection&' => 'qt_QCollection*' , -'QCollection*' => 'qt_QCollection*', -'QCollection::Item&' => 'void*' , -'QCollection::Item' => 'void*' , -'QColor &' => 'qt_QColor*', -'QColor&' => 'qt_QColor*', -'QColor&fillColor::white' => 'int' , -'QColor&linkColor::blue' => 'int' , -'QColor' => 'qt_QColor*', -'QColor*' => 'qt_QColor*' , -'QColorDialog*' => 'qt_QColorDialog*', -'QColorDrag*' => 'qt_QColorDrag*', -'QColorGroup&' => 'qt_QColorGroup*', -'QColorGroup' => 'qt_QColorGroup*' , -'QColorGroup*' => 'qt_QColorGroup*' , -'QColorGroup::ColorRole' => 'int' , -'QComboBox*' => 'qt_QComboBox*' , -'QComboBox::Policy' => 'int' , -'QComboBox::Policypolicy::AtBottom' => 'int' , -'QComboTableItem*' => 'qt_QComboTableItem*', -'QCommonStyle*' => 'qt_QCommonStyle*', -'QCompactStyle*' => 'qt_QCompactStyle*', -'QComponentFactory*' => 'qt_QComponentFactory*', -'QComponentFactoryInterface*' => 'qt_QComponentFactoryInterface*', -'QComponentInterface*' => 'qt_QComponentInterface*', -'QComponentRegistration*' => 'qt_QComponentRegistration*', -'QComponentServerInterface*' => 'qt_QComponentServerInterface*', -'QConfigDB*' => 'qt_QConfigDB*' , -'QConfigDB*' => 'qt_QConfigDB*' , -'QConnection*' => 'qt_QConnection*', -'QConnectionList&' => 'qt_QConnectionList*' , -'QConnectionList*' => 'qt_QConnectionList*' , -'QConnectionListIt&' => 'qt_QConnectionListIt*' , -'QConnectionListIt*' => 'qt_QConnectionListIt*', -'QConstString' => 'qt_QConstString*', -'QConstString*' => 'qt_QConstString*', -'QContextMenuEvent*' => 'qt_QContextMenuEvent*', -'QCursor&' => 'qt_QCursor*', -'QCursor' => 'qt_QCursor*' , -'QCursor*' => 'qt_QCursor*', -'QCustomEvent*' => 'qt_QCustomEvent*' , -'QCustomMenuItem*' => 'qt_QCustomMenuItem*' , -'QDOM_NodeListPrivate*' => 'void*' , -'QDOM_NodePrivate*' => 'void*' , -'QDataBrowser*' => 'qt_QDataBrowser*', -'QDataPump*' => 'qt_QDataPump*', -'QDataSink*' => 'qt_QDataSink*' , -'QDataSource*' => 'qt_QDataSource*' , -'QDataStream&' => 'qt_QDataStream*', -'QDataStream*' => 'qt_QDataStream*' , -'QDataTable*' => 'qt_QDataTable*', -'QDataView*' => 'qt_QDataView*', -'QDate &' => 'qt_QDate*', -'QDate date()' => 'qt_QDate*', -'QDate&' => 'qt_QDate*', -'QDate' => 'qt_QDate*', -'QDate*' => 'qt_QDate*', -'QDateEdit*' => 'qt_QDateEdit*', -'QDateTime&' => 'qt_QDateTime*', -'QDateTime' => 'qt_QDateTime*', -'QDateTime*' => 'qt_QDateTime*' , -'QDateTimeEdit*' => 'qt_QDateTimeEdit*', -'QDateTimeEditBase*' => 'qt_QDateTimeEditBase*', -'QDesktopWidget*' => 'qt_QDesktopWidget*', -'QDial*' => 'qt_QDial*', -'QDialog*' => 'qt_QDialog*', -'QDict*' => 'qt_QDict*', -'QDictIterator*' => 'qt_QDictIterator*', -'QDir&' => 'qt_QDir*', -'QDir' => 'qt_QDir*', -'QDir*' => 'qt_QDir*', -'QDir::SortSpec&' => 'int' , -'QDir::SortSpec' => 'int' , -'QDirSortItem*' => 'qt_QDirSortItem*', -'QDiskFont*' => 'qt_QDiskFont*', -'QDispatchInterface*' => 'qt_QDispatchInterface*', -'QDns*' => 'qt_QDns*', -'QDnsSocket*' => 'qt_QDnsSocket*', -'QDockArea*' => 'qt_QDockArea*', -'QDockAreaLayout*' => 'qt_QDockAreaLayout*', -'QDockWindow*' => 'qt_QDockWindow*', -'QDomAttr&' => 'qt_QDomAttr*' , -'QDomAttr' => 'qt_QDomAttr*' , -'QDomAttr*' => 'qt_QDomAttr*', -'QDomCDATASection&' => 'qt_QDomCDATASection*' , -'QDomCDATASection' => 'qt_QDomCDATASection*' , -'QDomCDATASection*' => 'qt_QDomCDATASection*', -'QDomCharacterData&' => 'qt_QDomCharacterData*' , -'QDomCharacterData' => 'qt_QDomCharacterData*' , -'QDomCharacterData*' => 'qt_QDomCharacterData*', -'QDomComment&' => 'qt_QDomComment*' , -'QDomComment' => 'qt_QDomComment*' , -'QDomComment*' => 'qt_QDomComment*', -'QDomDocument&' => 'qt_QDomDocument*' , -'QDomDocument' => 'qt_QDomDocument*' , -'QDomDocument*' => 'qt_QDomDocument*', -'QDomDocumentFragment&' => 'qt_QDomDocumentFragment*' , -'QDomDocumentFragment' => 'qt_QDomDocumentFragment*' , -'QDomDocumentFragment*' => 'qt_QDomDocumentFragment*', -'QDomDocumentType&' => 'qt_QDomDocumentType*' , -'QDomDocumentType' => 'qt_QDomDocumentType*' , -'QDomDocumentType*' => 'qt_QDomDocumentType*', -'QDomElement&' => 'qt_QDomElement*' , -'QDomElement' => 'qt_QDomElement*' , -'QDomElement*' => 'qt_QDomElement*', -'QDomEntity&' => 'qt_QDomEntity*' , -'QDomEntity' => 'qt_QDomEntity*' , -'QDomEntity*' => 'qt_QDomEntity*', -'QDomEntityReference&' => 'qt_QDomEntityReference*' , -'QDomEntityReference' => 'qt_QDomEntityReference*' , -'QDomEntityReference*' => 'qt_QDomEntityReference*', -'QDomImplementation&' => 'qt_QDomImplementation*' , -'QDomImplementation' => 'qt_QDomImplementation*' , -'QDomImplementation*' => 'qt_QDomImplementation*', -'QDomNamedNodeMap&' => 'qt_QDomNamedNodeMap*' , -'QDomNamedNodeMap' => 'qt_QDomNamedNodeMap*' , -'QDomNamedNodeMap*' => 'qt_QDomNamedNodeMap*', -'QDomNode&' => 'qt_QDomNode*' , -'QDomNode' => 'qt_QDomNode*' , -'QDomNode*' => 'qt_QDomNode*', -'QDomNode::NodeType' => 'int', -'QDomNodeList&' => 'qt_QDomNodeList*' , -'QDomNodeList' => 'qt_QDomNodeList*' , -'QDomNodeList*' => 'qt_QDomNodeList*', -'QDomNodePrivate*' => 'qt_QDomNodePrivate*', -'QDomNotation&' => 'qt_QDomNotation*' , -'QDomNotation' => 'qt_QDomNotation*' , -'QDomNotation*' => 'qt_QDomNotation*', -'QDomProcessingInstruction&' => 'qt_QDomProcessingInstruction*' , -'QDomProcessingInstruction' => 'qt_QDomProcessingInstruction*' , -'QDomProcessingInstruction*' => 'qt_QDomProcessingInstruction*', -'QDomText&' => 'qt_QDomText*' , -'QDomText' => 'qt_QDomText*' , -'QDomText*' => 'qt_QDomText*', -'QDoubleValidator*' => 'qt_QDoubleValidator*', -'QDragEnterEvent*' => 'qt_QDragEnterEvent*' , -'QDragLeaveEvent*' => 'qt_QDragLeaveEvent*' , -'QDragManager*' => 'qt_QDragManager*', -'QDragMoveEvent*' => 'qt_QDragMoveEvent*' , -'QDragObject*' => 'qt_QDragObject*' , -'QDragResponseEvent*' => 'qt_QDragResponseEvent*', -'QDropEvent*' => 'qt_QDropEvent*' , -'QDropSite*' => 'qt_QDropSite*', -'QEditorFactory*' => 'qt_QEditorFactory*', -'QErrorMessage*' => 'qt_QErrorMessage*', -'QEucJpCodec*' => 'qt_QEucJpCodec*', -'QEucKrCodec*' => 'qt_QEucKrCodec*', -'QEvent*' => 'qt_QEvent*', -'QEventLoop::ProcessEventsFlags' => 'uint', -'QFeatureListInterface*' => 'qt_QFeatureListInterface*', -'QFile&' => 'qt_QFile*', -'QFile*' => 'qt_QFile*' , -'QFileDialog*' => 'qt_QFileDialog*', -'QFileIconProvider*' => 'qt_QFileIconProvider*' , -'QFileInfo&' => 'qt_QFileInfo*', -'QFileInfo*' => 'qt_QFileInfo*', -'QFileInfoList*' => 'qt_QFileInfoList*' , -'QFilePreview*' => 'qt_QFilePreview*' , -'QFocusData*' => 'qt_QFocusData*' , -'QFocusEvent*' => 'qt_QFocusEvent*' , -'QFont&' => 'qt_QFont*', -'QFont' => 'qt_QFont*', -'QFont*' => 'qt_QFont*', -'QFont::CharSet' => 'int', -'QFont::CharSetcharset::Unicode' => 'int' , -'QFont::StyleHint' => 'int', -'QFontData&' => 'qt_QFontData*' , -'QFontDatabase*' => 'qt_QFontDatabase*', -'QFontDialog*' => 'qt_QFontDialog*', -'QFontInfo&' => 'qt_QFontInfo*', -'QFontInfo' => 'qt_QFontInfo*', -'QFontInfo*' => 'qt_QFontInfo*', -'QFontMetrics&' => 'qt_QFontMetrics*', -'QFontMetrics' => 'qt_QFontMetrics*', -'QFontMetrics*' => 'qt_QFontMetrics*', -'QFrame*' => 'qt_QFrame*' , -'QFtp*' => 'qt_QFtp*', -'QGArray&' => 'qt_QGArray*' , -'QGArray*' => 'qt_QGArray*', -'QGCache&' => 'qt_QGCache*' , -'QGCache*' => 'qt_QGCache*', -'QGCacheIterator&' => 'qt_QGCacheIterator*' , -'QGCacheIterator*' => 'qt_QGCacheIterator*', -'QGDict&' => 'qt_QGDict*' , -'QGDict*' => 'qt_QGDict*', -'QGDictIterator&' => 'qt_QGDictIterator*' , -'QGDictIterator*' => 'qt_QGDictIterator*', -'QGL*' => 'qt_QGL*', -'QGLColormap&' => 'qt_QGLColormap*', -'QGLColormap*' => 'qt_QGLColormap*', -'QGLContext*' => 'qt_QGLContext*' , -'QGLFormat&' => 'qt_QGLFormat*' , -'QGLFormat' => 'qt_QGLFormat*' , -'QGLFormat*' => 'qt_QGLFormat*', -'QGLWidget*' => 'qt_QGLWidget*' , -'QGLayoutIterator*' => 'qt_QGLayoutIterator*' , -'QGListIterator&' => 'qt_QGListIterator*' , -'QGListIterator*' => 'qt_QGListIterator*', -'QGPlugin*' => 'qt_QGPlugin*', -'QGPluginManager*' => 'qt_QGPluginManager*', -'QGbkCodec*' => 'qt_QGbkCodec*', -'QGfx*' => 'qt_QGfx*' , -'QGrid*' => 'qt_QGrid*' , -'QGrid::Direction' => 'int' , -'QGridLayout*' => 'qt_QGridLayout*', -'QGridView*' => 'qt_QGridView*', -'QGroupBox*' => 'qt_QGroupBox*', -'QGuardedPtr*' => 'qt_QGuardedPtr*', -'QGuardedPtrPrivate*' => 'qt_QGuardedPtrPrivate*', -'QHBox*' => 'qt_QHBox*' , -'QHBoxLayout*' => 'qt_QHBoxLayout*' , -'QHButtonGroup*' => 'qt_QHButtonGroup*', -'QHGroupBox*' => 'qt_QHGroupBox*', -'QHeader*' => 'qt_QHeader*', -'QHebrewCodec*' => 'qt_QHebrewCodec*', -'QHideEvent*' => 'qt_QHideEvent*' , -'QHostAddress&' => 'qt_QHostAddress*' , -'QHostAddress' => 'qt_QHostAddress*' , -'QHostAddress*' => 'qt_QHostAddress*' , -'QHttp*' => 'qt_QHttp*', -'QIMEvent*' => 'qt_QIMEvent*', -'QIODevice*' => 'qt_QIODevice*', -'QIODevice::Offset' => 'int', -'QIODeviceSource*' => 'qt_QIODeviceSource*', -'QIOManager*' => 'qt_QIOManager*', -'QIOWatch*' => 'qt_QIOWatch*', -'QIconDrag*' => 'qt_QIconDrag*', -'QIconDragItem&' => 'qt_QIconDragItem*' , -'QIconDragItem*' => 'qt_QIconDragItem*', -'QIconSet&' => 'qt_QIconSet*' , -'QIconSet' => 'qt_QIconSet*' , -'QIconSet*' => 'qt_QIconSet*' , -'QIconView*' => 'qt_QIconView*' , -'QIconViewItem*' => 'qt_QIconViewItem*' , -'QImage&' => 'qt_QImage*', -'QImage' => 'qt_QImage*', -'QImage*' => 'qt_QImage*' , -'QImageConsumer*' => 'qt_QImageConsumer*' , -'QImageData*' => 'qt_QImageData*', -'QImageDecoder*' => 'qt_QImageDecoder*', -'QImageDrag*' => 'qt_QImageDrag*', -'QImageFormat*' => 'qt_QImageFormat*' , -'QImageFormatInterface*' => 'qt_QImageFormatInterface*', -'QImageFormatPlugin*' => 'qt_QImageFormatPlugin*', -'QImageFormatType*' => 'qt_QImageFormatType*' , -'QImageIO*' => 'qt_QImageIO*', -'QImageTextKeyLang&' => 'qt_QImageTextKeyLang*' , -'QImageTextKeyLang*' => 'qt_QImageTextKeyLang*', -'QInputDialog*' => 'qt_QInputDialog*', -'QIntBucket*' => 'qt_QIntBucket*', -'QIntCache*' => 'qt_QIntCache*', -'QIntCacheIterator*' => 'qt_QIntCacheIterator*', -'QIntDict*' => 'qt_QIntDict*', -'QIntDictIterator*' => 'qt_QIntDictIterator*', -'QIntValidator*' => 'qt_QIntValidator*', -'QInterfaceListInterface*' => 'qt_QInterfaceListInterface*', -'QInterfacePtr*' => 'qt_QInterfacePtr*', -'QInterlaceStyle*' => 'qt_QInterlaceStyle*', -'QInternal*' => 'qt_QInternal*', -'QJisCodec*' => 'qt_QJisCodec*', -'QJpUnicodeConv*' => 'qt_QJpUnicodeConv*' , -'QKeyEvent*' => 'qt_QKeyEvent*' , -'QKeySequence&' => 'qt_QKeySequence*', -'QKeySequence' => 'qt_QKeySequence*', -'QKeySequence*' => 'qt_QKeySequence*', -'QKoi8Codec*' => 'qt_QKoi8Codec*', -'QLCDNumber*' => 'qt_QLCDNumber*', -'QLNode*' => 'qt_QLNode*' , -'QLabel*' => 'qt_QLabel*', -'QLayout*' => 'qt_QLayout*', -'QLayoutItem*' => 'qt_QLayoutItem*' , -'QLayoutIterator&' => 'qt_QLayoutIterator*' , -'QLayoutIterator' => 'qt_QLayoutIterator*' , -'QLayoutIterator*' => 'qt_QLayoutIterator*', -'QLibrary*' => 'qt_QLibrary*', -'QLibrary::Policy' => 'int', -'QLibraryInterface*' => 'qt_QLibraryInterface*', -'QLineEdit*' => 'qt_QLineEdit*' , -'QLineEdit::EchoMode' => 'int' , -'QList*' => 'qt_QList*', -'QListBox*' => 'qt_QListBox*', -'QListBoxItem*' => 'qt_QListBoxItem*', -'QListBoxPixmap*' => 'qt_QListBoxPixmap*', -'QListBoxText*' => 'qt_QListBoxText*', -'QListIterator*' => 'qt_QListIterator*', -'QListView*' => 'qt_QListView*', -'QListViewItem*&' => 'qt_QListViewItem*', -'QListViewItem*' => 'qt_QListViewItem*', -'QListViewItemIterator&' => 'qt_QListViewItemIterator*' , -'QListViewItemIterator' => 'qt_QListViewItemIterator*' , -'QListViewItemIterator*' => 'qt_QListViewItemIterator*', -'QLocalFs*' => 'qt_QLocalFs*', -'QMCPI*' => 'qt_QMCPI*', -'QMainWindow*' => 'qt_QMainWindow*' , -'QMainWindow::ToolBarDock' => 'int', -'QMainWindow::ToolBarDock::Top' => 'int' , -'QMap&' => 'qt_QMap*' , -'QMap*' => 'qt_QMap*', -'QMapConstIterator*' => 'qt_QMapConstIterator*', -'QMapIterator*' => 'qt_QMapIterator*', -'QMapNode*' => 'qt_QMapNode*', -'QMapNodeBase*&' => 'qt_QMapNodeBase*' , -'QMapNodeBase*' => 'qt_QMapNodeBase*' , -'QMapPrivate*' => 'qt_QMapPrivate*', -'QMapPrivateBase*' => 'qt_QMapPrivateBase*' , -'QMemArray*' => 'qt_QMemArray*', -'QMember' => 'qt_QMember*' , -'QMember*' => 'qt_QMember*' , -'QMenuBar*' => 'qt_QMenuBar*', -'QMenuData*' => 'qt_QMenuData*', -'QMenuItem*' => 'qt_QMenuItem*', -'QMessageBox*' => 'qt_QMessageBox*', -'QMetaData*' => 'qt_QMetaData*' , -'QMetaData::Access*' => 'int*' , -'QMetaEnum*' => 'qt_QMetaEnum*' , -'QMetaEnum::Item*' => 'int*' , -'QMetaObject*&' => 'qt_QMetaObject*', -'QMetaObject*' => 'qt_QMetaObject*', -'QMetaObjectCleanUp*' => 'qt_QMetaObjectCleanUp*', -'QMetaObjectInit*' => 'qt_QMetaObjectInit*', -'QMetaProperty*' => 'qt_QMetaProperty*' , -'QMimeSource*' => 'qt_QMimeSource*' , -'QMimeSourceFactory*' => 'qt_QMimeSourceFactory*' , -'QMotifPlusStyle*' => 'qt_QMotifPlusStyle*', -'QMotifStyle*' => 'qt_QMotifStyle*', -'QMouseEvent*' => 'qt_QMouseEvent*' , -'QMoveEvent*' => 'qt_QMoveEvent*' , -'QMovie&' => 'qt_QMovie*', -'QMovie*' => 'qt_QMovie*', -'QMultiLineEdit*' => 'qt_QMultiLineEdit*', -'QMultiLineEditRow*' => 'qt_QMultiLineEditRow*', -'QMutex*' => 'qt_QMutex*', -'QNPInstance*' => 'qt_QNPInstance*', -'QNPStream*' => 'qt_QNPStream*', -'QNPWidget*' => 'qt_QNPWidget*', -'QNPlugin*' => 'qt_QNPlugin*', -'QNetworkOperation*' => 'qt_QNetworkOperation*' , -'QNetworkProtocol*' => 'qt_QNetworkProtocol*' , -'QNetworkProtocol::Operation' => 'int' , -'QNetworkProtocol::State' => 'int' , -'QNetworkProtocolFactory*' => 'qt_QNetworkProtocolFactory*', -'QNetworkProtocolFactoryBase*' => 'qt_QNetworkProtocolFactoryBase*' , -'QObject*' => 'qt_QObject*', -'QObjectCleanupHandler*' => 'qt_QObjectCleanupHandler*', -'QObjectDictionary&' => 'qt_QObjectDictionary*' , -'QObjectDictionary*' => 'qt_QObjectDictionary*', -'QObjectInterface*' => 'qt_QObjectInterface*', -'QObjectList&' => 'qt_QObjectList*' , -'QObjectList*' => 'qt_QObjectList*', -'QObjectListIt&' => 'qt_QObjectListIt*' , -'QObjectListIt*' => 'qt_QObjectListIt*', -'QPNGImagePacker*' => 'qt_QPNGImagePacker*', -'QPNGImageWriter*' => 'qt_QPNGImageWriter*', -'QPaintDevice*' => 'qt_QPaintDevice*', -'QPaintDeviceMetrics*' => 'qt_QPaintDeviceMetrics*', -'QPaintDeviceX11Data*' => 'qt_QPaintDeviceX11Data*' , -'QPaintEvent*' => 'qt_QPaintEvent*' , -'QPainter&' => 'qt_QPainter*' , -'QPainter*' => 'qt_QPainter*', -'QPair*' => 'qt_QPair*', -'QPalData*' => 'qt_QPalData*', -'QPalette&' => 'qt_QPalette*', -'QPalette' => 'qt_QPalette*', -'QPalette*' => 'qt_QPalette*', -'QPen&' => 'qt_QPen*', -'QPen' => 'qt_QPen*' , -'QPen*' => 'qt_QPen*', -'QPenData*' => 'qt_QPenData*', -'QPicture&' => 'qt_QPicture*', -'QPicture' => 'qt_QPicture*', -'QPicture*' => 'qt_QPicture*', -'QPicturePrivate*' => 'qt_QPicturePrivate*', -'QPixmap& pixmap()' => 'kde_QPixmap*', -'QPixmap&' => 'qt_QPixmap*', -'QPixmap' => 'qt_QPixmap*', -'QPixmap*' => 'qt_QPixmap*', -'QPixmap::Optimization' => 'int' , -'QPixmap::Optimization' => 'int', -'QPixmap::Optimization::DefaultOptim' => 'int' , -'QPixmapCache*' => 'qt_QPixmapCache*', -'QPixmapData*' => 'qt_QPixmapData*', -'QPlatinumStyle*' => 'qt_QPlatinumStyle*', -'QPluginManager*' => 'qt_QPluginManager*', -'QPoint&' => 'qt_QPoint*', -'QPoint&pos()' => 'int' , -'QPoint&pos::pos()' => 'int' , -'QPoint' => 'qt_QPoint*', -'QPoint*' => 'qt_QPoint*' , -'QPointArray&' => 'qt_QPointArray*', -'QPointArray' => 'qt_QPointArray*', -'QPointArray*' => 'qt_QPointArray*', -'QPointVal&' => 'qt_QPointVal*' , -'QPointVal' => 'qt_QPointVal*' , -'QPolygonScanner*' => 'qt_QPolygonScanner*', -'QPopupMenu*' => 'qt_QPopupMenu*', -'QPrintDialog*' => 'qt_QPrintDialog*', -'QPrinter*' => 'qt_QPrinter*' , -'QPrinter::PrinterMode' => 'int', -'QProcess*' => 'qt_QProcess*', -'QProgressBar*' => 'qt_QProgressBar*', -'QProgressDialog*' => 'qt_QProgressDialog*', -'QPtrBucket*' => 'qt_QPtrBucket*', -'QPtrCollection&' => 'qt_QPtrCollection*', -'QPtrCollection*' => 'qt_QPtrCollection*', -'QPtrDict*' => 'qt_QPtrDict*', -'QPtrDictIterator*' => 'qt_QPtrDictIterator*', -'QPtrList*' => 'qt_QPtrList*', -'QPtrListIterator*' => 'qt_QPtrListIterator*', -'QPtrQueue*' => 'qt_QPtrQueue*', -'QPtrStack*' => 'qt_QPtrStack*', -'QPtrVector*' => 'qt_QPtrVector*', -'QPushButton*' => 'qt_QPushButton*', -'QQueue*' => 'qt_QQueue*', -'QRESULT' => 'long', -'QRadioButton*' => 'qt_QRadioButton*', -'QRangeControl*' => 'qt_QRangeControl*', -'QRect&' => 'qt_QRect*', -'QRect' => 'qt_QRect*', -'QRect*' => 'qt_QRect*', -'QRegExp&' => 'qt_QRegExp*', -'QRegExp*' => 'qt_QRegExp*', -'QRegExpValidator*' => 'qt_QRegExpValidator*', -'QRegion&' => 'qt_QRegion*', -'QRegion' => 'qt_QRegion*', -'QRegion*' => 'qt_QRegion*', -'QRegionData*' => 'qt_QRegionData*', -'QRemoteFactory*' => 'qt_QRemoteFactory*', -'QRemotePlugin*' => 'qt_QRemotePlugin*', -'QResizeEvent*' => 'qt_QResizeEvent*' , -'QRgb' => 'unsigned int', -'QRgb*' => 'int*', -'QRichText&' => 'qt_QRichText*' , -'QSGIStyle*' => 'qt_QSGIStyle*', -'QScrollBar&' => 'qt_QScrollBar*' , -'QScrollBar*' => 'qt_QScrollBar*' , -'QScrollView*' => 'qt_QScrollView*', -'QSemaphore*' => 'qt_QSemaphore*', -'QSemiModal*' => 'qt_QSemiModal*', -'QSenderObject*' => 'qt_QSenderObject*', -'QServerSocket*' => 'qt_QServerSocket*', -'QSessionManager&' => 'qt_QSessionManager*' , -'QSessionManager*' => 'qt_QSessionManager*', -'QSettings*' => 'qt_QSettings*', -'QShared*' => 'qt_QShared*', -'QShowEvent*' => 'qt_QShowEvent*' , -'QSignal*' => 'qt_QSignal*', -'QSignalDict&' => 'qt_QSignalDict*' , -'QSignalDict*' => 'qt_QSignalDict*', -'QSignalDictIt&' => 'qt_QSignalDictIt*' , -'QSignalDictIt*' => 'qt_QSignalDictIt*', -'QSignalMapper*' => 'qt_QSignalMapper*', -'QSignalVec&' => 'qt_QSignalVec*', -'QSignalVec*' => 'qt_QSignalVec*', -'QSimpleRichText*' => 'qt_QSimpleRichText*', -'QSize&' => 'qt_QSize*', -'QSize' => 'qt_QSize*', -'QSize*' => 'qt_QSize*' , -'QSizeGrip*' => 'qt_QSizeGrip*', -'QSizePolicy&' => 'qt_QSizePolicy*' , -'QSizePolicy' => 'qt_QSizePolicy*' , -'QSizePolicy*' => 'qt_QSizePolicy*', -'QSizePolicy::ExpandData' => 'int' , -'QSizePolicy::SizeTypehData::Minimum' => 'int' , -'QSizePolicy::SizeTypevData::Minimum' => 'int' , -'QSjisCodec*' => 'qt_QSjisCodec*', -'QSlider*' => 'qt_QSlider*', -'QSmartPtr&' => 'qt_QSmartPtr*' , -'QSmartPtr*' => 'qt_QSmartPtr*', -'QSmartPtrPrivate*' => 'qt_QSmartPtrPrivate*', -'QSocket*' => 'qt_QSocket*', -'QSocketDevice*' => 'qt_QSocketDevice*' , -'QSocketNotifier*' => 'qt_QSocketNotifier*', -'QSocketNotifier::Type' => 'int', -'QSortedList*' => 'qt_QSortedList*', -'QSound*' => 'qt_QSound*', -'QSpacerItem*' => 'qt_QSpacerItem*' , -'QSpinBox*' => 'qt_QSpinBox*', -'QSpinWidget*' => 'qt_QSpinWidget*', -'QSplitter*' => 'qt_QSplitter*', -'QSql*' => 'qt_QSql*', -'QSql::Confirm' => 'int', -'QSql::Op' => 'int', -'QSqlCursor&' => 'qt_QSqlCursor*', -'QSqlCursor' => 'qt_QSqlCursor*', -'QSqlCursor*' => 'qt_QSqlCursor*', -'QSqlDatabase*' => 'qt_QSqlDatabase*', -'QSqlDriver*' => 'qt_QSqlDriver*', -'QSqlDriverCreator*' => 'qt_QSqlDriverCreator*', -'QSqlDriverCreatorBase*' => 'qt_QSqlDriverCreatorBase*', -'QSqlDriverFactoryInterface*' => 'qt_QSqlDriverFactoryInterface*', -'QSqlDriverPlugin*' => 'qt_QSqlDriverPlugin*', -'QSqlEditorFactory*' => 'qt_QSqlEditorFactory*', -'QSqlError&' => 'qt_QSqlError*', -'QSqlError' => 'qt_QSqlError*', -'QSqlError*' => 'qt_QSqlError*', -'QSqlField&' => 'qt_QSqlField*', -'QSqlField' => 'qt_QSqlField*', -'QSqlField*' => 'qt_QSqlField*', -'QSqlFieldInfo&' => 'qt_QSqlFieldInfo*', -'QSqlFieldInfo*' => 'qt_QSqlFieldInfo*', -'QSqlForm' => 'qt_QSqlForm*', -'QSqlForm*' => 'qt_QSqlForm*', -'QSqlIndex&' => 'qt_QSqlIndex*', -'QSqlIndex' => 'qt_QSqlIndex*', -'QSqlIndex*' => 'qt_QSqlIndex*', -'QSqlPropertyMap*' => 'qt_QSqlPropertyMap*', -'QSqlQuery&' => 'qt_QSqlQuery*', -'QSqlQuery' => 'qt_QSqlQuery*', -'QSqlQuery*' => 'qt_QSqlQuery*', -'QSqlRecord&' => 'qt_QSqlRecord*', -'QSqlRecord' => 'qt_QSqlRecord*', -'QSqlRecord*' => 'qt_QSqlRecord*', -'QSqlRecordInfo&' => 'qt_QSqlRecordInfo*', -'QSqlRecordInfo' => 'qt_QSqlRecordInfo*', -'QSqlRecordInfo*' => 'qt_QSqlRecordInfo*', -'QSqlRecordPrivate*' => 'qt_QSqlRecordPrivate*', -'QSqlRecordShared*' => 'qt_QSqlRecordShared*', -'QSqlResult' => 'qt_QSqlResult*', -'QSqlResult*' => 'qt_QSqlResult*', -'QSqlResultShared*' => 'qt_QSqlResultShared*', -'QStack*' => 'qt_QStack*', -'QStatusBar*' => 'qt_QStatusBar*' , -'QStoredDrag*' => 'qt_QStoredDrag*', -'QStrIList' => 'kde_QStrIList', -'QStrIList*' => 'qt_QStrIList*', -'QStrIVec*' => 'qt_QStrIVec*', -'QStrList&' => 'qt_QStrList*', -'QStrList' => 'qt_QStrList*', -'QStrList*' => 'qt_QStrList*', -'QStrListIterator*' => 'qt_QStrListIterator*', -'QStrVec*' => 'qt_QStrVec*', -'QString&' => 'qt_QString*', -'QString&::null' => 'qt_QString*' , -'QString&button0Text::null' => 'qt_QString*' , -'QString&button1Text::null' => 'qt_QString*' , -'QString&button2Text::null' => 'qt_QString*' , -'QString&buttonText::null' => 'qt_QString*' , -'QString&caption::null' => 'qt_QString*' , -'QString&charSet::null' => 'qt_QString*' , -'QString&context::null' => 'qt_QString*' , -'QString&defValue::null' => 'qt_QString*' , -'QString&dir::null' => 'qt_QString*' , -'QString&directory::null' => 'qt_QString*' , -'QString&filter::null' => 'qt_QString*' , -'QString&initially::null' => 'qt_QString*' , -'QString&location::null' => 'qt_QString*' , -'QString&n::null' => 'qt_QString*' , -'QString&nameFilter::null' => 'qt_QString*' , -'QString&noButtonText::null' => 'qt_QString*' , -'QString&search_delimiters::null' => 'qt_QString*' , -'QString&style::null' => 'qt_QString*' , -'QString&suffix::null' => 'qt_QString*' , -'QString&text::null' => 'qt_QString*' , -'QString&text_::null' => 'qt_QString*' , -'QString&translation::null' => 'qt_QString*' , -'QString&yesButtonText::null' => 'qt_QString*' , -'QString' => 'qt_QString*', -'QString*' => 'qt_QString*' , -'QString::null' => 'qt_QString_null()' , -'QStringBucket*' => 'qt_QStringBucket*', -'QStringData*' => 'qt_QStringData*', -'QStringList&' => 'qt_QStringList*' , -'QStringList' => 'qt_QStringList*' , -'QStringList*' => 'qt_QStringList*' , -'QStringcharSetName::null' => 'qt_QStringcharSetName*' , -'QStyle&' => 'qt_QStyle*' , -'QStyle*' => 'qt_QStyle*' , -'QStyle::ScrollControl' => 'int' , -'QStyle::StylePixmap' => 'int', -'QStyle::SubControl' => 'int', -'QStyle::SubRect' => 'int', -'QStyleFactory*' => 'qt_QStyleFactory*', -'QStyleFactoryInterface*' => 'qt_QStyleFactoryInterface*', -'QStyleOption&' => 'int', -'QStyleOption' => 'int', -'QStyleOption*' => 'int*', -'QStylePlugin*' => 'qt_QStylePlugin*', -'QStyleSheet*' => 'qt_QStyleSheet*' , -'QStyleSheetItem&' => 'qt_QStyleSheetItem*' , -'QStyleSheetItem*' => 'qt_QStyleSheetItem*' , -'QStyleSheetItem::DisplayMode*' => 'int', -'QStyleSheetItem::ListStyle*' => 'int', -'QStyleSheetItem::WhiteSpaceMode' => 'int', -'QTSCIICodec*' => 'qt_QTSCIICodec*', -'QTSMFI' => 'int' , -'QTab*' => 'qt_QTab*', -'QTabBar*' => 'qt_QTabBar*' , -'QTabBar::Shape' => 'int' , -'QTabDialog*' => 'qt_QTabDialog*', -'QTabWidget*' => 'qt_QTabWidget*', -'QTable*' => 'qt_QTable*' , -'QTableHeader*' => 'qt_QTableHeader*', -'QTableItem*' => 'qt_QTableItem*' , -'QTableSelection&' => 'qt_QTableSelection*' , -'QTableSelection' => 'qt_QTableSelection*' , -'QTableSelection*' => 'qt_QTableSelection*', -'QTableView*' => 'qt_QTableView*', -'QTabletEvent*' => 'qt_QTabletEvent*', -'QTextBrowser*' => 'qt_QTextBrowser*', -'QTextCodec*' => 'qt_QTextCodec*' , -'QTextCodecFactory*' => 'qt_QTextCodecFactory*', -'QTextCodecFactoryInterface*' => 'qt_QTextCodecFactoryInterface*', -'QTextCodecPlugin*' => 'qt_QTextCodecPlugin*', -'QTextCursor*' => 'qt_QTextCursor*', -'QTextDecoder*' => 'qt_QTextDecoder*' , -'QTextDocument*' => 'qt_QTextDocument*', -'QTextDrag*' => 'qt_QTextDrag*', -'QTextEdit*' => 'qt_QTextEdit*', -'QTextEncoder*' => 'qt_QTextEncoder*' , -'QTextFormat*' => 'qt_QTextFormat*', -'QTextIStream*' => 'qt_QTextIStream*', -'QTextOStream&' => 'qt_QTextOStream*' , -'QTextOStream*' => 'qt_QTextOStream*', -'QTextOStreamIterator*' => 'qt_QTextOStreamIterator*', -'QTextParag**' => 'qt_QTextParag**', -'QTextStream&' => 'qt_QTextStream*' , -'QTextStream*' => 'qt_QTextStream*' , -'QTextView*' => 'qt_QTextView*', -'QThread*' => 'qt_QThread*', -'QThreadData*' => 'qt_QThreadData*', -'QThreadEvent*' => 'qt_QThreadEvent*', -'QTime&' => 'qt_QTime*', -'QTime' => 'qt_QTime*', -'QTime*' => 'qt_QTime*', -'QTimeEdit*' => 'qt_QTimeEdit*', -'QTimeWatch*' => 'qt_QTimeWatch*', -'QTimer*' => 'qt_QTimer*', -'QTimerEvent*' => 'qt_QTimerEvent*' , -'QToolBar*' => 'qt_QToolBar*' , -'QToolButton*' => 'qt_QToolButton*' , -'QToolTip*' => 'qt_QToolTip*', -'QToolTipGroup*' => 'qt_QToolTipGroup*', -'QTranslator*' => 'qt_QTranslator*' , -'QTranslatorMessage&' => 'qt_QTranslatorMessage*' , -'QTranslatorMessage' => 'qt_QTranslatorMessage*' , -'QTranslatorMessage*' => 'qt_QTranslatorMessage*', -'QTsciiCodec*' => 'qt_QTsciiCodec*', -'QUObject*' => 'qt_QUObject*', -'QUnknownInterface*' => 'qt_QUnknownInterface*', -'QUnknownInterface**' => 'qt_QUnknownInterface**', -'QUriDrag*' => 'qt_QUriDrag*', -'QUrl&' => 'qt_QUrl*' , -'QUrl' => 'qt_QUrl*' , -'QUrl*' => 'qt_QUrl*', -'QUrlInfo&' => 'qt_QUrlInfo*' , -'QUrlInfo' => 'qt_QUrlInfo*' , -'QUrlInfo*' => 'qt_QUrlInfo*', -'QUrlOperator&' => 'qt_QUrlOperator*' , -'QUrlOperator*' => 'qt_QUrlOperator*' , -'QUtf16Codec*' => 'qt_QUtf16Codec*', -'QUtf8Codec*' => 'qt_QUtf8Codec*', -'QUuid&' => 'qt_QUuid*', -'QUuid*' => 'qt_QUuid*', -'QVBox*' => 'qt_QVBox*' , -'QVBoxLayout*' => 'qt_QVBoxLayout*', -'QVButtonGroup*' => 'qt_QVButtonGroup*', -'QVFbHeader*' => 'qt_QVFbHeader*', -'QVFbKeyData*' => 'qt_QVFbKeyData*', -'QVGroupBox*' => 'qt_QVGroupBox*', -'QValidator*' => 'qt_QValidator*', -'QValidator::State' => 'int', -'QValueList*' => 'qt_QValueList*', -'QValueListConstIterator*' => 'qt_QValueListConstIterator*', -'QValueListIterator*' => 'qt_QValueListIterator*', -'QValueListNode*' => 'qt_QValueListNode*', -'QValueListPrivate*' => 'qt_QValueListPrivate*', -'QValueStack*' => 'qt_QValueStack*', -'QValueVector*' => 'qt_QValueVector*', -'QValueVectorPrivate*' => 'qt_QValueVectorPrivate*', -'QVariant&' => 'qt_QVariant*', -'QVariant' => 'qt_QVariant*', -'QVariant*' => 'qt_QVariant*', -'QVariant::Type' => 'int' , -'QVariantPrivate*' => 'qt_QVariantPrivate*' , -'QVector*' => 'qt_QVector*', -'QWMatrix&' => 'qt_QWMatrix*', -'QWMatrix' => 'qt_QWMatrix*', -'QWMatrix*' => 'qt_QWMatrix*', -'QWSDecoration&' => 'qt_QWSDecoration*' , -'QWSDecoration*' => 'qt_QWSDecoration*' , -'QWSDisplay*' => 'qt_QWSDisplay*' , -'QWSEvent*' => 'qt_QWSEvent*' , -'QWaitCondition*' => 'qt_QWaitCondition*', -'QWhatsThis*' => 'qt_QWhatsThis*', -'QWheelEvent*' => 'qt_QWheelEvent*' , -'QWidget*' => 'qt_QWidget*', -'QWidget' => 'qt_QWidget*', -'QWidget*' => 'qt_QWidget*', -'QWidgetFactory*' => 'qt_QWidgetFactory*', -'QWidgetIntDict&' => 'qt_QWidgetIntDict*' , -'QWidgetIntDict*' => 'qt_QWidgetIntDict*', -'QWidgetIntDictIt&' => 'qt_QWidgetIntDictIt*' , -'QWidgetIntDictIt*' => 'qt_QWidgetIntDictIt*', -'QWidgetItem*' => 'qt_QWidgetItem*', -'QWidgetList&' => 'qt_QWidgetList*' , -'QWidgetList&' => 'qt_QWidgetList*' , -'QWidgetList' => 'qt_QWidgetList*' , -'QWidgetList' => 'qt_QWidgetList*' , -'QWidgetList*' => 'qt_QWidgetList*', -'QWidgetList*' => 'qt_QWidgetList*', -'QWidgetListIt&' => 'qt_QWidgetListIt*' , -'QWidgetListIt*' => 'qt_QWidgetListIt*', -'QWidgetMapper*' => 'qt_QWidgetMapper*', -'QWidgetPlugin*' => 'qt_QWidgetPlugin*', -'QWidgetStack*' => 'qt_QWidgetStack*', -'QWindowsMime*' => 'qt_QWindowsMime*' , -'QWindowsStyle*' => 'qt_QWindowsStyle*', -'QWizard*' => 'qt_QWizard*', -'QWorkspace*' => 'qt_QWorkspace*', -'QXEmbed*' => 'qt_QXEmbed*' , -'QXmlAttributes&' => 'qt_QXmlAttributes*' , -'QXmlAttributes*' => 'qt_QXmlAttributes*', -'QXmlContentHandler*' => 'qt_QXmlContentHandler*' , -'QXmlDTDHandler*' => 'qt_QXmlDTDHandler*' , -'QXmlDeclHandler*' => 'qt_QXmlDeclHandler*' , -'QXmlDefaultHandler*' => 'qt_QXmlDefaultHandler*', -'QXmlEntityResolver*' => 'qt_QXmlEntityResolver*' , -'QXmlErrorHandler*' => 'qt_QXmlErrorHandler*' , -'QXmlInputSource&' => 'qt_QXmlInputSource*' , -'QXmlInputSource*&' => 'qt_QXmlInputSource*', -'QXmlInputSource*' => 'qt_QXmlInputSource*' , -'QXmlLexicalHandler*' => 'qt_QXmlLexicalHandler*' , -'QXmlLocator*' => 'qt_QXmlLocator*' , -'QXmlNamespaceSupport*' => 'qt_QXmlNamespaceSupport*', -'QXmlParseException&' => 'qt_QXmlParseException*' , -'QXmlParseException*' => 'qt_QXmlParseException*', -'QXmlReader*' => 'qt_QXmlReader*', -'QXmlSimpleReader*' => 'qt_QXmlSimpleReader*' , -'QXtApplication*' => 'qt_QXtApplication*', -'QXtWidget*' => 'qt_QXtWidget*', +'TQAccel*' => 'qt_QAccel*', +'TQAccessible*' => 'qt_QAccessible*', +'TQAccessibleFactoryInterface*' => 'qt_QAccessibleFactoryInterface*', +'TQAccessibleInterface*' => 'qt_QAccessibleInterface*', +'TQAccessibleInterface**' => 'qt_QAccessibleInterface**', +'TQAccessibleObject*' => 'qt_QAccessibleObject*', +'TQAction*' => 'qt_QAction*' , +'TQActionGroup*' => 'qt_QActionGroup*', +'TQApplication*' => 'qt_QApplication*' , +'TQArabicCodec*' => 'qt_QArabicCodec*', +'TQArray*' => 'qt_QArray*', +'TQAsciiBucket*' => 'qt_QAsciiBucket*', +'TQAsciiCache*' => 'qt_QAsciiCache*', +'TQAsciiCacheIterator*' => 'qt_QAsciiCacheIterator*', +'TQAsciiDict*' => 'qt_QAsciiDict*', +'TQAsciiDictIterator*' => 'qt_QAsciiDictIterator*', +'TQAsyncIO*' => 'qt_QAsyncIO*', +'TQAuBucket*' => 'qt_QAuBucket*' , +'TQAuServer*' => 'qt_QAuServer*', +'TQBaseBucket*' => 'qt_QBaseBucket*' , +'TQBig5Codec*' => 'qt_QBig5Codec*', +'TQBitArray&' => 'qt_QBitArray*' , +'TQBitArray' => 'qt_QBitArray*' , +'TQBitArray*' => 'qt_QBitArray*' , +'TQBitVal&' => 'qt_QBitVal*' , +'TQBitVal' => 'qt_QBitVal*' , +'TQBitVal*' => 'qt_QBitVal*', +'TQBitmap&' => 'qt_QBitmap*', +'TQBitmap' => 'qt_QBitmap*', +'TQBitmap*' => 'qt_QBitmap*', +'TQBoxLayout*' => 'qt_QBoxLayout*', +'TQBrush&' => 'qt_QBrush*', +'TQBrush' => 'qt_QBrush*' , +'TQBrush*' => 'qt_QBrush*' , +'TQBrushData*' => 'qt_QBrushData*', +'TQBuffer*' => 'qt_QBuffer*', +'TQButton*' => 'qt_QButton*', +'TQButtonGroup*' => 'qt_QButtonGroup*' , +'TQByteArray& arr ()' => 'qt_QByteArray*', +'TQByteArray&' => 'qt_QByteArray*' , +'TQByteArray' => 'qt_QByteArray*', +'TQByteArray*' => 'qt_QByteArray*', +'TQCDEStyle*' => 'qt_QCDEStyle*', +'TQCOORD&' => 'short', +'TQCOORD' => 'short', +'TQCOORD*' => 'short*', +'TQCString&' => 'qt_QCString*' , +'TQCString' => 'qt_QCString*' , +'TQCString*' => 'qt_QCString*' , +'TQCStringLess*' => 'qt_QCStringLess*' , +'TQCStringList' => 'kde_QCStringList*' , +'TQCache*' => 'qt_QCache*', +'TQCacheIterator*' => 'qt_QCacheIterator*', +'TQCanvas*' => 'qt_QCanvas*' , +'TQCanvasEllipse*' => 'qt_QCanvasEllipse*', +'TQCanvasItem*' => 'qt_QCanvasItem*' , +'TQCanvasItemList' => 'qt_QCanvasItemList*' , +'TQCanvasItemList*' => 'qt_QCanvasItemList*', +'TQCanvasLine*' => 'qt_QCanvasLine*', +'TQCanvasPixmap*' => 'qt_QCanvasPixmap*' , +'TQCanvasPixmapArray*' => 'qt_QCanvasPixmapArray*' , +'TQCanvasPolygon*' => 'qt_QCanvasPolygon*', +'TQCanvasPolygonalItem*' => 'qt_QCanvasPolygonalItem*', +'TQCanvasRectangle*' => 'qt_QCanvasRectangle*', +'TQCanvasSpline*' => 'qt_QCanvasSpline*', +'TQCanvasSprite*' => 'qt_QCanvasSprite*', +'TQCanvasText*' => 'qt_QCanvasText*', +'TQCanvasView*' => 'qt_QCanvasView*' , +'TQChain*' => 'qt_QChain*' , +'TQChar::Category' => 'int' , +'TQChar::Decomposition' => 'int' , +'TQChar::Direction' => 'int' , +'TQChar::Joining' => 'int' , +'TQCharRef&' => 'qt_QCharRef*' , +'TQCharRef' => 'qt_QCharRef*' , +'TQCharRef*' => 'qt_QCharRef*', +'TQCheckBox*' => 'qt_QCheckBox*', +'TQCheckListItem*' => 'qt_QCheckListItem*', +'TQCheckTableItem*' => 'qt_QCheckTableItem*', +'TQChildEvent*' => 'qt_QChildEvent*' , +'TQClassInfo*' => 'qt_QClassInfo*' , +'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' , +'TQColor&linkColor::blue' => 'int' , +'TQColor' => 'qt_QColor*', +'TQColor*' => 'qt_QColor*' , +'TQColorDialog*' => 'qt_QColorDialog*', +'TQColorDrag*' => 'qt_QColorDrag*', +'TQColorGroup&' => 'qt_QColorGroup*', +'TQColorGroup' => 'qt_QColorGroup*' , +'TQColorGroup*' => 'qt_QColorGroup*' , +'TQColorGroup::ColorRole' => 'int' , +'TQComboBox*' => 'qt_QComboBox*' , +'TQComboBox::Policy' => 'int' , +'TQComboBox::Policypolicy::AtBottom' => 'int' , +'TQComboTableItem*' => 'qt_QComboTableItem*', +'TQCommonStyle*' => 'qt_QCommonStyle*', +'TQCompactStyle*' => 'qt_QCompactStyle*', +'TQComponentFactory*' => 'qt_QComponentFactory*', +'TQComponentFactoryInterface*' => 'qt_QComponentFactoryInterface*', +'TQComponentInterface*' => 'qt_QComponentInterface*', +'TQComponentRegistration*' => 'qt_QComponentRegistration*', +'TQComponentServerInterface*' => 'qt_QComponentServerInterface*', +'TQConfigDB*' => 'qt_QConfigDB*' , +'TQConfigDB*' => 'qt_QConfigDB*' , +'TQConnection*' => 'qt_QConnection*', +'TQConnectionList&' => 'qt_QConnectionList*' , +'TQConnectionList*' => 'qt_QConnectionList*' , +'TQConnectionListIt&' => 'qt_QConnectionListIt*' , +'TQConnectionListIt*' => 'qt_QConnectionListIt*', +'TQConstString' => 'qt_QConstString*', +'TQConstString*' => 'qt_QConstString*', +'TQContextMenuEvent*' => 'qt_QContextMenuEvent*', +'TQCursor&' => 'qt_QCursor*', +'TQCursor' => 'qt_QCursor*' , +'TQCursor*' => 'qt_QCursor*', +'TQCustomEvent*' => 'qt_QCustomEvent*' , +'TQCustomMenuItem*' => 'qt_QCustomMenuItem*' , +'TQDOM_NodeListPrivate*' => 'void*' , +'TQDOM_NodePrivate*' => 'void*' , +'TQDataBrowser*' => 'qt_QDataBrowser*', +'TQDataPump*' => 'qt_QDataPump*', +'TQDataSink*' => 'qt_QDataSink*' , +'TQDataSource*' => 'qt_QDataSource*' , +'TQDataStream&' => 'qt_QDataStream*', +'TQDataStream*' => 'qt_QDataStream*' , +'TQDataTable*' => 'qt_QDataTable*', +'TQDataView*' => 'qt_QDataView*', +'TQDate &' => 'qt_QDate*', +'TQDate date()' => 'qt_QDate*', +'TQDate&' => 'qt_QDate*', +'TQDate' => 'qt_QDate*', +'TQDate*' => 'qt_QDate*', +'TQDateEdit*' => 'qt_QDateEdit*', +'TQDateTime&' => 'qt_QDateTime*', +'TQDateTime' => 'qt_QDateTime*', +'TQDateTime*' => 'qt_QDateTime*' , +'TQDateTimeEdit*' => 'qt_QDateTimeEdit*', +'TQDateTimeEditBase*' => 'qt_QDateTimeEditBase*', +'TQDesktopWidget*' => 'qt_QDesktopWidget*', +'TQDial*' => 'qt_QDial*', +'TQDialog*' => 'qt_QDialog*', +'TQDict*' => 'qt_QDict*', +'TQDictIterator*' => 'qt_QDictIterator*', +'TQDir&' => 'qt_QDir*', +'TQDir' => 'qt_QDir*', +'TQDir*' => 'qt_QDir*', +'TQDir::SortSpec&' => 'int' , +'TQDir::SortSpec' => 'int' , +'TQDirSortItem*' => 'qt_QDirSortItem*', +'TQDiskFont*' => 'qt_QDiskFont*', +'TQDispatchInterface*' => 'qt_QDispatchInterface*', +'TQDns*' => 'qt_QDns*', +'TQDnsSocket*' => 'qt_QDnsSocket*', +'TQDockArea*' => 'qt_QDockArea*', +'TQDockAreaLayout*' => 'qt_QDockAreaLayout*', +'TQDockWindow*' => 'qt_QDockWindow*', +'TQDomAttr&' => 'qt_QDomAttr*' , +'TQDomAttr' => 'qt_QDomAttr*' , +'TQDomAttr*' => 'qt_QDomAttr*', +'TQDomCDATASection&' => 'qt_QDomCDATASection*' , +'TQDomCDATASection' => 'qt_QDomCDATASection*' , +'TQDomCDATASection*' => 'qt_QDomCDATASection*', +'TQDomCharacterData&' => 'qt_QDomCharacterData*' , +'TQDomCharacterData' => 'qt_QDomCharacterData*' , +'TQDomCharacterData*' => 'qt_QDomCharacterData*', +'TQDomComment&' => 'qt_QDomComment*' , +'TQDomComment' => 'qt_QDomComment*' , +'TQDomComment*' => 'qt_QDomComment*', +'TQDomDocument&' => 'qt_QDomDocument*' , +'TQDomDocument' => 'qt_QDomDocument*' , +'TQDomDocument*' => 'qt_QDomDocument*', +'TQDomDocumentFragment&' => 'qt_QDomDocumentFragment*' , +'TQDomDocumentFragment' => 'qt_QDomDocumentFragment*' , +'TQDomDocumentFragment*' => 'qt_QDomDocumentFragment*', +'TQDomDocumentType&' => 'qt_QDomDocumentType*' , +'TQDomDocumentType' => 'qt_QDomDocumentType*' , +'TQDomDocumentType*' => 'qt_QDomDocumentType*', +'TQDomElement&' => 'qt_QDomElement*' , +'TQDomElement' => 'qt_QDomElement*' , +'TQDomElement*' => 'qt_QDomElement*', +'TQDomEntity&' => 'qt_QDomEntity*' , +'TQDomEntity' => 'qt_QDomEntity*' , +'TQDomEntity*' => 'qt_QDomEntity*', +'TQDomEntityReference&' => 'qt_QDomEntityReference*' , +'TQDomEntityReference' => 'qt_QDomEntityReference*' , +'TQDomEntityReference*' => 'qt_QDomEntityReference*', +'TQDomImplementation&' => 'qt_QDomImplementation*' , +'TQDomImplementation' => 'qt_QDomImplementation*' , +'TQDomImplementation*' => 'qt_QDomImplementation*', +'TQDomNamedNodeMap&' => 'qt_QDomNamedNodeMap*' , +'TQDomNamedNodeMap' => 'qt_QDomNamedNodeMap*' , +'TQDomNamedNodeMap*' => 'qt_QDomNamedNodeMap*', +'TQDomNode&' => 'qt_QDomNode*' , +'TQDomNode' => 'qt_QDomNode*' , +'TQDomNode*' => 'qt_QDomNode*', +'TQDomNode::NodeType' => 'int', +'TQDomNodeList&' => 'qt_QDomNodeList*' , +'TQDomNodeList' => 'qt_QDomNodeList*' , +'TQDomNodeList*' => 'qt_QDomNodeList*', +'TQDomNodePrivate*' => 'qt_QDomNodePrivate*', +'TQDomNotation&' => 'qt_QDomNotation*' , +'TQDomNotation' => 'qt_QDomNotation*' , +'TQDomNotation*' => 'qt_QDomNotation*', +'TQDomProcessingInstruction&' => 'qt_QDomProcessingInstruction*' , +'TQDomProcessingInstruction' => 'qt_QDomProcessingInstruction*' , +'TQDomProcessingInstruction*' => 'qt_QDomProcessingInstruction*', +'TQDomText&' => 'qt_QDomText*' , +'TQDomText' => 'qt_QDomText*' , +'TQDomText*' => 'qt_QDomText*', +'TQDoubleValidator*' => 'qt_QDoubleValidator*', +'TQDragEnterEvent*' => 'qt_QDragEnterEvent*' , +'TQDragLeaveEvent*' => 'qt_QDragLeaveEvent*' , +'TQDragManager*' => 'qt_QDragManager*', +'TQDragMoveEvent*' => 'qt_QDragMoveEvent*' , +'TQDragObject*' => 'qt_QDragObject*' , +'TQDragResponseEvent*' => 'qt_QDragResponseEvent*', +'TQDropEvent*' => 'qt_QDropEvent*' , +'TQDropSite*' => 'qt_QDropSite*', +'TQEditorFactory*' => 'qt_QEditorFactory*', +'TQErrorMessage*' => 'qt_QErrorMessage*', +'TQEucJpCodec*' => 'qt_QEucJpCodec*', +'TQEucKrCodec*' => 'qt_QEucKrCodec*', +'TQEvent*' => 'qt_QEvent*', +'TQEventLoop::ProcessEventsFlags' => 'uint', +'TQFeatureListInterface*' => 'qt_QFeatureListInterface*', +'TQFile&' => 'qt_QFile*', +'TQFile*' => 'qt_QFile*' , +'TQFileDialog*' => 'qt_QFileDialog*', +'TQFileIconProvider*' => 'qt_QFileIconProvider*' , +'TQFileInfo&' => 'qt_QFileInfo*', +'TQFileInfo*' => 'qt_QFileInfo*', +'TQFileInfoList*' => 'qt_QFileInfoList*' , +'TQFilePreview*' => 'qt_QFilePreview*' , +'TQFocusData*' => 'qt_QFocusData*' , +'TQFocusEvent*' => 'qt_QFocusEvent*' , +'TQFont&' => 'qt_QFont*', +'TQFont' => 'qt_QFont*', +'TQFont*' => 'qt_QFont*', +'TQFont::CharSet' => 'int', +'TQFont::CharSetcharset::Unicode' => 'int' , +'TQFont::StyleHint' => 'int', +'TQFontData&' => 'qt_QFontData*' , +'TQFontDatabase*' => 'qt_QFontDatabase*', +'TQFontDialog*' => 'qt_QFontDialog*', +'TQFontInfo&' => 'qt_QFontInfo*', +'TQFontInfo' => 'qt_QFontInfo*', +'TQFontInfo*' => 'qt_QFontInfo*', +'TQFontMetrics&' => 'qt_QFontMetrics*', +'TQFontMetrics' => 'qt_QFontMetrics*', +'TQFontMetrics*' => 'qt_QFontMetrics*', +'TQFrame*' => 'qt_QFrame*' , +'TQFtp*' => 'qt_QFtp*', +'TQGArray&' => 'qt_QGArray*' , +'TQGArray*' => 'qt_QGArray*', +'TQGCache&' => 'qt_QGCache*' , +'TQGCache*' => 'qt_QGCache*', +'TQGCacheIterator&' => 'qt_QGCacheIterator*' , +'TQGCacheIterator*' => 'qt_QGCacheIterator*', +'TQGDict&' => 'qt_QGDict*' , +'TQGDict*' => 'qt_QGDict*', +'TQGDictIterator&' => 'qt_QGDictIterator*' , +'TQGDictIterator*' => 'qt_QGDictIterator*', +'TQGL*' => 'qt_QGL*', +'TQGLColormap&' => 'qt_QGLColormap*', +'TQGLColormap*' => 'qt_QGLColormap*', +'TQGLContext*' => 'qt_QGLContext*' , +'TQGLFormat&' => 'qt_QGLFormat*' , +'TQGLFormat' => 'qt_QGLFormat*' , +'TQGLFormat*' => 'qt_QGLFormat*', +'TQGLWidget*' => 'qt_QGLWidget*' , +'TQGLayoutIterator*' => 'qt_QGLayoutIterator*' , +'TQGListIterator&' => 'qt_QGListIterator*' , +'TQGListIterator*' => 'qt_QGListIterator*', +'TQGPlugin*' => 'qt_QGPlugin*', +'TQGPluginManager*' => 'qt_QGPluginManager*', +'TQGbkCodec*' => 'qt_QGbkCodec*', +'TQGfx*' => 'qt_QGfx*' , +'TQGrid*' => 'qt_QGrid*' , +'TQGrid::Direction' => 'int' , +'TQGridLayout*' => 'qt_QGridLayout*', +'TQGridView*' => 'qt_QGridView*', +'TQGroupBox*' => 'qt_QGroupBox*', +'TQGuardedPtr*' => 'qt_QGuardedPtr*', +'TQGuardedPtrPrivate*' => 'qt_QGuardedPtrPrivate*', +'TQHBox*' => 'qt_QHBox*' , +'TQHBoxLayout*' => 'qt_QHBoxLayout*' , +'TQHButtonGroup*' => 'qt_QHButtonGroup*', +'TQHGroupBox*' => 'qt_QHGroupBox*', +'TQHeader*' => 'qt_QHeader*', +'TQHebrewCodec*' => 'qt_QHebrewCodec*', +'TQHideEvent*' => 'qt_QHideEvent*' , +'TQHostAddress&' => 'qt_QHostAddress*' , +'TQHostAddress' => 'qt_QHostAddress*' , +'TQHostAddress*' => 'qt_QHostAddress*' , +'TQHttp*' => 'qt_QHttp*', +'TQIMEvent*' => 'qt_QIMEvent*', +'TQIODevice*' => 'qt_QIODevice*', +'TQIODevice::Offset' => 'int', +'TQIODeviceSource*' => 'qt_QIODeviceSource*', +'TQIOManager*' => 'qt_QIOManager*', +'TQIOWatch*' => 'qt_QIOWatch*', +'TQIconDrag*' => 'qt_QIconDrag*', +'TQIconDragItem&' => 'qt_QIconDragItem*' , +'TQIconDragItem*' => 'qt_QIconDragItem*', +'TQIconSet&' => 'qt_QIconSet*' , +'TQIconSet' => 'qt_QIconSet*' , +'TQIconSet*' => 'qt_QIconSet*' , +'TQIconView*' => 'qt_QIconView*' , +'TQIconViewItem*' => 'qt_QIconViewItem*' , +'TQImage&' => 'qt_QImage*', +'TQImage' => 'qt_QImage*', +'TQImage*' => 'qt_QImage*' , +'TQImageConsumer*' => 'qt_QImageConsumer*' , +'TQImageData*' => 'qt_QImageData*', +'TQImageDecoder*' => 'qt_QImageDecoder*', +'TQImageDrag*' => 'qt_QImageDrag*', +'TQImageFormat*' => 'qt_QImageFormat*' , +'TQImageFormatInterface*' => 'qt_QImageFormatInterface*', +'TQImageFormatPlugin*' => 'qt_QImageFormatPlugin*', +'TQImageFormatType*' => 'qt_QImageFormatType*' , +'TQImageIO*' => 'qt_QImageIO*', +'TQImageTextKeyLang&' => 'qt_QImageTextKeyLang*' , +'TQImageTextKeyLang*' => 'qt_QImageTextKeyLang*', +'TQInputDialog*' => 'qt_QInputDialog*', +'TQIntBucket*' => 'qt_QIntBucket*', +'TQIntCache*' => 'qt_QIntCache*', +'TQIntCacheIterator*' => 'qt_QIntCacheIterator*', +'TQIntDict*' => 'qt_QIntDict*', +'TQIntDictIterator*' => 'qt_QIntDictIterator*', +'TQIntValidator*' => 'qt_QIntValidator*', +'TQInterfaceListInterface*' => 'qt_QInterfaceListInterface*', +'TQInterfacePtr*' => 'qt_QInterfacePtr*', +'TQInterlaceStyle*' => 'qt_QInterlaceStyle*', +'TQInternal*' => 'qt_QInternal*', +'TQJisCodec*' => 'qt_QJisCodec*', +'TQJpUnicodeConv*' => 'qt_QJpUnicodeConv*' , +'TQKeyEvent*' => 'qt_QKeyEvent*' , +'TQKeySequence&' => 'qt_QKeySequence*', +'TQKeySequence' => 'qt_QKeySequence*', +'TQKeySequence*' => 'qt_QKeySequence*', +'TQKoi8Codec*' => 'qt_QKoi8Codec*', +'TQLCDNumber*' => 'qt_QLCDNumber*', +'TQLNode*' => 'qt_QLNode*' , +'TQLabel*' => 'qt_QLabel*', +'TQLayout*' => 'qt_QLayout*', +'TQLayoutItem*' => 'qt_QLayoutItem*' , +'TQLayoutIterator&' => 'qt_QLayoutIterator*' , +'TQLayoutIterator' => 'qt_QLayoutIterator*' , +'TQLayoutIterator*' => 'qt_QLayoutIterator*', +'TQLibrary*' => 'qt_QLibrary*', +'TQLibrary::Policy' => 'int', +'TQLibraryInterface*' => 'qt_QLibraryInterface*', +'TQLineEdit*' => 'qt_QLineEdit*' , +'TQLineEdit::EchoMode' => 'int' , +'TQList*' => 'qt_QList*', +'TQListBox*' => 'qt_QListBox*', +'TQListBoxItem*' => 'qt_QListBoxItem*', +'TQListBoxPixmap*' => 'qt_QListBoxPixmap*', +'TQListBoxText*' => 'qt_QListBoxText*', +'TQListIterator*' => 'qt_QListIterator*', +'TQListView*' => 'qt_QListView*', +'TQListViewItem*&' => 'qt_QListViewItem*', +'TQListViewItem*' => 'qt_QListViewItem*', +'TQListViewItemIterator&' => 'qt_QListViewItemIterator*' , +'TQListViewItemIterator' => 'qt_QListViewItemIterator*' , +'TQListViewItemIterator*' => 'qt_QListViewItemIterator*', +'TQLocalFs*' => 'qt_QLocalFs*', +'TQMCPI*' => 'qt_QMCPI*', +'TQMainWindow*' => 'qt_QMainWindow*' , +'TQMainWindow::ToolBarDock' => 'int', +'TQMainWindow::ToolBarDock::Top' => 'int' , +'TQMap&' => 'qt_QMap*' , +'TQMap*' => 'qt_QMap*', +'TQMapConstIterator*' => 'qt_QMapConstIterator*', +'TQMapIterator*' => 'qt_QMapIterator*', +'TQMapNode*' => 'qt_QMapNode*', +'TQMapNodeBase*&' => 'qt_QMapNodeBase*' , +'TQMapNodeBase*' => 'qt_QMapNodeBase*' , +'TQMapPrivate*' => 'qt_QMapPrivate*', +'TQMapPrivateBase*' => 'qt_QMapPrivateBase*' , +'TQMemArray*' => 'qt_QMemArray*', +'TQMember' => 'qt_QMember*' , +'TQMember*' => 'qt_QMember*' , +'TQMenuBar*' => 'qt_QMenuBar*', +'TQMenuData*' => 'qt_QMenuData*', +'TQMenuItem*' => 'qt_QMenuItem*', +'TQMessageBox*' => 'qt_QMessageBox*', +'TQMetaData*' => 'qt_QMetaData*' , +'TQMetaData::Access*' => 'int*' , +'TQMetaEnum*' => 'qt_QMetaEnum*' , +'TQMetaEnum::Item*' => 'int*' , +'TQMetaObject*&' => 'qt_QMetaObject*', +'TQMetaObject*' => 'qt_QMetaObject*', +'TQMetaObjectCleanUp*' => 'qt_QMetaObjectCleanUp*', +'TQMetaObjectInit*' => 'qt_QMetaObjectInit*', +'TQMetaProperty*' => 'qt_QMetaProperty*' , +'TQMimeSource*' => 'qt_QMimeSource*' , +'TQMimeSourceFactory*' => 'qt_QMimeSourceFactory*' , +'TQMotifPlusStyle*' => 'qt_QMotifPlusStyle*', +'TQMotifStyle*' => 'qt_QMotifStyle*', +'TQMouseEvent*' => 'qt_QMouseEvent*' , +'TQMoveEvent*' => 'qt_QMoveEvent*' , +'TQMovie&' => 'qt_QMovie*', +'TQMovie*' => 'qt_QMovie*', +'TQMultiLineEdit*' => 'qt_QMultiLineEdit*', +'TQMultiLineEditRow*' => 'qt_QMultiLineEditRow*', +'TQMutex*' => 'qt_QMutex*', +'TQNPInstance*' => 'qt_QNPInstance*', +'TQNPStream*' => 'qt_QNPStream*', +'TQNPWidget*' => 'qt_QNPWidget*', +'TQNPlugin*' => 'qt_QNPlugin*', +'TQNetworkOperation*' => 'qt_QNetworkOperation*' , +'TQNetworkProtocol*' => 'qt_QNetworkProtocol*' , +'TQNetworkProtocol::Operation' => 'int' , +'TQNetworkProtocol::State' => 'int' , +'TQNetworkProtocolFactory*' => 'qt_QNetworkProtocolFactory*', +'TQNetworkProtocolFactoryBase*' => 'qt_QNetworkProtocolFactoryBase*' , +'TQObject*' => 'qt_QObject*', +'TQObjectCleanupHandler*' => 'qt_QObjectCleanupHandler*', +'TQObjectDictionary&' => 'qt_QObjectDictionary*' , +'TQObjectDictionary*' => 'qt_QObjectDictionary*', +'TQObjectInterface*' => 'qt_QObjectInterface*', +'TQObjectList&' => 'qt_QObjectList*' , +'TQObjectList*' => 'qt_QObjectList*', +'TQObjectListIt&' => 'qt_QObjectListIt*' , +'TQObjectListIt*' => 'qt_QObjectListIt*', +'TQPNGImagePacker*' => 'qt_QPNGImagePacker*', +'TQPNGImageWriter*' => 'qt_QPNGImageWriter*', +'TQPaintDevice*' => 'qt_QPaintDevice*', +'TQPaintDeviceMetrics*' => 'qt_QPaintDeviceMetrics*', +'TQPaintDeviceX11Data*' => 'qt_QPaintDeviceX11Data*' , +'TQPaintEvent*' => 'qt_QPaintEvent*' , +'TQPainter&' => 'qt_QPainter*' , +'TQPainter*' => 'qt_QPainter*', +'TQPair*' => 'qt_QPair*', +'TQPalData*' => 'qt_QPalData*', +'TQPalette&' => 'qt_QPalette*', +'TQPalette' => 'qt_QPalette*', +'TQPalette*' => 'qt_QPalette*', +'TQPen&' => 'qt_QPen*', +'TQPen' => 'qt_QPen*' , +'TQPen*' => 'qt_QPen*', +'TQPenData*' => 'qt_QPenData*', +'TQPicture&' => 'qt_QPicture*', +'TQPicture' => 'qt_QPicture*', +'TQPicture*' => 'qt_QPicture*', +'TQPicturePrivate*' => 'qt_QPicturePrivate*', +'TQPixmap& pixmap()' => 'kde_QPixmap*', +'TQPixmap&' => 'qt_QPixmap*', +'TQPixmap' => 'qt_QPixmap*', +'TQPixmap*' => 'qt_QPixmap*', +'TQPixmap::Optimization' => 'int' , +'TQPixmap::Optimization' => 'int', +'TQPixmap::Optimization::DefaultOptim' => 'int' , +'TQPixmapCache*' => 'qt_QPixmapCache*', +'TQPixmapData*' => 'qt_QPixmapData*', +'TQPlatinumStyle*' => 'qt_QPlatinumStyle*', +'TQPluginManager*' => 'qt_QPluginManager*', +'TQPoint&' => 'qt_QPoint*', +'TQPoint&pos()' => 'int' , +'TQPoint&pos::pos()' => 'int' , +'TQPoint' => 'qt_QPoint*', +'TQPoint*' => 'qt_QPoint*' , +'TQPointArray&' => 'qt_QPointArray*', +'TQPointArray' => 'qt_QPointArray*', +'TQPointArray*' => 'qt_QPointArray*', +'TQPointVal&' => 'qt_QPointVal*' , +'TQPointVal' => 'qt_QPointVal*' , +'TQPolygonScanner*' => 'qt_QPolygonScanner*', +'TQPopupMenu*' => 'qt_QPopupMenu*', +'TQPrintDialog*' => 'qt_QPrintDialog*', +'TQPrinter*' => 'qt_QPrinter*' , +'TQPrinter::PrinterMode' => 'int', +'TQProcess*' => 'qt_QProcess*', +'TQProgressBar*' => 'qt_QProgressBar*', +'TQProgressDialog*' => 'qt_QProgressDialog*', +'TQPtrBucket*' => 'qt_QPtrBucket*', +'TQPtrCollection&' => 'qt_QPtrCollection*', +'TQPtrCollection*' => 'qt_QPtrCollection*', +'TQPtrDict*' => 'qt_QPtrDict*', +'TQPtrDictIterator*' => 'qt_QPtrDictIterator*', +'TQPtrList*' => 'qt_QPtrList*', +'TQPtrListIterator*' => 'qt_QPtrListIterator*', +'TQPtrQueue*' => 'qt_QPtrQueue*', +'TQPtrStack*' => 'qt_QPtrStack*', +'TQPtrVector*' => 'qt_QPtrVector*', +'TQPushButton*' => 'qt_QPushButton*', +'TQQueue*' => 'qt_QQueue*', +'TQRESULT' => 'long', +'TQRadioButton*' => 'qt_QRadioButton*', +'TQRangeControl*' => 'qt_QRangeControl*', +'TQRect&' => 'qt_QRect*', +'TQRect' => 'qt_QRect*', +'TQRect*' => 'qt_QRect*', +'TQRegExp&' => 'qt_QRegExp*', +'TQRegExp*' => 'qt_QRegExp*', +'TQRegExpValidator*' => 'qt_QRegExpValidator*', +'TQRegion&' => 'qt_QRegion*', +'TQRegion' => 'qt_QRegion*', +'TQRegion*' => 'qt_QRegion*', +'TQRegionData*' => 'qt_QRegionData*', +'TQRemoteFactory*' => 'qt_QRemoteFactory*', +'TQRemotePlugin*' => 'qt_QRemotePlugin*', +'TQResizeEvent*' => 'qt_QResizeEvent*' , +'TQRgb' => 'unsigned int', +'TQRgb*' => 'int*', +'TQRichText&' => 'qt_QRichText*' , +'TQSGIStyle*' => 'qt_QSGIStyle*', +'TQScrollBar&' => 'qt_QScrollBar*' , +'TQScrollBar*' => 'qt_QScrollBar*' , +'TQScrollView*' => 'qt_QScrollView*', +'TQSemaphore*' => 'qt_QSemaphore*', +'TQSemiModal*' => 'qt_QSemiModal*', +'TQSenderObject*' => 'qt_QSenderObject*', +'TQServerSocket*' => 'qt_QServerSocket*', +'TQSessionManager&' => 'qt_QSessionManager*' , +'TQSessionManager*' => 'qt_QSessionManager*', +'TQSettings*' => 'qt_QSettings*', +'TQShared*' => 'qt_QShared*', +'TQShowEvent*' => 'qt_QShowEvent*' , +'TQSignal*' => 'qt_QSignal*', +'TQSignalDict&' => 'qt_QSignalDict*' , +'TQSignalDict*' => 'qt_QSignalDict*', +'TQSignalDictIt&' => 'qt_QSignalDictIt*' , +'TQSignalDictIt*' => 'qt_QSignalDictIt*', +'TQSignalMapper*' => 'qt_QSignalMapper*', +'TQSignalVec&' => 'qt_QSignalVec*', +'TQSignalVec*' => 'qt_QSignalVec*', +'TQSimpleRichText*' => 'qt_QSimpleRichText*', +'TQSize&' => 'qt_QSize*', +'TQSize' => 'qt_QSize*', +'TQSize*' => 'qt_QSize*' , +'TQSizeGrip*' => 'qt_QSizeGrip*', +'TQSizePolicy&' => 'qt_QSizePolicy*' , +'TQSizePolicy' => 'qt_QSizePolicy*' , +'TQSizePolicy*' => 'qt_QSizePolicy*', +'TQSizePolicy::ExpandData' => 'int' , +'TQSizePolicy::SizeTypehData::Minimum' => 'int' , +'TQSizePolicy::SizeTypevData::Minimum' => 'int' , +'TQSjisCodec*' => 'qt_QSjisCodec*', +'TQSlider*' => 'qt_QSlider*', +'TQSmartPtr&' => 'qt_QSmartPtr*' , +'TQSmartPtr*' => 'qt_QSmartPtr*', +'TQSmartPtrPrivate*' => 'qt_QSmartPtrPrivate*', +'TQSocket*' => 'qt_QSocket*', +'TQSocketDevice*' => 'qt_QSocketDevice*' , +'TQSocketNotifier*' => 'qt_QSocketNotifier*', +'TQSocketNotifier::Type' => 'int', +'TQSortedList*' => 'qt_QSortedList*', +'TQSound*' => 'qt_QSound*', +'TQSpacerItem*' => 'qt_QSpacerItem*' , +'TQSpinBox*' => 'qt_QSpinBox*', +'TQSpinWidget*' => 'qt_QSpinWidget*', +'TQSplitter*' => 'qt_QSplitter*', +'TQSql*' => 'qt_QSql*', +'TQSql::Confirm' => 'int', +'TQSql::Op' => 'int', +'TQSqlCursor&' => 'qt_QSqlCursor*', +'TQSqlCursor' => 'qt_QSqlCursor*', +'TQSqlCursor*' => 'qt_QSqlCursor*', +'TQSqlDatabase*' => 'qt_QSqlDatabase*', +'TQSqlDriver*' => 'qt_QSqlDriver*', +'TQSqlDriverCreator*' => 'qt_QSqlDriverCreator*', +'TQSqlDriverCreatorBase*' => 'qt_QSqlDriverCreatorBase*', +'TQSqlDriverFactoryInterface*' => 'qt_QSqlDriverFactoryInterface*', +'TQSqlDriverPlugin*' => 'qt_QSqlDriverPlugin*', +'TQSqlEditorFactory*' => 'qt_QSqlEditorFactory*', +'TQSqlError&' => 'qt_QSqlError*', +'TQSqlError' => 'qt_QSqlError*', +'TQSqlError*' => 'qt_QSqlError*', +'TQSqlField&' => 'qt_QSqlField*', +'TQSqlField' => 'qt_QSqlField*', +'TQSqlField*' => 'qt_QSqlField*', +'TQSqlFieldInfo&' => 'qt_QSqlFieldInfo*', +'TQSqlFieldInfo*' => 'qt_QSqlFieldInfo*', +'TQSqlForm' => 'qt_QSqlForm*', +'TQSqlForm*' => 'qt_QSqlForm*', +'TQSqlIndex&' => 'qt_QSqlIndex*', +'TQSqlIndex' => 'qt_QSqlIndex*', +'TQSqlIndex*' => 'qt_QSqlIndex*', +'TQSqlPropertyMap*' => 'qt_QSqlPropertyMap*', +'TQSqlQuery&' => 'qt_QSqlQuery*', +'TQSqlQuery' => 'qt_QSqlQuery*', +'TQSqlQuery*' => 'qt_QSqlQuery*', +'TQSqlRecord&' => 'qt_QSqlRecord*', +'TQSqlRecord' => 'qt_QSqlRecord*', +'TQSqlRecord*' => 'qt_QSqlRecord*', +'TQSqlRecordInfo&' => 'qt_QSqlRecordInfo*', +'TQSqlRecordInfo' => 'qt_QSqlRecordInfo*', +'TQSqlRecordInfo*' => 'qt_QSqlRecordInfo*', +'TQSqlRecordPrivate*' => 'qt_QSqlRecordPrivate*', +'TQSqlRecordShared*' => 'qt_QSqlRecordShared*', +'TQSqlResult' => 'qt_QSqlResult*', +'TQSqlResult*' => 'qt_QSqlResult*', +'TQSqlResultShared*' => 'qt_QSqlResultShared*', +'TQStack*' => 'qt_QStack*', +'TQStatusBar*' => 'qt_QStatusBar*' , +'TQStoredDrag*' => 'qt_QStoredDrag*', +'TQStrIList' => 'kde_QStrIList', +'TQStrIList*' => 'qt_QStrIList*', +'TQStrIVec*' => 'qt_QStrIVec*', +'TQStrList&' => 'qt_QStrList*', +'TQStrList' => 'qt_QStrList*', +'TQStrList*' => 'qt_QStrList*', +'TQStrListIterator*' => 'qt_QStrListIterator*', +'TQStrVec*' => 'qt_QStrVec*', +'TQString&' => 'qt_QString*', +'TQString&::null' => 'qt_QString*' , +'TQString&button0Text::null' => 'qt_QString*' , +'TQString&button1Text::null' => 'qt_QString*' , +'TQString&button2Text::null' => 'qt_QString*' , +'TQString&buttonText::null' => 'qt_QString*' , +'TQString&caption::null' => 'qt_QString*' , +'TQString&charSet::null' => 'qt_QString*' , +'TQString&context::null' => 'qt_QString*' , +'TQString&defValue::null' => 'qt_QString*' , +'TQString&dir::null' => 'qt_QString*' , +'TQString&directory::null' => 'qt_QString*' , +'TQString&filter::null' => 'qt_QString*' , +'TQString&initially::null' => 'qt_QString*' , +'TQString&location::null' => 'qt_QString*' , +'TQString&n::null' => 'qt_QString*' , +'TQString&nameFilter::null' => 'qt_QString*' , +'TQString&noButtonText::null' => 'qt_QString*' , +'TQString&search_delimiters::null' => 'qt_QString*' , +'TQString&style::null' => 'qt_QString*' , +'TQString&suffix::null' => 'qt_QString*' , +'TQString&text::null' => 'qt_QString*' , +'TQString&text_::null' => 'qt_QString*' , +'TQString&translation::null' => 'qt_QString*' , +'TQString&yesButtonText::null' => 'qt_QString*' , +'TQString' => 'qt_QString*', +'TQString*' => 'qt_QString*' , +'TQString::null' => 'qt_QString_null()' , +'TQStringBucket*' => 'qt_QStringBucket*', +'TQStringData*' => 'qt_QStringData*', +'TQStringList&' => 'qt_QStringList*' , +'TQStringList' => 'qt_QStringList*' , +'TQStringList*' => 'qt_QStringList*' , +'TQStringcharSetName::null' => 'qt_QStringcharSetName*' , +'TQStyle&' => 'qt_QStyle*' , +'TQStyle*' => 'qt_QStyle*' , +'TQStyle::ScrollControl' => 'int' , +'TQStyle::StylePixmap' => 'int', +'TQStyle::SubControl' => 'int', +'TQStyle::SubRect' => 'int', +'TQStyleFactory*' => 'qt_QStyleFactory*', +'TQStyleFactoryInterface*' => 'qt_QStyleFactoryInterface*', +'TQStyleOption&' => 'int', +'TQStyleOption' => 'int', +'TQStyleOption*' => 'int*', +'TQStylePlugin*' => 'qt_QStylePlugin*', +'TQStyleSheet*' => 'qt_QStyleSheet*' , +'TQStyleSheetItem&' => 'qt_QStyleSheetItem*' , +'TQStyleSheetItem*' => 'qt_QStyleSheetItem*' , +'TQStyleSheetItem::DisplayMode*' => 'int', +'TQStyleSheetItem::ListStyle*' => 'int', +'TQStyleSheetItem::WhiteSpaceMode' => 'int', +'TQTSCIICodec*' => 'qt_QTSCIICodec*', +'TQTSMFI' => 'int' , +'TQTab*' => 'qt_QTab*', +'TQTabBar*' => 'qt_QTabBar*' , +'TQTabBar::Shape' => 'int' , +'TQTabDialog*' => 'qt_QTabDialog*', +'TQTabWidget*' => 'qt_QTabWidget*', +'TQTable*' => 'qt_QTable*' , +'TQTableHeader*' => 'qt_QTableHeader*', +'TQTableItem*' => 'qt_QTableItem*' , +'TQTableSelection&' => 'qt_QTableSelection*' , +'TQTableSelection' => 'qt_QTableSelection*' , +'TQTableSelection*' => 'qt_QTableSelection*', +'TQTableView*' => 'qt_QTableView*', +'TQTabletEvent*' => 'qt_QTabletEvent*', +'TQTextBrowser*' => 'qt_QTextBrowser*', +'TQTextCodec*' => 'qt_QTextCodec*' , +'TQTextCodecFactory*' => 'qt_QTextCodecFactory*', +'TQTextCodecFactoryInterface*' => 'qt_QTextCodecFactoryInterface*', +'TQTextCodecPlugin*' => 'qt_QTextCodecPlugin*', +'TQTextCursor*' => 'qt_QTextCursor*', +'TQTextDecoder*' => 'qt_QTextDecoder*' , +'TQTextDocument*' => 'qt_QTextDocument*', +'TQTextDrag*' => 'qt_QTextDrag*', +'TQTextEdit*' => 'qt_QTextEdit*', +'TQTextEncoder*' => 'qt_QTextEncoder*' , +'TQTextFormat*' => 'qt_QTextFormat*', +'TQTextIStream*' => 'qt_QTextIStream*', +'TQTextOStream&' => 'qt_QTextOStream*' , +'TQTextOStream*' => 'qt_QTextOStream*', +'TQTextOStreamIterator*' => 'qt_QTextOStreamIterator*', +'TQTextParag**' => 'qt_QTextParag**', +'TQTextStream&' => 'qt_QTextStream*' , +'TQTextStream*' => 'qt_QTextStream*' , +'TQTextView*' => 'qt_QTextView*', +'TQThread*' => 'qt_QThread*', +'TQThreadData*' => 'qt_QThreadData*', +'TQThreadEvent*' => 'qt_QThreadEvent*', +'TQTime&' => 'qt_QTime*', +'TQTime' => 'qt_QTime*', +'TQTime*' => 'qt_QTime*', +'TQTimeEdit*' => 'qt_QTimeEdit*', +'TQTimeWatch*' => 'qt_QTimeWatch*', +'TQTimer*' => 'qt_QTimer*', +'TQTimerEvent*' => 'qt_QTimerEvent*' , +'TQToolBar*' => 'qt_QToolBar*' , +'TQToolButton*' => 'qt_QToolButton*' , +'TQToolTip*' => 'qt_QToolTip*', +'TQToolTipGroup*' => 'qt_QToolTipGroup*', +'TQTranslator*' => 'qt_QTranslator*' , +'TQTranslatorMessage&' => 'qt_QTranslatorMessage*' , +'TQTranslatorMessage' => 'qt_QTranslatorMessage*' , +'TQTranslatorMessage*' => 'qt_QTranslatorMessage*', +'TQTsciiCodec*' => 'qt_QTsciiCodec*', +'TQUObject*' => 'qt_QUObject*', +'TQUnknownInterface*' => 'qt_QUnknownInterface*', +'TQUnknownInterface**' => 'qt_QUnknownInterface**', +'TQUriDrag*' => 'qt_QUriDrag*', +'TQUrl&' => 'qt_QUrl*' , +'TQUrl' => 'qt_QUrl*' , +'TQUrl*' => 'qt_QUrl*', +'TQUrlInfo&' => 'qt_QUrlInfo*' , +'TQUrlInfo' => 'qt_QUrlInfo*' , +'TQUrlInfo*' => 'qt_QUrlInfo*', +'TQUrlOperator&' => 'qt_QUrlOperator*' , +'TQUrlOperator*' => 'qt_QUrlOperator*' , +'TQUtf16Codec*' => 'qt_QUtf16Codec*', +'TQUtf8Codec*' => 'qt_QUtf8Codec*', +'TQUuid&' => 'qt_QUuid*', +'TQUuid*' => 'qt_QUuid*', +'TQVBox*' => 'qt_QVBox*' , +'TQVBoxLayout*' => 'qt_QVBoxLayout*', +'TQVButtonGroup*' => 'qt_QVButtonGroup*', +'TQVFbHeader*' => 'qt_QVFbHeader*', +'TQVFbKeyData*' => 'qt_QVFbKeyData*', +'TQVGroupBox*' => 'qt_QVGroupBox*', +'TQValidator*' => 'qt_QValidator*', +'TQValidator::State' => 'int', +'TQValueList*' => 'qt_QValueList*', +'TQValueListConstIterator*' => 'qt_QValueListConstIterator*', +'TQValueListIterator*' => 'qt_QValueListIterator*', +'TQValueListNode*' => 'qt_QValueListNode*', +'TQValueListPrivate*' => 'qt_QValueListPrivate*', +'TQValueStack*' => 'qt_QValueStack*', +'TQValueVector*' => 'qt_QValueVector*', +'TQValueVectorPrivate*' => 'qt_QValueVectorPrivate*', +'TQVariant&' => 'qt_QVariant*', +'TQVariant' => 'qt_QVariant*', +'TQVariant*' => 'qt_QVariant*', +'TQVariant::Type' => 'int' , +'TQVariantPrivate*' => 'qt_QVariantPrivate*' , +'TQVector*' => 'qt_QVector*', +'TQWMatrix&' => 'qt_QWMatrix*', +'TQWMatrix' => 'qt_QWMatrix*', +'TQWMatrix*' => 'qt_QWMatrix*', +'TQWSDecoration&' => 'qt_QWSDecoration*' , +'TQWSDecoration*' => 'qt_QWSDecoration*' , +'TQWSDisplay*' => 'qt_QWSDisplay*' , +'TQWSEvent*' => 'qt_QWSEvent*' , +'TQWaitCondition*' => 'qt_QWaitCondition*', +'TQWhatsThis*' => 'qt_QWhatsThis*', +'TQWheelEvent*' => 'qt_QWheelEvent*' , +'TQWidget*' => 'qt_QWidget*', +'TQWidget' => 'qt_QWidget*', +'TQWidget*' => 'qt_QWidget*', +'TQWidgetFactory*' => 'qt_QWidgetFactory*', +'TQWidgetIntDict&' => 'qt_QWidgetIntDict*' , +'TQWidgetIntDict*' => 'qt_QWidgetIntDict*', +'TQWidgetIntDictIt&' => 'qt_QWidgetIntDictIt*' , +'TQWidgetIntDictIt*' => 'qt_QWidgetIntDictIt*', +'TQWidgetItem*' => 'qt_QWidgetItem*', +'TQWidgetList&' => 'qt_QWidgetList*' , +'TQWidgetList&' => 'qt_QWidgetList*' , +'TQWidgetList' => 'qt_QWidgetList*' , +'TQWidgetList' => 'qt_QWidgetList*' , +'TQWidgetList*' => 'qt_QWidgetList*', +'TQWidgetList*' => 'qt_QWidgetList*', +'TQWidgetListIt&' => 'qt_QWidgetListIt*' , +'TQWidgetListIt*' => 'qt_QWidgetListIt*', +'TQWidgetMapper*' => 'qt_QWidgetMapper*', +'TQWidgetPlugin*' => 'qt_QWidgetPlugin*', +'TQWidgetStack*' => 'qt_QWidgetStack*', +'TQWindowsMime*' => 'qt_QWindowsMime*' , +'TQWindowsStyle*' => 'qt_QWindowsStyle*', +'TQWizard*' => 'qt_QWizard*', +'TQWorkspace*' => 'qt_QWorkspace*', +'TQXEmbed*' => 'qt_QXEmbed*' , +'TQXmlAttributes&' => 'qt_QXmlAttributes*' , +'TQXmlAttributes*' => 'qt_QXmlAttributes*', +'TQXmlContentHandler*' => 'qt_QXmlContentHandler*' , +'TQXmlDTDHandler*' => 'qt_QXmlDTDHandler*' , +'TQXmlDeclHandler*' => 'qt_QXmlDeclHandler*' , +'TQXmlDefaultHandler*' => 'qt_QXmlDefaultHandler*', +'TQXmlEntityResolver*' => 'qt_QXmlEntityResolver*' , +'TQXmlErrorHandler*' => 'qt_QXmlErrorHandler*' , +'TQXmlInputSource&' => 'qt_QXmlInputSource*' , +'TQXmlInputSource*&' => 'qt_QXmlInputSource*', +'TQXmlInputSource*' => 'qt_QXmlInputSource*' , +'TQXmlLexicalHandler*' => 'qt_QXmlLexicalHandler*' , +'TQXmlLocator*' => 'qt_QXmlLocator*' , +'TQXmlNamespaceSupport*' => 'qt_QXmlNamespaceSupport*', +'TQXmlParseException&' => 'qt_QXmlParseException*' , +'TQXmlParseException*' => 'qt_QXmlParseException*', +'TQXmlReader*' => 'qt_QXmlReader*', +'TQXmlSimpleReader*' => 'qt_QXmlSimpleReader*' , +'TQXtApplication*' => 'qt_QXtApplication*', +'TQXtWidget*' => 'qt_QXtWidget*', 'Q_INT16&' => 'short', 'Q_INT16' => 'short', 'Q_INT32&' => 'int', @@ -2290,16 +2290,16 @@ BEGIN 'Q_ULONG&' => 'long', 'Q_ULONG' => 'long', 'Qt*' => 'qt_Qt*' , -'Qt::ArrowType' => 'int' , -'Qt::BackgroundMode' => 'int', -'Qt::DateFormat' => 'int', -'Qt::GUIStyle' => 'int' , -'Qt::GUIStylecolorStyle::WindowsStyle' => 'int' , -'Qt::GUIStylestyle::WindowsStyle' => 'int' , -'Qt::Orientation' => 'int' , -'Qt::RasterOp' => 'int' , -'Qt::UIEffect' => 'int' , -'Qt::WFlags' => 'int' , +'TQt::ArrowType' => 'int' , +'TQt::BackgroundMode' => 'int', +'TQt::DateFormat' => 'int', +'TQt::GUIStyle' => 'int' , +'TQt::GUIStylecolorStyle::WindowsStyle' => 'int' , +'TQt::GUIStylestyle::WindowsStyle' => 'int' , +'TQt::Orientation' => 'int' , +'TQt::RasterOp' => 'int' , +'TQt::UIEffect' => 'int' , +'TQt::WFlags' => 'int' , 'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*', 'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*', 'QtTableView*' => 'qt_QtTableView*', @@ -2399,7 +2399,7 @@ BEGIN 'StartupManager*' => 'kde_StartupManager*', 'StatJob*' => 'kde_StatJob*', 'State' => 'int', -'QSocket::State' => 'int', +'TQSocket::State' => 'int', 'StatusbarProgress*' => 'kde_StatusbarProgress*', 'StdAddressBook*' => 'kde_StdAddressBook*', 'StdFlowSystem*' => 'kde_StdFlowSystem*', @@ -2490,12 +2490,12 @@ BEGIN 'Synth_BUS_UPLINK_base*' => 'kde_Synth_BUS_UPLINK_base*', 'Synth_BUS_UPLINK_skel*' => 'kde_Synth_BUS_UPLINK_skel*', 'Synth_BUS_UPLINK_stub*' => 'kde_Synth_BUS_UPLINK_stub*', -'Synth_FREQUENCY&' => 'kde_Synth_FREQUENCY*', -'Synth_FREQUENCY' => 'kde_Synth_FREQUENCY*', -'Synth_FREQUENCY*' => 'kde_Synth_FREQUENCY*', -'Synth_FREQUENCY_base*' => 'kde_Synth_FREQUENCY_base*', -'Synth_FREQUENCY_skel*' => 'kde_Synth_FREQUENCY_skel*', -'Synth_FREQUENCY_stub*' => 'kde_Synth_FREQUENCY_stub*', +'Synth_FRETQUENCY&' => 'kde_Synth_FRETQUENCY*', +'Synth_FRETQUENCY' => 'kde_Synth_FRETQUENCY*', +'Synth_FRETQUENCY*' => 'kde_Synth_FRETQUENCY*', +'Synth_FRETQUENCY_base*' => 'kde_Synth_FRETQUENCY_base*', +'Synth_FRETQUENCY_skel*' => 'kde_Synth_FRETQUENCY_skel*', +'Synth_FRETQUENCY_stub*' => 'kde_Synth_FRETQUENCY_stub*', 'Synth_MUL&' => 'kde_Synth_MUL*', 'Synth_MUL' => 'kde_Synth_MUL*', 'Synth_MUL*' => 'kde_Synth_MUL*', @@ -2653,7 +2653,7 @@ BEGIN 'classExtensionLoader*' => 'kde_classExtensionLoader*', 'classMidiStatus*' => 'kde_classMidiStatus*', 'classObjectReference' => 'kde_classObjectReference*', -'classQPainter*' => 'kde_classQPainter*', +'classTQPainter*' => 'kde_classTQPainter*', 'classStartupClass*' => 'kde_classStartupClass*', 'double d .0' => 'double', 'double nDefault .0' => 'double', @@ -2754,18 +2754,18 @@ BEGIN 'void(*)()' => 'void(*)()' , 'void*' => 'void*', '~' => '~', -'QValueList<int>' => 'qt_QIntValueList*', -'QValueList<int>&' => 'qt_QIntValueList*', -'QValueList<QIconDragItem>' => 'qt_QIconDragItemValueList*', -'QValueList<QIconDragItem>&' => 'qt_QIconDragItemValueList*', -'QValueList<QPixmap>' => 'qt_QPixmapValueList*', -'QValueList<QString>&' => 'qt_QStringValueList*', -'QValueList<QVariant>&' => 'qt_QVariantValueList*', -'QValueList<QUrlInfo>*' => 'qt_QUrlInfoValueList*', -'QValueList<KDataToolInfo>&' => 'kde_KDataToolInfoValueList*', -'QPtrList<QDockWindow>*' => 'qt_QDockWindowPtrList*', -'QPtrList<QPixmap>' => 'qt_QPixmapPtrList*', -'QPtrList<QPoint>' => 'qt_QPointPtrList*', +'TQValueList<int>' => 'qt_QIntValueList*', +'TQValueList<int>&' => 'qt_QIntValueList*', +'TQValueList<TQIconDragItem>' => 'qt_QIconDragItemValueList*', +'TQValueList<TQIconDragItem>&' => 'qt_QIconDragItemValueList*', +'TQValueList<TQPixmap>' => 'qt_QPixmapValueList*', +'TQValueList<TQString>&' => 'qt_QStringValueList*', +'TQValueList<TQVariant>&' => 'qt_QVariantValueList*', +'TQValueList<TQUrlInfo>*' => 'qt_QUrlInfoValueList*', +'TQValueList<KDataToolInfo>&' => 'kde_KDataToolInfoValueList*', +'TQPtrList<TQDockWindow>*' => 'qt_QDockWindowPtrList*', +'TQPtrList<TQPixmap>' => 'qt_QPixmapPtrList*', +'TQPtrList<TQPoint>' => 'qt_QPointPtrList*', 'ClassContext*' => 'kde_ClassContext*', 'ClassStoreIface*' => 'kde_ClassStoreIface*', 'ClipboardDocumentIface*' => 'kde_ClipboardDocumentIface*', @@ -2784,8 +2784,8 @@ BEGIN 'ParsedClassContainer&' => 'kde_ParsedClassContainer*', 'ParsedContainer&' => 'kde_ParsedContainer*', 'ParsedScopeContainer&' => 'kde_ParsedScopeContainer*', -'QValueList<ParsedMethod>*' => 'kde_ParsedMethodList*', -'QValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*', +'TQValueList<ParsedMethod>*' => 'kde_ParsedMethodList*', +'TQValueList<CompletionEntry>' => 'kde_CompletionEntryValueList*', 'StatusDocumentIface*' => 'kde_StatusDocumentIface*', 'UndoDocumentIface*' => 'kde_UndoDocumentIface*', 'KShortcut&' => 'kde_KShortcut*', @@ -2924,7 +2924,7 @@ sub resolveTypeInternal($$$) Look up a type, following the class hierarchy. e.g. "Mode", if ContextClassName is A, will be looked as A::Mode, - then as B::Mode (if B is a parent class of A), then as Qt::Mode, + then as B::Mode (if B is a parent class of A), then as TQt::Mode, then as just Mode. =cut diff --git a/kalyptus/kdocAstUtil.pm b/kalyptus/kdocAstUtil.pm index 8c24430c..e620d3aa 100644 --- a/kalyptus/kdocAstUtil.pm +++ b/kalyptus/kdocAstUtil.pm @@ -696,7 +696,7 @@ sub dumpAst =cut sub testRef { - require Term::ReadLine; + retquire Term::ReadLine; my $rootNode = $_[ 0 ]; diff --git a/kalyptus/kdocLib.pm b/kalyptus/kdocLib.pm index 0e224cb9..700564a3 100644 --- a/kalyptus/kdocLib.pm +++ b/kalyptus/kdocLib.pm @@ -32,7 +32,7 @@ NOTES ON THE NEW FORMAT <BASE URL="http://www.kde.org/API/tdecore/"> <C NAME="KApplication" REF="KApplication.html"> - <IN NAME="QObject"> + <IN NAME="TQObject"> <ME NAME="getConfig" REF="KApplication.html#getConfig"> <M NAME="" REF=""> </C> diff --git a/kalyptus/kdocParseDoc.pm b/kalyptus/kdocParseDoc.pm index f28b4e56..da2c68b6 100644 --- a/kalyptus/kdocParseDoc.pm +++ b/kalyptus/kdocParseDoc.pm @@ -180,7 +180,7 @@ PARSELOOP: # postprocess docnode - # add a . to the end of the short if required. + # add a . to the end of the short if retquired. my $short = $docNode->{ClassShort}; if ( defined $short ) { @@ -369,7 +369,7 @@ sub recombineOnWords =head2 attachDoc Connects a docnode to a code node, setting any other properties -if required, such as groups, internal/deprecated flags etc. +if retquired, such as groups, internal/deprecated flags etc. =cut diff --git a/kalyptus/kdocUtil.pm b/kalyptus/kdocUtil.pm index 827b3771..f77c0838 100644 --- a/kalyptus/kdocUtil.pm +++ b/kalyptus/kdocUtil.pm @@ -139,7 +139,7 @@ sub userName =head2 splitUnnested Helper to split a list using a delimiter, but looking for nesting with (), {}, [] and <>. - Example: splitting int a, QPair<c,b> d, e="," + Example: splitting int a, TQPair<c,b> d, e="," on ',' will give 3 items in the list. Parameter: delimiter, string |