diff options
137 files changed, 5775 insertions, 5775 deletions
@@ -1,5 +1,5 @@ -PerlQt-3 is (c) Ashley Winters 2002, and (c) Germain Garand 2003 +PerlTQt-3 is (c) Ashley Winters 2002, and (c) Germain Garand 2003 The project's homepage is at http://perlqt.sourceforge.net @@ -263,14 +263,14 @@ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + 12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER @@ -5,52 +5,52 @@ - faster/cleaner build system (no more automake dependancy) - speed optimizations (+50% gain) - 9 new marshallers (Q*List are marshalled as a reference to a Perl array of Q*) - - tied marshallers for non-const QString/QByteArray - $ts = Qt::TextStream( $x, IO_WriteOnly ); + - tied marshallers for non-const TQString/TQByteArray + $ts = TQt::TextStream( $x, IO_WriteOnly ); $ts << "foo"; # will write to $x - alternative Sig/Slot declaration syntax - sub a_signal : SIGNAL(int,QString); - sub a_slot : SLOT(int,QString) { + sub a_signal : TQT_SIGNAL(int,TQString); + sub a_slot : TQT_SLOT(int,TQString) { #do something } - - perleditor plugin for Qt Designer (released separately as pqt-designer package) + - perleditor plugin for TQt Designer (released separately as pqt-designer package) - Perl syntax highlighting - - thorough code completion (static and instance methods, &Qt::enums...) + - thorough code completion (static and instance methods, &TQt::enums...) - Perl aware Object Browser ("Class Declarations" tab) - - run your PerlQt project straight from the designer + - run your PerlTQt project straight from the designer - STDIN/STDOUT output and Perl messages are redirected to the Output Window view, with corrected line numbers pointing to syntax errors. - - global scope Qt functions (bitBlt, qCompress...) are now available. - - gathered in the Qt::GlobalSpace namespace - - import them to current namespace with "use Qt::GlobalSpace" - - global scope operators are available as well (e.g Qt::Point + Qt::point) + - global scope TQt functions (bitBlt, qCompress...) are now available. + - gathered in the TQt::GlobalSpace namespace + - import them to current namespace with "use TQt::GlobalSpace" + - global scope operators are available as well (e.g TQt::Point + TQt::point) - bug fixes and other improvements. => see ChangeLog.CVS.delta and ChangeLog.CVS for details 2002-02-13 GG (v.3.006) - - "use bytes" pragma now changes the way QStrings are marshalled - back to Perl : within the scope, instead of all utf-8, QStrings are + - "use bytes" pragma now changes the way TQStrings are marshalled + back to Perl : within the scope, instead of all utf-8, TQStrings are marshalled to ISO-Latin1 by default, or to locale if "use locale" is active. - Operator overloading is now functional. 21 operators are available. e.g: - $d = Qt::TextStream( $f ); + $d = TQt::TextStream( $f ); $d << "Foo " << 12 << " Bar"; N.B: the copy constructor operator('=') isn't overloaded. It clashes with the perl paradigm. - - fixed a bug in QCString Marshaller : plain ASCII was tagged as UTF-8 - - raised priority of QString in case of ambiguous call + - fixed a bug in TQCString Marshaller : plain ASCII was tagged as UTF-8 + - raised priority of TQString in case of ambiguous call - allow runtime definition of signals and slots (via eval) - - added two development tools : pqtsh (a graphical PerlQt shell) and + - added two development tools : pqtsh (a graphical PerlTQt shell) and pqtapi (a command line introspection tool) - - look also in super classes when dumping possible candidates (Qt::debug) + - look also in super classes when dumping possible candidates (TQt::debug) - updated french and english documentation - - module Qt::constants for on-demand loading of global Qt constants + - module TQt::constants for on-demand loading of global TQt constants (as of now, only concerns IO_* constants defined in qiodevice.h) e.g: - use Qt::constants qw(:IO) + use TQt::constants qw(:IO) or - use Qt::constants qw( IO_ReadOnly IO_WriteOnly ) + use TQt::constants qw( IO_ReadOnly IO_WriteOnly ) from an idea by Marek Rouchal 2002-12-16 GG (v.3.004-final) @@ -62,13 +62,13 @@ - raised default test threshold to 10 - some code optimizations (object construction/destruction) - added an undocumented but supported CAST function - e.g CAST $obj, "Qt::Application"; (it proved to be useful in some + e.g CAST $obj, "TQt::Application"; (it proved to be useful in some situations) 2002-12-11 GG. (v.3.004-RC2) - turnaround for segfaults with some KDE themes (KThemeStyles) =>will work witth kdelibs compiled with --disable-fast-malloc and --enable-fast-malloc, but not with --enable-fast-malloc=full - - Qt::version() + - TQt::version() - updated documentation (marshallers, debugging, i18n) - switch to Makefile.PL for driving ./configure @@ -78,25 +78,25 @@ - speed improvements over 40% ported memoïze-like cache to C++ ; various code optimizations - Signal/Slots inheritance now works as expected - - proper handling of Qt modules stored in a hierarchy + - proper handling of TQt modules stored in a hierarchy - introduced SUPER->method() construct for accessing methods in the superclass - Internationalization - Perl strings are marshalled to QStrings either in utf8, iso-latin-1 or + Perl strings are marshalled to TQStrings either in utf8, iso-latin-1 or current locale according to context (the rule is: if they are tagged as utf8, use utf8 ; if not, use iso-latin by default or current locale if the "locale" pragma is active) ; they are always marshalled back as utf8. - - You can now safely "eval" PerlQt code. + - You can now safely "eval" PerlTQt code. - New marshallers: - QCString /*/&, bool */&, QValueList<int> /*/& - - Debugging channels through "use Qt::debug" + TQCString /*/&, bool */&, TQValueList<int> /*/& + - Debugging channels through "use TQt::debug" You can now monitor specific parts of your application's behaviour. Available channels are : ambiguous, calls, gc, autoload, virtual, verbose, all. - Updated documentation + french translation many thanks to Stéphane Payrard for the accurate french translation ! - - Subclassing Qt::Application is now possible - - Smoke can be built with Qt-3.1 + - Subclassing TQt::Application is now possible + - Smoke can be built with TQt-3.1 - Various other bug fixes 2002-08-24 Germain Garand <germain@ebooksfrance.com> (v.3.001) diff --git a/ChangeLog.CVS b/ChangeLog.CVS index 7589419..b396db0 100644 --- a/ChangeLog.CVS +++ b/ChangeLog.CVS @@ -1,54 +1,54 @@ 2003-09-13 00:39 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - cache copy constructor && destructor lookups - avoid looking twice in type hash for most common types 2003-09-13 00:37 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - fix line numbers && current file on error (no method to call...) 2003-09-12 15:43 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - reworking the tied marshallers: let's allow readonly variables. 2003-09-12 15:24 germaingarand - * PerlQt/t/b_nogui.t: + * PerlTQt/t/b_nogui.t: - adding test for tied marshaller/TextStream 2003-09-12 13:13 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: (see previous commit on handlers.cpp) 2003-09-12 13:12 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - fix garbage collection: we need to register external objects as well, so that widgets using e.g: the $mainWindow->menuBar() pointer as parent don't get GCed. - - do not look in real stash if call is for a Qt::enum + - do not look in real stash if call is for a TQt::enum (emulation of the previous Legacy autoload behaviour) 2003-09-12 13:02 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - strict matching is too strict. We'll do that only for operators 2003-09-10 18:16 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - - We don't want to check the type of every argument, but let's check at least Qt Objects. + - We don't want to check the type of every argument, but let's check at least TQt Objects. Wrong casts are deadly and hard to debug. - got rid of the legacy autoload. Fully qualified calls are much faster now. @@ -66,7 +66,7 @@ 2003-09-09 09:21 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: fix compile for 5.6.1 @@ -79,29 +79,29 @@ 2003-09-09 06:25 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: - - add qt_libraries to RPATH too, otherwise Qt.so can pull a qt-mt library different from the one Smoke + - add qt_libraries to RPATH too, otherwise TQt.so can pull a qt-mt library different from the one Smoke would have picked up. 2003-09-08 18:13 germaingarand - * PerlQt/t/ca_i18n.t: + * PerlTQt/t/ca_i18n.t: - one more test, monitoring "use bytes" pragma 2003-09-08 16:24 germaingarand - * PerlQt/: MANIFEST, Makefile.PL.in, Qt.pod: + * PerlTQt/: MANIFEST, Makefile.PL.in, TQt.pod: - cleaning Makefile.PL.in - - install documentation in {datadir}/PerlQt-3 - - install a short Qt.pod notice pointing to the real doc, for those - who are going to try "perldoc Qt" :-} + - install documentation in {datadir}/PerlTQt-3 + - install a short TQt.pod notice pointing to the real doc, for those + who are going to try "perldoc TQt" :-} 2003-09-08 15:38 germaingarand - * doc/: en/PerlQt.pod, en/index.html, fr/PerlQt.pod, fr/index.html: + * doc/: en/PerlTQt.pod, en/index.html, fr/PerlTQt.pod, fr/index.html: - updated documentation (/en and /fr) to reflect 3.008 changes @@ -126,19 +126,19 @@ 2003-09-07 15:26 germaingarand - * PerlQt/lib/Qt/debug.pm: + * PerlTQt/lib/TQt/debug.pm: - warn and display list of available debugging channels when asked for an unknown one 2003-09-07 15:18 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: - bumping version to 3.008 2003-09-07 14:35 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: - major bug fix: "use bytes" and "use locale" pragmata didn't apply to current scope. They are held in the op_private of the context stack after compiling, no more in PL_hints. @@ -160,38 +160,38 @@ 2003-09-06 16:51 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - be more strict when matching ambiguous methods - fixed a bug regarding the priority of some types 2003-09-05 03:30 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp: - - implemented QByteArray Marshaller (from/to Perl string, tied if needed) + - implemented TQByteArray Marshaller (from/to Perl string, tied if needed) Still needs some thought /wrt to Utf8 handling (think qCompress/qUncompress) - With QDataStream static operators and this, we get a nice object serializer :) + With TQDataStream static operators and this, we get a nice object serializer :) - use Qt::constants; + use TQt::constants; $bytearray = ""; - $a = Qt::DataStream( $bytearray, IO_WriteOnly ); + $a = TQt::DataStream( $bytearray, IO_WriteOnly ); # now magically serialize some objects in $bytearray $a << $qdatetime << $qfont << $qpixmap; 2003-09-01 21:09 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: - - real non-const QString&/* marshaller implemented via tied scalars + - real non-const TQString&/* marshaller implemented via tied scalars e.g: - use Qt; - use Qt::constants; + use TQt; + use TQt::constants; $str = "Foooooooooooooooo"; - $ts = Qt::TextStream( $str, IO_WriteOnly ); + $ts = TQt::TextStream( $str, IO_WriteOnly ); $ts << "pi = " << 3.14; # $str is now "pi = 3.14oooooooo" @@ -200,7 +200,7 @@ 2003-08-31 16:35 germaingarand - * PerlQt/lib/Qt/GlobalSpace.pm, PerlQt/Qt.pm, PerlQt/t/b_nogui.t, + * PerlTQt/lib/TQt/GlobalSpace.pm, PerlTQt/TQt.pm, PerlTQt/t/b_nogui.t, kalyptus/ChangeLog, kalyptus/Iter.pm, kalyptus/README, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, kalyptus/kdocAstUtil.pm: @@ -209,23 +209,23 @@ 2003-08-31 14:38 germaingarand - * PerlQt/: Qt.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, lib/TQt/slots.pm: - more permissive syntax for new sig/slot declarations (white spaces, quotes) - implement consistency check of old vs. new style slot declarations allows one to say - use Qt::slots "foo" => ["int"]; + use TQt::slots "foo" => ["int"]; then - sub foo : SLOT( int ) {} # OK. Same decl. Noop. - sub foo : SLOT( QString ) {} # triggers a warning: + sub foo : TQT_SLOT( int ) {} # OK. Same decl. Noop. + sub foo : TQT_SLOT( TQString ) {} # triggers a warning: # Slot declaration: - # foo(QString) + # foo(TQString) # will override previous declaration: # foo(int) 2003-08-30 23:01 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Doing it the Right Way. - make $SIG{__DIE__} local inside eval'ed ops @@ -248,42 +248,42 @@ 2003-08-28 01:28 germaingarand - * PerlQt/: Qt.pm, lib/Qt/GlobalSpace.pm, lib/Qt/constants.pm: + * PerlTQt/: TQt.pm, lib/TQt/GlobalSpace.pm, lib/TQt/constants.pm: - - adding support for the new Qt::GlobalSpace pseudo-class holding all global Qt functions. + - adding support for the new TQt::GlobalSpace pseudo-class holding all global TQt functions. Requires a recompilation of Smoke. - use Qt::GlobalSpace; # exports all symbols to the caller's namespace (not recommended) - use Qt::GlobalSpace qw( bitBlt qCompress qSysInfo ); # export listed symbols only - - when an operator call fails, forward the call to Qt::GlobalSpace which has a lot of static operators: - $aPoint = Qt::Point( 20, 20 ); - $aPoint += Qt::Point( 10, 10); # this one calls Qt::Point->operator+() - $o = Qt::Point(10,10) + Qt::Point(30,30); # this is forwarded to Qt::GlobalSpace::+( QPoint, QPoint ) - - made "use Qt::constant" export all symbols by default (IO_ReadOnly, ...). + use TQt::GlobalSpace; # exports all symbols to the caller's namespace (not recommended) + use TQt::GlobalSpace qw( bitBlt qCompress qSysInfo ); # export listed symbols only + - when an operator call fails, forward the call to TQt::GlobalSpace which has a lot of static operators: + $aPoint = TQt::Point( 20, 20 ); + $aPoint += TQt::Point( 10, 10); # this one calls TQt::Point->operator+() + $o = TQt::Point(10,10) + TQt::Point(30,30); # this is forwarded to TQt::GlobalSpace::+( TQPoint, TQPoint ) + - made "use TQt::constant" export all symbols by default (IO_ReadOnly, ...). 2003-08-20 10:12 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - construct_copy for const ref: update the macros, and oh, don't forget to mark the resulting object as allocated. Caveat leakem. 2003-08-20 09:25 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - fixed a severe bug in construct_copy - - when marshalling const QFoo&, construct a copy... - this ought to fix a lot of subtle bugs (mostly QShared related). + - when marshalling const TQFoo&, construct a copy... + this ought to fix a lot of subtle bugs (mostly TQShared related). 2003-08-14 20:52 germaingarand * puic/: form.cpp, uic.cpp, uic.h: - - various fixes for when compiling with Qt < 3.1 + - various fixes for when compiling with TQt < 3.1 2003-08-14 18:44 germaingarand - * PerlQt/Makefile.PL.in, admin/acinclude.m4.in, + * PerlTQt/Makefile.PL.in, admin/acinclude.m4.in, smoke/qt/qtguess.pl.in: - nice patch by Marek Rouchal<marek.rouchal@infineon.com>. Improves Solaris @@ -314,23 +314,23 @@ * smoke/qt/Makefile.am, smoke/qt/header_list, kalyptus/kalyptusCxxToSmoke.pm: - - fix Smoke generation for Qt-3.2b1 + - fix Smoke generation for TQt-3.2b1 2003-06-14 04:47 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp, perlqt.h: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp, perlqt.h: - speed optimizations again. cachegrind rocks 2003-06-09 17:17 germaingarand - * PerlQt/lib/Qt/attributes.pm: + * PerlTQt/lib/TQt/attributes.pm: - do not redefine attributes if they have already been defined in base class. 2003-06-09 17:15 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - Some polishing on Q*Items garbage collection. setAllocated() is now correct. - Speed, speed, speed. Moved object destruction routine to XS. Object creation/deletion @@ -345,38 +345,38 @@ 2003-06-06 21:30 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - sig/slot defined via sub attributes are now created upon metaObject() request if needed. Much better this way, since it allows runtime evaluation: - eval "sub foo : SLOT() {}" + eval "sub foo : TQT_SLOT() {}" 2003-06-06 02:51 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: for now: slot/signal/dcop => SLOT/SIGNAL/DCOP 2003-06-06 01:53 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - - moved the sig/slot attributes handling from Qt::base to the Qt::Object package, + - moved the sig/slot attributes handling from TQt::base to the TQt::Object package, where it obviously belongs - - silenced a 5.6.0 warning /wrt Qt::debug + - silenced a 5.6.0 warning /wrt TQt::debug 2003-06-05 22:07 germaingarand - * PerlQt/: Qt.pm, lib/Qt/signals.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, lib/TQt/signals.pm, lib/TQt/slots.pm: - implemented Ashley's great syntax proposal for sig/slots definition via sub attributes - sub mySlot : slot( int, const QString& ) { ... } + sub mySlot : slot( int, const TQString& ) { ... } sub mySig : signal( bool ); Of course, the old/alternative syntax is still valid. 2003-06-05 15:22 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - fixed the garbage collection for Q*Items. Use list->takeItem( foo ) when available to safely remove an Item from a list (then undef it to delete). @@ -388,8 +388,8 @@ * puic/puic.pro: - added a qmake project file, for easy building of puic when checked out separately - ( export QTDIR, then: - $QTDIR/bin/qmake -makefile puic.pro && make && make install ) + ( export TQTDIR, then: + $TQTDIR/bin/qmake -makefile puic.pro && make && make install ) 2003-05-30 01:36 germaingarand @@ -429,7 +429,7 @@ projectsettingsinterfaceimpl.cpp, slotfuncdia.h, sourcetemplateinterfaceimpl.cpp: - - implemented "Build and run project". One can now fully develop/test/run a PerlQt program without ever using + - implemented "Build and run project". One can now fully develop/test/run a PerlTQt program without ever using a console. This is VB on steroids :) - added an application template - project settings looks OK. Would need some testing usability wise though @@ -456,7 +456,7 @@ projectsettings.h, slotfuncdia.h, images/perlqt.png, images/perlqtblue.png, images/perlqtblue2.png: - - added PerlQt Menu/toolbar ("Run form/run project" triggers puic->perl) + - added PerlTQt Menu/toolbar ("Run form/run project" triggers puic->perl) - "run project" not yet implemented - "Run Form" can be accessed also with RMB on source code - When Form is run through Perl, STDOUT/STDERR are captured and redirected to the Designer's @@ -508,7 +508,7 @@ 2003-05-23 16:23 germaingarand - * PerlQt/bin/pqtapi: + * PerlTQt/bin/pqtapi: - added option 'p' for including inherited methods of 'class' in results - option 'm' is for communication with the Designer Plugin (for code completion) @@ -554,7 +554,7 @@ interfaces/sourcetemplateiface.h, interfaces/templatewizardiface.h, interfaces/widgetinterface.h: - Initial import of the PerlQt plugin for Qt Designer + Initial import of the PerlTQt plugin for TQt Designer 2003-05-22 21:34 germaingarand @@ -596,7 +596,7 @@ * puic/: form.cpp, subclassing.cpp: - - support for the Designer's PerlQt plugin + - support for the Designer's PerlTQt plugin - patch by Terrence (Terry) Fleury <tfleury@ncsa.uiuc.edu> for incluson of "Use" directives (also supported by the plugin, and stored in the same structure) @@ -610,23 +610,23 @@ 2003-04-15 23:03 germaingarand - * doc/: en/PerlQt.pod, en/index.html, fr/PerlQt.pod, fr/index.html: + * doc/: en/PerlTQt.pod, en/index.html, fr/PerlTQt.pod, fr/index.html: -documenting new marshallers 2003-04-15 22:43 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: bumping version number to 3.007 2003-04-15 16:07 germaingarand - * PerlQt/: handlers.cpp, Qt.pm, smokeperl.h: + * PerlTQt/: handlers.cpp, TQt.pm, smokeperl.h: - added 8 marshallers for Q*List classes: - QWidgetList, QCanvasItemList, QObjectList, QPtrList<QTab>, QPtrList<QToolBar>, - QPtrList<QDockWindow>, QPtrList<QNetworkOperation>, QFileInfoList + TQWidgetList, TQCanvasItemList, TQObjectList, TQPtrList<TQTab>, TQPtrList<TQToolBar>, + TQPtrList<TQDockWindow>, TQPtrList<TQNetworkOperation>, TQFileInfoList 2003-04-15 16:04 germaingarand @@ -650,7 +650,7 @@ 2003-03-08 19:03 germaingarand - * PerlQt/bin/pqtsh: + * PerlTQt/bin/pqtsh: disable strict in eval @@ -680,10 +680,10 @@ 2003-02-19 17:01 germaingarand - * PerlQt/bin/pqtsh: + * PerlTQt/bin/pqtsh: - redirect STDOUT/STDERR to shell window (patch by Stéphane Payrard<stef@payrard.net>) - - fixed troubles with line breaks and Qt-3.1 + - fixed troubles with line breaks and TQt-3.1 - discard empty lines on save 2003-02-19 13:44 germaingarand @@ -696,21 +696,21 @@ 2003-02-13 15:30 germaingarand - * doc/: en/PerlQt.pod, en/index.html, fr/PerlQt.pod, fr/index.html: + * doc/: en/PerlTQt.pod, en/index.html, fr/PerlTQt.pod, fr/index.html: How to perform an installation with user rights + various details 2003-02-13 12:23 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: finally, lets bump the version number to 3.006 2003-02-13 12:21 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - operators modifying their operand (++, +=, ...) need to return the modified object itself, not the Qt ref to the modified object + operators modifying their operand (++, +=, ...) need to return the modified object itself, not the TQt ref to the modified object 2003-02-12 23:47 germaingarand @@ -720,44 +720,44 @@ 2003-02-12 23:34 germaingarand - * PerlQt/t/h_allstyles.t: + * PerlTQt/t/h_allstyles.t: too many errors on this one 2003-02-12 22:11 germaingarand - * PerlQt/examples/: progress/progress.pl, richedit/richedit.pl: + * PerlTQt/examples/: progress/progress.pl, richedit/richedit.pl: no blib 2003-02-12 22:04 germaingarand - * PerlQt/examples/forever/forever.pl: + * PerlTQt/examples/forever/forever.pl: no blib 2003-02-12 21:21 germaingarand - * PerlQt/examples/drawlines/drawlines.pl: + * PerlTQt/examples/drawlines/drawlines.pl: no blib 2003-02-12 21:17 germaingarand - * PerlQt/examples/: aclock/aclock.pl, dclock/dclock.pl, + * PerlTQt/examples/: aclock/aclock.pl, dclock/dclock.pl, buttongroups/buttongroups.pl, drawdemo/drawdemo.pl: no blib 2003-02-12 21:16 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: better chmod +x the scripts before install 2003-02-12 17:07 germaingarand - * doc/: fr/PerlQt.pod, fr/index.html, en/PerlQt.pod, en/index.html: + * doc/: fr/PerlTQt.pod, fr/index.html, en/PerlTQt.pod, en/index.html: updated documentation @@ -769,63 +769,63 @@ 2003-02-12 15:25 germaingarand - * doc/: en/PerlQt.pod, en/index.html, images/pqtsh.png: + * doc/: en/PerlTQt.pod, en/index.html, images/pqtsh.png: updated english documentation 2003-02-12 13:18 germaingarand - * PerlQt/bin/pqtsh: + * PerlTQt/bin/pqtsh: adding an interactive example (within help menu) 2003-02-12 10:54 germaingarand - * PerlQt/lib/Qt/isa.pm: + * PerlTQt/lib/TQt/isa.pm: cope with 5.8.0's buggy if.pm - patch by S.Payrard<stef@payrard.net> 2003-02-12 10:44 germaingarand - * PerlQt/: Qt.pm, lib/Qt/signals.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, lib/TQt/signals.pm, lib/TQt/slots.pm: -Allow runtime definition of Signals/Slots (via eval) 2003-02-11 23:18 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: -when dumping possible method matches, look also in super classes 2003-02-11 23:15 germaingarand - * PerlQt/: MANIFEST, Makefile.PL.in, bin/pqtsh, bin/pqtapi: + * PerlTQt/: MANIFEST, Makefile.PL.in, bin/pqtsh, bin/pqtapi: - adding pqtsh and pqtapi utilities 2003-02-09 15:15 germaingarand - * PerlQt/lib/Qt/constants.pm: + * PerlTQt/lib/TQt/constants.pm: export sub names, not globs 2003-02-07 22:25 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: oops 2003-02-07 22:24 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: - IRIX compiler fix (don't 'return' in a void method) 2003-02-06 23:07 germaingarand - * PerlQt/: lib/Qt/constants.pm, MANIFEST: + * PerlTQt/: lib/TQt/constants.pm, MANIFEST: - - adding a Qt::constants module for import of Qt constants + - adding a TQt::constants module for import of TQt constants (mainly intended for qiodevice.h's IO_* hardcoded values, but who knows...) 2003-02-06 18:36 germaingarand @@ -838,7 +838,7 @@ * configure.in: - too many QT_NO_* tests - totally overkill + too many TQT_NO_* tests - totally overkill 2003-02-05 11:14 germaingarand @@ -848,7 +848,7 @@ 2003-02-05 10:03 germaingarand - * PerlQt/t/g_gui.t: + * PerlTQt/t/g_gui.t: avoid loading syle plugins for first GUI test @@ -860,25 +860,25 @@ 2003-02-04 16:52 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: bump version 2003-01-30 10:41 germaingarand - * Makefile.am, PerlQt/t/h_allstyles.t: + * Makefile.am, PerlTQt/t/h_allstyles.t: set correct LD_LIBRARY_PATH before running tests 2003-01-27 11:11 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: add CXXFLAGS to compilation parameters 2003-01-27 11:09 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: use RPATH in a more crossplatform way (through libtool) @@ -896,23 +896,23 @@ 2003-01-05 04:00 germaingarand - * PerlQt/: lib/Qt/isa.pm, Qt.pm: + * PerlTQt/: lib/TQt/isa.pm, TQt.pm: - implementation of operator overloading (21 supported operators). Copy constructors *aren't* available : they clash with Perl semantics. - - raised priority of QString in ambiguous methods resolution + - raised priority of TQString in ambiguous methods resolution 2003-01-04 06:22 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - - fixed QCString marshaller : don't tag pure ASCII strings as UTF-8 - - QString marshalling toSV is now driven by HINT_BYTES (a.k.a "use bytes" pragma) + - fixed TQCString marshaller : don't tag pure ASCII strings as UTF-8 + - TQString marshalling toSV is now driven by HINT_BYTES (a.k.a "use bytes" pragma) This is intended as a compatiblity device for legacy code that can't handle UTF-8 2002-12-22 02:52 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - fixing Perl debugger at last @@ -924,15 +924,15 @@ 2002-12-16 20:45 germaingarand - * PerlQt/: t/f_import.t, t/h_allstyles.t, MANIFEST: + * PerlTQt/: t/f_import.t, t/h_allstyles.t, MANIFEST: - fixing invocation of make test from within Perlqt/ 2002-12-16 18:13 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: - version = 'PerlQt-3.004' (final) + version = 'PerlTQt-3.004' (final) 2002-12-16 17:43 germaingarand @@ -942,49 +942,49 @@ 2002-12-16 17:38 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp, perlqt.h, smokeperl.h: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp, perlqt.h, smokeperl.h: - code cleanup and optimization - fixed a bug with hasVirtual() 2002-12-16 17:32 germaingarand - * PerlQt/examples/forever/forever.pl: + * PerlTQt/examples/forever/forever.pl: - avoid QPoint + avoid TQPoint 2002-12-16 17:26 germaingarand - * PerlQt/examples/progress/progress.pl: + * PerlTQt/examples/progress/progress.pl: initial checkin 2002-12-16 17:24 germaingarand - * PerlQt/lib/Qt/: isa.pm, debug.pm: + * PerlTQt/lib/TQt/: isa.pm, debug.pm: - fixed redefinition of a sub in isa.pm - - added "use Qt;" in debug.pm + - added "use TQt;" in debug.pm 2002-12-16 17:04 germaingarand - * PerlQt/t/Foo/SubCodec.pm: + * PerlTQt/t/Foo/SubCodec.pm: - adding the test suite (make test) 2002-12-16 17:01 germaingarand - * test.pl, Makefile.am, PerlQt/test.pl, PerlQt/t/a_loading.t, - PerlQt/t/b_nogui.t, PerlQt/t/c_qapp.t, PerlQt/t/d_sigslot.t, - PerlQt/t/e_sigslot_inherit.t, PerlQt/t/f_import.t, - PerlQt/t/g_gui.t, PerlQt/t/h_allstyles.t, PerlQt/t/My/Codec.pm, - PerlQt/t/My/SubCodec.pm: + * test.pl, Makefile.am, PerlTQt/test.pl, PerlTQt/t/a_loading.t, + PerlTQt/t/b_nogui.t, PerlTQt/t/c_qapp.t, PerlTQt/t/d_sigslot.t, + PerlTQt/t/e_sigslot_inherit.t, PerlTQt/t/f_import.t, + PerlTQt/t/g_gui.t, PerlTQt/t/h_allstyles.t, PerlTQt/t/My/Codec.pm, + PerlTQt/t/My/SubCodec.pm: - adding the test suite (make test) 2002-12-16 16:57 germaingarand - * configure.in, doc/en/PerlQt.pod, doc/en/index.html, + * configure.in, doc/en/PerlTQt.pod, doc/en/index.html, smoke/qt/qtguess.pl.in: typo: treshold <-> threshold (configure option) @@ -997,23 +997,23 @@ 2002-12-13 20:53 germaingarand - * PerlQt/: handlers.cpp, Qt.xs: + * PerlTQt/: handlers.cpp, TQt.xs: -fixed compilation with 5.6.0 -fix HAS_BOOL for SUN's Forte 2002-12-13 11:42 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: added a CAST function 2002-12-13 11:41 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - - made the marshaller croak instead of marshalling null as a reference to a Qt object - - 5.6.0 doesn't have is_utf8_string, made it use QTextCodec::heuristicContentMatch() instead + - made the marshaller croak instead of marshalling null as a reference to a TQt object + - 5.6.0 doesn't have is_utf8_string, made it use TQTextCodec::heuristicContentMatch() instead 2002-12-12 01:50 germaingarand @@ -1024,7 +1024,7 @@ 2002-12-11 15:53 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: updating $VERSION (3.004-RC2) @@ -1036,17 +1036,17 @@ 2002-12-11 15:31 germaingarand - * doc/en/: PerlQt.pod, index.html: + * doc/en/: PerlTQt.pod, index.html: added several appendices to documentation (debugging, marshallers and i18n) 2002-12-11 09:54 germaingarand - * INSTALL, README, PerlQt/MANIFEST, PerlQt/Qt.pm: + * INSTALL, README, PerlTQt/MANIFEST, PerlTQt/TQt.pm: - updated README/INSTALL - - turnaround for KDE's malloc in Qt.pm - - added Qt/debug.pm in MANIFEST + - turnaround for KDE's malloc in TQt.pm + - added TQt/debug.pm in MANIFEST 2002-12-09 18:09 germaingarand @@ -1064,9 +1064,9 @@ 2002-12-09 05:37 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: - added Qt::version() + added TQt::version() 2002-12-09 05:06 germaingarand @@ -1076,16 +1076,16 @@ 2002-12-07 15:55 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: - Adjust version no. for RC1 - - correct USE_QT_KDE so that configure doesn't reject Qt-3.0 + - correct USE_TQT_KDE so that configure doesn't reject TQt-3.0 2002-12-07 13:17 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - - allow subclassing of Qt::Application + - allow subclassing of TQt::Application 2002-12-06 23:36 germaingarand @@ -1095,10 +1095,10 @@ 2002-12-06 21:37 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp: - - code cleanup && added some comments in Qt.xs - - fixed segfault when marshalling "undef" as QString& (handlers.cpp) + - code cleanup && added some comments in TQt.xs + - fixed segfault when marshalling "undef" as TQString& (handlers.cpp) - added bool*/bool& marshallers - more consistent debugging statements wrt the considered channel - more profiling/optimization of caching @@ -1112,10 +1112,10 @@ 2002-12-05 14:10 germaingarand - * PerlQt/: Qt.xs, Qt.pm: + * PerlTQt/: TQt.xs, TQt.pm: - switched all method calls to G_EVAL : needed for having a correct 'this' pointer if an error occur inside an eval{} - - implemented the memoize-like cache in C++ with a QAsciiDict (gain 50% in speed) + - implemented the memoize-like cache in C++ with a TQAsciiDict (gain 50% in speed) 2002-12-03 21:45 germaingarand @@ -1141,7 +1141,7 @@ 2002-12-03 16:53 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: removing a stupid debug line that went in @@ -1155,17 +1155,17 @@ 2002-12-02 21:28 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp, perlqt.h, lib/Qt/debug.pm: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp, perlqt.h, lib/TQt/debug.pm: - - added pragma for enabling multiple debugging channels. See lib/Qt/debug.pm + - added pragma for enabling multiple debugging channels. See lib/TQt/debug.pm - findAllMethods(classId [, startingWith]) for a more useful debug output and easy impl. of code completion. - eg. to pretty print the whole Qt API: + eg. to pretty print the whole TQt API: for (1..400) { - $a=Qt::_internal::findAllMethods($_); + $a=TQt::_internal::findAllMethods($_); @x=map {@{ $$a{$_} }} sort keys %$a; - print Qt::_internal::dumpCandidates(\@x); + print TQt::_internal::dumpCandidates(\@x); } - various optimizations and cleanups for an overall gain in speed of 15% approx. @@ -1177,33 +1177,33 @@ 2002-11-28 13:08 germaingarand - * PerlQt/smokeperl.h: + * PerlTQt/smokeperl.h: operator= should return *this 2002-11-28 12:33 germaingarand - * doc/: Makefile, PerlQt.pod, index.html, pod.css: + * doc/: Makefile, PerlTQt.pod, index.html, pod.css: removing doc/* (moved to /doc/en) 2002-11-28 12:31 germaingarand - * doc/: css/pod.css, en/Makefile, en/PerlQt.pod, en/index.html, - fr/Makefile, fr/PerlQt.pod, fr/index.html: + * doc/: css/pod.css, en/Makefile, en/PerlTQt.pod, en/index.html, + fr/Makefile, fr/PerlTQt.pod, fr/index.html: adding french documentation, thanks to Stéphane Payard 2002-11-27 19:53 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - - Internationalization support (QString now marshalls toSV as UTF8) + - Internationalization support (TQString now marshalls toSV as UTF8) - ISO C++ fixes (replaced variable-size arrays by new[]) 2002-11-27 19:51 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Changed variable-size arrays to use "new" (ISO C++ conformance... should fix the build on Compaq's CC) @@ -1211,29 +1211,29 @@ * smoke/qt/generate.pl.in: - Exclude some more Qt headers (3.1) + Exclude some more TQt headers (3.1) 2002-11-18 02:17 germaingarand * kalyptus/: kalyptus, kalyptusCxxToSmoke.pm, kalyptusDataDict.pm: - Syncing Qt-3.1 fixes from KDE's CVS + Syncing TQt-3.1 fixes from KDE's CVS 2002-10-14 10:15 germaingarand - * PerlQt/: handlers.cpp, Qt.pm: + * PerlTQt/: handlers.cpp, TQt.pm: - added a marshaller for QValueList<int> + added a marshaller for TQValueList<int> 2002-10-12 17:42 germaingarand * kalyptus/kalyptusCxxToSmoke.pm: - Skip QTSManip class: resulting file cause internal compiler errors on many platforms + Skip TQTSManip class: resulting file cause internal compiler errors on many platforms 2002-10-09 18:20 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: updating $VERSION @@ -1242,14 +1242,14 @@ * puic/: main.cpp, form.cpp, object.cpp: - s/this->SUPER::polish/SUPER->polish/ in database code - - fixed setAccel to use an intermediate Qt::KeySequence + - fixed setAccel to use an intermediate TQt::KeySequence 2002-10-08 00:27 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - Added a turnaround for a Qt bug. - QGridLayout::addMultiCellLayout does not reparent its QLayout argument, leading to parentless Layouts. + Added a turnaround for a TQt bug. + TQGridLayout::addMultiCellLayout does not reparent its TQLayout argument, leading to parentless Layouts. 2002-09-27 20:04 germaingarand @@ -1259,38 +1259,38 @@ 2002-09-27 11:40 germaingarand - * PerlQt/MANIFEST: + * PerlTQt/MANIFEST: added network example 2002-09-27 11:35 germaingarand - * PerlQt/examples/network/httpd/httpd.pl: + * PerlTQt/examples/network/httpd/httpd.pl: initial import of the httpd example 2002-09-27 00:41 germaingarand - * doc/: PerlQt.pod, index.html: + * doc/: PerlTQt.pod, index.html: typo 2002-09-26 21:08 germaingarand - * PerlQt/: Qt.xs, lib/Qt/isa.pm: + * PerlTQt/: TQt.xs, lib/TQt/isa.pm: - SUPER was only forwarding to base Perl classes, not base Qt classes + SUPER was only forwarding to base Perl classes, not base TQt classes Fixed 2002-09-25 11:04 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Fixing signals inheritance 2002-09-22 16:30 germaingarand - * PerlQt/Qt.xs, doc/PerlQt.pod, doc/index.html: + * PerlTQt/TQt.xs, doc/PerlTQt.pod, doc/index.html: SUPER->foo() was not passing the 'this' object. Removed the this->SUPER->foo construct which was buggy, and useless since SUPER is "protected" right now. @@ -1301,7 +1301,7 @@ * smoke/qt/generate.pl.in, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm: - Fixing SMOKE to build with Qt-3.1b1 + Fixing SMOKE to build with TQt-3.1b1 2002-09-20 16:01 germaingarand @@ -1320,23 +1320,23 @@ * Makefile.am, smoke/qt/generate.pl.in, smoke/qt/header_list: - Changed generate.pl to use a closed list of headers... some system don't store Qt headers in a distinct directory. + Changed generate.pl to use a closed list of headers... some system don't store TQt headers in a distinct directory. 2002-09-18 18:56 germaingarand - * doc/: PerlQt.pod, index.html: + * doc/: PerlTQt.pod, index.html: fixed an error in one of the tutorials 2002-09-18 10:06 germaingarand - * doc/: PerlQt.pod, index.html: + * doc/: PerlTQt.pod, index.html: Updating install instructions 2002-09-16 16:24 germaingarand - * PerlQt/: lib/Qt/attributes.pm, lib/Qt/isa.pm, Qt.pm, Qt.xs: + * PerlTQt/: lib/TQt/attributes.pm, lib/TQt/isa.pm, TQt.pm, TQt.xs: Inheritance of slots/attributes/SUPER was still half wrong. Fixed. @@ -1360,25 +1360,25 @@ 2002-09-14 17:58 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: cleaning a debug line 2002-09-14 17:52 germaingarand - * doc/: PerlQt.pod, index.html: + * doc/: PerlTQt.pod, index.html: Update for the "SUPER" construct 2002-09-14 17:50 germaingarand - * PerlQt/: lib/Qt/isa.pm, Qt.pm, Qt.xs: + * PerlTQt/: lib/TQt/isa.pm, TQt.pm, TQt.xs: Implemented a special attribute "SUPER" for calling methods on the superclass 2002-09-14 05:37 germaingarand - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/isa.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/isa.pm: - Fixed inheritance of attributes - added a "no warnings" block around "this" assignation statement @@ -1397,7 +1397,7 @@ * kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, smoke/qt/qtguess.pl.in: - Qt 3.1 fixes + TQt 3.1 fixes 2002-09-12 12:32 germaingarand @@ -1407,7 +1407,7 @@ 2002-09-12 03:19 germaingarand - * PerlQt/MANIFEST: + * PerlTQt/MANIFEST: Update @@ -1415,17 +1415,17 @@ * doc/index.html: - updated from latest PerlQt.pod + updated from latest PerlTQt.pod 2002-09-12 03:10 germaingarand - * doc/PerlQt.pod: + * doc/PerlTQt.pod: Added a note about correct syntax for calling a base class method 2002-09-12 02:43 germaingarand - * PerlQt/lib/Qt/isa.pm: + * PerlTQt/lib/TQt/isa.pm: cleaning pollution of $_ @@ -1437,26 +1437,26 @@ 2002-09-11 19:26 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: fixing broken regex in argmatch (my fault) 2002-09-11 05:18 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: fixing polling of uninitialised {slots} array Still not totally right... creating extra/unneeded qt_invoke 2002-09-11 04:21 germaingarand - * doc/PerlQt.pod: + * doc/PerlTQt.pod: Added a chapter about puic usage 2002-09-11 02:59 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: Fixing some env vars value and a broken regex @@ -1467,11 +1467,11 @@ Adding OpenGL detection && compilation to the autoconf framework --without-Mesa : if you use a vendor specific GL lib, specify this (default is to look for Mesa) - --disable-GL : skip GL stuff... not really needed since it is skipped anyway if Qt doesn't have it + --disable-GL : skip GL stuff... not really needed since it is skipped anyway if TQt doesn't have it 2002-09-11 02:51 germaingarand - * PerlQt/examples/opengl/: README, gear/gear, box/GLBox.pm, + * PerlTQt/examples/opengl/: README, gear/gear, box/GLBox.pm, box/glbox: Initial import of OpenGL examples @@ -1493,19 +1493,19 @@ 2002-09-10 00:33 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Implementing slot inheritance 2002-09-09 13:55 germaingarand - * PerlQt/lib/Qt/: signals.pm, slots.pm: + * PerlTQt/lib/TQt/: signals.pm, slots.pm: Allow a space between typename and ref/star sign for sig/slot args (i.e 'FooType &' is now OK) 2002-09-09 12:13 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: oops. removed unwanted debug output @@ -1531,7 +1531,7 @@ 2002-09-09 10:38 germaingarand - * PerlQt/lib/Qt/isa.pm: + * PerlTQt/lib/TQt/isa.pm: Fixing import rules for deeper-than-CWD located modules New rule is : always import fully qualified &X::Y::classname, but only @@ -1540,22 +1540,22 @@ 2002-09-09 10:30 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: - test for virtual destructor replaces endless isDerivedFrom() tests - added a function to lookup for an allocated object corresponding to a given anonymous pointer 2002-09-09 10:25 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: -better discrimination of method arguments (check for array reference) - -added Qt::SqlCursor to PersistentObjects (this is getting ugly :-/) + -added TQt::SqlCursor to PersistentObjects (this is getting ugly :-/) 2002-09-09 10:23 germaingarand * COPYING, ChangeLog, INSTALL, Makefile.am, configure.in, - inst-apps, subdirs, PerlQt/Makefile.PL.in, smoke/qt/Makefile.am, + inst-apps, subdirs, PerlTQt/Makefile.PL.in, smoke/qt/Makefile.am, smoke/qt/generate.pl.in: improved build system @@ -1567,7 +1567,7 @@ * README, TODO, configure.in, subdirs, AUTHORS, COPYING, ChangeLog, Makefile.am, Makefile.cvs, config.h.in, stamp-h.in, doc/Makefile, - doc/PerlQt.pod, doc/index.html, doc/pod.css, doc/images/ex1.png, + doc/PerlTQt.pod, doc/index.html, doc/pod.css, doc/images/ex1.png, doc/images/ex2.png, puic/TODO, puic/Makefile.am, puic/domtool.cpp, puic/embed.cpp, puic/form.cpp, puic/globaldefs.h, puic/main.cpp, puic/object.cpp, puic/parser.cpp, puic/parser.h, @@ -1585,22 +1585,22 @@ admin/old-ltcf-c.sh, smoke/Makefile.am, smoke/README, smoke/smoke.h, smoke/qt/Makefile.am, smoke/qt/generate.pl.in, smoke/qt/generate_makefile_am.pl, smoke/qt/qt_smoke.h, - smoke/qt/qtguess.pl.in, PerlQt/MANIFEST, PerlQt/Makefile.PL.in, - PerlQt/examples/richedit/imageCollection.pm, - PerlQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, + smoke/qt/qtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, + PerlTQt/examples/richedit/imageCollection.pm, + PerlTQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, kalyptus/README, kalyptus/TODO, kalyptus/Version, kalyptus/Iter.pm, kalyptus/kalyptus, kalyptus/kalyptusDataDict.pm, kalyptus/kdocAstUtil.pm, kalyptus/ChangeLog, kalyptus/kalyptusCxxToSmoke.pm, kalyptus/kdocLib.pm, kalyptus/kdocParseDoc.pm, kalyptus/kdocUtil.pm: - Initial import of new PerlQt-3 tree with Autoconf framework + Initial import of new PerlTQt-3 tree with Autoconf framework 2002-08-22 05:46 germaingarand * README, TODO, configure.in, subdirs, AUTHORS, COPYING, ChangeLog, Makefile.am, Makefile.cvs, config.h.in, stamp-h.in, doc/Makefile, - doc/PerlQt.pod, doc/index.html, doc/pod.css, doc/images/ex1.png, + doc/PerlTQt.pod, doc/index.html, doc/pod.css, doc/images/ex1.png, doc/images/ex2.png, puic/TODO, puic/Makefile.am, puic/domtool.cpp, puic/embed.cpp, puic/form.cpp, puic/globaldefs.h, puic/main.cpp, puic/object.cpp, puic/parser.cpp, puic/parser.h, @@ -1618,9 +1618,9 @@ admin/old-ltcf-c.sh, smoke/Makefile.am, smoke/README, smoke/smoke.h, smoke/qt/Makefile.am, smoke/qt/generate.pl.in, smoke/qt/generate_makefile_am.pl, smoke/qt/qt_smoke.h, - smoke/qt/qtguess.pl.in, PerlQt/MANIFEST, PerlQt/Makefile.PL.in, - PerlQt/examples/richedit/imageCollection.pm, - PerlQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, + smoke/qt/qtguess.pl.in, PerlTQt/MANIFEST, PerlTQt/Makefile.PL.in, + PerlTQt/examples/richedit/imageCollection.pm, + PerlTQt/examples/richedit/richedit.pl, kalyptus/Ast.pm, kalyptus/README, kalyptus/TODO, kalyptus/Version, kalyptus/Iter.pm, kalyptus/kalyptus, kalyptus/kalyptusDataDict.pm, kalyptus/kdocAstUtil.pm, kalyptus/ChangeLog, @@ -1631,229 +1631,229 @@ 2002-08-22 04:38 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Added line number & file to the 'Lookup for...' warning in do_autoload/autoloaded. It also filters out calls to enums now. 2002-08-20 18:15 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: do_autoload/autoloaded: Choose a different caller(n) if needed 2002-08-20 17:59 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: burn-proofing catArguments 2002-08-20 15:33 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - Added detailed error reporting (Ambiguity candidates, warning when discarding args, correct file and line spotting when dying, etc.). Partly backported from dev branch. - - Added caching for method calls (makes PerlQt 300% faster :-) + - Added caching for method calls (makes PerlTQt 300% faster :-) 2002-08-14 17:02 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Don't hide object into parent if parent shall die ! - Fixes case where parent is a pointer to a QObject that wasn't allocated from Perl. + Fixes case where parent is a pointer to a TQObject that wasn't allocated from Perl. 2002-08-13 18:11 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Added some PersistentObjects cases as well as some isDerivedFrom tests. 2002-07-19 18:40 awinters - * PerlQt/: Makefile.PL, smokeperl.cpp, lib/Qt/isa.pm: + * PerlTQt/: Makefile.PL, smokeperl.cpp, lib/TQt/isa.pm: - Fix to virtual functions in Perl subclasses - register the classname with Smoke from Qt::isa + Fix to virtual functions in Perl subclasses - register the classname with Smoke from TQt::isa 2002-07-17 03:35 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Fixing perl-5.8 compatibility problem. This generates a warning with -w, but since this code branch is obsolete I don't care that much. :( 2002-06-30 01:51 awinters - * PerlQt/: handlers.cpp, smokeperl.cpp: + * PerlTQt/: handlers.cpp, smokeperl.cpp: memory leak fixes 2002-06-29 21:55 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: broken leaky virtual method support - rejoice 2002-06-28 08:52 awinters - * PerlQt/: Qt.pm, smokeperl.cpp: + * PerlTQt/: TQt.pm, smokeperl.cpp: - More destructor voodoo. Why is QApplication getting addRefed? + More destructor voodoo. Why is TQApplication getting addRefed? 2002-06-27 04:59 awinters - * PerlQt/: Qt.pm, smokeperl.cpp, smokeperl.h: + * PerlTQt/: TQt.pm, smokeperl.cpp, smokeperl.h: global destruction working nicely 2002-06-27 02:22 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: enabled method calling - t1 through t6 work again 2002-06-27 01:46 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: code movement 2002-06-27 01:44 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: Start of multimethod dispatching 2002-06-26 04:56 awinters - * PerlQt/: Qt.xs, smokeperl.cpp, lib/Qt/attributes.pm, - lib/Qt/isa.pm, lib/Qt/signals.pm, lib/Qt/slots.pm, + * PerlTQt/: TQt.xs, smokeperl.cpp, lib/TQt/attributes.pm, + lib/TQt/isa.pm, lib/TQt/signals.pm, lib/TQt/slots.pm, tutorials/t7/LCDRange.pm: Getting the skeleton working for the tutorials 2002-06-26 03:36 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: Added Smoke::this(), and a possibly useful closure() function 2002-06-26 02:45 awinters - * PerlQt/: Qt.pm, smokeperl.cpp, smokeperl.h: + * PerlTQt/: TQt.pm, smokeperl.cpp, smokeperl.h: This debugging stuff is great 2002-06-25 21:08 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: use SmokeClass::parents() 2002-06-25 20:54 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: reference counting... 2002-06-25 16:52 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: file/line-number needed to be taken from caller 2002-06-25 07:09 awinters - * PerlQt/smokeperl.cpp: + * PerlTQt/smokeperl.cpp: Kickass error messages! 2002-06-25 06:18 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Changed the versioning, cooler this way. 2002-06-25 05:47 awinters - * PerlQt/: Makefile.PL, Qt.pm, Qt.xs, handlers.cpp, marshall.h, + * PerlTQt/: Makefile.PL, TQt.pm, TQt.xs, handlers.cpp, marshall.h, perlqt.h, smokeperl.cpp, smokeperl.h: Initial version of code rewrite 2002-06-15 01:19 awinters - * PerlQt/: smokeperl.cpp, smokeperl.h: + * PerlTQt/: smokeperl.cpp, smokeperl.h: Added smokeperl.cpp... doesn't do anything, and it's not linked in yet. 2002-06-14 21:02 awinters - * PerlQt/smokeperl.h: + * PerlTQt/smokeperl.h: Perhaps I have it right this time 2002-06-14 20:57 awinters - * PerlQt/smokeperl.h: + * PerlTQt/smokeperl.h: SmokeMethod::call() 2002-06-14 20:51 awinters - * PerlQt/smokeperl.h: + * PerlTQt/smokeperl.h: Added SmokeMethod 2002-06-14 20:27 awinters - * PerlQt/: Qt.xs, handlers.cpp, marshall.h, perlqt.h, smokeperl.h: + * PerlTQt/: TQt.xs, handlers.cpp, marshall.h, perlqt.h, smokeperl.h: Adding smokeperl.h. Changed all uses of Smoke::Type to SmokeType. 2002-06-14 03:11 awinters - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: I unchanged my mind. Is that a crime? 2002-06-14 03:06 awinters - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: I changed my mind, you can't pass NULL to a function expecting int*. Sorry. 2002-06-14 02:52 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Added a global object persistance thing 2002-06-14 02:28 awinters - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: int* handler 2002-06-13 22:58 awinters - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - Untested QStringList marshaller. Try it. + Untested TQStringList marshaller. Try it. 2002-06-13 09:09 awinters - * PerlQt/: Qt.pm, lib/Qt/isa.pm: + * PerlTQt/: TQt.pm, lib/TQt/isa.pm: Created a global baseclass - something I've been meaning to do for a while. Made constructors automatically inherit, you don't need to have empty constructors anymore. 2002-06-13 08:47 awinters - * PerlQt/: Qt.pm, examples/aclock/AnalogClock.pm, + * PerlTQt/: TQt.pm, examples/aclock/AnalogClock.pm, examples/buttongroups/ButtonsGroups.pm, examples/dclock/DigitalClock.pm, examples/drawdemo/drawdemo.pl, examples/drawlines/drawlines.pl, examples/forever/forever.pl, - lib/Qt/isa.pm, tutorials/t10/CannonField.pm, + lib/TQt/isa.pm, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl, tutorials/t11/CannonField.pm, tutorials/t11/LCDRange.pm, tutorials/t11/t11.pl, tutorials/t12/CannonField.pm, @@ -1871,15 +1871,15 @@ 2002-06-13 03:10 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Evil debug statement 2002-06-13 03:05 awinters - * PerlQt/: Qt.xs, examples/drawdemo/drawdemo.pl, + * PerlTQt/: TQt.xs, examples/drawdemo/drawdemo.pl, examples/drawlines/drawlines.pl, examples/forever/forever.pl, - lib/Qt/isa.pm, tutorials/t10/t10.pl, tutorials/t11/t11.pl, + lib/TQt/isa.pm, tutorials/t10/t10.pl, tutorials/t11/t11.pl, tutorials/t12/t12.pl, tutorials/t4/t4.pl, tutorials/t5/t5.pl, tutorials/t6/t6.pl, tutorials/t7/t7.pl, tutorials/t8/t8.pl, tutorials/t9/t9.pl: @@ -1888,31 +1888,31 @@ 2002-06-10 06:04 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: @ISA is now honored - had to fudge to make Exporter work 2002-06-10 04:29 awinters - * PerlQt/: Qt.pm, handlers.cpp: + * PerlTQt/: TQt.pm, handlers.cpp: - New type handlers for uchar* and QRgb*, as well as a QImage constructor + New type handlers for uchar* and TQRgb*, as well as a TQImage constructor 2002-06-10 02:04 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Evil hacks for puic 2002-06-05 18:35 awinters - * PerlQt/examples/buttongroups/: buttongroups.pl, buttonsgroups.pl: + * PerlTQt/examples/buttongroups/: buttongroups.pl, buttonsgroups.pl: Original was misnamed buttonsgroups.pl - now buttongroups.pl 2002-06-04 20:58 awinters - * PerlQt/: examples/dclock/DigitalClock.pm, + * PerlTQt/: examples/dclock/DigitalClock.pm, tutorials/t14/GameBoard.pm, tutorials/t5/t5.pl, tutorials/t6/t6.pl, tutorials/t7/LCDRange.pm: @@ -1920,37 +1920,37 @@ 2002-06-04 20:20 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - $AUTOLOAD is always $Qt::AutoLoad::AUTOLOAD, now + $AUTOLOAD is always $TQt::AutoLoad::AUTOLOAD, now 2002-06-04 18:57 awinters - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: No smoke_types.h 2002-06-04 16:58 awinters - * PerlQt/: INSTALL, Qt.xs: + * PerlTQt/: INSTALL, TQt.xs: Fixing build procedure - smoke_types.h is long dead 2002-06-04 08:36 awinters - * PerlQt/INSTALL: + * PerlTQt/INSTALL: KDE SDK hopefully isn't required 2002-06-04 07:55 awinters - * PerlQt/: INSTALL, README: + * PerlTQt/: INSTALL, README: Build instructions 2002-06-04 01:50 awinters - * PerlQt/examples/: aclock/aclock.pl, + * PerlTQt/examples/: aclock/aclock.pl, buttongroups/buttonsgroups.pl, dclock/dclock.pl, drawdemo/drawdemo.pl, drawlines/drawlines.pl, forever/forever.pl: @@ -1958,107 +1958,107 @@ 2002-06-04 00:51 awinters - * PerlQt/examples/dclock/DigitalClock.pm: + * PerlTQt/examples/dclock/DigitalClock.pm: LeftButton is global 2002-06-03 07:29 awinters - * PerlQt/tutorials/runall.pl: + * PerlTQt/tutorials/runall.pl: $^X is handy 2002-06-03 06:25 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/isa.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/isa.pm: XS autoload was disabled in Perl-5.6.1, so I made a perl sub redirect autoloads 2002-06-02 10:53 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: List ops are fun 2002-06-02 10:49 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Don't ask me why, but signals can have return-values. I don't even want to imagine it. 2002-06-02 10:46 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Switched from DynaLoader to XSLoader. Gave exported functions prototypes, for better or worse. 2002-06-02 10:29 awinters - * PerlQt/tutorials/runall.pl: + * PerlTQt/tutorials/runall.pl: I'm not usually paranoid about security, but this was too easy not to fix. 2002-06-02 10:25 awinters - * PerlQt/tutorials/runall.pl: + * PerlTQt/tutorials/runall.pl: Script to run all the tutorials in order 2002-06-02 07:24 awinters - * PerlQt/perlqt.h: + * PerlTQt/perlqt.h: ifdef 2002-06-02 07:22 awinters - * PerlQt/: Makefile.PL, Qt.xs, handlers.cpp, perlqt.h: + * PerlTQt/: Makefile.PL, TQt.xs, handlers.cpp, perlqt.h: - Created perlqt.h, moved code from Qt.xs to new handlers.cpp. Starting code reorganization. + Created perlqt.h, moved code from TQt.xs to new handlers.cpp. Starting code reorganization. 2002-06-02 03:28 awinters - * PerlQt/examples/forever/forever.pl: + * PerlTQt/examples/forever/forever.pl: Added forever - this will be my benchmark. Current results: SLOW 2002-06-02 03:09 awinters - * PerlQt/examples/drawlines/drawlines.pl: + * PerlTQt/examples/drawlines/drawlines.pl: Adding drawlines demo 2002-06-02 02:35 awinters - * PerlQt/examples/drawdemo/drawdemo.pl: + * PerlTQt/examples/drawdemo/drawdemo.pl: Added drawdemo 2002-06-01 23:37 awinters - * PerlQt/examples/dclock/: dclock, dclock.pl: + * PerlTQt/examples/dclock/: dclock, dclock.pl: Renamed dclock to dclock.pl 2002-06-01 23:36 awinters - * PerlQt/examples/buttongroups/: ButtonsGroups.pm, + * PerlTQt/examples/buttongroups/: ButtonsGroups.pm, buttonsgroups.pl: Added buttongroups example 2002-06-01 23:36 awinters - * PerlQt/examples/aclock/: aclock, aclock.pl: + * PerlTQt/examples/aclock/: aclock, aclock.pl: Renamed aclock to aclock.pl 2002-06-01 23:05 awinters - * PerlQt/: Qt.pm, Qt.xs, examples/aclock/AnalogClock.pm, + * PerlTQt/: TQt.pm, TQt.xs, examples/aclock/AnalogClock.pm, examples/aclock/aclock, examples/dclock/DigitalClock.pm, - examples/dclock/dclock, lib/Qt/attributes.pm, lib/Qt/isa.pm, - lib/Qt/signals.pm, lib/Qt/slots.pm, tutorials/t1/t1.pl, + examples/dclock/dclock, lib/TQt/attributes.pm, lib/TQt/isa.pm, + lib/TQt/signals.pm, lib/TQt/slots.pm, tutorials/t1/t1.pl, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl, tutorials/t11/CannonField.pm, tutorials/t11/LCDRange.pm, tutorials/t11/t11.pl, @@ -2078,50 +2078,50 @@ 2002-06-01 23:00 awinters - * PerlQt/examples/dclock/: DigitalClock.pm, dclock: + * PerlTQt/examples/dclock/: DigitalClock.pm, dclock: Adding dclock 2002-06-01 23:00 awinters - * PerlQt/examples/dclock/DigitalClock.pm: + * PerlTQt/examples/dclock/DigitalClock.pm: file DigitalClock.pm was initially added on branch this. 2002-06-01 23:00 awinters - * PerlQt/examples/dclock/dclock: + * PerlTQt/examples/dclock/dclock: file dclock was initially added on branch this. 2002-06-01 21:17 awinters - * PerlQt/examples/aclock/AnalogClock.pm: + * PerlTQt/examples/aclock/AnalogClock.pm: file AnalogClock.pm was initially added on branch this. 2002-06-01 21:17 awinters - * PerlQt/examples/aclock/aclock: + * PerlTQt/examples/aclock/aclock: file aclock was initially added on branch this. 2002-06-01 21:17 awinters - * PerlQt/: Qt.pm, Qt.xs, examples/aclock/AnalogClock.pm, + * PerlTQt/: TQt.pm, TQt.xs, examples/aclock/AnalogClock.pm, examples/aclock/aclock: - Added support for QCOORD* and Qt::PointArray::setPoints. Added global min() and max() functions. + Added support for TQCOORD* and TQt::PointArray::setPoints. Added global min() and max() functions. 2002-06-01 11:15 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/signals.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/signals.pm: - Made qt_emit also use XS code - noticable speedup in t7. Qt::_internal::invoke is obsolete + Made qt_emit also use XS code - noticable speedup in t7. TQt::_internal::invoke is obsolete 2002-06-01 10:13 awinters - * PerlQt/: lib/Qt/slots.pm, tutorials/t1/t1.pl, + * PerlTQt/: lib/TQt/slots.pm, tutorials/t1/t1.pl, tutorials/t10/t10.pl, tutorials/t11/t11.pl, tutorials/t12/t12.pl, tutorials/t13/CannonField.pm, tutorials/t13/GameBoard.pm, tutorials/t13/t13.pl, tutorials/t14/CannonField.pm, @@ -2134,25 +2134,25 @@ 2002-06-01 09:59 awinters - * PerlQt/: Qt.xs, lib/Qt/slots.pm: + * PerlTQt/: TQt.xs, lib/TQt/slots.pm: qt_invoke implemented in XS 2002-06-01 06:37 awinters - * PerlQt/: Qt.xs, lib/Qt/signals.pm: + * PerlTQt/: TQt.xs, lib/TQt/signals.pm: Code reorganization, start of XS slot work 2002-06-01 00:19 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/signals.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/signals.pm, lib/TQt/slots.pm: emit signal() now uses type marshalling -- the way has been shown 2002-05-31 06:42 awinters - * PerlQt/: Qt.pm, tutorials/t10/CannonField.pm, + * PerlTQt/: TQt.pm, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl, tutorials/t11/CannonField.pm, tutorials/t11/t11.pl, tutorials/t12/CannonField.pm, tutorials/t12/t12.pl, @@ -2165,34 +2165,34 @@ 2002-05-31 06:18 awinters - * PerlQt/: Qt.xs, tutorials/t11/CannonField.pm, + * PerlTQt/: TQt.xs, tutorials/t11/CannonField.pm, tutorials/t11/LCDRange.pm, tutorials/t11/t11.pl: It seems I still haven't knocked down the &Constant quirks. It's zero arguments! Sheesh. 2002-05-31 06:07 awinters - * PerlQt/tutorials/t12/: CannonField.pm, LCDRange.pm, t12.pl: + * PerlTQt/tutorials/t12/: CannonField.pm, LCDRange.pm, t12.pl: My revisionist ways continue 2002-05-31 05:51 awinters - * PerlQt/tutorials/t13/: CannonField.pm, GameBoard.pm, LCDRange.pm, + * PerlTQt/tutorials/t13/: CannonField.pm, GameBoard.pm, LCDRange.pm, t13.pl: t13 revisions 2002-05-31 05:37 awinters - * PerlQt/tutorials/t14/: CannonField.pm, GameBoard.pm, LCDRange.pm, + * PerlTQt/tutorials/t14/: CannonField.pm, GameBoard.pm, LCDRange.pm, t14.pl: I'm trying to define a coding style using t14 as the baseline. This works with the latest kalyptus. 2002-05-31 04:48 awinters - * PerlQt/: Qt.pm, Qt.xs, tutorials/t10/CannonField.pm, + * PerlTQt/: TQt.pm, TQt.xs, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl, tutorials/t11/CannonField.pm, tutorials/t11/LCDRange.pm, tutorials/t11/t11.pl, tutorials/t14/CannonField.pm, @@ -2209,14 +2209,14 @@ 2002-05-31 03:37 awinters - * PerlQt/: Qt.pm, lib/Qt/attributes.pm, tutorials/t9/LCDRange.pm, + * PerlTQt/: TQt.pm, lib/TQt/attributes.pm, tutorials/t9/LCDRange.pm, tutorials/t9/t9.pl: Changed static method calls from Class->method to Class::method 2002-05-30 22:48 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/signals.pm, + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/signals.pm, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl, tutorials/t9/CannonField.pm, tutorials/t9/LCDRange.pm, tutorials/t9/t9.pl: @@ -2225,14 +2225,14 @@ 2002-05-30 13:30 awinters - * PerlQt/: lib/Qt/isa.pm, tutorials/t8/CannonField.pm, + * PerlTQt/: lib/TQt/isa.pm, tutorials/t8/CannonField.pm, tutorials/t8/LCDRange.pm, tutorials/t8/t8.pl: passing 'this' as an lvalue to constructors which MODIFY 'this' could be unpleasant. Perhaps using sv_setsv was a bad idea. 2002-05-30 13:16 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/signals.pm, lib/Qt/slots.pm, + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/signals.pm, lib/TQt/slots.pm, tutorials/t5/t5.pl, tutorials/t6/t6.pl, tutorials/t7/LCDRange.pm, tutorials/t7/t7.pl: @@ -2240,73 +2240,73 @@ 2002-05-30 12:51 awinters - * PerlQt/: Qt.pm, Qt.xs, tutorials/t4/t4.pl: + * PerlTQt/: TQt.pm, TQt.xs, tutorials/t4/t4.pl: - set 'this' for do_autoload, so QObject-mirroring refcounting works + set 'this' for do_autoload, so TQObject-mirroring refcounting works 2002-05-30 12:29 awinters - * PerlQt/: Qt.xs, lib/Qt/isa.pm: + * PerlTQt/: TQt.xs, lib/TQt/isa.pm: AUTOLOAD now works on non-method-calls in classes, by defaulting unknown functions to this->method 2002-05-30 11:05 awinters - * PerlQt/: Qt.pm, lib/Qt/isa.pm: + * PerlTQt/: TQt.pm, lib/TQt/isa.pm: enable MyClass->AUTOLOAD and @ISA searching from autoloader 2002-05-30 10:53 awinters - * PerlQt/lib/Qt/isa.pm: + * PerlTQt/lib/TQt/isa.pm: Add import() function for use classes, so MyClass() constructors work 2002-05-30 10:07 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Object destruction seems to work again 2002-05-30 07:40 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Stop pushing 'this' on the stack for virtual methods 2002-05-30 07:28 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Calling convention works. $x->foo works for AUTOLOAD case, haven't tested the non-AUTOLOAD case even though it should work too. 2002-05-30 05:01 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: AUTOLOAD now works for calling Perl-defined methods 2002-05-30 04:12 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/isa.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/isa.pm: Added an XS autoload 2002-05-30 02:08 awinters - * PerlQt/: Qt.xs, lib/Qt/attributes.pm, lib/Qt/isa.pm: + * PerlTQt/: TQt.xs, lib/TQt/attributes.pm, lib/TQt/isa.pm: Implementation of 'this' and attributes 2002-05-30 02:08 awinters - * PerlQt/lib/Qt/attributes.pm: + * PerlTQt/lib/TQt/attributes.pm: file attributes.pm was initially added on branch this. 2002-05-29 11:09 awinters - * PerlQt/: Qt.pm, Qt.xs, tutorials/t1/t1.pl, + * PerlTQt/: TQt.pm, TQt.xs, tutorials/t1/t1.pl, tutorials/t14/CannonField.pm, tutorials/t14/GameBoard.pm, tutorials/t14/LCDRange.pm, tutorials/t14/t14.pl, tutorials/t2/t2.pl, tutorials/t3/t3.pl, tutorials/t4/t4.pl, @@ -2320,25 +2320,25 @@ 2002-05-29 09:18 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Forgot to remove debugging arguments to warn() before committing 2002-05-29 04:49 awinters - * PerlQt/tutorials/t9/: CannonField.pm, LCDRange.pm, t9.pl: + * PerlTQt/tutorials/t9/: CannonField.pm, LCDRange.pm, t9.pl: Initial commit 2002-05-29 04:47 awinters - * PerlQt/tutorials/t10/CannonField.pm: + * PerlTQt/tutorials/t10/CannonField.pm: Color constants work now 2002-05-29 04:40 awinters - * PerlQt/tutorials/: t11/CannonField.pm, t11/LCDRange.pm, + * PerlTQt/tutorials/: t11/CannonField.pm, t11/LCDRange.pm, t11/t11.pl, t12/CannonField.pm, t12/LCDRange.pm, t12/t12.pl, t13/CannonField.pm, t13/GameBoard.pm, t13/LCDRange.pm, t13/t13.pl, t14/CannonField.pm, t14/GameBoard.pm, t14/LCDRange.pm, t14/t14.pl: @@ -2347,275 +2347,275 @@ 2002-05-28 23:33 awinters - * PerlQt/: Qt.xs, tutorials/t10/CannonField.pm, + * PerlTQt/: TQt.xs, tutorials/t10/CannonField.pm, tutorials/t10/LCDRange.pm, tutorials/t10/t10.pl: - Plugged a memory-leak involving tf_stack return-values, and added isa(QPaintDevice) to the list of classes added to the + Plugged a memory-leak involving tf_stack return-values, and added isa(TQPaintDevice) to the list of classes added to the virtual function object-map. Tutorial 10 added. 2002-05-28 22:13 awinters - * PerlQt/tutorials/t8/CannonField.pm: + * PerlTQt/tutorials/t8/CannonField.pm: When I said ambiguous method resolution was improved, I wasn't kidding. 2002-05-28 22:12 awinters - * PerlQt/: Qt.pm, Qt.xs, tutorials/t8/CannonField.pm, + * PerlTQt/: TQt.pm, TQt.xs, tutorials/t8/CannonField.pm, tutorials/t8/LCDRange.pm, tutorials/t8/t8.pl: Copy constructor implemented for virtual method return-values, ambiguous method resolution improved, t8 working. 2002-05-28 20:27 awinters - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Added emit keyword 2002-05-28 20:13 awinters - * PerlQt/tutorials/: t6/t6.pl, t7/LCDRange.pm, t7/t7.pl: + * PerlTQt/tutorials/: t6/t6.pl, t7/LCDRange.pm, t7/t7.pl: Last commit failed, new object destruction 2002-05-28 20:13 awinters - * PerlQt/: Qt.pm, Qt.xs, tutorials/t4/t4.pl, tutorials/t5/t5.pl: + * PerlTQt/: TQt.pm, TQt.xs, tutorials/t4/t4.pl, tutorials/t5/t5.pl: - New object destruction - Perl now mirrors QObject reference counts + New object destruction - Perl now mirrors TQObject reference counts 2002-05-28 07:49 awinters - * PerlQt/tutorials/t7/: LCDRange.pm, t7.pl: + * PerlTQt/tutorials/t7/: LCDRange.pm, t7.pl: Tutorial 7, in all its glory 2002-05-28 07:48 awinters - * PerlQt/: Qt.xs, lib/Qt/signals.pm: + * PerlTQt/: TQt.xs, lib/TQt/signals.pm: Workings of tutorial 7 2002-05-28 06:53 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/signals.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/signals.pm, lib/TQt/slots.pm: signal and slot implementation merged a bit, first stab at ambiguous method resolution added. 2002-05-28 04:08 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/slots.pm: - Slots are now declared through the Qt::slots pragma. Only int arguments are supported, so far. + Slots are now declared through the TQt::slots pragma. Only int arguments are supported, so far. 2002-05-28 00:19 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/slots.pm: Got slot arguments working 2002-05-27 19:52 awinters - * PerlQt/lib/Qt/slots.pm: + * PerlTQt/lib/TQt/slots.pm: More slot goodness 2002-05-27 19:37 awinters - * PerlQt/lib/Qt/slots.pm: + * PerlTQt/lib/TQt/slots.pm: Recognize when Perl slot is invoked 2002-05-27 19:27 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/slots.pm: Paranoid backup. I got a slot to work, and I want it to stay that way. :) 2002-05-27 18:47 awinters - * PerlQt/: Qt.pm, Qt.xs, lib/Qt/isa.pm, lib/Qt/signals.pm, - lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, TQt.xs, lib/TQt/isa.pm, lib/TQt/signals.pm, + lib/TQt/slots.pm: - Start overriding signal/slot methods. Qt is now 'aware' of PerlQt classes, thanks to overrides of className() and + Start overriding signal/slot methods. TQt is now 'aware' of PerlTQt classes, thanks to overrides of className() and metaObject(). 2002-05-27 09:09 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Bye bye, comments 2002-05-27 08:53 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Dirty first draft of 'proper' reference counting 2002-05-27 08:52 awinters - * PerlQt/tutorials/: t1/t1.pl, t2/t2.pl, t3/t3.pl, t4/t4.pl, + * PerlTQt/tutorials/: t1/t1.pl, t2/t2.pl, t3/t3.pl, t4/t4.pl, t5/t5.pl, t6/t6.pl: use strict is mandatory, now. Reference counts matter. 2002-05-27 02:51 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: I never manage to get all the debug statements first time around... 2002-05-27 02:49 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Fully working marshalling class. Toss MyStack for good; Long live Marshall! 2002-05-27 01:35 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: I don't need these debugging statements anymore 2002-05-27 01:28 awinters - * PerlQt/: Qt.xs, marshall.h: + * PerlTQt/: TQt.xs, marshall.h: Marshalling works for method calls 2002-05-26 23:41 awinters - * PerlQt/: Qt.xs, marshall.h: + * PerlTQt/: TQt.xs, marshall.h: Defined some of the type mapping 2002-05-26 23:23 awinters - * PerlQt/marshall.h: + * PerlTQt/marshall.h: #ifndef MARSHALL_H 2002-05-26 23:19 awinters - * PerlQt/: Qt.xs, marshall.h: + * PerlTQt/: TQt.xs, marshall.h: Defining general type-marshalling interface 2002-05-24 20:14 awinters - * PerlQt/Makefile.PL: + * PerlTQt/Makefile.PL: Forgot to update this... 2002-05-24 17:25 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Eliminate warning during global destruction 2002-05-24 17:19 awinters - * PerlQt/tutorials/: t2/t2.pl, t3/t3.pl, t4/t4.pl, t5/t5.pl, + * PerlTQt/tutorials/: t2/t2.pl, t3/t3.pl, t4/t4.pl, t5/t5.pl, t6/t6.pl: Enums work, now 2002-05-24 08:19 awinters - * PerlQt/lib/Qt/: enumerations.pm, properties.pm, signals.pm, + * PerlTQt/lib/TQt/: enumerations.pm, properties.pm, signals.pm, slots.pm: Documented some proposed usage. Perhaps good, perhaps not. 2002-05-24 07:45 awinters - * PerlQt/lib/Qt/isa.pm: + * PerlTQt/lib/TQt/isa.pm: - Initial implementation - no QMetaObject stuff yet + Initial implementation - no TQMetaObject stuff yet 2002-05-24 07:43 awinters - * PerlQt/tutorials/: t4/t4.pl, t5/t5.pl, t6/t6.pl: + * PerlTQt/tutorials/: t4/t4.pl, t5/t5.pl, t6/t6.pl: - Use Qt::isa pragma + Use TQt::isa pragma 2002-05-24 07:36 awinters - * PerlQt/lib/Qt/: enumerations.pm, isa.pm, properties.pm, + * PerlTQt/lib/TQt/: enumerations.pm, isa.pm, properties.pm, signals.pm, slots.pm: - Adding some QMetaObject-generating pragmas + Adding some TQMetaObject-generating pragmas 2002-05-24 04:46 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: That qobject boolean was a bad idea... 2002-05-24 04:13 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: - Fixed memory leak, isQObject() forgot to return false + Fixed memory leak, isTQObject() forgot to return false 2002-05-24 03:41 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Call delete through smoked library 2002-05-24 03:24 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Added a flag indicating whether an object can be deleted -- object deletion enabled. 2002-05-24 02:59 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: First version with virtual functions 2002-05-24 02:36 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Beginning of virtual method support 2002-05-24 02:07 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Default to silent output, and remove old commented functions. 2002-05-24 01:56 awinters - * PerlQt/: Qt.xs, Qt.pm: + * PerlTQt/: TQt.xs, TQt.pm: Implemented rudimentary object tracking and destruction. 2002-05-23 22:57 awinters - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: Implement new smokelib => perl interface SmokeBinding class, and add destructor callback. Start of work to get working object destruction. 2002-05-23 20:53 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: Changed return-value handling to be generic so it can handle virtual-function arguments as well. 2002-05-23 06:16 awinters - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: This one works. First working version in SF CVS 2002-05-23 06:02 awinters - * PerlQt/: Makefile.PL, Qt.pm, Qt.xs, tutorials/t1/t1.pl, + * PerlTQt/: Makefile.PL, TQt.pm, TQt.xs, tutorials/t1/t1.pl, tutorials/t2/t2.pl, tutorials/t3/t3.pl, tutorials/t4/t4.pl, tutorials/t5/t5.pl, tutorials/t6/t6.pl: @@ -2623,7 +2623,7 @@ 2002-05-23 06:02 awinters - * PerlQt/: Makefile.PL, Qt.pm, Qt.xs, tutorials/t1/t1.pl, + * PerlTQt/: Makefile.PL, TQt.pm, TQt.xs, tutorials/t1/t1.pl, tutorials/t2/t2.pl, tutorials/t3/t3.pl, tutorials/t4/t4.pl, tutorials/t5/t5.pl, tutorials/t6/t6.pl: diff --git a/ChangeLog.CVS.delta b/ChangeLog.CVS.delta index 7450ada..84062b6 100644 --- a/ChangeLog.CVS.delta +++ b/ChangeLog.CVS.delta @@ -1,54 +1,54 @@ 2003-09-13 00:39 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - cache copy constructor && destructor lookups - avoid looking twice in type hash for most common types 2003-09-13 00:37 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - fix line numbers && current file on error (no method to call...) 2003-09-12 15:43 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - reworking the tied marshallers: let's allow readonly variables. 2003-09-12 15:24 germaingarand - * PerlQt/t/b_nogui.t: + * PerlTQt/t/b_nogui.t: - adding test for tied marshaller/TextStream 2003-09-12 13:13 germaingarand - * PerlQt/Qt.xs: + * PerlTQt/TQt.xs: (see previous commit on handlers.cpp) 2003-09-12 13:12 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - fix garbage collection: we need to register external objects as well, so that widgets using e.g: the $mainWindow->menuBar() pointer as parent don't get GCed. - - do not look in real stash if call is for a Qt::enum + - do not look in real stash if call is for a TQt::enum (emulation of the previous Legacy autoload behaviour) 2003-09-12 13:02 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - strict matching is too strict. We'll do that only for operators 2003-09-10 18:16 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - - We don't want to check the type of every argument, but let's check at least Qt Objects. + - We don't want to check the type of every argument, but let's check at least TQt Objects. Wrong casts are deadly and hard to debug. - got rid of the legacy autoload. Fully qualified calls are much faster now. @@ -66,7 +66,7 @@ 2003-09-09 09:21 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: fix compile for 5.6.1 @@ -79,29 +79,29 @@ 2003-09-09 06:25 germaingarand - * PerlQt/Makefile.PL.in: + * PerlTQt/Makefile.PL.in: - - add qt_libraries to RPATH too, otherwise Qt.so can pull a qt-mt library different from the one Smoke + - add qt_libraries to RPATH too, otherwise TQt.so can pull a qt-mt library different from the one Smoke would have picked up. 2003-09-08 18:13 germaingarand - * PerlQt/t/ca_i18n.t: + * PerlTQt/t/ca_i18n.t: - one more test, monitoring "use bytes" pragma 2003-09-08 16:24 germaingarand - * PerlQt/: MANIFEST, Makefile.PL.in, Qt.pod: + * PerlTQt/: MANIFEST, Makefile.PL.in, TQt.pod: - cleaning Makefile.PL.in - - install documentation in {datadir}/PerlQt-3 - - install a short Qt.pod notice pointing to the real doc, for those - who are going to try "perldoc Qt" :-} + - install documentation in {datadir}/PerlTQt-3 + - install a short TQt.pod notice pointing to the real doc, for those + who are going to try "perldoc TQt" :-} 2003-09-08 15:38 germaingarand - * doc/: en/PerlQt.pod, en/index.html, fr/PerlQt.pod, fr/index.html: + * doc/: en/PerlTQt.pod, en/index.html, fr/PerlTQt.pod, fr/index.html: - updated documentation (/en and /fr) to reflect 3.008 changes @@ -126,19 +126,19 @@ 2003-09-07 15:26 germaingarand - * PerlQt/lib/Qt/debug.pm: + * PerlTQt/lib/TQt/debug.pm: - warn and display list of available debugging channels when asked for an unknown one 2003-09-07 15:18 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: - bumping version to 3.008 2003-09-07 14:35 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: - major bug fix: "use bytes" and "use locale" pragmata didn't apply to current scope. They are held in the op_private of the context stack after compiling, no more in PL_hints. @@ -160,38 +160,38 @@ 2003-09-06 16:51 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - be more strict when matching ambiguous methods - fixed a bug regarding the priority of some types 2003-09-05 03:30 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp: - - implemented QByteArray Marshaller (from/to Perl string, tied if needed) + - implemented TQByteArray Marshaller (from/to Perl string, tied if needed) Still needs some thought /wrt to Utf8 handling (think qCompress/qUncompress) - With QDataStream static operators and this, we get a nice object serializer :) + With TQDataStream static operators and this, we get a nice object serializer :) - use Qt::constants; + use TQt::constants; $bytearray = ""; - $a = Qt::DataStream( $bytearray, IO_WriteOnly ); + $a = TQt::DataStream( $bytearray, IO_WriteOnly ); # now magically serialize some objects in $bytearray $a << $qdatetime << $qfont << $qpixmap; 2003-09-01 21:09 germaingarand - * PerlQt/: Qt.xs, handlers.cpp: + * PerlTQt/: TQt.xs, handlers.cpp: - - real non-const QString&/* marshaller implemented via tied scalars + - real non-const TQString&/* marshaller implemented via tied scalars e.g: - use Qt; - use Qt::constants; + use TQt; + use TQt::constants; $str = "Foooooooooooooooo"; - $ts = Qt::TextStream( $str, IO_WriteOnly ); + $ts = TQt::TextStream( $str, IO_WriteOnly ); $ts << "pi = " << 3.14; # $str is now "pi = 3.14oooooooo" @@ -200,7 +200,7 @@ 2003-08-31 16:35 germaingarand - * PerlQt/lib/Qt/GlobalSpace.pm, PerlQt/Qt.pm, PerlQt/t/b_nogui.t, + * PerlTQt/lib/TQt/GlobalSpace.pm, PerlTQt/TQt.pm, PerlTQt/t/b_nogui.t, kalyptus/ChangeLog, kalyptus/Iter.pm, kalyptus/README, kalyptus/kalyptus, kalyptus/kalyptusCxxToSmoke.pm, kalyptus/kdocAstUtil.pm: @@ -209,23 +209,23 @@ 2003-08-31 14:38 germaingarand - * PerlQt/: Qt.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, lib/TQt/slots.pm: - more permissive syntax for new sig/slot declarations (white spaces, quotes) - implement consistency check of old vs. new style slot declarations allows one to say - use Qt::slots "foo" => ["int"]; + use TQt::slots "foo" => ["int"]; then - sub foo : SLOT( int ) {} # OK. Same decl. Noop. - sub foo : SLOT( QString ) {} # triggers a warning: + sub foo : TQT_SLOT( int ) {} # OK. Same decl. Noop. + sub foo : TQT_SLOT( TQString ) {} # triggers a warning: # Slot declaration: - # foo(QString) + # foo(TQString) # will override previous declaration: # foo(int) 2003-08-30 23:01 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: Doing it the Right Way. - make $SIG{__DIE__} local inside eval'ed ops @@ -248,42 +248,42 @@ 2003-08-28 01:28 germaingarand - * PerlQt/: Qt.pm, lib/Qt/GlobalSpace.pm, lib/Qt/constants.pm: + * PerlTQt/: TQt.pm, lib/TQt/GlobalSpace.pm, lib/TQt/constants.pm: - - adding support for the new Qt::GlobalSpace pseudo-class holding all global Qt functions. + - adding support for the new TQt::GlobalSpace pseudo-class holding all global TQt functions. Requires a recompilation of Smoke. - use Qt::GlobalSpace; # exports all symbols to the caller's namespace (not recommended) - use Qt::GlobalSpace qw( bitBlt qCompress qSysInfo ); # export listed symbols only - - when an operator call fails, forward the call to Qt::GlobalSpace which has a lot of static operators: - $aPoint = Qt::Point( 20, 20 ); - $aPoint += Qt::Point( 10, 10); # this one calls Qt::Point->operator+() - $o = Qt::Point(10,10) + Qt::Point(30,30); # this is forwarded to Qt::GlobalSpace::+( QPoint, QPoint ) - - made "use Qt::constant" export all symbols by default (IO_ReadOnly, ...). + use TQt::GlobalSpace; # exports all symbols to the caller's namespace (not recommended) + use TQt::GlobalSpace qw( bitBlt qCompress qSysInfo ); # export listed symbols only + - when an operator call fails, forward the call to TQt::GlobalSpace which has a lot of static operators: + $aPoint = TQt::Point( 20, 20 ); + $aPoint += TQt::Point( 10, 10); # this one calls TQt::Point->operator+() + $o = TQt::Point(10,10) + TQt::Point(30,30); # this is forwarded to TQt::GlobalSpace::+( TQPoint, TQPoint ) + - made "use TQt::constant" export all symbols by default (IO_ReadOnly, ...). 2003-08-20 10:12 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - construct_copy for const ref: update the macros, and oh, don't forget to mark the resulting object as allocated. Caveat leakem. 2003-08-20 09:25 germaingarand - * PerlQt/handlers.cpp: + * PerlTQt/handlers.cpp: - fixed a severe bug in construct_copy - - when marshalling const QFoo&, construct a copy... - this ought to fix a lot of subtle bugs (mostly QShared related). + - when marshalling const TQFoo&, construct a copy... + this ought to fix a lot of subtle bugs (mostly TQShared related). 2003-08-14 20:52 germaingarand * puic/: form.cpp, uic.cpp, uic.h: - - various fixes for when compiling with Qt < 3.1 + - various fixes for when compiling with TQt < 3.1 2003-08-14 18:44 germaingarand - * PerlQt/Makefile.PL.in, admin/acinclude.m4.in, + * PerlTQt/Makefile.PL.in, admin/acinclude.m4.in, smoke/qt/qtguess.pl.in: - nice patch by Marek Rouchal<marek.rouchal@infineon.com>. Improves Solaris @@ -314,23 +314,23 @@ * smoke/qt/Makefile.am, smoke/qt/header_list, kalyptus/kalyptusCxxToSmoke.pm: - - fix Smoke generation for Qt-3.2b1 + - fix Smoke generation for TQt-3.2b1 2003-06-14 04:47 germaingarand - * PerlQt/: Qt.pm, Qt.xs, handlers.cpp, perlqt.h: + * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp, perlqt.h: - speed optimizations again. cachegrind rocks 2003-06-09 17:17 germaingarand - * PerlQt/lib/Qt/attributes.pm: + * PerlTQt/lib/TQt/attributes.pm: - do not redefine attributes if they have already been defined in base class. 2003-06-09 17:15 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - Some polishing on Q*Items garbage collection. setAllocated() is now correct. - Speed, speed, speed. Moved object destruction routine to XS. Object creation/deletion @@ -345,38 +345,38 @@ 2003-06-06 21:30 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - sig/slot defined via sub attributes are now created upon metaObject() request if needed. Much better this way, since it allows runtime evaluation: - eval "sub foo : SLOT() {}" + eval "sub foo : TQT_SLOT() {}" 2003-06-06 02:51 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: for now: slot/signal/dcop => SLOT/SIGNAL/DCOP 2003-06-06 01:53 germaingarand - * PerlQt/Qt.pm: + * PerlTQt/TQt.pm: - - moved the sig/slot attributes handling from Qt::base to the Qt::Object package, + - moved the sig/slot attributes handling from TQt::base to the TQt::Object package, where it obviously belongs - - silenced a 5.6.0 warning /wrt Qt::debug + - silenced a 5.6.0 warning /wrt TQt::debug 2003-06-05 22:07 germaingarand - * PerlQt/: Qt.pm, lib/Qt/signals.pm, lib/Qt/slots.pm: + * PerlTQt/: TQt.pm, lib/TQt/signals.pm, lib/TQt/slots.pm: - implemented Ashley's great syntax proposal for sig/slots definition via sub attributes - sub mySlot : slot( int, const QString& ) { ... } + sub mySlot : slot( int, const TQString& ) { ... } sub mySig : signal( bool ); Of course, the old/alternative syntax is still valid. 2003-06-05 15:22 germaingarand - * PerlQt/: Qt.pm, Qt.xs: + * PerlTQt/: TQt.pm, TQt.xs: - fixed the garbage collection for Q*Items. Use list->takeItem( foo ) when available to safely remove an Item from a list (then undef it to delete). @@ -388,8 +388,8 @@ * puic/puic.pro: - added a qmake project file, for easy building of puic when checked out separately - ( export QTDIR, then: - $QTDIR/bin/qmake -makefile puic.pro && make && make install ) + ( export TQTDIR, then: + $TQTDIR/bin/qmake -makefile puic.pro && make && make install ) 2003-05-30 01:36 germaingarand @@ -429,7 +429,7 @@ projectsettingsinterfaceimpl.cpp, slotfuncdia.h, sourcetemplateinterfaceimpl.cpp: - - implemented "Build and run project". One can now fully develop/test/run a PerlQt program without ever using + - implemented "Build and run project". One can now fully develop/test/run a PerlTQt program without ever using a console. This is VB on steroids :) - added an application template - project settings looks OK. Would need some testing usability wise though @@ -456,7 +456,7 @@ projectsettings.h, slotfuncdia.h, images/perlqt.png, images/perlqtblue.png, images/perlqtblue2.png: - - added PerlQt Menu/toolbar ("Run form/run project" triggers puic->perl) + - added PerlTQt Menu/toolbar ("Run form/run project" triggers puic->perl) - "run project" not yet implemented - "Run Form" can be accessed also with RMB on source code - When Form is run through Perl, STDOUT/STDERR are captured and redirected to the Designer's @@ -508,7 +508,7 @@ 2003-05-23 16:23 germaingarand - * PerlQt/bin/pqtapi: + * PerlTQt/bin/pqtapi: - added option 'p' for including inherited methods of 'class' in results - option 'm' is for communication with the Designer Plugin (for code completion) @@ -554,7 +554,7 @@ interfaces/sourcetemplateiface.h, interfaces/templatewizardiface.h, interfaces/widgetinterface.h: - Initial import of the PerlQt plugin for Qt Designer + Initial import of the PerlTQt plugin for TQt Designer 2003-05-22 21:34 germaingarand @@ -596,7 +596,7 @@ * puic/: form.cpp, subclassing.cpp: - - support for the Designer's PerlQt plugin + - support for the Designer's PerlTQt plugin - patch by Terrence (Terry) Fleury <tfleury@ncsa.uiuc.edu> for incluson of "Use" directives (also supported by the plugin, and stored in the same structure) @@ -610,23 +610,23 @@ 2003-04-15 23:03 germaingarand - * doc/: en/PerlQt.pod, en/index.html, fr/PerlQt.pod, fr/index.html: + * doc/: en/PerlTQt.pod, en/index.html, fr/PerlTQt.pod, fr/index.html: -documenting new marshallers 2003-04-15 22:43 germaingarand - * configure.in, PerlQt/Qt.pm: + * configure.in, PerlTQt/TQt.pm: bumping version number to 3.007 2003-04-15 16:07 germaingarand - * PerlQt/: handlers.cpp, Qt.pm, smokeperl.h: + * PerlTQt/: handlers.cpp, TQt.pm, smokeperl.h: - added 8 marshallers for Q*List classes: - QWidgetList, QCanvasItemList, QObjectList, QPtrList<QTab>, QPtrList<QToolBar>, - QPtrList<QDockWindow>, QPtrList<QNetworkOperation>, QFileInfoList + TQWidgetList, TQCanvasItemList, TQObjectList, TQPtrList<TQTab>, TQPtrList<TQToolBar>, + TQPtrList<TQDockWindow>, TQPtrList<TQNetworkOperation>, TQFileInfoList 2003-04-15 16:04 germaingarand @@ -650,7 +650,7 @@ 2003-03-08 19:03 germaingarand - * PerlQt/bin/pqtsh: + * PerlTQt/bin/pqtsh: disable strict in eval @@ -680,10 +680,10 @@ 2003-02-19 17:01 germaingarand - * PerlQt/bin/pqtsh: + * PerlTQt/bin/pqtsh: - redirect STDOUT/STDERR to shell window (patch by Stéphane Payrard<stef@payrard.net>) - - fixed troubles with line breaks and Qt-3.1 + - fixed troubles with line breaks and TQt-3.1 - discard empty lines on save 2003-02-19 13:44 germaingarand @@ -26,9 +26,9 @@ Custom important options : --enable-smoke : force generation and compilation of the Smoke library, even if it has been detected on your system ---with-threshold=<0..15> : set the lever of standardness of your Qt +--with-threshold=<0..15> : set the lever of standardness of your TQt library. Default is 10, which is reasonable. - If your Qt library is very customized, and you + If your TQt library is very customized, and you experience missing symbols in libsmokeqt.so, set this to zero (paranoid level). ==== @@ -36,7 +36,7 @@ Custom important options : See doc/en/index.html for installation procedure, requirements and detailed tutorial. -See also PerlQt/tutorials and PerlQt/examples to get started. +See also PerlTQt/tutorials and PerlTQt/examples to get started. diff --git a/Makefile.PL b/Makefile.PL index fa18b9f..b84f83b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -20,13 +20,13 @@ my @alt; exec "./configure --help" if grep /^-?-h(elp)?$/, @ARGV; -unless ($ENV{'QTDIR'} or grep /--with-qt-dir/, @ARGV) +unless ($ENV{'TQTDIR'} or grep /--with-qt-dir/, @ARGV) { print "\n!!!!!!!!!!!! WARNING !!!!!!!!!!!!\n". - " Your QTDIR environment variable is not set and you\n". + " Your TQTDIR environment variable is not set and you\n". "did not use the '--with-qt-dir=' commandline option.\n". "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n"; - print "Nevermind, I'll try to guess Qt's location.\n"; + print "Nevermind, I'll try to guess TQt's location.\n"; sleep(6); for(@prefix) { @@ -34,7 +34,7 @@ unless ($ENV{'QTDIR'} or grep /--with-qt-dir/, @ARGV) if(-s $stdpath."/$libname") { push @alt, glob($stdpath."/$libname*"); - print "Found what looks like a Qt-3 tree in $_/lib/qt3\n"; + print "Found what looks like a TQt-3 tree in $_/lib/qt3\n"; sleep(1); } } @@ -99,7 +99,7 @@ unless ($ENV{'KDEDIR'} or grep /--prefix/, @ARGV) " Your KDEDIR environment variable is not set and you\n". "did not use the '--prefix=' commandline option.\n"; print "KDE-3 isn't required at all. However, if it's installed on your system,\n". - "it is much better to specify it's location since PerlQt uses (or build, if\n". + "it is much better to specify it's location since PerlTQt uses (or build, if\n". "it can't find it) a KDE library named smokeqt.\n"; print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n"; sleep(5); diff --git a/Makefile.am b/Makefile.am index 55d68c4..1b332d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs diff --git a/Makefile.in b/Makefile.in index 5d38411..d20ea77 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,14 +104,14 @@ LIBUCB = @LIBUCB@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ +LIB_TQPE = @LIB_TQPE@ LIB_QT = @LIB_QT@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MOC = @MOC@ +TQMOC = @TQMOC@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -122,9 +122,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ +TQTE_NORTTI = @TQTE_NORTTI@ +TQT_INCLUDES = @TQT_INCLUDES@ +TQT_LDFLAGS = @TQT_LDFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -196,7 +196,7 @@ x_libraries = @x_libraries@ SUBDIRS = $(TOPSUBDIRS) -EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png +EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO Makefile.cvs test.pl Makefile.PL inst-apps smoke/smoke.h smoke/Makefile.in smoke/Makefile.am smoke/qt/qtguess.pl.in smoke/qt/generate.pl.in smoke/qt/qt_smoke.h smoke/qt/generate_makefile_am.pl smoke/qt/Makefile.am smoke/qt/Makefile.in smoke/qt/header_list kalyptus/Ast.pm kalyptus/kalyptus kalyptus/kalyptusDataDict.pm kalyptus/kdocParseDoc.pm kalyptus/Version kalyptus/ChangeLog kalyptus/kdocUtil.pm kalyptus/kdocAstUtil.pm kalyptus/README kalyptus/Iter.pm kalyptus/kalyptusCxxToSmoke.pm kalyptus/kdocLib.pm kalyptus/TODO doc/en/index.html doc/en/Makefile doc/en/PerlTQt.pod doc/fr/index.html doc/fr/Makefile doc/fr/PerlTQt.pod doc/css/pod.css doc/images/ex1.png doc/images/ex2.png doc/images/pqtsh.png # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs @@ -207,7 +207,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = PerlQt/Makefile.PL +CONFIG_CLEAN_FILES = PerlTQt/Makefile.PL DIST_SOURCES = #>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ @@ -249,7 +249,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>+ 3 cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) @@ -277,7 +277,7 @@ $(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) distclean-hdr: -rm -f config.h stamp-h1 -PerlQt/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/PerlQt/Makefile.PL.in +PerlTQt/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/PerlTQt/Makefile.PL.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: @@ -429,7 +429,7 @@ distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/PerlQt $(distdir)/admin $(distdir)/doc/css $(distdir)/doc/en $(distdir)/doc/fr $(distdir)/doc/images $(distdir)/kalyptus $(distdir)/smoke $(distdir)/smoke/qt + $(mkinstalldirs) $(distdir)/PerlTQt $(distdir)/admin $(distdir)/doc/css $(distdir)/doc/en $(distdir)/doc/fr $(distdir)/doc/images $(distdir)/kalyptus $(distdir)/smoke $(distdir)/smoke/qt @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -675,7 +675,7 @@ docs-am: force-reedit: cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/Makefile.in #>+ 5 diff --git a/PerlQt/INSTALL b/PerlQt/INSTALL index bd4a724..bad4e4a 100644 --- a/PerlQt/INSTALL +++ b/PerlQt/INSTALL @@ -1,22 +1,22 @@ -PerlQt is distributed under the GPL. Development is coordinated on the +PerlTQt is distributed under the GPL. Development is coordinated on the kde-perl@mail.kde.org mailing-list. To subscribe, visit http://mail.kde.org/mailman/listinfo/kde-perl or send a subscribe message to kde-perl-request@mail.kde.org. Please send patches and bug reports to the mailing-list. -This file contains instructions for downloading and building the SmokeQt -library and PerlQt. PerlQt is not a direct Perl interface to the Qt -library, but is rather an interface to the SmokeQt library generated by +This file contains instructions for downloading and building the SmokeTQt +library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt +library, but is rather an interface to the SmokeTQt library generated by Kalyptus. The programs+version I use, but not necessarily required: Linux (oddly enough, most of the developers use Mandrake) Perl-5.6.0 or above (tested up to 5.8.0-RC1) -Qt-3.0.1 or above (untested with 3.0.0, should work though) +TQt-3.0.1 or above (untested with 3.0.0, should work though) automake-1.5 (KDE requires recent automake) autoconf-2.53 (KDE requires recent autoconf) -Make sure your $QTDIR environment-variable is set. +Make sure your $TQTDIR environment-variable is set. I'm sorry for all the requirements, but you *are* getting this from CVS. Release versions will be much easier and more independant. @@ -33,15 +33,15 @@ $ cd kdebindings # kdebindings/ $ cvs co admin # get kde build tools At this point, you now have the full smokeqt environment. The -pre-generated smoke library is based off KDE's copy of Qt-3.0.4. I have -Qt-3.0.1, so I have to re-generate the files to match my installed -version of Qt. Here's how to do it. +pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have +TQt-3.0.1, so I have to re-generate the files to match my installed +version of TQt. Here's how to do it. $ cd smoke/qt # kdebindings/smoke/qt/ -$ perl ./qtguess.pl # simple script to find disabled Qt features +$ perl ./qtguess.pl # simple script to find disabled TQt features $ perl ./generate.pl # calls kalyptus which generates code -Now you have the SmokeQt source-code generated for your personal Qt +Now you have the SmokeTQt source-code generated for your personal TQt configuration. Here's how to compile. $ cd ../.. # kdebindings/ @@ -52,12 +52,12 @@ $ make # this should succeed $ make install # will install to --prefix from configure Okay, you now have libsmokeqt installed on your system. You can now -compile PerlQt. First, get the latest version of PerlQt-3. +compile PerlTQt. First, get the latest version of PerlTQt-3. $ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt $ cvs login # no password -$ cvs co PerlQt-3 -$ cd PerlQt-3 # PerlQt-3/ +$ cvs co PerlTQt-3 +$ cd PerlTQt-3 # PerlTQt-3/ If you installed libsmokeqt in a non-standard library path, you will need to edit Makefile.PL and add -L/your/lib/path to the LIBS @@ -67,14 +67,14 @@ your system, you will need to change it now. $ perl Makefile.PL $ make -Now PerlQt is built on your system. To test it out: +Now PerlTQt is built on your system. To test it out: -$ cd tutorials # PerlQt-3/tutorials/ +$ cd tutorials # PerlTQt-3/tutorials/ $ perl runall.pl All 14 tutorials should run in order. As you close one program out by clicking Quit or the window close button, the next should start. If all 14 -tutorials run without error and work like the C++ version, PerlQt is built +tutorials run without error and work like the C++ version, PerlTQt is built correctly and you can make install if you wish. If an error occurs which you can't fix, contact the kde-perl mailing list and make a bug report. diff --git a/PerlQt/MANIFEST b/PerlQt/MANIFEST index d52681c..53d07ac 100644 --- a/PerlQt/MANIFEST +++ b/PerlQt/MANIFEST @@ -1,9 +1,9 @@ INSTALL MANIFEST Makefile.PL.in -Qt.pm -Qt.xs -Qt.pod +TQt.pm +TQt.xs +TQt.pod bin/pqtapi bin/pqtsh examples/aclock/AnalogClock.pm @@ -24,15 +24,15 @@ examples/progress/progress.pl examples/richedit/imageCollection.pm examples/richedit/richedit.pl handlers.cpp -lib/Qt/attributes.pm -lib/Qt/debug.pm -lib/Qt/enumerations.pm -lib/Qt/isa.pm -lib/Qt/constants.pm -lib/Qt/properties.pm -lib/Qt/signals.pm -lib/Qt/slots.pm -lib/Qt/GlobalSpace.pm +lib/TQt/attributes.pm +lib/TQt/debug.pm +lib/TQt/enumerations.pm +lib/TQt/isa.pm +lib/TQt/constants.pm +lib/TQt/properties.pm +lib/TQt/signals.pm +lib/TQt/slots.pm +lib/TQt/GlobalSpace.pm marshall.h perlqt.h smokeperl.cpp diff --git a/PerlQt/Makefile.PL.in b/PerlQt/Makefile.PL.in index e848160..e4009db 100644 --- a/PerlQt/Makefile.PL.in +++ b/PerlQt/Makefile.PL.in @@ -21,7 +21,7 @@ $x{'X_PRE_LIBS'} = '@X_PRE_LIBS@'; interpolate('LIB_X11', 'exec_prefix', 'libdir', 'datadir'); -my $objects='Qt$(OBJ_EXT) handlers$(OBJ_EXT)'; +my $objects='TQt$(OBJ_EXT) handlers$(OBJ_EXT)'; my $qtlib ='@LIB_QT@'; interpolate(\$qtlib); @@ -81,12 +81,12 @@ my $localsmoke = File::Spec->catdir($abs_topdir,"smoke","qt",".libs"); # the contents of the Makefile that is written. WriteMakefile( - 'NAME' => 'Qt', - 'VERSION_FROM' => 'Qt.pm', # finds $VERSION - 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1, + 'NAME' => 'TQt', + 'VERSION_FROM' => 'TQt.pm', # finds $VERSION + 'PRERETTQ_PM' => {}, # e.g., Module::Name => 1.1, 'INC' => '@all_includes@ -I. -I../smoke', 'LIBS' => ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"], -# 'XS' => {'Qt.xs' => 'Qt.cpp'}, # does not work ... still expects Qt.c +# 'XS' => {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 'XSOPT' => "-C++", 'OBJECT' => "$objects", # Object files 'CC' => '@CXX@', @@ -97,7 +97,7 @@ WriteMakefile( 'INST_BIN' => './bin', 'DEFINE' => $cxxflags, 'H' => ["marshall.h", "perlqt.h", "smokeperl.h"], - 'ABSTRACT' => "An OO interface to Trolltech's Qt toolkit", + 'ABSTRACT' => "An OO interface to Trolltech's TQt toolkit", 'dynamic_lib' => {'OTHERLDFLAGS' => $rpath}, ($] >= 5.005 ? ## Add these new keywords supported since 5.005 ( @@ -174,16 +174,16 @@ for my $s( @scripts ) chmod 0755, $s; } -open(IN, ">Qt.pod") or die "couldn't write Qt.pod: $!\n"; +open(IN, ">TQt.pod") or die "couldn't write TQt.pod: $!\n"; print IN <<STOP; =head1 NAME -PerlQt - Perl interface to the Qt GUI Widget toolkit +PerlTQt - Perl interface to the TQt GUI Widget toolkit -=head1 Qt +=head1 TQt -Given the huge size of the Qt module +Given the huge size of the TQt module (more than 400 classes and 13000 methods) it doesn't have any formal documentation. @@ -193,17 +193,17 @@ Instead, it provides two introspection tools =item * pqtapi: -a command line PerlQt API introspector +a command line PerlTQt API introspector =item * pqtsh: -a graphical PerlQt shell +a graphical PerlTQt shell =back and a detailed B<tutorial> with comprehensive explanations. -This is where anyone new to PerlQt +This is where anyone new to PerlTQt should start. The tutorial has been originally installed @@ -213,9 +213,9 @@ B<HTML> format. For a complete IDE allowing RAD and visual programming, check the pqt-designer package. ---- The PerlQt team +--- The PerlTQt team -http://perlqt.sf.net - PerlQt Project Homepage +http://perlqt.sf.net - PerlTQt Project Homepage =cut STOP diff --git a/PerlQt/Qt.pm b/PerlQt/Qt.pm index 01a08e8..69bcbca 100644 --- a/PerlQt/Qt.pm +++ b/PerlQt/Qt.pm @@ -1,4 +1,4 @@ -package Qt::base; +package TQt::base; use strict; sub this () {} @@ -8,394 +8,394 @@ sub new { my $t = this; shift->NEW(@_); my $ret = this; - Qt::_internal::setThis($t); + TQt::_internal::setThis($t); return $ret; } -package Qt::base::_overload; +package TQt::base::_overload; use strict; no strict 'refs'; use overload "fallback" => 1, - "==" => "Qt::base::_overload::op_equal", - "!=" => "Qt::base::_overload::op_not_equal", - "+=" => "Qt::base::_overload::op_plus_equal", - "-=" => "Qt::base::_overload::op_minus_equal", - "*=" => "Qt::base::_overload::op_mul_equal", - "/=" => "Qt::base::_overload::op_div_equal", - ">>" => "Qt::base::_overload::op_shift_right", - "<<" => "Qt::base::_overload::op_shift_left", - "<=" => "Qt::base::_overload::op_lesser_equal", - ">=" => "Qt::base::_overload::op_greater_equal", - "^=" => "Qt::base::_overload::op_xor_equal", - "|=" => "Qt::base::_overload::op_or_equal", - ">" => "Qt::base::_overload::op_greater", - "<" => "Qt::base::_overload::op_lesser", - "+" => "Qt::base::_overload::op_plus", - "-" => "Qt::base::_overload::op_minus", - "*" => "Qt::base::_overload::op_mul", - "/" => "Qt::base::_overload::op_div", - "^" => "Qt::base::_overload::op_xor", - "|" => "Qt::base::_overload::op_or", - "--" => "Qt::base::_overload::op_decrement", - "++" => "Qt::base::_overload::op_increment", - "neg"=> "Qt::base::_overload::op_negate"; + "==" => "TQt::base::_overload::op_equal", + "!=" => "TQt::base::_overload::op_not_equal", + "+=" => "TQt::base::_overload::op_plus_equal", + "-=" => "TQt::base::_overload::op_minus_equal", + "*=" => "TQt::base::_overload::op_mul_equal", + "/=" => "TQt::base::_overload::op_div_equal", + ">>" => "TQt::base::_overload::op_shift_right", + "<<" => "TQt::base::_overload::op_shift_left", + "<=" => "TQt::base::_overload::op_lesser_equal", + ">=" => "TQt::base::_overload::op_greater_equal", + "^=" => "TQt::base::_overload::op_xor_equal", + "|=" => "TQt::base::_overload::op_or_equal", + ">" => "TQt::base::_overload::op_greater", + "<" => "TQt::base::_overload::op_lesser", + "+" => "TQt::base::_overload::op_plus", + "-" => "TQt::base::_overload::op_minus", + "*" => "TQt::base::_overload::op_mul", + "/" => "TQt::base::_overload::op_div", + "^" => "TQt::base::_overload::op_xor", + "|" => "TQt::base::_overload::op_or", + "--" => "TQt::base::_overload::op_decrement", + "++" => "TQt::base::_overload::op_increment", + "neg"=> "TQt::base::_overload::op_negate"; sub op_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator=='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator=='; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator=='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator=='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_not_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator!='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator!='; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator!='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator!='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_plus_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator+='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator+='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator+='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator+='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_minus_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator-='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator-='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_mul_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator*='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator*='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator*='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator*='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_div_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator/='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator/='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator/='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator/='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_shift_right { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>>'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>>'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator>>'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator>>'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_shift_left { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<<'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<<'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator<<'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator<<'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_lesser_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator<='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator<='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_greater_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator>='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator>='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_xor_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator^='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator^='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator^='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator^='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_or_equal { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator|='; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator|='; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return ($_[2] ? $_[1] : $_[0]) unless $err = $@; my $ret; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator|='; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator|='; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_greater { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator>'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator>'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator>'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_lesser { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator<'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator<'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator<'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_plus { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator+'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator+'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator+'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator+'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_minus { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator-'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator-'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_mul { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator*'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator*'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator*'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator*'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_div { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator/'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator/'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator/'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator/'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_negate { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator-'; my $autoload = ref($_[0])."::AUTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->($_[0]) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator-'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator-'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload($_[0]) }; die $err.$@ if $@; $ret } sub op_xor { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator^'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator^'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator^'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator^'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_or { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator|'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator|'; my $autoload = ref($_[0])."::_UTOLOAD"; my ($ret, $err); - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $ret = $autoload->(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $ret unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator|'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator|'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; $ret = &$autoload(($_[2] ? (@_)[1,0] : (@_)[0,1])) }; die $err.$@ if $@; $ret } sub op_increment { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator++'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator++'; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->($_[0]) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $_[0] unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator++'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator++'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; &$autoload($_[0]) }; die $err.$@ if $@; $_[0] } sub op_decrement { - $Qt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator--'; + $TQt::AutoLoad::AUTOLOAD = ref($_[0]).'::operator--'; my $autoload = ref($_[0])."::_UTOLOAD"; my $err; - $Qt::_internal::strictArgMatch = 1; + $TQt::_internal::strictArgMatch = 1; eval { local $SIG{'__DIE__'}; $autoload->($_[0]) }; - $Qt::_internal::strictArgMatch = 0; + $TQt::_internal::strictArgMatch = 0; return $_[0] unless $err = $@; - $Qt::AutoLoad::AUTOLOAD = 'Qt::GlobalSpace::operator--'; - $autoload = "Qt::GlobalSpace::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GlobalSpace::operator--'; + $autoload = "TQt::GlobalSpace::_UTOLOAD"; eval { local $SIG{'__DIE__'}; &$autoload($_[0]) }; die $err.$@ if $@; $_[0] } -package Qt::_internal; +package TQt::_internal; use strict; @@ -414,41 +414,41 @@ sub init_class { no strict 'refs'; my $c = shift; my $class = $c; - $class =~ s/^Q(?=[A-Z])/Qt::/; - my $classId = Qt::_internal::idClass($c); + $class =~ s/^Q(?=[A-Z])/TQt::/; + my $classId = TQt::_internal::idClass($c); insert_pclassid($class, $classId); $IdClass[$classId] = $class; $CppName{$class} = $c; - Qt::_internal::installautoload("$class"); + TQt::_internal::installautoload("$class"); { - package Qt::AutoLoad; # this package holds $AUTOLOAD + package TQt::AutoLoad; # this package holds $AUTOLOAD my $closure = \&{ "$class\::_UTOLOAD" }; *{ $class . "::AUTOLOAD" } = sub{ &$closure }; } - my @isa = Qt::_internal::getIsa($classId); + my @isa = TQt::_internal::getIsa($classId); for my $super (@isa) { - $super =~ s/^Q(?=[A-Z])/Qt::/; + $super =~ s/^Q(?=[A-Z])/TQt::/; } - # the general base class is Qt::base. + # the general base class is TQt::base. # implicit new(@_) calls are forwarded there. - @isa = ("Qt::base") unless @isa; + @isa = ("TQt::base") unless @isa; *{ "$class\::ISA" } = \@isa; - Qt::_internal::installautoload(" $class"); + TQt::_internal::installautoload(" $class"); { - package Qt::AutoLoad; + package TQt::AutoLoad; # do lookup at compile-time my $autosub = \&{ " $class\::_UTOLOAD" }; *{ " $class\::AUTOLOAD" } = sub { &$autosub }; } - *{ " $class\::ISA" } = ["Qt::base::_overload"]; + *{ " $class\::ISA" } = ["TQt::base::_overload"]; *{ "$class\::NEW" } = sub { my $class = shift; - $Qt::AutoLoad::AUTOLOAD = "$class\::$c"; + $TQt::AutoLoad::AUTOLOAD = "$class\::$c"; my $autoload = " $class\::_UTOLOAD"; { no warnings; @@ -482,9 +482,9 @@ sub argmatch { $match{$method} = [0,$methix]; } } elsif($argtype eq 's') { - if($typename =~ /^(?:(?:const )?u?char\*|(?:const )?(?:(Q(C?)String)|QByteArray)[*&]?)$/) { + if($typename =~ /^(?:(?:const )?u?char\*|(?:const )?(?:(Q(C?)String)|TQByteArray)[*&]?)$/) { # the below read as: is it a (Q(C)String) ? ->priority 1 - # is it a (QString) ? -> priority 2 + # is it a (TQString) ? -> priority 2 # neither: normal priority # Watch the capturing parens vs. non-capturing (?:) $match{$method}[0] = defined $2 && $2 ? 1 : ( defined $1 ? 2 : 0 ); @@ -493,13 +493,13 @@ sub argmatch { } elsif($argtype eq 'a') { # FIXME: shouldn't be hardcoded. Installed handlers should tell what perl type they expect. if($typename =~ /^(?: - const\ QCOORD\*| + const\ TQCOORD\*| (?:const\ )? (?: Q(?:String|Widget|Object|FileInfo|CanvasItem)List[\*&]?| - QValueList<int>[\*&]?| - QPtrList<Q(?:Tab|ToolBar|DockWindow|NetworkOperation)>| - QRgb\*| + TQValueList<int>[\*&]?| + TQPtrList<Q(?:Tab|ToolBar|DockWindow|NetworkOperation)>| + TQRgb\*| char\*\* ) )$/x) { @@ -553,8 +553,8 @@ sub do_autoload { } } my @methodids = map { findMethod($class, $_) } @methods; -# @methodids = map { findMethod('QGlobalSpace', $_) } @methods -# if (!@methodids and $withObject || $class eq 'Qt'); +# @methodids = map { findMethod('TQGlobalSpace', $_) } @methods +# if (!@methodids and $withObject || $class eq 'TQt'); if(@methodids > 1) { # ghetto method resolution @@ -567,11 +567,11 @@ sub do_autoload { my $c = ($method eq $class)? 4:2; warn "Ambiguous method call for :\n". "\t${class}::${method}(".catArguments(\@_).")". - ((debug() && (debug() & $Qt::debug::channel{'verbose'})) ? + ((debug() && (debug() & $TQt::debug::channel{'verbose'})) ? "\nCandidates are:\n".dumpCandidates(\@methodids). "\nTaking first one...\nat " : ""). (caller($c))[1]." line ".(caller($c))[2].".\n" - } if debug() && @methodids > 1 && (debug() & $Qt::debug::channel{'ambiguous'}); + } if debug() && @methodids > 1 && (debug() & $TQt::debug::channel{'ambiguous'}); } elsif( @methodids == 1 and @_ ) { @@ -585,17 +585,17 @@ sub do_autoload { my $c = ($method eq $class)? 4:2; warn "Lookup for ${class}::${method}(".catArguments(\@_). ")\ndid not yeld any result.\n". - ((debug() && (debug() & $Qt::debug::channel{'verbose'})) ? + ((debug() && (debug() & $TQt::debug::channel{'verbose'})) ? "Might be a call for an enumerated value (enum).\n":""). "Trying ${class}::${method}() with no arguments\nat ". (caller($c))[1]." line ".(caller($c))[2].".\n" - } if debug() && @_ > 1 && (debug() & $Qt::debug::channel{'ambiguous'}); + } if debug() && @_ > 1 && (debug() & $TQt::debug::channel{'ambiguous'}); @_ = () } if @methodids; } do{ my $verbose = ""; - if(debug() && (debug() & $Qt::debug::channel{'verbose'})) { + if(debug() && (debug() & $TQt::debug::channel{'verbose'})) { my $alt = findAllMethods( $classId ); getAllParents($classId, \my @sup); for my $s(@sup) @@ -627,7 +627,7 @@ sub do_autoload { sub init { no warnings; installthis(__PACKAGE__); - installthis("Qt::base"); + installthis("TQt::base"); $Classes = getClassList(); for my $c (@$Classes) { init_class($c); @@ -673,19 +673,19 @@ sub getSubName return ( $glob =~ /^.*::(.*)$/ )[0]; } -sub Qt::Application::NEW { +sub TQt::Application::NEW { my $class = shift; my $argv = shift; unshift @$argv, $0; my $count = scalar @$argv; - setThis( bless Qt::Application::QApplication($count, $argv, @_), " $class" ); + setThis( bless TQt::Application::TQApplication($count, $argv, @_), " $class" ); mapObject(this); setAllocated(this, 1); setqapp(this); shift @$argv; } -sub Qt::Image::NEW { +sub TQt::Image::NEW { no strict 'refs'; # another ugly hack, whee my $class = shift; @@ -696,8 +696,8 @@ sub Qt::Image::NEW { } # FIXME: this is evil - $Qt::AutoLoad::AUTOLOAD = 'Qt::Image::QImage'; - my $autoload = " Qt::Image::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::Image::TQImage'; + my $autoload = " TQt::Image::_UTOLOAD"; dontRecurse(); setThis( $autoload->(@_) ); setAllocated(this, 1); @@ -710,19 +710,19 @@ sub makeMetaData { my @params; my $argcnt = scalar @{ $entry->{arguments} }; for my $arg (@{ $entry->{arguments} }) { - push @params, make_QUParameter($arg->{name}, $arg->{type}, 0, 1); + push @params, make_TQUParameter($arg->{name}, $arg->{type}, 0, 1); } - my $method = make_QUMethod($entry->{name}, \@params); - push @tbl, make_QMetaData($entry->{prototype}, $method); + my $method = make_TQUMethod($entry->{name}, \@params); + push @tbl, make_TQMetaData($entry->{prototype}, $method); } my $count = scalar @tbl; - my $metadata = make_QMetaData_tbl(\@tbl); + my $metadata = make_TQMetaData_tbl(\@tbl); return ($metadata, $count); } # This is the key function for signal/slots... -# All META hash entries have been defined by /lib/Qt/slots.pm and /lib/Qt/signals.pm -# Thereafter, /lib/Qt/isa.pm build the MetaObject by calling this function +# All META hash entries have been defined by /lib/TQt/slots.pm and /lib/TQt/signals.pm +# Thereafter, /lib/TQt/isa.pm build the MetaObject by calling this function # Here is the structure of the META hash: # META { 'slot' => { $slotname-1 => { name => $slotname-1, # arguments => xxx, @@ -750,7 +750,7 @@ sub getMetaObject { inheritSuperSigSlots($class); my($slot_tbl, $slot_tbl_count) = makeMetaData($meta->{slots}); my($signal_tbl, $signal_tbl_count) = makeMetaData($meta->{signals}); - $meta->{object} = make_metaObject($class, Qt::this()->staticMetaObject, + $meta->{object} = make_metaObject($class, TQt::this()->staticMetaObject, $slot_tbl, $slot_tbl_count, $signal_tbl, $signal_tbl_count); $meta->{changed} = 0; @@ -759,11 +759,11 @@ sub getMetaObject { sub updateSigSlots { - require Qt::signals; - require Qt::slots; + require TQt::signals; + require TQt::slots; for my $i (@sigslots) { no strict 'refs'; - my $mod = "Qt::" . lc($$i[0]) . ( substr($$i[0], 0, 1) eq 'S' ? 's' : '' ) . "::import"; + my $mod = "TQt::" . lc($$i[0]) . ( substr($$i[0], 0, 1) eq 'S' ? 's' : '' ) . "::import"; $mod->( $$i[1], getSubName($$i[2]) => $$i[3] ); } @sigslots = (); @@ -790,12 +790,12 @@ sub inheritSuperSigSlots { push @{$meta->{signals}}, \%ss; $meta->{signal}->{$ssn} = \%ss; $ss{index} = $#{ $meta->{signals} }; - Qt::_internal::installsignal("$class\::$ssn"); + TQt::_internal::installsignal("$class\::$ssn"); } } - Qt::_internal::installqt_invoke($class . '::qt_invoke') + TQt::_internal::installqt_invoke($class . '::qt_invoke') if( !defined &{ $class. '::qt_invoke' } && exists $meta->{slots} && @{ $meta->{slots} }); - Qt::_internal::installqt_invoke($class . '::qt_emit') + TQt::_internal::installqt_invoke($class . '::qt_emit') if( !defined &{ $class. '::qt_emit' } && exists $meta->{signals} && @{ $meta->{signals} }); } } @@ -805,46 +805,46 @@ sub getAllParents { my $classId = shift; my $res = shift; - my @classes = Qt::_internal::getIsa( $classId ); + my @classes = TQt::_internal::getIsa( $classId ); for my $s( @classes ) { - my $c = Qt::_internal::idClass($s); + my $c = TQt::_internal::idClass($s); push @{ $res }, $c; getAllParents($c, $res) } } -sub Qt::PointArray::setPoints { +sub TQt::PointArray::setPoints { my $points = $_[0]; no strict 'refs'; # what a horrible, horrible way to do this - $Qt::AutoLoad::AUTOLOAD = 'Qt::PointArray::setPoints'; - my $autoload = " Qt::PointArray::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::PointArray::setPoints'; + my $autoload = " TQt::PointArray::_UTOLOAD"; dontRecurse(); $autoload->(scalar(@$points)/2, $points); } -sub Qt::GridLayout::addMultiCellLayout { - # yet another hack. Turnaround for a bug in Qt < 3.1 - # (addMultiCellLayout doesn't reparent its QLayout argument) +sub TQt::GridLayout::addMultiCellLayout { + # yet another hack. Turnaround for a bug in TQt < 3.1 + # (addMultiCellLayout doesn't reparent its TQLayout argument) no strict 'refs'; if(!defined $_[0]->{'has been hidden'}) { push @{ this()->{'hidden children'} }, $_[0]; $_[0]->{'has been hidden'} = 1; } - $Qt::AutoLoad::AUTOLOAD = 'Qt::GridLayout::addMultiCellLayout'; - my $autoload = " Qt::GridLayout::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::GridLayout::addMultiCellLayout'; + my $autoload = " TQt::GridLayout::_UTOLOAD"; dontRecurse(); $autoload->(@_); } -package Qt::Object; +package TQt::Object; use strict; sub MODIFY_CODE_ATTRIBUTES { - package Qt::_internal; + package TQt::_internal; my ($package, $coderef, @attrs ) = @_; my @reject; foreach my $attr( @attrs ) @@ -866,7 +866,7 @@ sub MODIFY_CODE_ATTRIBUTES return @reject; } -package Qt; +package TQt; use 5.006; use strict; @@ -877,22 +877,22 @@ require Exporter; our $VERSION = '3.008'; -our @EXPORT = qw(&SIGNAL &SLOT &CAST &emit &min &max); +our @EXPORT = qw(&TQT_SIGNAL &TQT_SLOT &CAST &emit &min &max); -XSLoader::load 'Qt', $VERSION; +XSLoader::load 'TQt', $VERSION; # try to avoid KDE's buggy malloc # only works for --enable-fast-malloc, # not when --enable-fast-malloc=full $ENV{'KDE_MALLOC'} = 0; -Qt::_internal::init(); +TQt::_internal::init(); # In general, I'm not a fan of prototypes. # However, I'm also not a fan of parentheses -sub SIGNAL ($) { '2' . $_[0] } -sub SLOT ($) { '1' . $_[0] } +sub TQT_SIGNAL ($) { '2' . $_[0] } +sub TQT_SLOT ($) { '1' . $_[0] } sub CAST ($$) { bless $_[0], " $_[1]" } sub emit (@) { pop @_ } sub min ($$) { $_[0] < $_[1] ? $_[0] : $_[1] } @@ -900,11 +900,11 @@ sub max ($$) { $_[0] > $_[1] ? $_[0] : $_[1] } sub import { goto &Exporter::import } -sub Qt::base::ON_DESTROY { 0 }; +sub TQt::base::ON_DESTROY { 0 }; -sub Qt::Object::ON_DESTROY +sub TQt::Object::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->parent; if( $parent ) { @@ -915,18 +915,18 @@ sub Qt::Object::ON_DESTROY return 0 } -sub Qt::Application::ON_DESTROY { 0 } +sub TQt::Application::ON_DESTROY { 0 } -# we need to solve an ambiguity for Q*Items: they aren't QObjects, +# we need to solve an ambiguity for Q*Items: they aren't TQObjects, # and are meant to be created on the heap / destroyed manually. -# On the one hand, we don't want to delete them if they are still owned by a QObject hierarchy +# On the one hand, we don't want to delete them if they are still owned by a TQObject hierarchy # but on the other hand, what can we do if the user DOES need to destroy them? # # So the solution adopted here is to use the takeItem() method when it exists # to lower the refcount and allow explicit destruction/removal. -sub Qt::ListViewItem::ON_DESTROY { - package Qt::_internal; +sub TQt::ListViewItem::ON_DESTROY { + package TQt::_internal; my $parent = this()->listView(); if( $parent ) { @@ -939,35 +939,35 @@ sub Qt::ListViewItem::ON_DESTROY { return 0 } -sub Qt::ListViewItem::takeItem +sub TQt::ListViewItem::takeItem { - package Qt::_internal; + package TQt::_internal; delete ${ this()->{"hidden children"} } { sv_to_ptr($_[0]) }; delete $_[0]->{"has been hidden"}; setAllocated( $_[0], 1 ); no strict 'refs'; - $Qt::AutoLoad::AUTOLOAD = 'Qt::ListViewItem::takeItem'; - my $autoload = " Qt::ListViewItem::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::ListViewItem::takeItem'; + my $autoload = " TQt::ListViewItem::_UTOLOAD"; dontRecurse(); $autoload->( $_[0] ); } -sub Qt::ListView::takeItem +sub TQt::ListView::takeItem { - package Qt::_internal; + package TQt::_internal; delete ${ this()->{"hidden children"} } { sv_to_ptr($_[0]) }; delete $_[0]->{"has been hidden"}; setAllocated( $_[0], 1 ); no strict 'refs'; - $Qt::AutoLoad::AUTOLOAD = 'Qt::ListView::takeItem'; - my $autoload = " Qt::ListView::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::ListView::takeItem'; + my $autoload = " TQt::ListView::_UTOLOAD"; dontRecurse(); $autoload->( $_[0] ); } -sub Qt::IconViewItem::ON_DESTROY +sub TQt::IconViewItem::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->iconView; if( $parent ) { @@ -980,23 +980,23 @@ sub Qt::IconViewItem::ON_DESTROY return 0 } -sub Qt::IconView::takeItem +sub TQt::IconView::takeItem { - package Qt::_internal; + package TQt::_internal; delete ${ this()->{"hidden children"} } { sv_to_ptr($_[0]) }; delete $_[0]->{"has been hidden"}; setAllocated( $_[0], 1 ); no strict 'refs'; - $Qt::AutoLoad::AUTOLOAD = 'Qt::IconView::takeItem'; - my $autoload = " Qt::IconView::_UTOLOAD"; - Qt::_internal::dontRecurse(); + $TQt::AutoLoad::AUTOLOAD = 'TQt::IconView::takeItem'; + my $autoload = " TQt::IconView::_UTOLOAD"; + TQt::_internal::dontRecurse(); $autoload->( $_[0] ); } -sub Qt::ListBoxItem::ON_DESTROY +sub TQt::ListBoxItem::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->listBox(); if( $parent ) { @@ -1009,24 +1009,24 @@ sub Qt::ListBoxItem::ON_DESTROY return 0 } -sub Qt::ListBox::takeItem +sub TQt::ListBox::takeItem { # Unfortunately, takeItem() won't reset the Item's listBox() pointer to 0. - # That's a Qt bug (I reported it and it got fixed as of Qt 3.2b2) - package Qt::_internal; + # That's a TQt bug (I reported it and it got fixed as of TQt 3.2b2) + package TQt::_internal; delete ${ this()->{"hidden children"} } { sv_to_ptr($_[0]) }; delete $_[0]->{"has been hidden"}; setAllocated( $_[0], 1 ); no strict 'refs'; - $Qt::Autoload::AUTOLOAD = 'Qt::ListBox::takeItem'; - my $autoload = " Qt::ListBox::_UTOLOAD"; + $TQt::Autoload::AUTOLOAD = 'TQt::ListBox::takeItem'; + my $autoload = " TQt::ListBox::_UTOLOAD"; dontRecurse(); $autoload->( $_[0] ); } -sub Qt::TableItem::ON_DESTROY +sub TQt::TableItem::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->table; if( $parent ) { @@ -1039,22 +1039,22 @@ sub Qt::TableItem::ON_DESTROY return 0 } -sub Qt::Table::takeItem +sub TQt::Table::takeItem { - package Qt::_internal; + package TQt::_internal; delete ${ this()->{"hidden children"} } { sv_to_ptr($_[0]) }; delete $_[0]->{"has been hidden"}; setAllocated( $_[0], 1 ); no strict 'refs'; - $Qt::AutoLoad::AUTOLOAD = 'Qt::Table::takeItem'; - my $autoload = " Qt::Table::_UTOLOAD"; + $TQt::AutoLoad::AUTOLOAD = 'TQt::Table::takeItem'; + my $autoload = " TQt::Table::_UTOLOAD"; dontRecurse(); $autoload->( $_[0] ); } -sub Qt::LayoutItem::ON_DESTROY +sub TQt::LayoutItem::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->widget() || this()->layout(); if( $parent ) { @@ -1069,9 +1069,9 @@ sub Qt::LayoutItem::ON_DESTROY return 1 } -sub Qt::Layout::ON_DESTROY +sub TQt::Layout::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->mainWidget() || this()->parent(); if( $parent ) { @@ -1082,9 +1082,9 @@ sub Qt::Layout::ON_DESTROY return 0 } -sub Qt::StyleSheetItem::ON_DESTROY +sub TQt::StyleSheetItem::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; my $parent = this()->styleSheet(); if( $parent ) { @@ -1097,9 +1097,9 @@ sub Qt::StyleSheetItem::ON_DESTROY return 0 } -sub Qt::SqlCursor::ON_DESTROY +sub TQt::SqlCursor::ON_DESTROY { - package Qt::_internal; + package TQt::_internal; push @PersistentObjects, this(); this()->{"has been hidden"} = 1; setAllocated( this(), 0 ); diff --git a/PerlQt/Qt.pod b/PerlQt/Qt.pod index 94503ba..2feceeb 100644 --- a/PerlQt/Qt.pod +++ b/PerlQt/Qt.pod @@ -1,11 +1,11 @@ =head1 NAME -PerlQt - Perl interface to the Qt GUI Widget toolkit +PerlTQt - Perl interface to the TQt GUI Widget toolkit -=head1 Qt +=head1 TQt -Given the huge size of the Qt module +Given the huge size of the TQt module (more than 400 classes and 13000 methods) it doesn't have any formal documentation. @@ -15,17 +15,17 @@ Instead, it provides two introspection tools =item * pqtapi: -a command line PerlQt API introspector +a command line PerlTQt API introspector =item * pqtsh: -a graphical PerlQt shell +a graphical PerlTQt shell =back and a detailed B<tutorial> with comprehensive explanations. -This is where anyone new to PerlQt +This is where anyone new to PerlTQt should start. The tutorial has been originally installed @@ -35,8 +35,8 @@ B<HTML> format. For a complete IDE allowing RAD and visual programming, check the pqt-designer package. ---- The PerlQt team +--- The PerlTQt team -http://perlqt.sf.net - PerlQt Project Homepage +http://perlqt.sf.net - PerlTQt Project Homepage =cut diff --git a/PerlQt/Qt.xs b/PerlQt/Qt.xs index e72bffd..22a66de 100644 --- a/PerlQt/Qt.xs +++ b/PerlQt/Qt.xs @@ -23,8 +23,8 @@ #include "perl.h" #include "XSUB.h" -#ifndef QT_VERSION_STR -#define QT_VERSION_STR "Unknown" +#ifndef TQT_VERSION_STR +#define TQT_VERSION_STR "Unknown" #endif #undef free @@ -54,8 +54,8 @@ void *_current_object = 0; // TODO: ask myself if this is stupid bool temporary_virtual_function_success = false; -static QAsciiDict<Smoke::Index> *methcache = 0; -static QAsciiDict<Smoke::Index> *classcache = 0; +static TQAsciiDict<Smoke::Index> *methcache = 0; +static TQAsciiDict<Smoke::Index> *classcache = 0; SV *sv_this = 0; @@ -65,7 +65,7 @@ Smoke::Index _current_method = 0; * Type handling by moc is simple. * * If the type name matches /^(?:const\s+)?\Q$types\E&?$/, use the - * static_QUType, where $types is join('|', qw(bool int double char* QString); + * static_TQUType, where $types is join('|', qw(bool int double char* TQString); * * Everything else is passed as a pointer! There are types which aren't * Smoke::tf_ptr but will have to be passed as a pointer. Make sure to keep @@ -86,7 +86,7 @@ enum MocArgumentType { xmoc_int, xmoc_double, xmoc_charstar, - xmoc_QString + xmoc_TQString }; struct MocArgument { @@ -96,7 +96,7 @@ struct MocArgument { }; -extern TypeHandler Qt_handlers[]; +extern TypeHandler TQt_handlers[]; void install_handlers(TypeHandler *); void *sv_to_ptr(SV *sv) { // ptr on success, null on fail @@ -104,13 +104,13 @@ void *sv_to_ptr(SV *sv) { // ptr on success, null on fail return o ? o->ptr : 0; } -bool isQObject(Smoke *smoke, Smoke::Index classId) { - if(!strcmp(smoke->classes[classId].className, "QObject")) +bool isTQObject(Smoke *smoke, Smoke::Index classId) { + if(!strcmp(smoke->classes[classId].className, "TQObject")) return true; for(Smoke::Index *p = smoke->inheritanceList + smoke->classes[classId].parents; *p; p++) { - if(isQObject(smoke, *p)) + if(isTQObject(smoke, *p)) return true; } return false; @@ -174,7 +174,7 @@ void unmapPointer(smokeperl_object *o, Smoke::Index classId, void *lastptr) { } } -// Store pointer in pointer_map hash : "pointer_to_Qt_object" => weak ref to associated Perl object +// Store pointer in pointer_map hash : "pointer_to_TQt_object" => weak ref to associated Perl object // Recurse to store it also as casted to its parent classes. void mapPointer(SV *obj, smokeperl_object *o, HV *hv, Smoke::Index classId, void *lastptr) { @@ -390,14 +390,14 @@ public: bool cleanup() { return true; } }; -class UnencapsulatedQObject : public QObject { +class UnencapsulatedTQObject : public TQObject { public: - QConnectionList *public_receivers(int signal) const { return receivers(signal); } - void public_activate_signal(QConnectionList *clist, QUObject *o) { activate_signal(clist, o); } + TQConnectionList *public_receivers(int signal) const { return receivers(signal); } + void public_activate_signal(TQConnectionList *clist, TQUObject *o) { activate_signal(clist, o); } }; class EmitSignal : public Marshall { - UnencapsulatedQObject *_qobj; + UnencapsulatedTQObject *_qobj; int _id; MocArgument *_args; SV **_sp; @@ -406,8 +406,8 @@ class EmitSignal : public Marshall { Smoke::Stack _stack; bool _called; public: - EmitSignal(QObject *qobj, int id, int items, MocArgument *args, SV **sp) : - _qobj((UnencapsulatedQObject*)qobj), _id(id), _items(items), _args(args), + EmitSignal(TQObject *qobj, int id, int items, MocArgument *args, SV **sp) : + _qobj((UnencapsulatedTQObject*)qobj), _id(id), _items(items), _args(args), _sp(sp), _cur(-1), _called(false) { _stack = new Smoke::StackItem[_items]; } @@ -427,28 +427,28 @@ public: if(_called) return; _called = true; - QConnectionList *clist = _qobj->public_receivers(_id); + TQConnectionList *clist = _qobj->public_receivers(_id); if(!clist) return; - QUObject *o = new QUObject[_items + 1]; + TQUObject *o = new TQUObject[_items + 1]; for(int i = 0; i < _items; i++) { - QUObject *po = o + i + 1; + TQUObject *po = o + i + 1; Smoke::StackItem *si = _stack + i; switch(_args[i].argType) { case xmoc_bool: - static_QUType_bool.set(po, si->s_bool); + static_TQUType_bool.set(po, si->s_bool); break; case xmoc_int: - static_QUType_int.set(po, si->s_int); + static_TQUType_int.set(po, si->s_int); break; case xmoc_double: - static_QUType_double.set(po, si->s_double); + static_TQUType_double.set(po, si->s_double); break; case xmoc_charstar: - static_QUType_charstar.set(po, (char*)si->s_voidp); + static_TQUType_charstar.set(po, (char*)si->s_voidp); break; - case xmoc_QString: - static_QUType_QString.set(po, *(QString*)si->s_voidp); + case xmoc_TQString: + static_TQUType_TQString.set(po, *(TQString*)si->s_voidp); break; default: { @@ -511,7 +511,7 @@ public: p = 0; break; } - static_QUType_ptr.set(po, p); + static_TQUType_ptr.set(po, p); } } } @@ -536,11 +536,11 @@ public: }; class InvokeSlot : public Marshall { - QObject *_qobj; + TQObject *_qobj; GV *_gv; int _items; MocArgument *_args; - QUObject *_o; + TQUObject *_o; int _cur; bool _called; SV **_sp; @@ -558,27 +558,27 @@ public: } void copyArguments() { for(int i = 0; i < _items; i++) { - QUObject *o = _o + i + 1; + TQUObject *o = _o + i + 1; switch(_args[i].argType) { case xmoc_bool: - _stack[i].s_bool = static_QUType_bool.get(o); + _stack[i].s_bool = static_TQUType_bool.get(o); break; case xmoc_int: - _stack[i].s_int = static_QUType_int.get(o); + _stack[i].s_int = static_TQUType_int.get(o); break; case xmoc_double: - _stack[i].s_double = static_QUType_double.get(o); + _stack[i].s_double = static_TQUType_double.get(o); break; case xmoc_charstar: - _stack[i].s_voidp = static_QUType_charstar.get(o); + _stack[i].s_voidp = static_TQUType_charstar.get(o); break; - case xmoc_QString: - _stack[i].s_voidp = &static_QUType_QString.get(o); + case xmoc_TQString: + _stack[i].s_voidp = &static_TQUType_TQString.get(o); break; default: // case xmoc_ptr: { const SmokeType &t = _args[i].st; - void *p = static_QUType_ptr.get(o); + void *p = static_TQUType_ptr.get(o); switch(t.elem()) { case Smoke::t_bool: _stack[i].s_bool = *(bool*)p; @@ -661,7 +661,7 @@ public: invokeSlot(); _cur = oldcur; } - InvokeSlot(QObject *qobj, GV *gv, int items, MocArgument *args, QUObject *o) : + InvokeSlot(TQObject *qobj, GV *gv, int items, MocArgument *args, TQUObject *o) : _qobj(qobj), _gv(gv), _items(items), _args(args), _o(o), _cur(-1), _called(false) { dSP; ENTER; @@ -681,9 +681,9 @@ public: }; -class QtSmokeBinding : public SmokeBinding { +class TQtSmokeBinding : public SmokeBinding { public: - QtSmokeBinding(Smoke *s) : SmokeBinding(s) {} + TQtSmokeBinding(Smoke *s) : SmokeBinding(s) {} void deleted(Smoke::Index classId, void *ptr) { SV *obj = getPointerObject(ptr); smokeperl_object *o = sv_obj_info(obj); @@ -727,7 +727,7 @@ public: char *className(Smoke::Index classId) { const char *className = smoke->className(classId); char *buf = new char[strlen(className) + 6]; - strcpy(buf, " Qt::"); + strcpy(buf, " TQt::"); strcat(buf, className + 1); return buf; } @@ -885,7 +885,7 @@ XS(XS_super) { //---------- XS Autoload (for all functions except fully qualified statics & enums) --------- -static inline bool isQt(char *p) { +static inline bool isTQt(char *p) { return (p[0] == 'Q' && p[1] && p[1] == 't' && ((p[2] && p[2] == ':') || !p[2])); } @@ -893,7 +893,7 @@ bool avoid_fetchmethod = false; XS(XS_AUTOLOAD) { // Err, XS autoload is borked. Lets try... dXSARGS; - SV *sv = get_sv("Qt::AutoLoad::AUTOLOAD", TRUE); + SV *sv = get_sv("TQt::AutoLoad::AUTOLOAD", TRUE); char *package = SvPV_nolen(sv); char *method = 0; for(char *s = package; *s ; s++) @@ -912,7 +912,7 @@ XS(XS_AUTOLOAD) { strcat(super, "::SUPER"); package = super; } - } else if( isQt(package) ) + } else if( isTQt(package) ) avoid_fetchmethod = true; HV *stash = gv_stashpv(package, TRUE); @@ -1012,7 +1012,7 @@ XS(XS_AUTOLOAD) { fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", package, o->ptr); } else { - if( items > 18 ) XSRETURN_NO; // current max number of args in Qt is 13. + if( items > 18 ) XSRETURN_NO; // current max number of args in TQt is 13. // save the stack -- we'll need it SV **savestack = new SV*[items+1]; @@ -1021,7 +1021,7 @@ XS(XS_AUTOLOAD) { Copy(SP - items + 1 + withObject, savestack, items-withObject, SV*); - // Get the classid (eventually converting SUPER to the right Qt class) + // Get the classid (eventually converting SUPER to the right TQt class) Smoke::Index cid = package_classid(package); // Look in the cache char *cname = (char*)qt_Smoke->className(cid); @@ -1068,7 +1068,7 @@ XS(XS_AUTOLOAD) { old_this = sv_this; sv_this = newSVsv(saveobj); } - call_pv("Qt::_internal::do_autoload", G_DISCARD|G_EVAL); + call_pv("TQt::_internal::do_autoload", G_DISCARD|G_EVAL); FREETMPS; LEAVE; @@ -1145,7 +1145,7 @@ MocArgument *getmetainfo(GV *gv, const char *name, int &offset, int &index, int if(!svp) return 0; smokeperl_object *ometa = sv_obj_info(*svp); if(!ometa) return 0; - QMetaObject *metaobject = (QMetaObject*)ometa->ptr; + TQMetaObject *metaobject = (TQMetaObject*)ometa->ptr; offset = metaobject->signalOffset(); @@ -1194,7 +1194,7 @@ MocArgument *getslotinfo(GV *gv, int id, char *&slotname, int &index, int &argcn if(!svp) return 0; smokeperl_object *ometa = sv_obj_info(*svp); if(!ometa) return 0; - QMetaObject *metaobject = (QMetaObject*)ometa->ptr; + TQMetaObject *metaobject = (TQMetaObject*)ometa->ptr; int offset = isSignal ? metaobject->signalOffset() : metaobject->slotOffset(); @@ -1229,10 +1229,10 @@ XS(XS_signal) { dXSARGS; smokeperl_object *o = sv_obj_info(sv_this); - QObject *qobj = (QObject*)o->smoke->cast( + TQObject *qobj = (TQObject*)o->smoke->cast( o->ptr, o->classId, - o->smoke->idClass("QObject") + o->smoke->idClass("TQObject") ); if(qobj->signalsBlocked()) XSRETURN_UNDEF; @@ -1256,15 +1256,15 @@ XS(XS_signal) { XS(XS_qt_invoke) { dXSARGS; - // Arguments: int id, QUObject *o + // Arguments: int id, TQUObject *o int id = SvIV(ST(0)); - QUObject *_o = (QUObject*)SvIV(SvRV(ST(1))); + TQUObject *_o = (TQUObject*)SvIV(SvRV(ST(1))); smokeperl_object *o = sv_obj_info(sv_this); - QObject *qobj = (QObject*)o->smoke->cast( + TQObject *qobj = (TQObject*)o->smoke->cast( o->ptr, o->classId, - o->smoke->idClass("QObject") + o->smoke->idClass("TQObject") ); // Now, I need to find out if this means me @@ -1290,7 +1290,7 @@ XS(XS_qt_invoke) { // ------------------- Tied types ------------------------ -MODULE = Qt PACKAGE = Qt::_internal::QString +MODULE = TQt PACKAGE = TQt::_internal::TQString PROTOTYPES: DISABLE SV* @@ -1300,7 +1300,7 @@ FETCH(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QString *s = (QString*) tmp; + TQString *s = (TQString*) tmp; RETVAL = newSV(0); if( s ) { @@ -1327,15 +1327,15 @@ STORE(obj,what) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QString *s = (QString*) tmp; + TQString *s = (TQString*) tmp; s->truncate(0); if(SvOK(what)) { if(SvUTF8(what)) - s->append(QString::fromUtf8(SvPV_nolen(what))); + s->append(TQString::fromUtf8(SvPV_nolen(what))); else if(IN_LOCALE) - s->append(QString::fromLocal8Bit(SvPV_nolen(what))); + s->append(TQString::fromLocal8Bit(SvPV_nolen(what))); else - s->append(QString::fromLatin1(SvPV_nolen(what))); + s->append(TQString::fromLatin1(SvPV_nolen(what))); } void @@ -1345,10 +1345,10 @@ DESTROY(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QString *s = (QString*) tmp; + TQString *s = (TQString*) tmp; delete s; -MODULE = Qt PACKAGE = Qt::_internal::QByteArray +MODULE = TQt PACKAGE = TQt::_internal::TQByteArray PROTOTYPES: DISABLE SV* @@ -1358,7 +1358,7 @@ FETCH(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QByteArray *s = (QByteArray*) tmp; + TQByteArray *s = (TQByteArray*) tmp; RETVAL = newSV(0); if( s ) { @@ -1377,7 +1377,7 @@ STORE(obj,what) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QByteArray *s = (QByteArray*) tmp; + TQByteArray *s = (TQByteArray*) tmp; if(SvOK(what)) { STRLEN len; @@ -1394,10 +1394,10 @@ DESTROY(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QByteArray *s = (QByteArray*) tmp; + TQByteArray *s = (TQByteArray*) tmp; delete s; -MODULE = Qt PACKAGE = Qt::_internal::QRgbStar +MODULE = TQt PACKAGE = TQt::_internal::TQRgbStar PROTOTYPES: DISABLE SV* @@ -1407,7 +1407,7 @@ FETCH(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QRgb *s = (QRgb*) tmp; + TQRgb *s = (TQRgb*) tmp; AV* ar = newAV(); RETVAL = newRV_noinc((SV*)ar); for(int i=0; s[i] ; i++) @@ -1427,17 +1427,17 @@ STORE(obj,sv) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QRgb *s = (QRgb*) tmp; + TQRgb *s = (TQRgb*) tmp; if(!SvROK(sv) || SvTYPE(SvRV(sv)) != SVt_PVAV || av_len((AV*)SvRV(sv)) < 0) { - s = new QRgb[1]; + s = new TQRgb[1]; s[0] = 0; - sv_setref_pv(obj, "Qt::_internal::QRgbStar", (void*)s); + sv_setref_pv(obj, "TQt::_internal::TQRgbStar", (void*)s); return; } AV *list = (AV*)SvRV(sv); int count = av_len(list); - s = new QRgb[count + 2]; + s = new TQRgb[count + 2]; int i; for(i = 0; i <= count; i++) { SV **item = av_fetch(list, i, 0); @@ -1448,7 +1448,7 @@ STORE(obj,sv) s[i] = SvIV(*item); } s[i] = 0; - sv_setref_pv(obj, "Qt::_internal::QRgbStar", (void*)s); + sv_setref_pv(obj, "TQt::_internal::TQRgbStar", (void*)s); void DESTROY(obj) @@ -1457,13 +1457,13 @@ DESTROY(obj) if (!SvROK(obj)) croak("?"); IV tmp = SvIV((SV*)SvRV(obj)); - QRgb *s = (QRgb*) tmp; + TQRgb *s = (TQRgb*) tmp; delete[] s; -# --------------- XSUBS for Qt::_internal::* helpers ---------------- +# --------------- XSUBS for TQt::_internal::* helpers ---------------- -MODULE = Qt PACKAGE = Qt::_internal +MODULE = TQt PACKAGE = TQt::_internal PROTOTYPES: DISABLE void @@ -1526,8 +1526,8 @@ setMocType(ptr, idx, name, static_type) arg[idx].argType = xmoc_double; else if(!strcmp(static_type, "char*")) arg[idx].argType = xmoc_charstar; - else if(!strcmp(static_type, "QString")) - arg[idx].argType = xmoc_QString; + else if(!strcmp(static_type, "TQString")) + arg[idx].argType = xmoc_TQString; XSRETURN_YES; void @@ -1624,28 +1624,28 @@ getSVt(sv) RETVAL void * -make_QUParameter(name, type, extra, inout) +make_TQUParameter(name, type, extra, inout) char *name char *type SV *extra int inout CODE: - QUParameter *p = new QUParameter; + TQUParameter *p = new TQUParameter; p->name = new char[strlen(name) + 1]; strcpy((char*)p->name, name); if(!strcmp(type, "bool")) - p->type = &static_QUType_bool; + p->type = &static_TQUType_bool; else if(!strcmp(type, "int")) - p->type = &static_QUType_int; + p->type = &static_TQUType_int; else if(!strcmp(type, "double")) - p->type = &static_QUType_double; + p->type = &static_TQUType_double; else if(!strcmp(type, "char*") || !strcmp(type, "const char*")) - p->type = &static_QUType_charstar; - else if(!strcmp(type, "QString") || !strcmp(type, "QString&") || - !strcmp(type, "const QString") || !strcmp(type, "const QString&")) - p->type = &static_QUType_QString; + p->type = &static_TQUType_charstar; + else if(!strcmp(type, "TQString") || !strcmp(type, "TQString&") || + !strcmp(type, "const TQString") || !strcmp(type, "const TQString&")) + p->type = &static_TQUType_TQString; else - p->type = &static_QUType_ptr; + p->type = &static_TQUType_ptr; // Lacking support for several types. Evil. p->inOut = inout; p->typeExtra = 0; @@ -1654,25 +1654,25 @@ make_QUParameter(name, type, extra, inout) RETVAL void * -make_QMetaData(name, method) +make_TQMetaData(name, method) char *name void *method CODE: - QMetaData *m = new QMetaData; // will be deleted + TQMetaData *m = new TQMetaData; // will be deleted m->name = new char[strlen(name) + 1]; strcpy((char*)m->name, name); - m->method = (QUMethod*)method; - m->access = QMetaData::Public; + m->method = (TQUMethod*)method; + m->access = TQMetaData::Public; RETVAL = m; OUTPUT: RETVAL void * -make_QUMethod(name, params) +make_TQUMethod(name, params) char *name SV *params CODE: - QUMethod *m = new QUMethod; // permanent memory allocation + TQUMethod *m = new TQUMethod; // permanent memory allocation m->name = new char[strlen(name) + 1]; // this too strcpy((char*)m->name, name); m->count = 0; @@ -1681,14 +1681,14 @@ make_QUMethod(name, params) AV *av = (AV*)SvRV(params); m->count = av_len(av) + 1; if(m->count > 0) { - m->parameters = new QUParameter[m->count]; + m->parameters = new TQUParameter[m->count]; for(int i = 0; i < m->count; i++) { SV *sv = av_shift(av); if(!SvOK(sv)) - croak("Invalid paramater for QUMethod\n"); - QUParameter *p = (QUParameter*)SvIV(sv); + croak("Invalid paramater for TQUMethod\n"); + TQUParameter *p = (TQUParameter*)SvIV(sv); SvREFCNT_dec(sv); - ((QUParameter*)m->parameters)[i] = *p; + ((TQUParameter*)m->parameters)[i] = *p; delete p; } } else @@ -1699,19 +1699,19 @@ make_QUMethod(name, params) RETVAL void * -make_QMetaData_tbl(list) +make_TQMetaData_tbl(list) SV *list CODE: RETVAL = 0; if(SvOK(list) && SvRV(list)) { AV *av = (AV*)SvRV(list); int count = av_len(av) + 1; - QMetaData *m = new QMetaData[count]; + TQMetaData *m = new TQMetaData[count]; for(int i = 0; i < count; i++) { SV *sv = av_shift(av); if(!SvOK(sv)) croak("Invalid metadata\n"); - QMetaData *old = (QMetaData*)SvIV(sv); + TQMetaData *old = (TQMetaData*)SvIV(sv); SvREFCNT_dec(sv); m[i] = *old; delete old; @@ -1732,10 +1732,10 @@ make_metaObject(className, parent, slot_tbl, slot_count, signal_tbl, signal_coun CODE: smokeperl_object *po = sv_obj_info(parent); if(!po || !po->ptr) croak("Cannot create metaObject\n"); - QMetaObject *meta = QMetaObject::new_metaobject( - className, (QMetaObject*)po->ptr, - (const QMetaData*)slot_tbl, slot_count, // slots - (const QMetaData*)signal_tbl, signal_count, // signals + TQMetaObject *meta = TQMetaObject::new_metaobject( + className, (TQMetaObject*)po->ptr, + (const TQMetaData*)slot_tbl, slot_count, // slots + (const TQMetaData*)signal_tbl, signal_count, // signals 0, 0, // properties 0, 0, // enums 0, 0); @@ -1746,7 +1746,7 @@ make_metaObject(className, parent, slot_tbl, slot_count, signal_tbl, signal_coun smokeperl_object o; o.smoke = qt_Smoke; - o.classId = qt_Smoke->idClass("QMetaObject"); + o.classId = qt_Smoke->idClass("TQMetaObject"); o.ptr = meta; o.allocated = true; sv_magic((SV*)hv, sv_qapp, '~', (char*)&o, sizeof(o)); @@ -1796,7 +1796,7 @@ setqapp(obj) SV *obj CODE: if(!obj || !SvROK(obj)) - croak("Invalid Qt::Application object. Couldn't set Qt::app()\n"); + croak("Invalid TQt::Application object. Couldn't set TQt::app()\n"); sv_qapp = SvRV(obj); void @@ -1811,7 +1811,7 @@ deleteObject(obj) CODE: smokeperl_object *o = sv_obj_info(obj); if(!o) { XSRETURN_EMPTY; } - QObject *qobj = (QObject*)o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject")); + TQObject *qobj = (TQObject*)o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject")); delete qobj; void @@ -1828,12 +1828,12 @@ mapObject(obj) mapPointer(obj, o, pointer_map, o->classId, 0); bool -isQObject(obj) +isTQObject(obj) SV *obj CODE: RETVAL = 0; smokeperl_object *o = sv_obj_info(obj); - if(o && isQObject(o->smoke, o->classId)) + if(o && isTQObject(o->smoke, o->classId)) RETVAL = 1; OUTPUT: RETVAL @@ -2161,9 +2161,9 @@ installautoload(package) newXS(autoload, XS_AUTOLOAD, file); delete[] autoload; -# ----------------- XSUBS for Qt:: ----------------- +# ----------------- XSUBS for TQt:: ----------------- -MODULE = Qt PACKAGE = Qt +MODULE = TQt PACKAGE = TQt SV * this() @@ -2182,17 +2182,17 @@ app() SV * version() CODE: - RETVAL = newSVpv(QT_VERSION_STR,0); + RETVAL = newSVpv(TQT_VERSION_STR,0); OUTPUT: RETVAL BOOT: init_qt_Smoke(); - qt_Smoke->binding = new QtSmokeBinding(qt_Smoke); - install_handlers(Qt_handlers); + qt_Smoke->binding = new TQtSmokeBinding(qt_Smoke); + install_handlers(TQt_handlers); pointer_map = newHV(); sv_this = newSV(0); - methcache = new QAsciiDict<Smoke::Index>(1187); - classcache = new QAsciiDict<Smoke::Index>(827); + methcache = new TQAsciiDict<Smoke::Index>(1187); + classcache = new TQAsciiDict<Smoke::Index>(827); methcache->setAutoDelete(1); classcache->setAutoDelete(1); diff --git a/PerlQt/bin/pqtapi b/PerlQt/bin/pqtapi index 9c5eadf..338d600 100755 --- a/PerlQt/bin/pqtapi +++ b/PerlQt/bin/pqtapi @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Note: this program is part of PerlQt and makes use of its internal functions. +# Note: this program is part of PerlTQt and makes use of its internal functions. # You should not rely on those in your own programs. use Getopt::Std; @@ -9,17 +9,17 @@ use strict 'vars'; our (%o, @x, $h); getopts('r:hvimp', \%o); -package Qt::_internal; -use Qt; +package TQt::_internal; +use TQt; -exists $o{'v'} and do{ print "PerlQt-$Qt::VERSION using Qt-".&Qt::version."\n" and exit 0 }; +exists $o{'v'} and do{ print "PerlTQt-$TQt::VERSION using TQt-".&TQt::version."\n" and exit 0 }; exists $o{'h'} and do{ print $h and exit 0 }; -exists $o{'m'} and do{ # interactive mode for driving the Qt Designer Plugin +exists $o{'m'} and do{ # interactive mode for driving the TQt Designer Plugin select(STDOUT); $| = 1; # unbuffered while(<STDIN>) { chomp; - s/^Q(?=[A-Z])/Qt::/; + s/^Q(?=[A-Z])/TQt::/; my $i = find_pclassid( $_ ); print "__START__\n"; if ($i) @@ -38,7 +38,7 @@ exists $o{'m'} and do{ # interactive mode for driving the Qt Designer Plugi print "__END__\n"; } }; -(my $c = $ARGV[0]) =~ s/^Q(?=[A-Z])/Qt::/; +(my $c = $ARGV[0]) =~ s/^Q(?=[A-Z])/TQt::/; my $i = $c ? find_pclassid( $c ) : 1; my $r = exists $o{'r'} ? (exists $o{'i'} ? qr|$o{'r'}|i : qr|$o{'r'}|) : 0; my $d = ""; @@ -71,12 +71,12 @@ while ($i) } BEGIN { - $h = "pqtapi - a PerlQt introspection tool\t(c) Germain Garand 2003 <germain\@ebooksfrance.org>\n\n". + $h = "pqtapi - a PerlTQt introspection tool\t(c) Germain Garand 2003 <germain\@ebooksfrance.org>\n\n". "usage: pqtapi [-r <re>] [<class>]\n\n". "options:\n". "\t-r <re> : find all functions matching regular expression/keyword <re>\n". "\t-i : together with -r, performs a case insensitive search\n". "\t-p : display also inherited methods for <class>.\n". - "\t-v : print PerlQt and Qt versions\n". + "\t-v : print PerlTQt and TQt versions\n". "\t-h : print this help message\n"; } diff --git a/PerlQt/bin/pqtsh b/PerlQt/bin/pqtsh index 11a9e64..ec44e43 100755 --- a/PerlQt/bin/pqtsh +++ b/PerlQt/bin/pqtsh @@ -1,6 +1,6 @@ #!/usr/bin/perl -# pqtsh : a graphical shell for PerlQt. +# pqtsh : a graphical shell for PerlTQt. # # author: Germain Garand <germain@ebooksfrance.org> # license: GNU Public License v2 @@ -9,20 +9,20 @@ use utf8; use strict 'vars'; -package QtShellControl; +package TQtShellControl; -use Qt; -use Qt::isa qw(Qt::MainWindow); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::MainWindow); +use TQt::slots fileOpen => [], fileSave => [], fileSaveAs => [], filePrint => [], fileExit => [], helpExample => []; -use Qt::signals - fileNeedsEval => [QString]; -use Qt::attributes qw( +use TQt::signals + fileNeedsEval => [TQString]; +use TQt::attributes qw( menubar fileMenu helpMenu @@ -134,7 +134,7 @@ our $image2_data = our $image3_data = ["22 22 88 2", -"Qt c None", +"TQt c None", ".2 c #000000", ".S c #08ff08", "#v c #100810", @@ -222,18 +222,18 @@ our $image3_data = ".e c #eeeeee", ".W c #f6f6f6", ".P c #ffffff", -"QtQtQtQtQtQt.#.a.b.b.b.b.c.c.a.a.d.aQtQtQtQt", -"QtQtQtQtQtQt.a.e.f.f.f.f.f.e.e.e.g.aQtQtQtQt", -"QtQtQtQtQtQt.a.c.c.c.b.b.c.c.c.c.a.cQtQtQtQt", -"QtQtQtQtQtQt.#.a.a.a.a.#.a.a.#.#.d.aQtQtQtQt", -"QtQtQtQtQt.c.d.c.a.c.c.c.a.a.a.c.#QtQtQtQtQt", -"QtQtQtQtQt.a.a.#.a.a.a.a.a.a.c.c.#QtQtQtQtQt", -"QtQtQtQtQt.a.#.c.a.a.a.a.a.c.a.c.dQtQtQtQtQt", -"QtQtQtQtQt.c.a.a.a.a.a.a.a.a.a.a.#QtQtQtQtQt", -"QtQtQtQtQt.d.b.f.g.g.g.g.g.g.h.g.i.i.jQtQtQt", -"QtQtQt.a.k.l.#.h.b.h.b.h.b.h.g.g.m.n.o.p.#Qt", -"QtQt.a.q.r.s.t.t.t.t.t.t.t.u.v.w.x.y.z.A.o.i", -"Qt.a.k.B.C.D.B.E.E.E.E.F.G.H.I.J.K.o.L.L.M.y", +"TQtTQtTQtTQtTQtTQt.#.a.b.b.b.b.c.c.a.a.d.aTQtTQtTQtTQt", +"TQtTQtTQtTQtTQtTQt.a.e.f.f.f.f.f.e.e.e.g.aTQtTQtTQtTQt", +"TQtTQtTQtTQtTQtTQt.a.c.c.c.b.b.c.c.c.c.a.cTQtTQtTQtTQt", +"TQtTQtTQtTQtTQtTQt.#.a.a.a.a.#.a.a.#.#.d.aTQtTQtTQtTQt", +"TQtTQtTQtTQtTQt.c.d.c.a.c.c.c.a.a.a.c.#TQtTQtTQtTQtTQt", +"TQtTQtTQtTQtTQt.a.a.#.a.a.a.a.a.a.c.c.#TQtTQtTQtTQtTQt", +"TQtTQtTQtTQtTQt.a.#.c.a.a.a.a.a.c.a.c.dTQtTQtTQtTQtTQt", +"TQtTQtTQtTQtTQt.c.a.a.a.a.a.a.a.a.a.a.#TQtTQtTQtTQtTQt", +"TQtTQtTQtTQtTQt.d.b.f.g.g.g.g.g.g.h.g.i.i.jTQtTQtTQt", +"TQtTQtTQt.a.k.l.#.h.b.h.b.h.b.h.g.g.m.n.o.p.#TQt", +"TQtTQt.a.q.r.s.t.t.t.t.t.t.t.u.v.w.x.y.z.A.o.i", +"TQt.a.k.B.C.D.B.E.E.E.E.F.G.H.I.J.K.o.L.L.M.y", ".a.N.O.P.P.P.P.P.P.P.P.P.Q.R.S.R.b.v.T.A.U.L", ".V.W.P.P.P.P.P.P.P.P.P.P.X.Y.Z.0.P.1.t.A.2.L", ".3.E.4.5.4.h.E.E.g.6.D.B.D.E.7.F.4.5.8.M.2.A", @@ -241,22 +241,22 @@ our $image3_data = ".m.j.j#..3.K.K.K.N.K.N.N.N.N#a#d#d.w#b#c.2#e", "#f#.#..K.N.K.N.N.N#a.k#a#d#d#d#a.m#g#b.M.2#h", ".m.3.K.K#a.k#a#d#a.k#a#d#a#d.q.m.8#i.x#c#e.d", -"#f#g#i.w#j.w#i.8.w#i.8.8.m.8.m#k.8.w#b#e#fQt", -".#.l.z.A#l.z#m#m#m#n#o#o#p#p#q#q#p#o#p#fQtQt", -"QtQt.d#r#s#s#t#p.T.T.T#u#u.z#e#e#v.o.kQtQtQt"]; +"#f#g#i.w#j.w#i.8.w#i.8.8.m.8.m#k.8.w#b#e#fTQt", +".#.l.z.A#l.z#m#m#m#n#o#o#p#p#q#q#p#o#p#fTQtTQt", +"TQtTQt.d#r#s#s#t#p.T.T.T#u#u.z#e#e#v.o.kTQtTQtTQt"]; sub NEW { shift->SUPER::NEW(@_); - my $image0 = Qt::Pixmap($image0_data); - my $image1 = Qt::Pixmap($image1_data); - my $image2 = Qt::Pixmap($image2_data); - my $image3 = Qt::Pixmap($image3_data); + my $image0 = TQt::Pixmap($image0_data); + my $image1 = TQt::Pixmap($image1_data); + my $image2 = TQt::Pixmap($image2_data); + my $image3 = TQt::Pixmap($image3_data); my $box = VBox(this); sessionLog = TextEdit($box, "sessionLog"); - sessionLog->setTextFormat(Qt::RichText()); + sessionLog->setTextFormat(TQt::RichText()); sessionLog->setReadOnly(1); comboBox = ComboBox($box, "comboBox"); comboBox->setEditable(1); @@ -264,42 +264,42 @@ sub NEW this->setCentralWidget($box); comboBox->setFocus; this->resize(500,300); - setCaption("PerlQt Shell"); -# fileNewAction= Qt::Action(this, "fileNewAction"); -# fileNewAction->setIconSet(Qt::IconSet($image0)); + setCaption("PerlTQt Shell"); +# fileNewAction= TQt::Action(this, "fileNewAction"); +# fileNewAction->setIconSet(TQt::IconSet($image0)); # fileNewAction->setText(trUtf8("New")); # fileNewAction->setMenuText(trUtf8("&New")); # fileNewAction->setAccel(KeySequence(trUtf8("Ctrl+N"))); - fileOpenAction= Qt::Action(this, "fileOpenAction"); - fileOpenAction->setIconSet(Qt::IconSet($image1)); + fileOpenAction= TQt::Action(this, "fileOpenAction"); + fileOpenAction->setIconSet(TQt::IconSet($image1)); fileOpenAction->setText(trUtf8("Open")); fileOpenAction->setMenuText(trUtf8("&Open...")); fileOpenAction->setAccel(KeySequence(trUtf8("Ctrl+O"))); - fileSaveAction= Qt::Action(this, "fileSaveAction"); - fileSaveAction->setIconSet(Qt::IconSet($image2)); + fileSaveAction= TQt::Action(this, "fileSaveAction"); + fileSaveAction->setIconSet(TQt::IconSet($image2)); fileSaveAction->setText(trUtf8("Save")); fileSaveAction->setMenuText(trUtf8("&Save")); fileSaveAction->setAccel(KeySequence(trUtf8("Ctrl+S"))); - fileSaveAsAction= Qt::Action(this, "fileSaveAsAction"); + fileSaveAsAction= TQt::Action(this, "fileSaveAsAction"); fileSaveAsAction->setText(trUtf8("Save As")); fileSaveAsAction->setMenuText(trUtf8("Save &As...")); fileSaveAsAction->setAccel(KeySequence(trUtf8("Ctrl+A"))); - filePrintAction= Qt::Action(this, "filePrintAction"); - filePrintAction->setIconSet(Qt::IconSet($image3)); + filePrintAction= TQt::Action(this, "filePrintAction"); + filePrintAction->setIconSet(TQt::IconSet($image3)); filePrintAction->setText(trUtf8("Print")); filePrintAction->setMenuText(trUtf8("&Print...")); filePrintAction->setAccel(KeySequence(trUtf8("Ctrl+P"))); - fileExitAction= Qt::Action(this, "fileExitAction"); + fileExitAction= TQt::Action(this, "fileExitAction"); fileExitAction->setText(trUtf8("Exit")); fileExitAction->setMenuText(trUtf8("E&xit")); fileExitAction->setAccel(KeySequence(trUtf8("Ctrl+E"))); - helpExampleAction= Qt::Action(this, "helpExampleAction"); + helpExampleAction= TQt::Action(this, "helpExampleAction"); helpExampleAction->setText(trUtf8("Example")); helpExampleAction->setMenuText(trUtf8("Examp&le")); helpExampleAction->setAccel(KeySequence(trUtf8("Ctrl+L"))); - toolBar = Qt::ToolBar("", this, DockTop()); + toolBar = TQt::ToolBar("", this, DockTop()); toolBar->setLabel(trUtf8("Tools")); fileOpenAction->addTo(toolBar); @@ -307,9 +307,9 @@ sub NEW filePrintAction->addTo(toolBar); - menubar= Qt::MenuBar( this, "menubar"); + menubar= TQt::MenuBar( this, "menubar"); - fileMenu= Qt::PopupMenu(this); + fileMenu= TQt::PopupMenu(this); # fileNewAction->addTo(fileMenu); fileOpenAction->addTo(fileMenu); fileSaveAction->addTo(fileMenu); @@ -322,17 +322,17 @@ sub NEW menubar->insertSeparator; - helpMenu= Qt::PopupMenu(this); + helpMenu= TQt::PopupMenu(this); helpExampleAction->addTo(helpMenu); menubar->insertItem(trUtf8("&Help"), helpMenu); -# Qt::Object::connect(fileNewAction, SIGNAL "activated()", this, SLOT "fileNew()"); - Qt::Object::connect(fileOpenAction, SIGNAL "activated()", this, SLOT "fileOpen()"); - Qt::Object::connect(fileSaveAction, SIGNAL "activated()", this, SLOT "fileSave()"); - Qt::Object::connect(fileSaveAsAction, SIGNAL "activated()", this, SLOT "fileSaveAs()"); - Qt::Object::connect(filePrintAction, SIGNAL "activated()", this, SLOT "filePrint()"); - Qt::Object::connect(fileExitAction, SIGNAL "activated()", this, SLOT "fileExit()"); - Qt::Object::connect(helpExampleAction, SIGNAL "activated()", this, SLOT "helpExample()"); +# TQt::Object::connect(fileNewAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileNew()"); + TQt::Object::connect(fileOpenAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileOpen()"); + TQt::Object::connect(fileSaveAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileSave()"); + TQt::Object::connect(fileSaveAsAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileSaveAs()"); + TQt::Object::connect(filePrintAction, TQT_SIGNAL "activated()", this, TQT_SLOT "filePrint()"); + TQt::Object::connect(fileExitAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileExit()"); + TQt::Object::connect(helpExampleAction, TQT_SIGNAL "activated()", this, TQT_SLOT "helpExample()"); executedLines = []; @@ -345,7 +345,7 @@ sub NEW sub fileOpen { - my $fn = Qt::FileDialog::getOpenFileName( + my $fn = TQt::FileDialog::getOpenFileName( ".", "Pqtsh Session (*.pqts)", this, @@ -358,7 +358,7 @@ sub fileOpen sub getFileName { - fileName = Qt::FileDialog::getSaveFileName( + fileName = TQt::FileDialog::getSaveFileName( ".", "Pqtsh Session (*.pqts)", this, @@ -373,12 +373,12 @@ sub save { my $fn = shift; open( OUT, ">$fn") or do { - Qt::MessageBox::critical( + TQt::MessageBox::critical( this, "Error" , "Couldn't open $fn for writing: $!", - &Qt::MessageBox::Ok, - &Qt::MessageBox::NoButton ); + &TQt::MessageBox::Ok, + &TQt::MessageBox::NoButton ); return }; for (@{ &executedLines }) @@ -411,17 +411,17 @@ sub fileSaveAs if( -e $fn ) { $cond++; - $doit = Qt::MessageBox::warning( + $doit = TQt::MessageBox::warning( this, "Warning" , "File exists, overwrite ?", - &Qt::MessageBox::Yes, - &Qt::MessageBox::No ); + &TQt::MessageBox::Yes, + &TQt::MessageBox::No ); } else { $cond = 0 } } - goto AGAIN if $cond and $doit == &Qt::MessageBox::No; + goto AGAIN if $cond and $doit == &TQt::MessageBox::No; save($fn) } @@ -430,10 +430,10 @@ sub filePrint my $Margin = 10; my $pageNo = 1; emptySession() and return; - printer = Qt::Printer unless printer; + printer = TQt::Printer unless printer; if ( printer->setup(this) ) { statusBar()->message( "Printing..." ); - my $p = Qt::Painter; + my $p = TQt::Painter; if( !$p->begin( printer ) ) { statusBar()->message( "An error occured..." ); @@ -443,7 +443,7 @@ sub filePrint $p->setFont( sessionLog->font() ); my $yPos = 0; my $fm = $p->fontMetrics; - my $metrics = Qt::PaintDeviceMetrics( printer ); + my $metrics = TQt::PaintDeviceMetrics( printer ); for( my $i = 0 ; $i < @{ &executedLines } ; $i++ ) { if ( $Margin + $yPos > $metrics->height() - $Margin ) { @@ -467,7 +467,7 @@ sub filePrint sub fileExit { - emit Qt::app()->quit() if confirmExit(); + emit TQt::app()->quit() if confirmExit(); } sub closeEvent @@ -488,17 +488,17 @@ sub confirmExit my $doit; if(@{ &executedLines }) { - $doit = Qt::MessageBox::warning( + $doit = TQt::MessageBox::warning( this, "Warning" , "A session is opened, quit anyway ?", - &Qt::MessageBox::Yes, - &Qt::MessageBox::No ); + &TQt::MessageBox::Yes, + &TQt::MessageBox::No ); } else { return 1 } - return (($doit == &Qt::MessageBox::No) ? 0 : 1); + return (($doit == &TQt::MessageBox::No) ? 0 : 1); } sub emptySession @@ -518,23 +518,23 @@ sub helpExample 1; -package QtShell; +package TQtShell; -use Qt; -use Qt::isa qw(Qt::MainWindow); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::MainWindow); +use TQt::slots evalInput=>[], - evalFile=>[QString]; -use Qt::attributes qw( + evalFile=>[TQString]; +use TQt::attributes qw( shellWindow ); -use QtShellControl; +use TQtShellControl; sub NEW { shift->SUPER::NEW(@_); - shellWindow = QtShellControl(undef, "shellWindow"); + shellWindow = TQtShellControl(undef, "shellWindow"); this->resize(350,350); this->move(Point(10,10)); shellWindow->move(Point(300,200)); @@ -542,11 +542,11 @@ sub NEW shellWindow->show; - this->connect(shellWindow->comboBox->lineEdit, SIGNAL 'returnPressed()', SLOT 'evalInput()'); + this->connect(shellWindow->comboBox->lineEdit, TQT_SIGNAL 'returnPressed()', TQT_SLOT 'evalInput()'); this->{'prompt'} = '<b><font color="blue">$></font></b>'; setCaption("MainWindow - this"); shellWindow->sessionLog->setText("Ready.<br>"); - Qt::Object::connect(shellWindow, SIGNAL 'fileNeedsEval(QString)', this, SLOT 'evalFile(QString)'); + TQt::Object::connect(shellWindow, TQT_SIGNAL 'fileNeedsEval(TQString)', this, TQT_SLOT 'evalFile(TQString)'); } sub logAppend @@ -599,12 +599,12 @@ sub evalFile else { open($fh, $fn) or do { - Qt::MessageBox::warning ( + TQt::MessageBox::warning ( this, "Error" , "Couldn't open $fn: $!", - &Qt::MessageBox::Ok, - &Qt::MessageBox::NoButton ); + &TQt::MessageBox::Ok, + &TQt::MessageBox::NoButton ); return }; } @@ -617,7 +617,7 @@ sub evalFile 1; -package Qt::TextHandle; +package TQt::TextHandle; sub TIEHANDLE { my ( $classnm, $widg, $color) = @_; my $h = { widg => $widg, color => $color}; @@ -645,31 +645,31 @@ sub UNTIE { } package main; use strict; -use Qt; -use QtShell; -use Qt::debug; +use TQt; +use TQtShell; +use TQt::debug; -my $app = Qt::Application(\@ARGV); -my $w = QtShell(undef, "mainWindow"); +my $app = TQt::Application(\@ARGV); +my $w = TQtShell(undef, "mainWindow"); my $shw = $w->shellWindow; $app->setMainWidget($shw); -tie *STDOUT, 'Qt::TextHandle', $shw->sessionLog, 'black'; -tie *STDERR, 'Qt::TextHandle', $shw->sessionLog, 'red'; +tie *STDOUT, 'TQt::TextHandle', $shw->sessionLog, 'black'; +tie *STDERR, 'TQt::TextHandle', $shw->sessionLog, 'red'; exit $app->exec; __DATA__ statusBar()->message("Hello World !"); -use Qt::attributes qw|datetime button textedit sample vbox| ; +use TQt::attributes qw|datetime button textedit sample vbox| ; vbox = VBox(this); datetime = DateTimeEdit(vbox); -textedit = Qt::TextEdit(vbox); +textedit = TQt::TextEdit(vbox); button = PushButton("Hello World!", vbox) ; this->setCentralWidget(vbox); resize(220,240); vbox->show; -sample = Qt::PopupMenu( this ); -use Qt::slots 'there' => []; -sample->insertItem("&There", this, SLOT 'there()'); +sample = TQt::PopupMenu( this ); +use TQt::slots 'there' => []; +sample->insertItem("&There", this, TQT_SLOT 'there()'); menuBar()->insertItem("&Here", sample); sub there { statusBar()->message("There...", 2000) }; diff --git a/PerlQt/examples/aclock/AnalogClock.pm b/PerlQt/examples/aclock/AnalogClock.pm index d4aeff9..0a52c44 100644 --- a/PerlQt/examples/aclock/AnalogClock.pm +++ b/PerlQt/examples/aclock/AnalogClock.pm @@ -1,24 +1,24 @@ package AnalogClock; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots - setTime => ['const QTime&'], - drawClock => ['QPainter*'], +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots + setTime => ['const TQTime&'], + drawClock => ['TQPainter*'], timeout => []; -use Qt::attributes qw( +use TQt::attributes qw( clickPos _time ); # -# Constructs an analog clock widget that uses an internal QTimer +# Constructs an analog clock widget that uses an internal TQTimer # sub NEW { shift->SUPER::NEW(@_); - _time = Qt::Time::currentTime(); # get current time - my $internalTimer = Qt::Timer(this); # create internal timer - this->connect($internalTimer, SIGNAL('timeout()'), SLOT('timeout()')); + _time = TQt::Time::currentTime(); # get current time + my $internalTimer = TQt::Timer(this); # create internal timer + this->connect($internalTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('timeout()')); $internalTimer->start(5000); # emit signal every 5 seconds } @@ -26,11 +26,11 @@ sub mousePressEvent { my $e = shift; if(isTopLevel()) { # Lack of operators is really noticable here - my $topLeft = Qt::Point( + my $topLeft = TQt::Point( geometry()->topLeft->x - frameGeometry()->topLeft->x, geometry()->topLeft->y - frameGeometry()->topLeft->y ); - clickPos = Qt::Point($e->pos->x + $topLeft->x, + clickPos = TQt::Point($e->pos->x + $topLeft->x, $e->pos->y + $topLeft->y); } } @@ -38,7 +38,7 @@ sub mousePressEvent { sub mouseMoveEvent { my $e = shift; if(isTopLevel()) { - move(Qt::Point($e->globalPos->x - clickPos->x, + move(TQt::Point($e->globalPos->x - clickPos->x, $e->globalPos->y - clickPos->y)); } } @@ -49,11 +49,11 @@ sub setTime { } # -# The QTimer::timeout() signal is received by this slot. +# The TQTimer::timeout() signal is received by this slot. # sub timeout { - my $new_time = Qt::Time::currentTime(); # get the current time + my $new_time = TQt::Time::currentTime(); # get the current time _time = _time->addSecs(5); if($new_time->minute != _time->minute) { # minute has changed if(autoMask()) { @@ -66,7 +66,7 @@ sub timeout { sub paintEvent { return if autoMask(); - my $paint = Qt::Painter(this); + my $paint = TQt::Painter(this); $paint->setBrush(colorGroup()->foreground); drawClock($paint); } @@ -75,10 +75,10 @@ sub paintEvent { # instead of paintEvent() sub updateMask { # paint clock mask - my $bm = Qt::Bitmap(size()); + my $bm = TQt::Bitmap(size()); $bm->fill(&color0); # transparent - my $paint = Qt::Painter; + my $paint = TQt::Painter; $paint->begin($bm, this); $paint->setBrush(&color1); # use non-transparent color $paint->setPen(&color1); @@ -105,8 +105,8 @@ sub drawClock { $paint->setViewport($v->left + ($v->width-$d)/2, $v->top - ($v->height-$d)/2, $d, $d); - # _time = Qt::Time::currentTime(); - my $pts = Qt::PointArray(); + # _time = TQt::Time::currentTime(); + my $pts = TQt::PointArray(); $paint->save; $paint->rotate(30*(_time->hour%12-3) + _time->minute/2); @@ -131,7 +131,7 @@ sub drawClock { sub setAutoMask { my $b = shift; setBackgroundMode($b ? &PaletteForeground : &PaletteBackground); - Qt::Widget::setAutoMask($b); + TQt::Widget::setAutoMask($b); } 1; diff --git a/PerlQt/examples/aclock/aclock.pl b/PerlQt/examples/aclock/aclock.pl index ff59ec1..b4ae659 100644 --- a/PerlQt/examples/aclock/aclock.pl +++ b/PerlQt/examples/aclock/aclock.pl @@ -1,13 +1,13 @@ #!/usr/bin/perl -w use strict; -use Qt; +use TQt; use AnalogClock; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $clock = AnalogClock; $clock->setAutoMask(1) if @ARGV and $ARGV[0] eq '-transparent'; $clock->resize(100, 100); $a->setMainWidget($clock); -$clock->setCaption("PerlQt example - Analog Clock"); +$clock->setCaption("PerlTQt example - Analog Clock"); $clock->show; exit $a->exec; diff --git a/PerlQt/examples/buttongroups/ButtonsGroups.pm b/PerlQt/examples/buttongroups/ButtonsGroups.pm index 0bb6c73..106cf1b 100644 --- a/PerlQt/examples/buttongroups/ButtonsGroups.pm +++ b/PerlQt/examples/buttongroups/ButtonsGroups.pm @@ -1,10 +1,10 @@ package ButtonsGroups; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots slotChangeGrp3State => []; -use Qt::attributes qw( +use TQt::attributes qw( state rb21 rb22 @@ -21,65 +21,65 @@ sub NEW { shift->SUPER::NEW(@_); # Create Widgets which allow easy layouting - my $vbox = Qt::VBoxLayout(this); - my $box1 = Qt::HBoxLayout($vbox); - my $box2 = Qt::HBoxLayout($vbox); + my $vbox = TQt::VBoxLayout(this); + my $box1 = TQt::HBoxLayout($vbox); + my $box2 = TQt::HBoxLayout($vbox); # ------- first group # Create an exclusive button group - my $bgrp1 = Qt::ButtonGroup(1, &Horizontal, "Button Group &1 (exclusive)", this); + my $bgrp1 = TQt::ButtonGroup(1, &Horizontal, "Button Group &1 (exclusive)", this); $box1->addWidget($bgrp1); $bgrp1->setExclusive(1); # insert 3 radiobuttons - Qt::RadioButton("R&adiobutton 2", $bgrp1); - Qt::RadioButton("Ra&diobutton 3", $bgrp1); + TQt::RadioButton("R&adiobutton 2", $bgrp1); + TQt::RadioButton("Ra&diobutton 3", $bgrp1); # ------- second group # Create a non-exclusive buttongroup - my $bgrp2 = Qt::ButtonGroup(1, &Horizontal, "Button Group &2 (non-exclusive)", this); + my $bgrp2 = TQt::ButtonGroup(1, &Horizontal, "Button Group &2 (non-exclusive)", this); $box1->addWidget($bgrp2); $bgrp2->setExclusive(0); # insert 3 checkboxes - Qt::CheckBox("&Checkbox 1", $bgrp2); - my $cb12 = Qt::CheckBox("C&heckbox 2", $bgrp2); + TQt::CheckBox("&Checkbox 1", $bgrp2); + my $cb12 = TQt::CheckBox("C&heckbox 2", $bgrp2); $cb12->setChecked(1); - my $cb13 = Qt::CheckBox("Triple &State Button", $bgrp2); + my $cb13 = TQt::CheckBox("Triple &State Button", $bgrp2); $cb13->setTristate(1); $cb13->setChecked(1); # ----------- third group # create a buttongroup which is exclusive for radiobuttons and non-exclusive for all other buttons - my $bgrp3 = Qt::ButtonGroup(1, &Horizontal, "Button Group &3 (Radiobutton-exclusive)", this); + my $bgrp3 = TQt::ButtonGroup(1, &Horizontal, "Button Group &3 (Radiobutton-exclusive)", this); $box2->addWidget($bgrp3); $bgrp3->setRadioButtonExclusive(1); # insert three radiobuttons - rb21 = Qt::RadioButton("Rad&iobutton 1", $bgrp3); - rb22 = Qt::RadioButton("Radi&obutton 2", $bgrp3); - rb23 = Qt::RadioButton("Radio&button 3", $bgrp3); + rb21 = TQt::RadioButton("Rad&iobutton 1", $bgrp3); + rb22 = TQt::RadioButton("Radi&obutton 2", $bgrp3); + rb23 = TQt::RadioButton("Radio&button 3", $bgrp3); rb23->setChecked(1); # insert a checkbox - state = Qt::CheckBox("E&nable Radiobuttons", $bgrp3); + state = TQt::CheckBox("E&nable Radiobuttons", $bgrp3); state->setChecked(1); - # ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - this->connect(state, SIGNAL('clicked()'), SLOT('slotChangeGrp3State()')); + # ...and connect its TQT_SIGNAL clicked() with the TQT_SLOT slotChangeGrp3State() + this->connect(state, TQT_SIGNAL('clicked()'), TQT_SLOT('slotChangeGrp3State()')); # ----------- fourth group # create a groupbox which layouts its childs in a columns - my $bgrp4 = Qt::ButtonGroup(1, &Horizontal, "Groupbox with &normal buttons", this); + my $bgrp4 = TQt::ButtonGroup(1, &Horizontal, "Groupbox with &normal buttons", this); $box2->addWidget($bgrp4); # insert three pushbuttons... - Qt::PushButton("&Push Button", $bgrp4); - my $tb2 = Qt::PushButton("&Toggle Button", $bgrp4); - my $tb3 = Qt::PushButton("&Flat Button", $bgrp4); + TQt::PushButton("&Push Button", $bgrp4); + my $tb2 = TQt::PushButton("&Toggle Button", $bgrp4); + my $tb3 = TQt::PushButton("&Flat Button", $bgrp4); # ... and make the second one a toggle button $tb2->setToggleButton(1); @@ -90,7 +90,7 @@ sub NEW { } # -# SLOT slotChangeGrp3State() +# TQT_SLOT slotChangeGrp3State() # # enables/disables the radiobuttons of the third buttongroup # diff --git a/PerlQt/examples/buttongroups/buttongroups.pl b/PerlQt/examples/buttongroups/buttongroups.pl index 3fdf884..632ad43 100644 --- a/PerlQt/examples/buttongroups/buttongroups.pl +++ b/PerlQt/examples/buttongroups/buttongroups.pl @@ -1,13 +1,13 @@ #!/usr/bin/perl -w use strict; -use Qt; +use TQt; use ButtonsGroups; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $buttonsgroups = ButtonsGroups; $buttonsgroups->resize(500, 250); -$buttonsgroups->setCaption("PerlQt Example - Buttongroups"); +$buttonsgroups->setCaption("PerlTQt Example - Buttongroups"); $a->setMainWidget($buttonsgroups); $buttonsgroups->show; exit $a->exec; diff --git a/PerlQt/examples/dclock/DigitalClock.pm b/PerlQt/examples/dclock/DigitalClock.pm index 4611272..2d25428 100644 --- a/PerlQt/examples/dclock/DigitalClock.pm +++ b/PerlQt/examples/dclock/DigitalClock.pm @@ -1,11 +1,11 @@ package DigitalClock; use strict; -use Qt; -use Qt::isa qw(Qt::LCDNumber); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::LCDNumber); +use TQt::slots stopDate => [], showTime => []; -use Qt::attributes qw( +use TQt::attributes qw( showingColon normalTimer showDateTimer @@ -56,7 +56,7 @@ sub mousePressEvent { sub showDate { return if showDateTimer != -1; # already showing date - my $date = Qt::Date::currentDate(); + my $date = TQt::Date::currentDate(); my $s = sprintf("%2d %2d", $date->month, $date->day); display($s); # sets the LCD number/text showDateTimer = startTimer(2000); # keep this state for 2 secs @@ -78,7 +78,7 @@ sub stopDate { sub showTime { showingColon = !showingColon; - my $s = substr(Qt::Time::currentTime()->toString, 0, 5); + my $s = substr(TQt::Time::currentTime()->toString, 0, 5); $s =~ s/^0/ /; $s =~ s/:/ / unless showingColon; display($s); diff --git a/PerlQt/examples/dclock/dclock.pl b/PerlQt/examples/dclock/dclock.pl index f5820fd..57c02bd 100644 --- a/PerlQt/examples/dclock/dclock.pl +++ b/PerlQt/examples/dclock/dclock.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -w use strict; -use Qt; +use TQt; use DigitalClock; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $clock = DigitalClock; $clock->resize(170, 80); $a->setMainWidget($clock); -$clock->setCaption("PerlQt Example - Digital Clock"); +$clock->setCaption("PerlTQt Example - Digital Clock"); $clock->show; exit $a->exec; diff --git a/PerlQt/examples/drawdemo/drawdemo.pl b/PerlQt/examples/drawdemo/drawdemo.pl index c58e10d..f119a94 100644 --- a/PerlQt/examples/drawdemo/drawdemo.pl +++ b/PerlQt/examples/drawdemo/drawdemo.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -w use strict; package DrawView; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots updateIt => ['int'], printIt => []; -use Qt::attributes qw( +use TQt::attributes qw( printer bgroup _print @@ -26,19 +26,19 @@ use Qt::attributes qw( sub drawColorWheel { my $p = shift; - my $f = Qt::Font("times", 18, &Qt::Font::Bold); + my $f = TQt::Font("times", 18, &TQt::Font::Bold); $p->setFont($f); $p->setPen(&black); $p->setWindow(0, 0, 500, 500); # defines coordinate system for my $i (0..35) { - my $matrix = Qt::WMatrix; + my $matrix = TQt::WMatrix; $matrix->translate(250.0, 250.0); # move to center $matrix->shear(0.0, 0.3); # twist it $matrix->rotate($i*10.0); # rotate 0,10,20,.. degrees $p->setWorldMatrix($matrix); # use this world matrix - my $c = Qt::Color; + my $c = TQt::Color; $c->setHsv($i*10, 255, 255); # rainbow effect $p->setBrush($c); # solid fill with color $c $p->drawRect(70, -10, 80, 10); # draw the rectangle @@ -59,7 +59,7 @@ sub drawFonts { my $y = 0; for my $f (@fonts) { for my $s (@sizes) { - my $font = Qt::Font($f, $s); + my $font = TQt::Font($f, $s); $p->setFont($font); my $fm = $p->fontMetrics; $y += $fm->ascent; @@ -75,10 +75,10 @@ sub drawFonts { sub drawShapes { my $p = shift; - my $b1 = Qt::Brush(&blue); - my $b2 = Qt::Brush(&green, &Dense6Pattern); # green 12% fill - my $b3 = Qt::Brush(&NoBrush); # void brush - my $b4 = Qt::Brush(&CrossPattern); # black cross pattern + my $b1 = TQt::Brush(&blue); + my $b2 = TQt::Brush(&green, &Dense6Pattern); # green 12% fill + my $b3 = TQt::Brush(&NoBrush); # void brush + my $b4 = TQt::Brush(&CrossPattern); # black cross pattern $p->setPen(&red); $p->setBrush($b1); @@ -105,13 +105,13 @@ our @drawFunctions = ( sub NEW { shift->SUPER::NEW(@_); - setCaption("PerlQt Draw Demo Application"); + setCaption("PerlTQt Draw Demo Application"); setBackgroundColor(&white); # Create a button group to contain all buttons - bgroup = Qt::ButtonGroup(this); + bgroup = TQt::ButtonGroup(this); bgroup->resize(200, 200); - this->connect(bgroup, SIGNAL('clicked(int)'), SLOT('updateIt(int)')); + this->connect(bgroup, TQT_SIGNAL('clicked(int)'), TQT_SLOT('updateIt(int)')); # Calculate the size for the radio buttons my $maxwidth = 80; @@ -128,7 +128,7 @@ sub NEW { for my $i (0 .. $#drawFunctions) { my $n = $drawFunctions[$i]{name}; - my $rb = Qt::RadioButton($n, bgroup); + my $rb = TQt::RadioButton($n, bgroup); $rb->setGeometry(10, $i*30+10, $maxwidth, 30); $maxheight += 30; @@ -145,12 +145,12 @@ sub NEW { bgroup->resize($maxwidth, $maxheight); - printer = Qt::Printer; + printer = TQt::Printer; - _print = Qt::PushButton("Print...", bgroup); + _print = TQt::PushButton("Print...", bgroup); _print->resize(80, 30); _print->move($maxwidth/2 - _print->width/2, maxindex*30+20); - this->connect(_print, SIGNAL('clicked()'), SLOT('printIt()')); + this->connect(_print, TQT_SIGNAL('clicked()'), TQT_SLOT('printIt()')); bgroup->resize($maxwidth, _print->y+_print->height+10); @@ -172,13 +172,13 @@ sub drawIt { sub printIt { if(printer->setup(this)) { - my $paint = Qt::Painter(printer); + my $paint = TQt::Painter(printer); drawIt($paint); } } sub paintEvent { - my $paint = Qt::Painter(this); + my $paint = TQt::Painter(this); drawIt($paint); } @@ -187,12 +187,12 @@ sub resizeEvent { } package main; -use Qt; +use TQt; use DrawView; -my $app = Qt::Application(\@ARGV); +my $app = TQt::Application(\@ARGV); my $draw = DrawView; $app->setMainWidget($draw); -$draw->setCaption("PerlQt Example - Drawdemo"); +$draw->setCaption("PerlTQt Example - Drawdemo"); $draw->show; exit $app->exec; diff --git a/PerlQt/examples/drawlines/drawlines.pl b/PerlQt/examples/drawlines/drawlines.pl index 7297fa2..1d7575f 100644 --- a/PerlQt/examples/drawlines/drawlines.pl +++ b/PerlQt/examples/drawlines/drawlines.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -w use strict; package ConnectWidget; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::attributes qw( +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::attributes qw( points colors count @@ -25,13 +25,13 @@ sub NEW { points = []; my @colors; for(1 .. MAXCOLORS) { - push @colors, Qt::Color(rand(255), rand(255), rand(255)); + push @colors, TQt::Color(rand(255), rand(255), rand(255)); } colors = \@colors; } sub paintEvent { - my $paint = Qt::Painter(this); + my $paint = TQt::Painter(this); for(my $i = 0; $i < count-1; $i++) { for(my $j = $i+1; $j < count; $j++) { $paint->setPen(colors->[rand(MAXCOLORS)]); @@ -55,20 +55,20 @@ sub mouseReleaseEvent { sub mouseMoveEvent { my $e = shift; if(down && count < MAXPOINTS) { - my $paint = Qt::Painter(this); - push @{this->points}, Qt::Point($e->pos); + my $paint = TQt::Painter(this); + push @{this->points}, TQt::Point($e->pos); count++; $paint->drawPoint($e->pos); } } package main; -use Qt; +use TQt; use ConnectWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $connect = ConnectWidget; -$connect->setCaption("PerlQt Example - Draw lines"); +$connect->setCaption("PerlTQt Example - Draw lines"); $a->setMainWidget($connect); $connect->show; exit $a->exec; diff --git a/PerlQt/examples/forever/forever.pl b/PerlQt/examples/forever/forever.pl index bf6d56a..e388e44 100644 --- a/PerlQt/examples/forever/forever.pl +++ b/PerlQt/examples/forever/forever.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl -w use strict; package Forever; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots updateCaption => []; -use Qt::attributes qw( +use TQt::attributes qw( rectangles colors ); @@ -15,23 +15,23 @@ sub NEW { shift->SUPER::NEW(@_); colors = \my @colors; for(my $a = 0; $a < numColors; $a++) { - push @colors, Qt::Color(rand(255), rand(255), rand(255)); + push @colors, TQt::Color(rand(255), rand(255), rand(255)); } rectangles = 0; startTimer(0); - my $counter = Qt::Timer(this); - this->connect($counter, SIGNAL('timeout()'), SLOT('updateCaption()')); + my $counter = TQt::Timer(this); + this->connect($counter, TQT_SIGNAL('timeout()'), TQT_SLOT('updateCaption()')); $counter->start(1000); } sub updateCaption { - my $s = sprintf "PerlQt Example - Forever - %d rectangles/second", rectangles; + my $s = sprintf "PerlTQt Example - Forever - %d rectangles/second", rectangles; rectangles = 0; setCaption($s); } sub paintEvent { - my $paint = Qt::Painter(this); + my $paint = TQt::Painter(this); my $w = width(); my $h = height(); return if $w <= 0 || $h <= 0; @@ -48,12 +48,12 @@ sub timerEvent { } package main; -use Qt; +use TQt; use Forever; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $always = Forever; $a->setMainWidget($always); -$always->setCaption("PerlQt Example - Forever"); +$always->setCaption("PerlTQt Example - Forever"); $always->show; exit $a->exec; diff --git a/PerlQt/examples/network/httpd/httpd.pl b/PerlQt/examples/network/httpd/httpd.pl index 3f46041..a9aa0fd 100644 --- a/PerlQt/examples/network/httpd/httpd.pl +++ b/PerlQt/examples/network/httpd/httpd.pl @@ -1,28 +1,28 @@ #!/usr/bin/perl -w -## This program is based on an example program for Qt. It +## This program is based on an example program for TQt. It ## may be used, distributed and modified without limitation. ## ## Copyright (C) 1992-2000 Trolltech AS. All rights reserved. -# When a new client connects, the server constructs a Qt::Socket and all -# communication with the client is done over this Socket object. Qt::Socket +# When a new client connects, the server constructs a TQt::Socket and all +# communication with the client is done over this Socket object. TQt::Socket # works asynchronously - this means that all the communication is done # through the two slots readClient() and discardClient(). package HttpDaemon; -use Qt; -use Qt::isa qw(Qt::ServerSocket); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::ServerSocket); +use TQt::signals newConnect => [], endConnect => [], wroteToClient => []; -use Qt::slots +use TQt::slots readClient => [], discardClient => []; -use Qt::attributes qw( +use TQt::attributes qw( sockets ); @@ -38,9 +38,9 @@ sub NEW sub newConnection { - my $s = Qt::Socket( this ); - this->connect( $s, SIGNAL 'readyRead()', this, SLOT 'readClient()' ); - this->connect( $s, SIGNAL 'delayedCloseFinished()', this, SLOT 'discardClient()' ); + my $s = TQt::Socket( this ); + this->connect( $s, TQT_SIGNAL 'readyRead()', this, TQT_SLOT 'readClient()' ); + this->connect( $s, TQT_SIGNAL 'delayedCloseFinished()', this, TQT_SLOT 'discardClient()' ); $s->setSocket( shift ); sockets->{ $s } = $s; emit newConnect(); @@ -81,13 +81,13 @@ sub discardClient package HttpInfo; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots newConnect => [], endConnect => [], wroteToClient => []; -use Qt::attributes qw( +use TQt::attributes qw( httpd infoText ); @@ -106,10 +106,10 @@ sub NEW $lb->setAlignment( &AlignHCenter ); infoText = TextView( this ); my $quit = PushButton( "quit" , this ); - this->connect( httpd, SIGNAL 'newConnect()', SLOT 'newConnect()' ); - this->connect( httpd, SIGNAL 'endConnect()', SLOT 'endConnect()' ); - this->connect( httpd, SIGNAL 'wroteToClient()', SLOT 'wroteToClient()' ); - this->connect( $quit, SIGNAL 'pressed()', Qt::app(), SLOT 'quit()' ); + this->connect( httpd, TQT_SIGNAL 'newConnect()', TQT_SLOT 'newConnect()' ); + this->connect( httpd, TQT_SIGNAL 'endConnect()', TQT_SLOT 'endConnect()' ); + this->connect( httpd, TQT_SIGNAL 'wroteToClient()', TQT_SLOT 'wroteToClient()' ); + this->connect( $quit, TQT_SIGNAL 'pressed()', TQt::app(), TQT_SLOT 'quit()' ); } sub newConnect @@ -130,10 +130,10 @@ sub wroteToClient 1; package main; -use Qt; +use TQt; use HttpInfo; -my $app = Qt::Application(\@ARGV); +my $app = TQt::Application(\@ARGV); my $info = HttpInfo; $app->setMainWidget($info); $info->show; diff --git a/PerlQt/examples/opengl/README b/PerlQt/examples/opengl/README index 5c93086..7e2f174 100644 --- a/PerlQt/examples/opengl/README +++ b/PerlQt/examples/opengl/README @@ -3,9 +3,9 @@ the OpenGL module available on CPAN (http://www.cpan.org) Latest version is 0.54, as of 09/11/02 -Both Smoke and Qt must also have been compiled with OpenGL support. +Both Smoke and TQt must also have been compiled with OpenGL support. -If your Qt library has OpenGL support but PerlQt complains about lacking +If your TQt library has OpenGL support but PerlTQt complains about lacking methods or classes, check ./configure's config.log file for any error that might have occured while detecting your OpenGL settings. diff --git a/PerlQt/examples/opengl/box/GLBox.pm b/PerlQt/examples/opengl/box/GLBox.pm index dd6ceb9..1c6ceb8 100644 --- a/PerlQt/examples/opengl/box/GLBox.pm +++ b/PerlQt/examples/opengl/box/GLBox.pm @@ -4,13 +4,13 @@ use OpenGL qw(:all); use strict; -use Qt; -use Qt::isa qw(Qt::GLWidget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::GLWidget); +use TQt::slots setXRotation => ['int'], setYRotation => ['int'], setZRotation => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( xRot yRot zRot @@ -75,7 +75,7 @@ sub makeObject glLineWidth( 2.0 ); - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); glVertex3f( 1.0, 0.5, -0.4 ); glVertex3f( 1.0, -0.5, -0.4 ); glVertex3f( -1.0, -0.5, -0.4 ); @@ -84,7 +84,7 @@ sub makeObject qglColor( &blue ); - glBegin( GL_QUADS ); + glBegin( GL_TQUADS ); glVertex3f( 1.0, 0.5, 0.4 ); glVertex3f( 1.0, -0.5, 0.4 ); glVertex3f( -1.0, -0.5, 0.4 ); @@ -93,7 +93,7 @@ sub makeObject qglColor( &darkRed ); - glBegin( GL_QUAD_STRIP ); + glBegin( GL_TQUAD_STRIP ); glVertex3f( 1.0, 0.5, -0.4 ); glVertex3f( 1.0, 0.5, 0.4 ); glVertex3f( 1.0, -0.5, -0.4 ); glVertex3f( 1.0, -0.5, 0.4 ); qglColor( &yellow ); diff --git a/PerlQt/examples/opengl/box/glbox b/PerlQt/examples/opengl/box/glbox index 613a274..fed74a3 100644 --- a/PerlQt/examples/opengl/box/glbox +++ b/PerlQt/examples/opengl/box/glbox @@ -3,9 +3,9 @@ package GLObjectWindow; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::attributes qw( +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::attributes qw( file frame menu @@ -22,50 +22,50 @@ sub NEW shift->SUPER::NEW(@_); # Create a menu - file = Qt::PopupMenu( this ); - file->insertItem( "Exit", Qt::app(), SLOT 'quit()', Qt::KeySequence(int &CTRL + &Key_Q )); + file = TQt::PopupMenu( this ); + file->insertItem( "Exit", TQt::app(), TQT_SLOT 'quit()', TQt::KeySequence(int &CTRL + &Key_Q )); # Create a menu bar - menu = Qt::MenuBar( this ); - menu->setSeparator( &Qt::MenuBar::InWindowsStyle ); + menu = TQt::MenuBar( this ); + menu->setSeparator( &TQt::MenuBar::InWindowsStyle ); menu->insertItem("&File", file ); # Create a nice frame to put around the OpenGL widget - frame = Qt::Frame( this, "frame" ); - frame->setFrameStyle( &Qt::Frame::Sunken | &Qt::Frame::Panel ); + frame = TQt::Frame( this, "frame" ); + frame->setFrameStyle( &TQt::Frame::Sunken | &TQt::Frame::Panel ); frame->setLineWidth( 2 ); # Create our OpenGL widget box = GLBox( frame, "glbox"); # Create the three sliders; one for each rotation axis - xpos = Qt::Slider ( 0, 360, 60, 0, &Qt::Slider::Vertical, this, "xsl" ); - xpos->setTickmarks( &Qt::Slider::Left ); - Qt::Object::connect( xpos, SIGNAL 'valueChanged(int)', box, SLOT 'setXRotation(int)' ); + xpos = TQt::Slider ( 0, 360, 60, 0, &TQt::Slider::Vertical, this, "xsl" ); + xpos->setTickmarks( &TQt::Slider::Left ); + TQt::Object::connect( xpos, TQT_SIGNAL 'valueChanged(int)', box, TQT_SLOT 'setXRotation(int)' ); - ypos = Qt::Slider ( 0, 360, 60, 0, &Qt::Slider::Vertical, this, "ysl" ); - ypos->setTickmarks( &Qt::Slider::Left ); - Qt::Object::connect( ypos, SIGNAL 'valueChanged(int)', box, SLOT 'setYRotation(int)' ); + ypos = TQt::Slider ( 0, 360, 60, 0, &TQt::Slider::Vertical, this, "ysl" ); + ypos->setTickmarks( &TQt::Slider::Left ); + TQt::Object::connect( ypos, TQT_SIGNAL 'valueChanged(int)', box, TQT_SLOT 'setYRotation(int)' ); - zpos = Qt::Slider ( 0, 360, 60, 0, &Qt::Slider::Vertical, this, "zsl" ); - zpos->setTickmarks( &Qt::Slider::Left ); - Qt::Object::connect( zpos, SIGNAL 'valueChanged(int)', box, SLOT 'setZRotation(int)' ); + zpos = TQt::Slider ( 0, 360, 60, 0, &TQt::Slider::Vertical, this, "zsl" ); + zpos->setTickmarks( &TQt::Slider::Left ); + TQt::Object::connect( zpos, TQT_SIGNAL 'valueChanged(int)', box, TQT_SLOT 'setZRotation(int)' ); # Now that we have all the widgets, put them into a nice layout # Put the sliders on top of each other - my $vlayout = Qt::VBoxLayout( 20, "vlayout"); + my $vlayout = TQt::VBoxLayout( 20, "vlayout"); $vlayout->addWidget( xpos ); $vlayout->addWidget( ypos ); $vlayout->addWidget( zpos ); # Put the GL widget inside the frame - my $flayout = Qt::HBoxLayout( frame, 2, 2, "flayout"); + my $flayout = TQt::HBoxLayout( frame, 2, 2, "flayout"); $flayout->addWidget( box, 1 ); # Top level layout, puts the sliders to the left of the frame/GL widget - my $hlayout = Qt::HBoxLayout( this, 20, 20, "hlayout"); + my $hlayout = TQt::HBoxLayout( this, 20, 20, "hlayout"); $hlayout->setMenuBar( menu ); $hlayout->addLayout( $vlayout ); $hlayout->addWidget( frame, 1 ); @@ -75,10 +75,10 @@ sub NEW package main; -use Qt; +use TQt; use GLObjectWindow; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = GLObjectWindow; $w->resize(350,350); diff --git a/PerlQt/examples/opengl/gear/gear b/PerlQt/examples/opengl/gear/gear index 2edc951..d9e4c8a 100644 --- a/PerlQt/examples/opengl/gear/gear +++ b/PerlQt/examples/opengl/gear/gear @@ -2,7 +2,7 @@ # # Draws a gear. # -# This code is originally from Qt-1.44, by Troll Tech +# This code is originally from TQt-1.44, by Troll Tech # # Portions of this code have been borrowed from Brian Paul's Mesa # distribution. @@ -11,8 +11,8 @@ package GearWidget; use OpenGL qw(:all); -use Qt; -use Qt::attributes qw( +use TQt; +use TQt::attributes qw( gear1 gear2 gear3 @@ -22,7 +22,7 @@ use Qt::attributes qw( angle ); -use Qt::isa qw(Qt::GLWidget); +use TQt::isa qw(TQt::GLWidget); # # Draw a gear wheel. You'll probably want to call this function when @@ -54,7 +54,7 @@ sub gear { glNormal3f(0.0, 0.0, 1.0); # draw front face - glBegin(GL_QUAD_STRIP); + glBegin(GL_TQUAD_STRIP); for $i (0 .. $teeth) { $angle = $i * 2.0*$pi / $teeth; glVertex3f($r0*cos($angle), $r0*sin($angle), $width*0.5); @@ -65,7 +65,7 @@ sub gear { glEnd(); # draw front sides of teeth - glBegin(GL_QUADS); + glBegin(GL_TQUADS); $da = 2.0*$pi / $teeth / 4.0; for $i (0 .. $teeth-1) { $angle = $i * 2.0*$pi / $teeth; @@ -81,7 +81,7 @@ sub gear { glNormal3f(0.0, 0.0, -1.0); # draw back face - glBegin(GL_QUAD_STRIP); + glBegin(GL_TQUAD_STRIP); for $i (0 .. $teeth) { $angle = $i * 2.0*$pi / $teeth; glVertex3f($r1*cos($angle), $r1*sin($angle), -$width*0.5); @@ -92,7 +92,7 @@ sub gear { glEnd(); # draw back sides of teeth - glBegin(GL_QUADS); + glBegin(GL_TQUADS); $da = 2.0*$pi / $teeth / 4.0; for $i (0 .. $teeth-1) { $angle = $i * 2.0*$pi / $teeth; @@ -105,7 +105,7 @@ sub gear { glEnd(); # draw outward faces of teeth - glBegin(GL_QUAD_STRIP); + glBegin(GL_TQUAD_STRIP); for $i (0 .. $teeth-1) { $angle = $i * 2.0*$pi / $teeth; @@ -139,7 +139,7 @@ sub gear { glShadeModel(GL_SMOOTH); # draw inside radius cylinder - glBegin(GL_QUAD_STRIP); + glBegin(GL_TQUAD_STRIP); for $i (0 .. $teeth) { $angle = $i * 2.0*$pi / $teeth; glNormal3f(-cos($angle), -sin($angle), 0.0); @@ -251,12 +251,12 @@ sub timerEvent { package main; -use Qt; +use TQt; use GearWidget; -$app = Qt::Application(\@ARGV); +$app = TQt::Application(\@ARGV); -if(!Qt::GLFormat::hasOpenGL()) { +if(!TQt::GLFormat::hasOpenGL()) { warn("This system has no OpenGL support. Exiting."); exit -1; } diff --git a/PerlQt/examples/progress/progress.pl b/PerlQt/examples/progress/progress.pl index a63e95e..4112e64 100644 --- a/PerlQt/examples/progress/progress.pl +++ b/PerlQt/examples/progress/progress.pl @@ -4,9 +4,9 @@ use strict; package AnimatedThingy; -use Qt; -use Qt::isa "Qt::Label"; -use Qt::attributes qw[ +use TQt; +use TQt::isa "TQt::Label"; +use TQt::attributes qw[ label step ox oy @@ -49,12 +49,12 @@ sub hide sub sizeHint { - Qt::Size(120,100) + TQt::Size(120,100) } sub timerEvent { - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); my $pn= $p->pen; $pn->setWidth(2); $pn->setColor(backgroundColor()); @@ -73,7 +73,7 @@ sub timerEvent ox->[1][step] = x1; oy->[1][step] = y1; - my $c = Qt::Color; + my $c = TQt::Color; $c->setHsv( (step*255)/nqix, 255, 255 ); # rainbow effect $pn->setColor($c); $pn->setWidth(2); @@ -86,13 +86,13 @@ sub timerEvent sub paintEvent { my $ev = shift; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); my $pn= $p->pen; $pn->setWidth(2); $p->setPen($pn); $p->setClipRect($ev->rect); for (my $i=0; $i<nqix; $i++) { - my $c = Qt::Color; + my $c = TQt::Color; $c->setHsv( ($i*255)/nqix, 255, 255 ); # rainbow effect $pn->setColor($c); $p->setPen($pn); @@ -115,9 +115,9 @@ sub inc package CPUWaster; -use Qt; -use Qt::isa "Qt::Widget"; -use Qt::attributes qw[ +use TQt; +use TQt::isa "TQt::Widget"; +use TQt::attributes qw[ menubar file options @@ -132,7 +132,7 @@ use Qt::attributes qw[ timer_driven default_label ]; -use Qt::slots +use TQt::slots drawItemRects => ['int'], doMenuItem => ['int'], stopDrawing => [ ], @@ -154,22 +154,22 @@ sub NEW menubar = MenuBar( this, "menu" ); pb = 0; - file = Qt::PopupMenu; + file = TQt::PopupMenu; menubar->insertItem( "&File", file ); for (my $i=first_draw_item; $i<=last_draw_item; $i++) { file->insertItem( drawItemRects($i)." Rectangles", $i) } - Qt::Object::connect( menubar, SIGNAL "activated(int)", this, SLOT "doMenuItem(int)" ); + TQt::Object::connect( menubar, TQT_SIGNAL "activated(int)", this, TQT_SLOT "doMenuItem(int)" ); file->insertSeparator; - file->insertItem( "Quit", Qt::app(), SLOT "quit()" ); - options = Qt::PopupMenu; + file->insertItem( "Quit", TQt::app(), TQT_SLOT "quit()" ); + options = TQt::PopupMenu; menubar->insertItem( "&Options", options ); - td_id = options->insertItem( "Timer driven", this, SLOT "timerDriven()" ); - ld_id = options->insertItem( "Loop driven", this, SLOT "loopDriven()" ); + td_id = options->insertItem( "Timer driven", this, TQT_SLOT "timerDriven()" ); + ld_id = options->insertItem( "Loop driven", this, TQT_SLOT "loopDriven()" ); options->insertSeparator; - dl_id = options->insertItem( "Default label", this, SLOT "defaultLabel()" ); - cl_id = options->insertItem( "Custom label", this, SLOT "customLabel()" ); + dl_id = options->insertItem( "Default label", this, TQT_SLOT "defaultLabel()" ); + cl_id = options->insertItem( "Custom label", this, TQT_SLOT "customLabel()" ); options->insertSeparator; - md_id = options->insertItem( "No minimum duration", this, SLOT "toggleMinimumDuration()" ); + md_id = options->insertItem( "No minimum duration", this, TQT_SLOT "toggleMinimumDuration()" ); options->setCheckable( 1 ); loopDriven(); customLabel(); @@ -240,14 +240,14 @@ sub timerEvent rects--; { - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); my $ww = width(); my $wh = height(); if ( $ww > 8 && $wh > 8 ) { - my $c = Qt::Color(rand(255), rand(255), rand(255)); + my $c = TQt::Color(rand(255), rand(255), rand(255)); my $x = rand($ww-8); my $y = rand($wh-8); my $w = rand($ww-$x); @@ -259,7 +259,7 @@ sub timerEvent if (!rects || got_stop) { pb->setProgress( pb->totalSteps ); - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); $p->fillRect(0, 0, width(), height(), Brush(backgroundColor())); enableDrawingItems(1); killTimers(); @@ -301,7 +301,7 @@ sub draw pb = newProgressDialog("Drawing rectangles.\n". "Using timer event.", $n, 0); pb->setCaption("Please Wait"); - Qt::Object::connect(pb, SIGNAL "cancelled()", this, SLOT "stopDrawing()"); + TQt::Object::connect(pb, TQT_SIGNAL "cancelled()", this, TQT_SLOT "stopDrawing()"); enableDrawingItems(0); startTimer(0); got_stop = 0; @@ -312,7 +312,7 @@ sub draw "Using loop.", $n, 1); $lpb->setCaption("Please Wait"); - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); for (my $i=0; $i<$n; $i++) { if(!($i%100)) @@ -321,7 +321,7 @@ sub draw last if ( $lpb->wasCancelled ); } my ($cw, $ch) = (width(), height()); - my $c = Qt::Color(rand(255), rand(255), rand(255)); + my $c = TQt::Color(rand(255), rand(255), rand(255)); my $x = rand($cw-8); my $y = rand($cw-8); my $w = rand($cw-$x); @@ -337,10 +337,10 @@ sub draw package main; -use Qt; +use TQt; use CPUWaster; -my $a=Qt::Application(\@ARGV); +my $a=TQt::Application(\@ARGV); my $w=CPUWaster; $w->show; diff --git a/PerlQt/examples/richedit/imageCollection.pm b/PerlQt/examples/richedit/imageCollection.pm index 318d4e5..9ba9880 100644 --- a/PerlQt/examples/richedit/imageCollection.pm +++ b/PerlQt/examples/richedit/imageCollection.pm @@ -20,15 +20,15 @@ # images/undo # # Created: jeu jun 13 20:03:44 2002 -# by: The PerlQt User Interface Compiler (puic) +# by: The PerlTQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! use strict; package DesignerMimeSourceFactory_richedit; -use Qt; -use Qt::isa qw(Qt::MimeSourceFactory); +use TQt; +use TQt::isa qw(TQt::MimeSourceFactory); # images/editcopy my $image_0_data = pack 'L*', @@ -1416,9 +1416,9 @@ sub uic_findImage { my $name = shift; return $images{$name} if exists $images{$name}; - return Qt::Image() unless exists $embed_images{$name}; + return TQt::Image() unless exists $embed_images{$name}; - my $img = Qt::Image(@{$embed_images{$name}}[0..4], &Qt::Image::BigEndian); + my $img = TQt::Image(@{$embed_images{$name}}[0..4], &TQt::Image::BigEndian); ${$embed_images{$name}}[5] && $img->setAlphaBuffer(1); $images{$name} = $img; return $img; @@ -1430,30 +1430,30 @@ sub data my $img = uic_findImage($abs_name); if($img->isNull()) { - Qt::MimeSourceFactory::removeFactory(this); - my $s = Qt::MimeSourceFactory::defaultFactory()->data($abs_name); - Qt::MimeSourceFactory::addFactory(this); + TQt::MimeSourceFactory::removeFactory(this); + my $s = TQt::MimeSourceFactory::defaultFactory()->data($abs_name); + TQt::MimeSourceFactory::addFactory(this); return $s; } - Qt::MimeSourceFactory::defaultFactory()->setImage($abs_name, $img); - return Qt::MimeSourceFactory::defaultFactory()->data($abs_name); + TQt::MimeSourceFactory::defaultFactory()->setImage($abs_name, $img); + return TQt::MimeSourceFactory::defaultFactory()->data($abs_name); } package staticImages; -use Qt; +use TQt; use DesignerMimeSourceFactory_richedit; our %factories; my $factory = DesignerMimeSourceFactory_richedit; -Qt::MimeSourceFactory::defaultFactory()->addFactory($factory); +TQt::MimeSourceFactory::defaultFactory()->addFactory($factory); $factories{'DesignerMimeSourceFactory_richedit'} = $factory; END { for( values %factories ) { - Qt::MimeSourceFactory::defaultFactory()->removeFactory($_); + TQt::MimeSourceFactory::defaultFactory()->removeFactory($_); } %factories = (); } diff --git a/PerlQt/examples/richedit/richedit.pl b/PerlQt/examples/richedit/richedit.pl index ef39e73..d2dee84 100644 --- a/PerlQt/examples/richedit/richedit.pl +++ b/PerlQt/examples/richedit/richedit.pl @@ -1,7 +1,7 @@ # Form implementation generated from reading ui file 'richedit.ui' # # Created: jeu jun 13 20:02:56 2002 -# by: The PerlQt User Interface Compiler (puic) +# by: The PerlTQt User Interface Compiler (puic) # @@ -14,9 +14,9 @@ use FindBin; use lib "$FindBin::Bin"; package EditorForm; -use Qt; -use Qt::isa qw(Qt::MainWindow); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::MainWindow); +use TQt::slots init => [], fileExit => [], fileNew => [], @@ -26,9 +26,9 @@ use Qt::slots helpAbout => [], helpContents => [], helpIndex => [], - changeAlignment => ['QAction*'], - saveAndContinue => ['const QString&']; -use Qt::attributes qw( + changeAlignment => ['TQAction*'], + saveAndContinue => ['const TQString&']; +use TQt::attributes qw( textEdit fontComboBox SpinBox2 @@ -64,12 +64,12 @@ use Qt::attributes qw( sub uic_load_pixmap_EditorForm { - my $pix = Qt::Pixmap(); - my $m = Qt::MimeSourceFactory::defaultFactory()->data(shift); + my $pix = TQt::Pixmap(); + my $m = TQt::MimeSourceFactory::defaultFactory()->data(shift); if($m) { - Qt::ImageDrag::decode($m, $pix); + TQt::ImageDrag::decode($m, $pix); } return $pix; @@ -88,115 +88,115 @@ sub NEW this->resize(646,436); this->setCaption(this->trUtf8("Rich Edit")); - this->setCentralWidget(Qt::Widget(this, "qt_central_widget")); - my $EditorFormLayout = Qt::HBoxLayout(this->centralWidget(), 11, 6, '$EditorFormLayout'); + this->setCentralWidget(TQt::Widget(this, "qt_central_widget")); + my $EditorFormLayout = TQt::HBoxLayout(this->centralWidget(), 11, 6, '$EditorFormLayout'); - textEdit = Qt::TextEdit(this->centralWidget(), "textEdit"); - textEdit->setSizePolicy(Qt::SizePolicy(7, 7, 0, 0, textEdit->sizePolicy()->hasHeightForWidth())); - textEdit->setTextFormat(&Qt::TextEdit::RichText); + textEdit = TQt::TextEdit(this->centralWidget(), "textEdit"); + textEdit->setSizePolicy(TQt::SizePolicy(7, 7, 0, 0, textEdit->sizePolicy()->hasHeightForWidth())); + textEdit->setTextFormat(&TQt::TextEdit::RichText); $EditorFormLayout->addWidget(textEdit); - fileNewAction= Qt::Action(this,"fileNewAction"); - fileNewAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("filenew"))); + fileNewAction= TQt::Action(this,"fileNewAction"); + fileNewAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("filenew"))); fileNewAction->setText(this->trUtf8("New")); fileNewAction->setMenuText(this->trUtf8("&New")); - fileNewAction->setAccel(Qt::KeySequence(int(4194382))); - fileOpenAction= Qt::Action(this,"fileOpenAction"); - fileOpenAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("fileopen"))); + fileNewAction->setAccel(TQt::KeySequence(int(4194382))); + fileOpenAction= TQt::Action(this,"fileOpenAction"); + fileOpenAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("fileopen"))); fileOpenAction->setText(this->trUtf8("Open")); fileOpenAction->setMenuText(this->trUtf8("&Open...")); - fileOpenAction->setAccel(Qt::KeySequence(int(4194383))); - fileSaveAction= Qt::Action(this,"fileSaveAction"); - fileSaveAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("filesave"))); + fileOpenAction->setAccel(TQt::KeySequence(int(4194383))); + fileSaveAction= TQt::Action(this,"fileSaveAction"); + fileSaveAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("filesave"))); fileSaveAction->setText(this->trUtf8("Save")); fileSaveAction->setMenuText(this->trUtf8("&Save")); - fileSaveAction->setAccel(Qt::KeySequence(int(4194387))); - fileSaveAsAction= Qt::Action(this,"fileSaveAsAction"); + fileSaveAction->setAccel(TQt::KeySequence(int(4194387))); + fileSaveAsAction= TQt::Action(this,"fileSaveAsAction"); fileSaveAsAction->setText(this->trUtf8("Save As")); fileSaveAsAction->setMenuText(this->trUtf8("Save &As...")); - fileSaveAsAction->setAccel(Qt::KeySequence(int(0))); - fileExitAction= Qt::Action(this,"fileExitAction"); + fileSaveAsAction->setAccel(TQt::KeySequence(int(0))); + fileExitAction= TQt::Action(this,"fileExitAction"); fileExitAction->setText(this->trUtf8("Exit")); fileExitAction->setMenuText(this->trUtf8("E&xit")); - fileExitAction->setAccel(Qt::KeySequence(int(0))); - editUndoAction= Qt::Action(this,"editUndoAction"); - editUndoAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("undo"))); + fileExitAction->setAccel(TQt::KeySequence(int(0))); + editUndoAction= TQt::Action(this,"editUndoAction"); + editUndoAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("undo"))); editUndoAction->setText(this->trUtf8("Undo")); editUndoAction->setMenuText(this->trUtf8("&Undo")); - editUndoAction->setAccel(Qt::KeySequence(int(4194394))); - editRedoAction= Qt::Action(this,"editRedoAction"); - editRedoAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("redo"))); + editUndoAction->setAccel(TQt::KeySequence(int(4194394))); + editRedoAction= TQt::Action(this,"editRedoAction"); + editRedoAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("redo"))); editRedoAction->setText(this->trUtf8("Redo")); editRedoAction->setMenuText(this->trUtf8("&Redo")); - editRedoAction->setAccel(Qt::KeySequence(int(4194393))); - editCutAction= Qt::Action(this,"editCutAction"); - editCutAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("editcut"))); + editRedoAction->setAccel(TQt::KeySequence(int(4194393))); + editCutAction= TQt::Action(this,"editCutAction"); + editCutAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("editcut"))); editCutAction->setText(this->trUtf8("Cut")); editCutAction->setMenuText(this->trUtf8("&Cut")); - editCutAction->setAccel(Qt::KeySequence(int(4194392))); - editCopyAction= Qt::Action(this,"editCopyAction"); - editCopyAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("editcopy"))); + editCutAction->setAccel(TQt::KeySequence(int(4194392))); + editCopyAction= TQt::Action(this,"editCopyAction"); + editCopyAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("editcopy"))); editCopyAction->setText(this->trUtf8("Copy")); editCopyAction->setMenuText(this->trUtf8("C&opy")); - editCopyAction->setAccel(Qt::KeySequence(int(4194371))); - editPasteAction= Qt::Action(this,"editPasteAction"); - editPasteAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("editpaste"))); + editCopyAction->setAccel(TQt::KeySequence(int(4194371))); + editPasteAction= TQt::Action(this,"editPasteAction"); + editPasteAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("editpaste"))); editPasteAction->setText(this->trUtf8("Paste")); editPasteAction->setMenuText(this->trUtf8("&Paste")); - editPasteAction->setAccel(Qt::KeySequence(int(4194390))); - helpContentsAction= Qt::Action(this,"helpContentsAction"); + editPasteAction->setAccel(TQt::KeySequence(int(4194390))); + helpContentsAction= TQt::Action(this,"helpContentsAction"); helpContentsAction->setText(this->trUtf8("Contents")); helpContentsAction->setMenuText(this->trUtf8("&Contents...")); - helpContentsAction->setAccel(Qt::KeySequence(int(0))); - helpIndexAction= Qt::Action(this,"helpIndexAction"); + helpContentsAction->setAccel(TQt::KeySequence(int(0))); + helpIndexAction= TQt::Action(this,"helpIndexAction"); helpIndexAction->setText(this->trUtf8("Index")); helpIndexAction->setMenuText(this->trUtf8("&Index...")); - helpIndexAction->setAccel(Qt::KeySequence(int(0))); - helpAboutAction= Qt::Action(this,"helpAboutAction"); + helpIndexAction->setAccel(TQt::KeySequence(int(0))); + helpAboutAction= TQt::Action(this,"helpAboutAction"); helpAboutAction->setText(this->trUtf8("About")); helpAboutAction->setMenuText(this->trUtf8("&About...")); - helpAboutAction->setAccel(Qt::KeySequence(int(0))); - boldAction= Qt::Action(this,"boldAction"); + helpAboutAction->setAccel(TQt::KeySequence(int(0))); + boldAction= TQt::Action(this,"boldAction"); boldAction->setToggleAction(1); - boldAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textbold"))); + boldAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textbold"))); boldAction->setText(this->trUtf8("bold")); boldAction->setMenuText(this->trUtf8("&Bold")); - boldAction->setAccel(Qt::KeySequence(int(272629826))); - italicAction= Qt::Action(this,"italicAction"); + boldAction->setAccel(TQt::KeySequence(int(272629826))); + italicAction= TQt::Action(this,"italicAction"); italicAction->setToggleAction(1); - italicAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textitalic"))); + italicAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textitalic"))); italicAction->setText(this->trUtf8("italic")); italicAction->setMenuText(this->trUtf8("&Italic")); - italicAction->setAccel(Qt::KeySequence(int(272629833))); - underlineAction= Qt::Action(this,"underlineAction"); + italicAction->setAccel(TQt::KeySequence(int(272629833))); + underlineAction= TQt::Action(this,"underlineAction"); underlineAction->setToggleAction(1); - underlineAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textunder"))); + underlineAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textunder"))); underlineAction->setText(this->trUtf8("underline")); underlineAction->setMenuText(this->trUtf8("&Underline")); - underlineAction->setAccel(Qt::KeySequence(int(272629845))); - alignActionGroup= Qt::ActionGroup(this,"alignActionGroup"); + underlineAction->setAccel(TQt::KeySequence(int(272629845))); + alignActionGroup= TQt::ActionGroup(this,"alignActionGroup"); alignActionGroup->setText(this->trUtf8("align")); alignActionGroup->setUsesDropDown(0); - leftAlignAction= Qt::Action(alignActionGroup,"leftAlignAction"); + leftAlignAction= TQt::Action(alignActionGroup,"leftAlignAction"); leftAlignAction->setToggleAction(1); - leftAlignAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textleft"))); + leftAlignAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textleft"))); leftAlignAction->setText(this->trUtf8("left")); leftAlignAction->setMenuText(this->trUtf8("&Left")); - leftAlignAction->setAccel(Qt::KeySequence(int(272629836))); - rightAlignAction= Qt::Action(alignActionGroup,"rightAlignAction"); + leftAlignAction->setAccel(TQt::KeySequence(int(272629836))); + rightAlignAction= TQt::Action(alignActionGroup,"rightAlignAction"); rightAlignAction->setToggleAction(1); - rightAlignAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textright"))); + rightAlignAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textright"))); rightAlignAction->setText(this->trUtf8("right")); rightAlignAction->setMenuText(this->trUtf8("&Right")); - rightAlignAction->setAccel(Qt::KeySequence(int(272629842))); - centerAlignAction= Qt::Action(alignActionGroup,"centerAlignAction"); + rightAlignAction->setAccel(TQt::KeySequence(int(272629842))); + centerAlignAction= TQt::Action(alignActionGroup,"centerAlignAction"); centerAlignAction->setToggleAction(1); - centerAlignAction->setIconSet(Qt::IconSet(uic_load_pixmap_EditorForm("textcenter"))); + centerAlignAction->setIconSet(TQt::IconSet(uic_load_pixmap_EditorForm("textcenter"))); centerAlignAction->setText(this->trUtf8("center")); centerAlignAction->setMenuText(this->trUtf8("&Center")); - toolBar = Qt::ToolBar("", this, &DockTop); + toolBar = TQt::ToolBar("", this, &DockTop); toolBar->setLabel(this->trUtf8("Tools")); fileNewAction->addTo(toolBar); @@ -208,7 +208,7 @@ sub NEW editCutAction->addTo(toolBar); editCopyAction->addTo(toolBar); editPasteAction->addTo(toolBar); - Toolbar = Qt::ToolBar("", this, &DockTop); + Toolbar = TQt::ToolBar("", this, &DockTop); Toolbar->setLabel(this->trUtf8("Toolbar")); leftAlignAction->addTo(Toolbar); @@ -220,16 +220,16 @@ sub NEW underlineAction->addTo(Toolbar); Toolbar->addSeparator; - fontComboBox = Qt::ComboBox(0, Toolbar, "fontComboBox"); + fontComboBox = TQt::ComboBox(0, Toolbar, "fontComboBox"); - SpinBox2 = Qt::SpinBox(Toolbar, "SpinBox2"); + SpinBox2 = TQt::SpinBox(Toolbar, "SpinBox2"); SpinBox2->setMinValue(int(6)); SpinBox2->setValue(int(10)); - menubar= Qt::MenuBar( this, "menubar"); + menubar= TQt::MenuBar( this, "menubar"); - fileMenu= Qt::PopupMenu(this); + fileMenu= TQt::PopupMenu(this); fileNewAction->addTo(fileMenu); fileOpenAction->addTo(fileMenu); fileSaveAction->addTo(fileMenu); @@ -238,7 +238,7 @@ sub NEW fileExitAction->addTo(fileMenu); menubar->insertItem(this->trUtf8("&File"), fileMenu); - editMenu= Qt::PopupMenu(this); + editMenu= TQt::PopupMenu(this); editUndoAction->addTo(editMenu); editRedoAction->addTo(editMenu); editMenu->insertSeparator; @@ -247,7 +247,7 @@ sub NEW editPasteAction->addTo(editMenu); menubar->insertItem(this->trUtf8("&Edit"), editMenu); - PopupMenu_2= Qt::PopupMenu(this); + PopupMenu_2= TQt::PopupMenu(this); leftAlignAction->addTo(PopupMenu_2); rightAlignAction->addTo(PopupMenu_2); centerAlignAction->addTo(PopupMenu_2); @@ -257,7 +257,7 @@ sub NEW underlineAction->addTo(PopupMenu_2); menubar->insertItem(this->trUtf8("F&ormat"), PopupMenu_2); - helpMenu= Qt::PopupMenu(this); + helpMenu= TQt::PopupMenu(this); helpContentsAction->addTo(helpMenu); helpIndexAction->addTo(helpMenu); helpMenu->insertSeparator; @@ -266,26 +266,26 @@ sub NEW - Qt::Object::connect(fileNewAction, SIGNAL "activated()", this, SLOT "fileNew()"); - Qt::Object::connect(fileOpenAction, SIGNAL "activated()", this, SLOT "fileOpen()"); - Qt::Object::connect(fileSaveAction, SIGNAL "activated()", this, SLOT "fileSave()"); - Qt::Object::connect(fileSaveAsAction, SIGNAL "activated()", this, SLOT "fileSaveAs()"); - Qt::Object::connect(fileExitAction, SIGNAL "activated()", this, SLOT "fileExit()"); - Qt::Object::connect(helpIndexAction, SIGNAL "activated()", this, SLOT "helpIndex()"); - Qt::Object::connect(helpContentsAction, SIGNAL "activated()", this, SLOT "helpContents()"); - Qt::Object::connect(helpAboutAction, SIGNAL "activated()", this, SLOT "helpAbout()"); - Qt::Object::connect(SpinBox2, SIGNAL "valueChanged(int)", textEdit, SLOT "setPointSize(int)"); - Qt::Object::connect(editCutAction, SIGNAL "activated()", textEdit, SLOT "cut()"); - Qt::Object::connect(editPasteAction, SIGNAL "activated()", textEdit, SLOT "paste()"); - Qt::Object::connect(editCopyAction, SIGNAL "activated()", textEdit, SLOT "copy()"); - Qt::Object::connect(editRedoAction, SIGNAL "activated()", textEdit, SLOT "redo()"); - Qt::Object::connect(editUndoAction, SIGNAL "activated()", textEdit, SLOT "undo()"); - Qt::Object::connect(alignActionGroup, SIGNAL "selected(QAction*)", this, SLOT "changeAlignment(QAction*)"); - Qt::Object::connect(underlineAction, SIGNAL "toggled(bool)", textEdit, SLOT "setUnderline(bool)"); - Qt::Object::connect(italicAction, SIGNAL "toggled(bool)", textEdit, SLOT "setItalic(bool)"); - Qt::Object::connect(boldAction, SIGNAL "toggled(bool)", textEdit, SLOT "setBold(bool)"); - Qt::Object::connect(fontComboBox, SIGNAL "activated(const QString&)", textEdit, SLOT "setFamily(const QString&)"); - Qt::Object::connect(fontComboBox, SIGNAL "activated(const QString&)", textEdit, SLOT "setFocus()"); + TQt::Object::connect(fileNewAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileNew()"); + TQt::Object::connect(fileOpenAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileOpen()"); + TQt::Object::connect(fileSaveAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileSave()"); + TQt::Object::connect(fileSaveAsAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileSaveAs()"); + TQt::Object::connect(fileExitAction, TQT_SIGNAL "activated()", this, TQT_SLOT "fileExit()"); + TQt::Object::connect(helpIndexAction, TQT_SIGNAL "activated()", this, TQT_SLOT "helpIndex()"); + TQt::Object::connect(helpContentsAction, TQT_SIGNAL "activated()", this, TQT_SLOT "helpContents()"); + TQt::Object::connect(helpAboutAction, TQT_SIGNAL "activated()", this, TQT_SLOT "helpAbout()"); + TQt::Object::connect(SpinBox2, TQT_SIGNAL "valueChanged(int)", textEdit, TQT_SLOT "setPointSize(int)"); + TQt::Object::connect(editCutAction, TQT_SIGNAL "activated()", textEdit, TQT_SLOT "cut()"); + TQt::Object::connect(editPasteAction, TQT_SIGNAL "activated()", textEdit, TQT_SLOT "paste()"); + TQt::Object::connect(editCopyAction, TQT_SIGNAL "activated()", textEdit, TQT_SLOT "copy()"); + TQt::Object::connect(editRedoAction, TQT_SIGNAL "activated()", textEdit, TQT_SLOT "redo()"); + TQt::Object::connect(editUndoAction, TQT_SIGNAL "activated()", textEdit, TQT_SLOT "undo()"); + TQt::Object::connect(alignActionGroup, TQT_SIGNAL "selected(TQAction*)", this, TQT_SLOT "changeAlignment(TQAction*)"); + TQt::Object::connect(underlineAction, TQT_SIGNAL "toggled(bool)", textEdit, TQT_SLOT "setUnderline(bool)"); + TQt::Object::connect(italicAction, TQT_SIGNAL "toggled(bool)", textEdit, TQT_SLOT "setItalic(bool)"); + TQt::Object::connect(boldAction, TQT_SIGNAL "toggled(bool)", textEdit, TQT_SLOT "setBold(bool)"); + TQt::Object::connect(fontComboBox, TQT_SIGNAL "activated(const TQString&)", textEdit, TQT_SLOT "setFamily(const TQString&)"); + TQt::Object::connect(fontComboBox, TQT_SIGNAL "activated(const TQString&)", textEdit, TQT_SLOT "setFocus()"); init(); } @@ -295,7 +295,7 @@ sub init { textEdit->setFocus; - my $fonts = Qt::FontDatabase; + my $fonts = TQt::FontDatabase; fontComboBox->insertStringList($fonts->families); my $font = lc textEdit->family; for(my $i = 0; $i < fontComboBox->count; $i++) { @@ -349,12 +349,12 @@ sub helpIndex sub changeAlignment { - print "EditorForm->changeAlignment(QAction*): Not implemented yet.\n"; + print "EditorForm->changeAlignment(TQAction*): Not implemented yet.\n"; } sub saveAndContinue { - print "EditorForm->saveAndContinue(const QString&): Not implemented yet.\n"; + print "EditorForm->saveAndContinue(const TQString&): Not implemented yet.\n"; } 1; @@ -362,12 +362,12 @@ sub saveAndContinue package main; -use Qt; +use TQt; use EditorForm; use imageCollection; -my $a = Qt::Application(\@ARGV); -Qt::Object::connect($a, SIGNAL("lastWindowClosed()"), $a, SLOT("quit()")); +my $a = TQt::Application(\@ARGV); +TQt::Object::connect($a, TQT_SIGNAL("lastWindowClosed()"), $a, TQT_SLOT("quit()")); my $w = EditorForm; $a->setMainWidget($w); $w->show; diff --git a/PerlQt/handlers.cpp b/PerlQt/handlers.cpp index da0278c..395298f 100644 --- a/PerlQt/handlers.cpp +++ b/PerlQt/handlers.cpp @@ -46,8 +46,8 @@ #endif extern HV* pointer_map; -static QIntDict<Smoke::Index> *dtorcache= 0; -static QIntDict<Smoke::Index> *cctorcache= 0; +static TQIntDict<Smoke::Index> *dtorcache= 0; +static TQIntDict<Smoke::Index> *cctorcache= 0; int smokeperl_free(pTHX_ SV *sv, MAGIC *mg) { smokeperl_object *o = (smokeperl_object*)mg->mg_ptr; @@ -355,7 +355,7 @@ static void marshall_basetype(Marshall *m) { } HV *hv = newHV(); obj = newRV_noinc((SV*)hv); - // TODO: Generic mapping from C++ classname to Qt classname + // TODO: Generic mapping from C++ classname to TQt classname smokeperl_object o; o.smoke = m->smoke(); @@ -445,22 +445,22 @@ void marshall_ucharP(Marshall *m) { case Marshall::FromSV: { SV* sv = m->var(); - QByteArray *s = 0; + TQByteArray *s = 0; MAGIC* mg = 0; bool hasMagic = false; if(SvOK(sv)) { if( SvTYPE(sv) == SVt_PVMG && (mg = mg_find(sv, PERL_MAGIC_tiedscalar)) - && sv_derived_from(mg->mg_obj, "Qt::_internal::QByteArray") ) { - s = (QByteArray*)SvIV((SV*)SvRV(mg->mg_obj)); + && sv_derived_from(mg->mg_obj, "TQt::_internal::TQByteArray") ) { + s = (TQByteArray*)SvIV((SV*)SvRV(mg->mg_obj)); hasMagic = true; } else { STRLEN len; char* tmp = SvPV(sv, len); - s = new QByteArray(len); + s = new TQByteArray(len); Copy((void*)tmp, (void*)s->data(), len, char); if( !m->type().isConst() && !SvREADONLY(sv) ) { SV* rv = newSV(0); - sv_setref_pv(rv, "Qt::_internal::QByteArray", (void*)s); + sv_setref_pv(rv, "TQt::_internal::TQByteArray", (void*)s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } @@ -471,16 +471,16 @@ void marshall_ucharP(Marshall *m) { m->item().s_voidp = 0; break; } - s = new QByteArray(0); + s = new TQByteArray(0); if( !SvREADONLY(sv) ) { SV* rv = newSV(0); sv_setpv_mg(sv, ""); - sv_setref_pv(rv, "Qt::_internal::QByteArray", s); + sv_setref_pv(rv, "TQt::_internal::TQByteArray", s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } } else - s = new QByteArray(0); + s = new TQByteArray(0); } m->item().s_voidp = s->data(); m->next(); @@ -494,30 +494,30 @@ void marshall_ucharP(Marshall *m) { } } -static void marshall_QString(Marshall *m) { +static void marshall_TQString(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { SV* sv = m->var(); - QString *s = 0; + TQString *s = 0; MAGIC* mg = 0; bool hasMagic = false; if(SvOK(sv) || m->type().isStack()) { if( SvTYPE(sv) == SVt_PVMG && (mg = mg_find(sv, PERL_MAGIC_tiedscalar)) - && sv_derived_from(mg->mg_obj, "Qt::_internal::QString") ) { - s = (QString*)SvIV((SV*)SvRV(mg->mg_obj)); + && sv_derived_from(mg->mg_obj, "TQt::_internal::TQString") ) { + s = (TQString*)SvIV((SV*)SvRV(mg->mg_obj)); hasMagic = true; } else { COP *cop = cxstack[cxstack_ix].blk_oldcop; if(SvUTF8(sv)) - s = new QString(QString::fromUtf8(SvPV_nolen(sv))); + s = new TQString(TQString::fromUtf8(SvPV_nolen(sv))); else if(cop->op_private & HINT_LOCALE) - s = new QString(QString::fromLocal8Bit(SvPV_nolen(sv))); + s = new TQString(TQString::fromLocal8Bit(SvPV_nolen(sv))); else - s = new QString(QString::fromLatin1(SvPV_nolen(sv))); + s = new TQString(TQString::fromLatin1(SvPV_nolen(sv))); if( !m->type().isConst() && !m->type().isStack() && !SvREADONLY(sv)) { SV* rv = newSV(0); - sv_setref_pv(rv, "Qt::_internal::QString", (void*)s); + sv_setref_pv(rv, "TQt::_internal::TQString", (void*)s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } @@ -528,16 +528,16 @@ static void marshall_QString(Marshall *m) { m->item().s_voidp = 0; break; } - s = new QString; + s = new TQString; if( !SvREADONLY(sv) ) { SV* rv = newSV(0); sv_setpv_mg(sv, ""); - sv_setref_pv(rv, "Qt::_internal::QString", s); + sv_setref_pv(rv, "TQt::_internal::TQString", s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } } else - s = new QString; + s = new TQString; } m->item().s_voidp = s; m->next(); @@ -547,7 +547,7 @@ static void marshall_QString(Marshall *m) { break; case Marshall::ToSV: { - QString *s = (QString*)m->item().s_voidp; + TQString *s = (TQString*)m->item().s_voidp; if(s) { COP *cop = cxstack[cxstack_ix].blk_oldcop; if(!(cop->op_private & HINT_BYTES)) @@ -572,28 +572,28 @@ static void marshall_QString(Marshall *m) { } } -static void marshall_QByteArray(Marshall *m) { +static void marshall_TQByteArray(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { SV* sv = m->var(); - QByteArray *s = 0; + TQByteArray *s = 0; MAGIC* mg = 0; bool hasMagic = false; if(SvOK(sv) || m->type().isStack()) { if( SvTYPE(sv) == SVt_PVMG && (mg = mg_find(sv, PERL_MAGIC_tiedscalar)) - && sv_derived_from(mg->mg_obj, "Qt::_internal::QByteArray") ) { - s = (QByteArray*)SvIV((SV*)SvRV(mg->mg_obj)); + && sv_derived_from(mg->mg_obj, "TQt::_internal::TQByteArray") ) { + s = (TQByteArray*)SvIV((SV*)SvRV(mg->mg_obj)); hasMagic = true; } else { STRLEN len; char* tmp = SvPV(sv, len); - s = new QByteArray(len); + s = new TQByteArray(len); Copy((void*)tmp, (void*)s->data(), len, char); - if( !m->type().isConst() && !SvREADONLY(sv) ) { // we tie also stack because of the funny QDataStream behaviour + if( !m->type().isConst() && !SvREADONLY(sv) ) { // we tie also stack because of the funny TQDataStream behaviour // fprintf(stderr, "Tying\n"); SV* rv = newSV(0); - sv_setref_pv(rv, "Qt::_internal::QByteArray", (void*)s); + sv_setref_pv(rv, "TQt::_internal::TQByteArray", (void*)s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } @@ -604,16 +604,16 @@ static void marshall_QByteArray(Marshall *m) { m->item().s_voidp = 0; break; } - s = new QByteArray(0); + s = new TQByteArray(0); if( !SvREADONLY(sv) ) { SV* rv = newSV(0); sv_setpv_mg(sv, ""); - sv_setref_pv(rv, "Qt::_internal::QByteArray", s); + sv_setref_pv(rv, "TQt::_internal::TQByteArray", s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); hasMagic = true; } } else - s = new QByteArray(0); + s = new TQByteArray(0); } m->item().s_voidp = s; m->next(); @@ -626,11 +626,11 @@ static void marshall_QByteArray(Marshall *m) { { bool hasMagic = false; SV *sv = m->var(); - QByteArray *s = (QByteArray*)m->item().s_voidp; + TQByteArray *s = (TQByteArray*)m->item().s_voidp; if(s) { if( !m->type().isConst() && !m->type().isStack() && !SvREADONLY(sv)) { SV* rv = newSV(0); - sv_setref_pv(rv, "Qt::_internal::QByteArray", (void*)s); + sv_setref_pv(rv, "TQt::_internal::TQByteArray", (void*)s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); // err, is a previous magic auto-untied here? hasMagic = true; } else @@ -660,13 +660,13 @@ static const char *not_ascii(const char *s, uint &len) return r ? s : 0L; } -static void marshall_QCString(Marshall *m) { +static void marshall_TQCString(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { - QCString *s = 0; + TQCString *s = 0; if(SvOK(m->var()) || m->type().isStack()) - s = new QCString(SvPV_nolen(m->var())); + s = new TQCString(SvPV_nolen(m->var())); m->item().s_voidp = s; m->next(); if(s && m->cleanup()) @@ -675,7 +675,7 @@ static void marshall_QCString(Marshall *m) { break; case Marshall::ToSV: { - QCString *s = (QCString*)m->item().s_voidp; + TQCString *s = (TQCString*)m->item().s_voidp; if(s) { sv_setpv_mg(m->var(), (const char *)*s); const char * p = (const char *)*s; @@ -684,7 +684,7 @@ static void marshall_QCString(Marshall *m) { if(!(cop->op_private & HINT_BYTES) && not_ascii(p,len)) { #if PERL_VERSION == 6 && PERL_SUBVERSION == 0 - QTextCodec* c = QTextCodec::codecForMib(106); // utf8 + TQTextCodec* c = TQTextCodec::codecForMib(106); // utf8 if(c->heuristicContentMatch(p,len) >= 0) #else if(is_utf8_string((U8 *)p,len)) @@ -705,7 +705,7 @@ static void marshall_QCString(Marshall *m) { } } -static void marshall_QCOORD_array(Marshall *m) { +static void marshall_TQCOORD_array(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { @@ -717,7 +717,7 @@ static void marshall_QCOORD_array(Marshall *m) { } AV *av = (AV*)SvRV(sv); int count = av_len(av); - QCOORD *coord = new QCOORD[count + 2]; + TQCOORD *coord = new TQCOORD[count + 2]; for(int i = 0; i <= count; i++) { SV **svp = av_fetch(av, i, 0); coord[i] = svp ? SvIV(*svp) : 0; @@ -862,7 +862,7 @@ static void marshall_charP_array(Marshall *m) { } } -static void marshall_QStringList(Marshall *m) { +static void marshall_TQStringList(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { @@ -874,23 +874,23 @@ static void marshall_QStringList(Marshall *m) { } AV *list = (AV*)SvRV(sv); int count = av_len(list); - QStringList *stringlist = new QStringList; + TQStringList *stringlist = new TQStringList; int i; COP *cop = cxstack[cxstack_ix].blk_oldcop; bool lc = cop->op_private & HINT_LOCALE; for(i = 0; i <= count; i++) { SV **item = av_fetch(list, i, 0); if(!item || !SvOK(*item)) { - stringlist->append(QString()); + stringlist->append(TQString()); continue; } if(SvUTF8(*item)) - stringlist->append(QString::fromUtf8(SvPV_nolen(*item))); + stringlist->append(TQString::fromUtf8(SvPV_nolen(*item))); else if(lc) - stringlist->append(QString::fromLocal8Bit(SvPV_nolen(*item))); + stringlist->append(TQString::fromLocal8Bit(SvPV_nolen(*item))); else - stringlist->append(QString::fromLatin1(SvPV_nolen(*item))); + stringlist->append(TQString::fromLatin1(SvPV_nolen(*item))); } m->item().s_voidp = stringlist; @@ -898,7 +898,7 @@ static void marshall_QStringList(Marshall *m) { if(m->cleanup()) { av_clear(list); - for(QStringList::Iterator it = stringlist->begin(); + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) av_push(list, newSVpv((const char *)*it, 0)); @@ -908,7 +908,7 @@ static void marshall_QStringList(Marshall *m) { break; case Marshall::ToSV: { - QStringList *stringlist = (QStringList*)m->item().s_voidp; + TQStringList *stringlist = (TQStringList*)m->item().s_voidp; if(!stringlist) { sv_setsv_mg(m->var(), &PL_sv_undef); break; @@ -922,7 +922,7 @@ static void marshall_QStringList(Marshall *m) { } COP *cop = cxstack[cxstack_ix].blk_oldcop; if(!(cop->op_private & HINT_BYTES)) - for(QStringList::Iterator it = stringlist->begin(); + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { SV *sv = newSVpv((const char *)(*it).utf8(), 0); @@ -930,14 +930,14 @@ static void marshall_QStringList(Marshall *m) { av_push(av, sv); } else if(cop->op_private & HINT_LOCALE) - for(QStringList::Iterator it = stringlist->begin(); + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { SV *sv = newSVpv((const char *)(*it).local8Bit(), 0); av_push(av, sv); } else - for(QStringList::Iterator it = stringlist->begin(); + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { SV *sv = newSVpv((const char *)(*it).latin1(), 0); @@ -953,7 +953,7 @@ static void marshall_QStringList(Marshall *m) { } } -static void marshall_QValueListInt(Marshall *m) { +static void marshall_TQValueListInt(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { @@ -965,7 +965,7 @@ static void marshall_QValueListInt(Marshall *m) { } AV *list = (AV*)SvRV(sv); int count = av_len(list); - QValueList<int> *valuelist = new QValueList<int>; + TQValueList<int> *valuelist = new TQValueList<int>; int i; for(i = 0; i <= count; i++) { SV **item = av_fetch(list, i, 0); @@ -982,7 +982,7 @@ static void marshall_QValueListInt(Marshall *m) { if(m->cleanup()) { av_clear(list); - for(QValueListIterator<int> it = valuelist->begin(); + for(TQValueListIterator<int> it = valuelist->begin(); it != valuelist->end(); ++it) av_push(list, newSViv((int)*it)); @@ -992,7 +992,7 @@ static void marshall_QValueListInt(Marshall *m) { break; case Marshall::ToSV: { - QValueList<int> *valuelist = (QValueList<int>*)m->item().s_voidp; + TQValueList<int> *valuelist = (TQValueList<int>*)m->item().s_voidp; if(!valuelist) { sv_setsv_mg(m->var(), &PL_sv_undef); break; @@ -1005,7 +1005,7 @@ static void marshall_QValueListInt(Marshall *m) { SvREFCNT_dec(rv); } - for(QValueListIterator<int> it = valuelist->begin(); + for(TQValueListIterator<int> it = valuelist->begin(); it != valuelist->end(); ++it) av_push(av, newSViv((int)*it)); @@ -1044,16 +1044,16 @@ void marshall_voidP(Marshall *m) { } } -void marshall_QRgb_array(Marshall *m) { +void marshall_TQRgb_array(Marshall *m) { switch(m->action()) { case Marshall::FromSV: { SV* sv = m->var(); - QRgb* s = 0; + TQRgb* s = 0; MAGIC* mg = 0; if( SvOK(sv) && SvTYPE(sv) == SVt_PVMG && (mg = mg_find(sv, PERL_MAGIC_tiedscalar)) - && sv_derived_from(mg->mg_obj, "Qt::_internal::QRgbStar") ) { - s = (QRgb*)SvIV((SV*)SvRV(mg->mg_obj)); + && sv_derived_from(mg->mg_obj, "TQt::_internal::TQRgbStar") ) { + s = (TQRgb*)SvIV((SV*)SvRV(mg->mg_obj)); } else if(!SvROK(sv) || SvREADONLY(sv) || SvTYPE(SvRV(sv)) != SVt_PVAV || av_len((AV*)SvRV(sv)) < 0) { m->item().s_voidp = 0; @@ -1061,7 +1061,7 @@ void marshall_QRgb_array(Marshall *m) { } else { AV *list = (AV*)SvRV(sv); int count = av_len(list); - s = new QRgb[count + 2]; + s = new TQRgb[count + 2]; int i; for(i = 0; i <= count; i++) { SV **item = av_fetch(list, i, 0); @@ -1073,7 +1073,7 @@ void marshall_QRgb_array(Marshall *m) { } s[i] = 0; SV* rv = newSV(0); - sv_setref_pv(rv, "Qt::_internal::QRgbStar", (void*)s); + sv_setref_pv(rv, "TQt::_internal::TQRgbStar", (void*)s); sv_magic(sv, rv, PERL_MAGIC_tiedscalar, Nullch, 0); } m->item().s_voidp = s; @@ -1123,7 +1123,7 @@ void marshall_QRgb_array(Marshall *m) { -#define MARSHALL_QPTRLIST( FNAME, TMPLNAME, CCLASSNAME, PCLASSNAME, IS_STACK ) \ +#define MARSHALL_TQPTRLIST( FNAME, TMPLNAME, CCLASSNAME, PCLASSNAME, IS_STACK ) \ static void marshall_ ## FNAME (Marshall *m) { \ switch(m->action()) { \ case Marshall::FromSV: \ @@ -1202,20 +1202,20 @@ static void marshall_ ## FNAME (Marshall *m) { } \ } -MARSHALL_QPTRLIST( QPtrListQNetworkOperation, QPtrList<QNetworkOperation>, QNetworkOperation, " Qt::NetworkOperation", FALSE ) -MARSHALL_QPTRLIST( QPtrListQToolBar, QPtrList<QToolBar>, QToolBar, " Qt::ToolBar", FALSE ) -MARSHALL_QPTRLIST( QPtrListQTab, QPtrList<QTab>, QTab, " Qt::Tab", FALSE ) -MARSHALL_QPTRLIST( QPtrListQDockWindow, QPtrList<QDockWindow>, QDockWindow, " Qt::DockWindow", FALSE ) -MARSHALL_QPTRLIST( QWidgetList, QWidgetList, QWidget, " Qt::Widget", FALSE ) -MARSHALL_QPTRLIST( QObjectList, QObjectList, QObject, " Qt::Object", FALSE ) -MARSHALL_QPTRLIST( QFileInfoList, QFileInfoList, QFileInfo, " Qt::FileInfo", FALSE ) +MARSHALL_TQPTRLIST( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, " TQt::NetworkOperation", FALSE ) +MARSHALL_TQPTRLIST( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, " TQt::ToolBar", FALSE ) +MARSHALL_TQPTRLIST( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, " TQt::Tab", FALSE ) +MARSHALL_TQPTRLIST( TQPtrListTQDockWindow, TQPtrList<TQDockWindow>, TQDockWindow, " TQt::DockWindow", FALSE ) +MARSHALL_TQPTRLIST( TQWidgetList, TQWidgetList, TQWidget, " TQt::Widget", FALSE ) +MARSHALL_TQPTRLIST( TQObjectList, TQObjectList, TQObject, " TQt::Object", FALSE ) +MARSHALL_TQPTRLIST( TQFileInfoList, TQFileInfoList, TQFileInfo, " TQt::FileInfo", FALSE ) -void marshall_QCanvasItemList(Marshall *m) { +void marshall_TQCanvasItemList(Marshall *m) { switch(m->action()) { case Marshall::ToSV: { - QCanvasItemList *cilist = (QCanvasItemList*)m->item().s_voidp; + TQCanvasItemList *cilist = (TQCanvasItemList*)m->item().s_voidp; if(!cilist) { sv_setsv_mg(m->var(), &PL_sv_undef); break; @@ -1228,12 +1228,12 @@ void marshall_QCanvasItemList(Marshall *m) { SvREFCNT_dec(rv); } - int ix = m->smoke()->idClass( "QCanvasItem" ); - for(QValueListIterator<QCanvasItem*> it = cilist->begin(); + int ix = m->smoke()->idClass( "TQCanvasItem" ); + for(TQValueListIterator<TQCanvasItem*> it = cilist->begin(); it != cilist->end(); ++it){ - QCanvasItem* t= *it; - GET_PERL_OBJECT( QCanvasItem, " Qt::CanvasItem", FALSE ) + TQCanvasItem* t= *it; + GET_PERL_OBJECT( TQCanvasItem, " TQt::CanvasItem", FALSE ) av_push(av, ret); } if(m->cleanup()) @@ -1248,22 +1248,22 @@ void marshall_QCanvasItemList(Marshall *m) { -TypeHandler Qt_handlers[] = { - { "QString", marshall_QString }, - { "QString&", marshall_QString }, - { "QString*", marshall_QString }, - { "const QString", marshall_QString }, - { "const QString&", marshall_QString }, - { "const QString*", marshall_QString }, - { "QCString", marshall_QCString }, - { "QCString&", marshall_QCString }, - { "QCString*", marshall_QCString }, - { "const QCString", marshall_QCString }, - { "const QCString&", marshall_QCString }, - { "const QCString*", marshall_QCString }, - { "QStringList", marshall_QStringList }, - { "QStringList&", marshall_QStringList }, - { "QStringList*", marshall_QStringList }, +TypeHandler TQt_handlers[] = { + { "TQString", marshall_TQString }, + { "TQString&", marshall_TQString }, + { "TQString*", marshall_TQString }, + { "const TQString", marshall_TQString }, + { "const TQString&", marshall_TQString }, + { "const TQString*", marshall_TQString }, + { "TQCString", marshall_TQCString }, + { "TQCString&", marshall_TQCString }, + { "TQCString*", marshall_TQCString }, + { "const TQCString", marshall_TQCString }, + { "const TQCString&", marshall_TQCString }, + { "const TQCString*", marshall_TQCString }, + { "TQStringList", marshall_TQStringList }, + { "TQStringList&", marshall_TQStringList }, + { "TQStringList*", marshall_TQStringList }, { "int&", marshall_intR }, { "int*", marshall_intR }, { "bool&", marshall_boolR }, @@ -1272,40 +1272,40 @@ TypeHandler Qt_handlers[] = { { "const char*", marshall_charP }, { "char**", marshall_charP_array }, { "uchar*", marshall_ucharP }, - { "QRgb*", marshall_QRgb_array }, - { "QUObject*", marshall_voidP }, - { "const QCOORD*", marshall_QCOORD_array }, + { "TQRgb*", marshall_TQRgb_array }, + { "TQUObject*", marshall_voidP }, + { "const TQCOORD*", marshall_TQCOORD_array }, { "void", marshall_void }, - { "QByteArray", marshall_QByteArray }, - { "QByteArray&", marshall_QByteArray }, - { "QByteArray*", marshall_QByteArray }, - { "QValueList<int>", marshall_QValueListInt }, - { "QValueList<int>*", marshall_QValueListInt }, - { "QValueList<int>&", marshall_QValueListInt }, - { "QCanvasItemList", marshall_QCanvasItemList }, - { "QCanvasItemList*", marshall_QCanvasItemList }, - { "QCanvasItemList&", marshall_QCanvasItemList }, - { "QWidgetList", marshall_QWidgetList }, - { "QWidgetList*", marshall_QWidgetList }, - { "QWidgetList&", marshall_QWidgetList }, - { "QObjectList", marshall_QObjectList }, - { "QObjectList*", marshall_QObjectList }, - { "QObjectList&", marshall_QObjectList }, - { "QFileInfoList", marshall_QFileInfoList }, - { "QFileInfoList*", marshall_QFileInfoList }, - { "QFileInfoList&", marshall_QFileInfoList }, - { "QPtrList<QToolBar>", marshall_QPtrListQToolBar }, - { "QPtrList<QToolBar>*", marshall_QPtrListQToolBar }, - { "QPtrList<QToolBar>&", marshall_QPtrListQToolBar }, - { "QPtrList<QTab>", marshall_QPtrListQTab }, - { "QPtrList<QTab>*", marshall_QPtrListQTab }, - { "QPtrList<QTab>&", marshall_QPtrListQTab }, - { "QPtrList<QDockWindow>", marshall_QPtrListQDockWindow }, - { "QPtrList<QDockWindow>*", marshall_QPtrListQDockWindow }, - { "QPtrList<QDockWindow>&", marshall_QPtrListQDockWindow }, - { "QPtrList<QNetworkOperation>", marshall_QPtrListQNetworkOperation }, - { "QPtrList<QNetworkOperation>*", marshall_QPtrListQNetworkOperation }, - { "QPtrList<QNetworkOperation>&", marshall_QPtrListQNetworkOperation }, + { "TQByteArray", marshall_TQByteArray }, + { "TQByteArray&", marshall_TQByteArray }, + { "TQByteArray*", marshall_TQByteArray }, + { "TQValueList<int>", marshall_TQValueListInt }, + { "TQValueList<int>*", marshall_TQValueListInt }, + { "TQValueList<int>&", marshall_TQValueListInt }, + { "TQCanvasItemList", marshall_TQCanvasItemList }, + { "TQCanvasItemList*", marshall_TQCanvasItemList }, + { "TQCanvasItemList&", marshall_TQCanvasItemList }, + { "TQWidgetList", marshall_TQWidgetList }, + { "TQWidgetList*", marshall_TQWidgetList }, + { "TQWidgetList&", marshall_TQWidgetList }, + { "TQObjectList", marshall_TQObjectList }, + { "TQObjectList*", marshall_TQObjectList }, + { "TQObjectList&", marshall_TQObjectList }, + { "TQFileInfoList", marshall_TQFileInfoList }, + { "TQFileInfoList*", marshall_TQFileInfoList }, + { "TQFileInfoList&", marshall_TQFileInfoList }, + { "TQPtrList<TQToolBar>", marshall_TQPtrListTQToolBar }, + { "TQPtrList<TQToolBar>*", marshall_TQPtrListTQToolBar }, + { "TQPtrList<TQToolBar>&", marshall_TQPtrListTQToolBar }, + { "TQPtrList<TQTab>", marshall_TQPtrListTQTab }, + { "TQPtrList<TQTab>*", marshall_TQPtrListTQTab }, + { "TQPtrList<TQTab>&", marshall_TQPtrListTQTab }, + { "TQPtrList<TQDockWindow>", marshall_TQPtrListTQDockWindow }, + { "TQPtrList<TQDockWindow>*", marshall_TQPtrListTQDockWindow }, + { "TQPtrList<TQDockWindow>&", marshall_TQPtrListTQDockWindow }, + { "TQPtrList<TQNetworkOperation>", marshall_TQPtrListTQNetworkOperation }, + { "TQPtrList<TQNetworkOperation>*", marshall_TQPtrListTQNetworkOperation }, + { "TQPtrList<TQNetworkOperation>&", marshall_TQPtrListTQNetworkOperation }, { 0, 0 } }; @@ -1318,11 +1318,11 @@ void install_handlers(TypeHandler *h) { h++; } if(!dtorcache){ - dtorcache = new QIntDict<Smoke::Index>(113); + dtorcache = new TQIntDict<Smoke::Index>(113); dtorcache->setAutoDelete(1); } if(!cctorcache) { - cctorcache = new QIntDict<Smoke::Index>(113); + cctorcache = new TQIntDict<Smoke::Index>(113); cctorcache->setAutoDelete(1); } } diff --git a/PerlQt/lib/Qt/GlobalSpace.pm b/PerlQt/lib/Qt/GlobalSpace.pm index 65e481a..75f30a2 100644 --- a/PerlQt/lib/Qt/GlobalSpace.pm +++ b/PerlQt/lib/Qt/GlobalSpace.pm @@ -1,11 +1,11 @@ -package Qt::GlobalSpace; +package TQt::GlobalSpace; use strict; -require Qt; +require TQt; require Exporter; our @ISA = qw(Exporter); our @EXPORT; -our $allMeth = Qt::_internal::findAllMethods( Qt::_internal::idClass("QGlobalSpace") ); +our $allMeth = TQt::_internal::findAllMethods( TQt::_internal::idClass("TQGlobalSpace") ); no strict 'refs'; for my $proto( keys %$allMeth ) @@ -14,8 +14,8 @@ for my $proto( keys %$allMeth ) $proto =~ s/[\#\$\?]+$//; *{ $proto } = sub { - $Qt::_internal::autoload::AUTOLOAD = "Qt::GlobalSpace\::$proto"; - goto &Qt::GlobalSpace::AUTOLOAD + $TQt::_internal::autoload::AUTOLOAD = "TQt::GlobalSpace\::$proto"; + goto &TQt::GlobalSpace::AUTOLOAD } unless defined &$proto; push @EXPORT, $proto; } diff --git a/PerlQt/lib/Qt/attributes.pm b/PerlQt/lib/Qt/attributes.pm index 3a25487..4398fa5 100644 --- a/PerlQt/lib/Qt/attributes.pm +++ b/PerlQt/lib/Qt/attributes.pm @@ -1,10 +1,10 @@ -package Qt::attributes; +package TQt::attributes; # # I plan to support public/protected/private attributes. here goes. # Attributes default to protected. # # package MyBase; -# use Qt::attributes qw( +# use TQt::attributes qw( # private: # foo # protected: @@ -14,7 +14,7 @@ package Qt::attributes; # ); # # package MyDerived; -# use Qt::isa qw(MyBase); +# use TQt::isa qw(MyBase); # # sub foo { # # 1 way to access private attributes from derived class @@ -43,7 +43,7 @@ sub import { for my $attribute (@_) { exists ${ ${$caller . '::META'}{'attributes'} }{$attribute} and next; - Qt::_internal::installattribute($caller, $attribute); + TQt::_internal::installattribute($caller, $attribute); ${ ${$caller . '::META'}{'attributes'} }{$attribute} = 1; } } diff --git a/PerlQt/lib/Qt/constants.pm b/PerlQt/lib/Qt/constants.pm index 9c7081c..5bdeed0 100644 --- a/PerlQt/lib/Qt/constants.pm +++ b/PerlQt/lib/Qt/constants.pm @@ -1,4 +1,4 @@ -package Qt::constants; +package TQt::constants; require Exporter; diff --git a/PerlQt/lib/Qt/debug.pm b/PerlQt/lib/Qt/debug.pm index 28c0a43..a0f4e19 100644 --- a/PerlQt/lib/Qt/debug.pm +++ b/PerlQt/lib/Qt/debug.pm @@ -1,5 +1,5 @@ -package Qt::debug; -use Qt; +package TQt::debug; +use TQt; our %channel = ( 'ambiguous' => 0x01, @@ -23,14 +23,14 @@ sub import { $usage++; } } - Qt::_internal::setDebug($db); + TQt::_internal::setDebug($db); print "Available channels: \n\t". join("\n\t", sort keys %channel). "\n" if $usage; } sub unimport { - Qt::_internal::setDebug(0); + TQt::_internal::setDebug(0); } 1;
\ No newline at end of file diff --git a/PerlQt/lib/Qt/enumerations.pm b/PerlQt/lib/Qt/enumerations.pm index 003b65b..9fea98f 100644 --- a/PerlQt/lib/Qt/enumerations.pm +++ b/PerlQt/lib/Qt/enumerations.pm @@ -1,15 +1,15 @@ -package Qt::enumerations; +package TQt::enumerations; # # Proposed usage: # # package MyWidget; # -# use Qt::enumerations MyInfo => { +# use TQt::enumerations MyInfo => { # Foo => 1, # Bar => 10, # Baz => 64 # }; # -# use Qt::enumerations MyInfo => [qw(Foo Bar Baz)]; +# use TQt::enumerations MyInfo => [qw(Foo Bar Baz)]; # 1; diff --git a/PerlQt/lib/Qt/isa.pm b/PerlQt/lib/Qt/isa.pm index fb4b646..71e9391 100644 --- a/PerlQt/lib/Qt/isa.pm +++ b/PerlQt/lib/Qt/isa.pm @@ -1,4 +1,4 @@ -package Qt::isa; +package TQt::isa; use strict; sub import { @@ -10,12 +10,12 @@ sub import { my $pm = $caller . ".pm"; $pm =~ s!::!/!g; unless(exists $::INC{$pm}) { - $::INC{$pm} = $::INC{"Qt/isa.pm"}; + $::INC{$pm} = $::INC{"TQt/isa.pm"}; } for my $super (@_) { push @{ $caller . '::ISA' }, $super; - push @{ ${$caller . '::META'}{'superClass'} }, $super; # if isa(QObject)? + push @{ ${$caller . '::META'}{'superClass'} }, $super; # if isa(TQObject)? } *{ $caller . '::className' } = sub { # closure on $caller @@ -23,10 +23,10 @@ sub import { }; ${ $caller. '::_INTERNAL_STATIC_'}{'SUPER'} = bless {}, " $caller"; - Qt::_internal::installsuper($caller) unless defined &{ $caller.'::SUPER' }; + TQt::_internal::installsuper($caller) unless defined &{ $caller.'::SUPER' }; *{ $caller . '::metaObject' } = sub { - Qt::_internal::getMetaObject($caller); + TQt::_internal::getMetaObject($caller); }; *{ $caller . '::import' } = sub { @@ -53,18 +53,18 @@ sub import { { if(! defined &{$incaller.'::'.$attribute }) { - Qt::_internal::installattribute($incaller, $attribute); + TQt::_internal::installattribute($incaller, $attribute); ${ ${$incaller .'::META'}{'attributes'} }{$attribute} = 1; } } } }; - Qt::_internal::installautoload(" $caller"); - Qt::_internal::installautoload(" $caller"); - Qt::_internal::installautoload($caller); + TQt::_internal::installautoload(" $caller"); + TQt::_internal::installautoload(" $caller"); + TQt::_internal::installautoload($caller); { - package Qt::AutoLoad; + package TQt::AutoLoad; my $autosub = \&{ " $caller\::_UTOLOAD" }; *{ " $caller\::AUTOLOAD" } = sub { &$autosub }; $autosub = \&{ " $caller\::_UTOLOAD" }; @@ -72,10 +72,10 @@ sub import { $autosub = \&{ "$caller\::_UTOLOAD" }; *{ "$caller\::AUTOLOAD" } = sub { &$autosub }; } - Qt::_internal::installthis($caller); + TQt::_internal::installthis($caller); # operator overloading - *{ " $caller\::ISA" } = ["Qt::base::_overload"]; + *{ " $caller\::ISA" } = ["TQt::base::_overload"]; } 1; diff --git a/PerlQt/lib/Qt/properties.pm b/PerlQt/lib/Qt/properties.pm index 5dfcdb7..951cdb6 100644 --- a/PerlQt/lib/Qt/properties.pm +++ b/PerlQt/lib/Qt/properties.pm @@ -1,8 +1,8 @@ -package Qt::properties; +package TQt::properties; # # Proposed usage: # -# use Qt::properties foo => { +# use TQt::properties foo => { # TYPE => 'bool', # READ => 'getFoo', # WRITE => 'setFoo', diff --git a/PerlQt/lib/Qt/signals.pm b/PerlQt/lib/Qt/signals.pm index 00aa061..1f454c1 100644 --- a/PerlQt/lib/Qt/signals.pm +++ b/PerlQt/lib/Qt/signals.pm @@ -1,11 +1,11 @@ -package Qt::signals; +package TQt::signals; use Carp; # # Proposed usage: # -# use Qt::signals fooActivated => ['int']; +# use TQt::signals fooActivated => ['int']; # -# use Qt::signals fooActivated => { +# use TQt::signals fooActivated => { # name => 'fooActivated(int)', # args => ['int'] # }; @@ -16,21 +16,21 @@ use Carp; sub import { no strict 'refs'; my $self = shift; - my $caller = $self eq "Qt::signals" ? (caller)[0] : $self; + my $caller = $self eq "TQt::signals" ? (caller)[0] : $self; my $parent = ${ $caller . '::ISA' }[0]; my $parent_qt_emit = $parent . '::qt_emit'; - Qt::_internal::installqt_invoke($caller . '::qt_emit') unless defined &{ $caller. '::qt_emit' }; + TQt::_internal::installqt_invoke($caller . '::qt_emit') unless defined &{ $caller. '::qt_emit' }; # *{ $caller . '::qt_emit' } = sub { # my $meta = \%{ $caller . '::META' }; # die unless $meta->{object}; # my $offset = $_[0] - $meta->{object}->signalOffset; # if($offset >= 0) { -# Qt::_internal::invoke(Qt::this(), $meta->{signals}[$offset], $_[1]); +# TQt::_internal::invoke(TQt::this(), $meta->{signals}[$offset], $_[1]); # return 1; # } else { -# Qt::this()->$parent_qt_emit(@_); +# TQt::this()->$parent_qt_emit(@_); # } # } unless defined &{ $caller . '::qt_emit' }; @@ -49,17 +49,17 @@ sub import { my $signal_index = $#{ $meta->{signals} }; my $argcnt = scalar @$args; - my $mocargs = Qt::_internal::allocateMocArguments($argcnt); + my $mocargs = TQt::_internal::allocateMocArguments($argcnt); my $i = 0; for my $arg (@$args) { my $a = $arg; $a =~ s/^const\s+//; - if($a =~ /^(bool|int|double|char\*|QString)&?$/) { + if($a =~ /^(bool|int|double|char\*|TQString)&?$/) { $a = $1; } else { $a = 'ptr'; } - my $valid = Qt::_internal::setMocType($mocargs, $i, $arg, $a); + my $valid = TQt::_internal::setMocType($mocargs, $i, $arg, $a); die "Invalid type for signal argument ($arg)\n" unless $valid; $i++; } @@ -69,7 +69,7 @@ sub import { $signal->{mocargs} = $mocargs; $signal->{argcnt} = $argcnt; - Qt::_internal::installsignal("$caller\::$signalname"); + TQt::_internal::installsignal("$caller\::$signalname"); } @_ and $meta->{changed} = 1; } diff --git a/PerlQt/lib/Qt/slots.pm b/PerlQt/lib/Qt/slots.pm index 5d1daf6..c12990e 100644 --- a/PerlQt/lib/Qt/slots.pm +++ b/PerlQt/lib/Qt/slots.pm @@ -1,11 +1,11 @@ -package Qt::slots; +package TQt::slots; use Carp; # # Proposed usage: # -# use Qt::slots changeSomething => ['int']; +# use TQt::slots changeSomething => ['int']; # -# use Qt::slots 'changeSomething(int)' => { +# use TQt::slots 'changeSomething(int)' => { # args => ['int'], # call => 'changeSomething' # }; @@ -14,21 +14,21 @@ use Carp; sub import { no strict 'refs'; my $self = shift; - my $caller = $self eq "Qt::slots" ? (caller)[0] : $self; + my $caller = $self eq "TQt::slots" ? (caller)[0] : $self; my $parent = ${ $caller . '::ISA' }[0]; my $parent_qt_invoke = $parent . '::qt_invoke'; - Qt::_internal::installqt_invoke($caller . '::qt_invoke') unless defined &{ $caller. '::qt_invoke' }; + TQt::_internal::installqt_invoke($caller . '::qt_invoke') unless defined &{ $caller. '::qt_invoke' }; # *{ $caller . '::qt_invoke' } = sub { # my $meta = \%{ $caller . '::META' }; # die unless $meta->{object}; # my $offset = $_[0] - $meta->{object}->slotOffset; # if($offset >= 0) { -# Qt::_internal::invoke(Qt::this(), $meta->{slots}[$offset], $_[1]); +# TQt::_internal::invoke(TQt::this(), $meta->{slots}[$offset], $_[1]); # return 1; # } else { -# Qt::this()->$parent_qt_invoke(@_); +# TQt::this()->$parent_qt_invoke(@_); # } # } unless defined &{ $caller . '::qt_invoke' }; @@ -58,17 +58,17 @@ sub import { my $slot_index = $#{ $meta->{slots} }; my $argcnt = scalar @$args; - my $mocargs = Qt::_internal::allocateMocArguments($argcnt); + my $mocargs = TQt::_internal::allocateMocArguments($argcnt); my $i = 0; for my $arg (@$args) { my $a = $arg; $a =~ s/^const\s+//; - if($a =~ /^(bool|int|double|char\*|QString)&?$/) { + if($a =~ /^(bool|int|double|char\*|TQString)&?$/) { $a = $1; } else { $a = 'ptr'; } - my $valid = Qt::_internal::setMocType($mocargs, $i, $arg, $a); + my $valid = TQt::_internal::setMocType($mocargs, $i, $arg, $a); die "Invalid type for slot argument ($arg)\n" unless $valid; $i++; } diff --git a/PerlQt/perlqt.h b/PerlQt/perlqt.h index e4a2c33..7eb240a 100644 --- a/PerlQt/perlqt.h +++ b/PerlQt/perlqt.h @@ -1,5 +1,5 @@ -#ifndef PERLQT_H -#define PERLQT_H +#ifndef PERLTQT_H +#define PERLTQT_H #include "marshall.h" @@ -19,9 +19,9 @@ extern int do_debug; // evil extern SV *sv_qapp; extern int object_count; -// keep this enum in sync with lib/Qt/debug.pm +// keep this enum in sync with lib/TQt/debug.pm -enum QtDebugChannel { +enum TQtDebugChannel { qtdb_none = 0x00, qtdb_ambiguous = 0x01, qtdb_autoload = 0x02, @@ -51,4 +51,4 @@ inline smokeperl_object *sv_obj_info(SV *sv) { // ptr on success, null on fail return o; } -#endif // PERLQT_H +#endif // PERLTQT_H diff --git a/PerlQt/smokeperl.cpp b/PerlQt/smokeperl.cpp index 12b6700..1998c85 100644 --- a/PerlQt/smokeperl.cpp +++ b/PerlQt/smokeperl.cpp @@ -1,9 +1,9 @@ #include "smokeperl.h" -class SmokePerlQt : public SmokePerl { +class SmokePerlTQt : public SmokePerl { public: - SmokePerlQt(); - virtual ~SmokePerlQt(); + SmokePerlTQt(); + virtual ~SmokePerlTQt(); void registerSmoke(const char *name, Smoke *smoke); Smoke *getSmoke(const char *name); @@ -41,11 +41,11 @@ private: } HV *package(const SmokeClass &c) { - // for now, we cheat on the class names by assuming they're all Qt:: - if(!strcmp(c.className(), "Qt")) + // for now, we cheat on the class names by assuming they're all TQt:: + if(!strcmp(c.className(), "TQt")) return gv_stashpv(c.className(), TRUE); - SV *name = newSVpv("Qt::", 0); + SV *name = newSVpv("TQt::", 0); sv_catpv(name, c.className() + 1); HV *stash = gv_stashpv(SvPV_nolen(name), TRUE); SvREFCNT_dec(name); @@ -257,10 +257,10 @@ public: bool cleanup() { return true; } }; -class SmokeBindingQt : public SmokeBinding { - SmokePerlQt *_smokeperl; +class SmokeBindingTQt : public SmokeBinding { + SmokePerlTQt *_smokeperl; public: - SmokeBindingQt(Smoke *s, SmokePerlQt *smokeperl) : + SmokeBindingTQt(Smoke *s, SmokePerlTQt *smokeperl) : SmokeBinding(s), _smokeperl(smokeperl) {} void deleted(Smoke::Index classId, void *ptr) { if(do_debug) printf("%p->~%s()\n", ptr, smoke->className(classId)); @@ -305,46 +305,46 @@ public: char *className(Smoke::Index classId) { const char *className = smoke->className(classId); char *buf = new char[strlen(className) + 6]; - strcpy(buf, " Qt::"); + strcpy(buf, " TQt::"); strcat(buf, className + 1); return buf; } }; -SmokePerlQt::SmokePerlQt() { +SmokePerlTQt::SmokePerlTQt() { _registered_smoke = newHV(); _registered_handlers = newHV(); _remembered_pointers = newHV(); } -SmokePerlQt::~SmokePerlQt() { +SmokePerlTQt::~SmokePerlTQt() { SvREFCNT_dec((SV*)_registered_smoke); SvREFCNT_dec((SV*)_registered_handlers); SvREFCNT_dec((SV*)_remembered_pointers); } -void SmokePerlQt::registerSmoke(const char *name, Smoke *smoke) { +void SmokePerlTQt::registerSmoke(const char *name, Smoke *smoke) { hv_store(_registered_smoke, name, strlen(name), newSViv((IV)smoke), 0); // This will also need to handle the per-class initialization - smoke->binding = new SmokeBindingQt(smoke, this); + smoke->binding = new SmokeBindingTQt(smoke, this); } -Smoke *SmokePerlQt::getSmoke(const char *name) { +Smoke *SmokePerlTQt::getSmoke(const char *name) { SV **svp = hv_fetch(_registered_smoke, name, strlen(name), 0); if(svp && SvOK(*svp)) return (Smoke*)SvIV(*svp); return 0; } -void SmokePerlQt::registerHandlers(TypeHandler *h) { +void SmokePerlTQt::registerHandlers(TypeHandler *h) { while(h->name) { hv_store(_registered_handlers, h->name, strlen(h->name), newSViv((IV)h->fn), 0); h++; } } -SmokeObject SmokePerlQt::createObject(void *p, const SmokeClass &c) { +SmokeObject SmokePerlTQt::createObject(void *p, const SmokeClass &c) { HV *hv = newHV(); SV *obj = newRV_noinc((SV*)hv); @@ -364,7 +364,7 @@ SmokeObject SmokePerlQt::createObject(void *p, const SmokeClass &c) { return o; } -SmokeObject SmokePerlQt::newObject(void *p, const SmokeClass &c) { +SmokeObject SmokePerlTQt::newObject(void *p, const SmokeClass &c) { SmokeObject o = createObject(p, c); if(c.isVirtual()) @@ -374,12 +374,12 @@ SmokeObject SmokePerlQt::newObject(void *p, const SmokeClass &c) { return o; } -SmokeObject SmokePerlQt::wrapObject(void *p, const SmokeClass &c) { +SmokeObject SmokePerlTQt::wrapObject(void *p, const SmokeClass &c) { SmokeObject o = createObject(p, c); return o; } -void SmokePerlQt::rememberPointer(SmokeObject &o, const SmokeClass &c, bool remember, void *lastptr) { +void SmokePerlTQt::rememberPointer(SmokeObject &o, const SmokeClass &c, bool remember, void *lastptr) { void *ptr = o.cast(c); if(ptr != lastptr) { SV *keysv = newSViv((IV)o.ptr()); @@ -400,21 +400,21 @@ void SmokePerlQt::rememberPointer(SmokeObject &o, const SmokeClass &c, bool reme rememberPointer(o, SmokeClass(c.smoke(), *i), remember, ptr); } -void SmokePerlQt::rememberPointer(SmokeObject &o) { +void SmokePerlTQt::rememberPointer(SmokeObject &o) { rememberPointer(o, o.c(), true); } -void SmokePerlQt::forgetPointer(SmokeObject &o) { +void SmokePerlTQt::forgetPointer(SmokeObject &o) { rememberPointer(o, o.c(), false); } -SmokeObject SmokePerlQt::getObject(SV *sv) { +SmokeObject SmokePerlTQt::getObject(SV *sv) { MAGIC *mg = mg_find(SvRV(sv), '~'); Smoke_MAGIC *m = (Smoke_MAGIC*)mg->mg_ptr; return SmokeObject(sv, m); } -SmokeObject SmokePerlQt::getObject(void *p) { +SmokeObject SmokePerlTQt::getObject(void *p) { SV *keysv = newSViv((IV)p); STRLEN klen; char *key = SvPV(keysv, klen); diff --git a/PerlQt/t/Foo/SubCodec.pm b/PerlQt/t/Foo/SubCodec.pm index 15ce08a..9d79fba 100644 --- a/PerlQt/t/Foo/SubCodec.pm +++ b/PerlQt/t/Foo/SubCodec.pm @@ -1,7 +1,7 @@ package Foo::SubCodec; -use Qt; +use TQt; use My::Codec; -use Qt::isa qw( My::Codec ); +use TQt::isa qw( My::Codec ); sub NEW diff --git a/PerlQt/t/My/Codec.pm b/PerlQt/t/My/Codec.pm index 93e1d01..f853f5d 100644 --- a/PerlQt/t/My/Codec.pm +++ b/PerlQt/t/My/Codec.pm @@ -1,6 +1,6 @@ package My::Codec; -use Qt; -use Qt::isa qw( Qt::TextCodec ); +use TQt; +use TQt::isa qw( TQt::TextCodec ); sub NEW { diff --git a/PerlQt/t/My/SubCodec.pm b/PerlQt/t/My/SubCodec.pm index 58f8987..35e2b0c 100644 --- a/PerlQt/t/My/SubCodec.pm +++ b/PerlQt/t/My/SubCodec.pm @@ -1,8 +1,8 @@ package My::SubCodec; -use Qt; +use TQt; use My::Codec; -use Qt::isa qw( My::Codec ); +use TQt::isa qw( My::Codec ); sub NEW diff --git a/PerlQt/t/a_loading.t b/PerlQt/t/a_loading.t index 4a9f4a1..1cffc31 100644 --- a/PerlQt/t/a_loading.t +++ b/PerlQt/t/a_loading.t @@ -1,6 +1,6 @@ BEGIN { print "1..1\n" } -use Qt; +use TQt; print "ok 1\n" diff --git a/PerlQt/t/b_nogui.t b/PerlQt/t/b_nogui.t index 23bdd72..cd28260 100644 --- a/PerlQt/t/b_nogui.t +++ b/PerlQt/t/b_nogui.t @@ -1,19 +1,19 @@ BEGIN { print "1..6\n" } -use Qt; -use Qt::constants; +use TQt; +use TQt::constants; -eval {my $c = Qt::TextCodec::codecForLocale()}; +eval {my $c = TQt::TextCodec::codecForLocale()}; print +$@ ? "not ok\n" : "ok 1\n"; -eval {my $s = Qt::Variant( Qt::DateTime::currentDateTime() ) }; +eval {my $s = TQt::Variant( TQt::DateTime::currentDateTime() ) }; print +$@ ? "not ok\n" : "ok 2\n"; my $ret; -eval {$ret = Qt::Point(20,20); $ret += Qt::Point(10,10); $ret *= 2 ; $ret /= 3 }; +eval {$ret = TQt::Point(20,20); $ret += TQt::Point(10,10); $ret *= 2 ; $ret /= 3 }; print +$@ ? "not ok\n" : "ok 3\n"; @@ -21,7 +21,7 @@ eval { $ret = ($ret->x != 20 or $ret->y != 20) ? 1 : 0 }; print +($@ || $ret) ? "not ok\n" : "ok 4\n"; -eval { my $z = Qt::GlobalSpace::qVersion() }; +eval { my $z = TQt::GlobalSpace::qVersion() }; if( $@ ) { @@ -30,8 +30,8 @@ if( $@ ) } else { - eval{ my $p = Qt::Point( 20, 20 ); - my $p2 = Qt::Point( 30, 30 ); + eval{ my $p = TQt::Point( 20, 20 ); + my $p2 = TQt::Point( 30, 30 ); $p = $p + $p2 + $p; $p2 = $p * 2; $p2 = -$p2; @@ -41,7 +41,7 @@ else eval { $str = "Fooooooooooo"; - $ts = Qt::TextStream( $str, IO_WriteOnly ); + $ts = TQt::TextStream( $str, IO_WriteOnly ); $ts << "pi = " << 3.14; }; print +($str eq "pi = 3.14ooo") ? "ok 6\n":"not ok\n"; diff --git a/PerlQt/t/c_qapp.t b/PerlQt/t/c_qapp.t index ee28266..01d6b39 100644 --- a/PerlQt/t/c_qapp.t +++ b/PerlQt/t/c_qapp.t @@ -1,23 +1,23 @@ BEGIN { print "1..3\n" } -use Qt; +use TQt; $a=0; -# testing if the Qt::Application ctor works +# testing if the TQt::Application ctor works -eval { $a=Qt::Application(\@ARGV) }; +eval { $a=TQt::Application(\@ARGV) }; print +$@ ? "not ok\n" : "ok 1\n"; # testing wether the global object is properly setup -eval { Qt::app()->libraryPaths() }; +eval { TQt::app()->libraryPaths() }; print +$@ ? "not ok\n" : "ok 2\n"; # one second test of the event loop -Qt::Timer::singleShot( 300, Qt::app(), SLOT "quit()" ); +TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" ); -print Qt::app()->exec ? "not ok\n" : "ok 3\n"; +print TQt::app()->exec ? "not ok\n" : "ok 3\n"; diff --git a/PerlQt/t/ca_i18n.t b/PerlQt/t/ca_i18n.t index fddbff7..1e71c29 100644 --- a/PerlQt/t/ca_i18n.t +++ b/PerlQt/t/ca_i18n.t @@ -1,21 +1,21 @@ BEGIN { print "1..1\n" } -use Qt; +use TQt; -$a = Qt::Application(); -$pb=Qt::PushButton("Foooo", undef); +$a = TQt::Application(); +$pb=TQt::PushButton("Foooo", undef); { use bytes; $pb->setText( "élégant" ); $b = $pb->text(); - $b2 = Qt::Widget::tr("élégant"); + $b2 = TQt::Widget::tr("élégant"); } $c = $pb->text(); -$c2= Qt::Widget::tr("élégant"); +$c2= TQt::Widget::tr("élégant"); { use bytes; diff --git a/PerlQt/t/d_sigslot.t b/PerlQt/t/d_sigslot.t index 1b455e1..acd3c4a 100644 --- a/PerlQt/t/d_sigslot.t +++ b/PerlQt/t/d_sigslot.t @@ -1,24 +1,24 @@ BEGIN { print "1..3\n" } package MyApp; -use Qt; -use Qt::isa qw(Qt::Application); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Application); +use TQt::slots foo => ['int'], baz => []; -use Qt::signals +use TQt::signals bar => ['int']; sub NEW { shift->SUPER::NEW(@_); - # 1) testing correct subclassing of Qt::Application and this pointer + # 1) testing correct subclassing of TQt::Application and this pointer print +(ref(this) eq " MyApp")? "ok 1\n" : "not ok\n"; - this->connect(this, SIGNAL 'bar(int)', SLOT 'foo(int)'); + this->connect(this, TQT_SIGNAL 'bar(int)', TQT_SLOT 'foo(int)'); - # 3) automatic quitting will test Qt sig to custom slot - this->connect(this, SIGNAL 'aboutToQuit()', SLOT 'baz()'); + # 3) automatic quitting will test TQt sig to custom slot + this->connect(this, TQT_SIGNAL 'aboutToQuit()', TQT_SLOT 'baz()'); # 2) testing custom sig to custom slot emit bar(3); @@ -38,12 +38,12 @@ sub baz package main; -use Qt; +use TQt; use MyApp; $a = 0; $a = MyApp(\@ARGV); -Qt::Timer::singleShot( 300, Qt::app(), SLOT "quit()" ); +TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" ); -exit Qt::app()->exec; +exit TQt::app()->exec; diff --git a/PerlQt/t/e_sigslot_inherit.t b/PerlQt/t/e_sigslot_inherit.t index aa3bd76..338a405 100644 --- a/PerlQt/t/e_sigslot_inherit.t +++ b/PerlQt/t/e_sigslot_inherit.t @@ -1,19 +1,19 @@ BEGIN { print "1..6\n" } package MyApp; -use Qt; -use Qt::isa('Qt::Application'); -use Qt::slots +use TQt; +use TQt::isa('TQt::Application'); +use TQt::slots foo => ['int'], baz => []; -use Qt::signals +use TQt::signals bar => ['int']; sub NEW { shift->SUPER::NEW(@_); - this->connect(this, SIGNAL 'bar(int)', SLOT 'foo(int)'); - this->connect(this, SIGNAL 'aboutToQuit()', SLOT 'baz()'); + this->connect(this, TQT_SIGNAL 'bar(int)', TQT_SLOT 'foo(int)'); + this->connect(this, TQT_SIGNAL 'aboutToQuit()', TQT_SLOT 'baz()'); } sub foo @@ -36,8 +36,8 @@ sub coincoin 1; package MySubApp; -use Qt; -use Qt::isa('MyApp'); +use TQt; +use TQt::isa('MyApp'); sub NEW @@ -61,12 +61,12 @@ sub baz package main; -use Qt; +use TQt; use MySubApp; $a = 0; $a = MySubApp(\@ARGV); -Qt::Timer::singleShot( 300, Qt::app(), SLOT "quit()" ); +TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" ); -exit Qt::app()->exec; +exit TQt::app()->exec; diff --git a/PerlQt/t/f_import.t b/PerlQt/t/f_import.t index c6467a3..9f8977c 100644 --- a/PerlQt/t/f_import.t +++ b/PerlQt/t/f_import.t @@ -2,7 +2,7 @@ BEGIN { push @INC, "./t" ; print "1..1\n" } package main; -use Qt; +use TQt; use My::SubCodec; use Foo::SubCodec; diff --git a/PerlQt/t/g_gui.t b/PerlQt/t/g_gui.t index b47c0c0..f3a7d05 100644 --- a/PerlQt/t/g_gui.t +++ b/PerlQt/t/g_gui.t @@ -3,11 +3,11 @@ BEGIN { print "1..1\n" } package ButtonsGroups; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots slotChangeGrp3State => []; -use Qt::attributes qw( +use TQt::attributes qw( state rb21 rb22 @@ -24,65 +24,65 @@ sub NEW { shift->SUPER::NEW(@_); # Create Widgets which allow easy layouting - my $vbox = Qt::VBoxLayout(this); - my $box1 = Qt::HBoxLayout($vbox); - my $box2 = Qt::HBoxLayout($vbox); + my $vbox = TQt::VBoxLayout(this); + my $box1 = TQt::HBoxLayout($vbox); + my $box2 = TQt::HBoxLayout($vbox); # ------- first group # Create an exclusive button group - my $bgrp1 = Qt::ButtonGroup(1, &Horizontal, "Button Group &1 (exclusive)", this); + my $bgrp1 = TQt::ButtonGroup(1, &Horizontal, "Button Group &1 (exclusive)", this); $box1->addWidget($bgrp1); $bgrp1->setExclusive(1); # insert 3 radiobuttons - Qt::RadioButton("R&adiobutton 2", $bgrp1); - Qt::RadioButton("Ra&diobutton 3", $bgrp1); + TQt::RadioButton("R&adiobutton 2", $bgrp1); + TQt::RadioButton("Ra&diobutton 3", $bgrp1); # ------- second group # Create a non-exclusive buttongroup - my $bgrp2 = Qt::ButtonGroup(1, &Horizontal, "Button Group &2 (non-exclusive)", this); + my $bgrp2 = TQt::ButtonGroup(1, &Horizontal, "Button Group &2 (non-exclusive)", this); $box1->addWidget($bgrp2); $bgrp2->setExclusive(0); # insert 3 checkboxes - Qt::CheckBox("&Checkbox 1", $bgrp2); - my $cb12 = Qt::CheckBox("C&heckbox 2", $bgrp2); + TQt::CheckBox("&Checkbox 1", $bgrp2); + my $cb12 = TQt::CheckBox("C&heckbox 2", $bgrp2); $cb12->setChecked(1); - my $cb13 = Qt::CheckBox("Triple &State Button", $bgrp2); + my $cb13 = TQt::CheckBox("Triple &State Button", $bgrp2); $cb13->setTristate(1); $cb13->setChecked(1); # ----------- third group # create a buttongroup which is exclusive for radiobuttons and non-exclusive for all other buttons - my $bgrp3 = Qt::ButtonGroup(1, &Horizontal, "Button Group &3 (Radiobutton-exclusive)", this); + my $bgrp3 = TQt::ButtonGroup(1, &Horizontal, "Button Group &3 (Radiobutton-exclusive)", this); $box2->addWidget($bgrp3); $bgrp3->setRadioButtonExclusive(1); # insert three radiobuttons - rb21 = Qt::RadioButton("Rad&iobutton 1", $bgrp3); - rb22 = Qt::RadioButton("Radi&obutton 2", $bgrp3); - rb23 = Qt::RadioButton("Radio&button 3", $bgrp3); + rb21 = TQt::RadioButton("Rad&iobutton 1", $bgrp3); + rb22 = TQt::RadioButton("Radi&obutton 2", $bgrp3); + rb23 = TQt::RadioButton("Radio&button 3", $bgrp3); rb23->setChecked(1); # insert a checkbox - state = Qt::CheckBox("E&nable Radiobuttons", $bgrp3); + state = TQt::CheckBox("E&nable Radiobuttons", $bgrp3); state->setChecked(1); - # ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State() - this->connect(state, SIGNAL('clicked()'), SLOT('slotChangeGrp3State()')); + # ...and connect its TQT_SIGNAL clicked() with the TQT_SLOT slotChangeGrp3State() + this->connect(state, TQT_SIGNAL('clicked()'), TQT_SLOT('slotChangeGrp3State()')); # ----------- fourth group # create a groupbox which layouts its childs in a columns - my $bgrp4 = Qt::ButtonGroup(1, &Horizontal, "Groupbox with &normal buttons", this); + my $bgrp4 = TQt::ButtonGroup(1, &Horizontal, "Groupbox with &normal buttons", this); $box2->addWidget($bgrp4); # insert three pushbuttons... - Qt::PushButton("&Push Button", $bgrp4); - my $tb2 = Qt::PushButton("&Toggle Button", $bgrp4); - my $tb3 = Qt::PushButton("&Flat Button", $bgrp4); + TQt::PushButton("&Push Button", $bgrp4); + my $tb2 = TQt::PushButton("&Toggle Button", $bgrp4); + my $tb3 = TQt::PushButton("&Flat Button", $bgrp4); # ... and make the second one a toggle button $tb2->setToggleButton(1); @@ -93,7 +93,7 @@ sub NEW { } # -# SLOT slotChangeGrp3State() +# TQT_SLOT slotChangeGrp3State() # # enables/disables the radiobuttons of the third buttongroup # @@ -108,20 +108,20 @@ sub slotChangeGrp3State { package main; -use Qt; +use TQt; use ButtonsGroups; -Qt::StyleFactory::keys(); # disable style plugins (hacky) +TQt::StyleFactory::keys(); # disable style plugins (hacky) -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $buttonsgroups = ButtonsGroups; $buttonsgroups->resize(500, 250); -$buttonsgroups->setCaption("PerlQt Test - Please wait"); +$buttonsgroups->setCaption("PerlTQt Test - Please wait"); $a->setMainWidget($buttonsgroups); $buttonsgroups->show; -Qt::Timer::singleShot( 2000, Qt::app(), SLOT "quit()" ); +TQt::Timer::singleShot( 2000, TQt::app(), TQT_SLOT "quit()" ); my $r = $a->exec; print +$r?"not ok\n" : "ok 1\n"; exit $r; diff --git a/PerlQt/tutorials/t1/t1.pl b/PerlQt/tutorials/t1/t1.pl index a1e2cd8..96c7153 100644 --- a/PerlQt/tutorials/t1/t1.pl +++ b/PerlQt/tutorials/t1/t1.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl -w use strict; use blib; -use Qt; +use TQt; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); -my $hello = Qt::PushButton("Hello World!", undef); +my $hello = TQt::PushButton("Hello World!", undef); $hello->resize(100, 30); $a->setMainWidget($hello); diff --git a/PerlQt/tutorials/t10/CannonField.pm b/PerlQt/tutorials/t10/CannonField.pm index 27bfcee..08b2e10 100644 --- a/PerlQt/tutorials/t10/CannonField.pm +++ b/PerlQt/tutorials/t10/CannonField.pm @@ -1,14 +1,14 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals angleChanged => ['int'], forceChanged => ['int']; -use Qt::slots +use TQt::slots setAngle => ['int'], setForce => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( ang f ); @@ -22,7 +22,7 @@ sub NEW { ang = 45; f = 0; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); } sub setAngle { @@ -47,16 +47,16 @@ sub paintEvent { my $e = shift; return unless $e->rect->intersects(cannonRect()); my $cr = cannonRect(); - my $pix = Qt::Pixmap($cr->size); + my $pix = TQt::Pixmap($cr->size); $pix->fill(this, $cr->topLeft); - my $p = Qt::Painter($pix); + my $p = TQt::Painter($pix); $p->setBrush(&blue); $p->setPen(&NoPen); $p->translate(0, $pix->height - 1); - $p->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $p->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $p->rotate(- ang); - $p->drawRect(Qt::Rect(33, -4, 15, 8)); + $p->drawRect(TQt::Rect(33, -4, 15, 8)); $p->end; $p->begin(this); @@ -64,13 +64,13 @@ sub paintEvent { } sub cannonRect { - my $r = Qt::Rect(0, 0, 50, 50); + my $r = TQt::Rect(0, 0, 50, 50); $r->moveBottomLeft(rect()->bottomLeft); return $r; } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t10/LCDRange.pm b/PerlQt/tutorials/t10/LCDRange.pm index be0f8ec..ab63af0 100644 --- a/PerlQt/tutorials/t10/LCDRange.pm +++ b/PerlQt/tutorials/t10/LCDRange.pm @@ -1,26 +1,26 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int'], setRange => ['int', 'int']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider ); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); } diff --git a/PerlQt/tutorials/t10/t10.pl b/PerlQt/tutorials/t10/t10.pl index d9b825e..7056680 100644 --- a/PerlQt/tutorials/t10/t10.pl +++ b/PerlQt/tutorials/t10/t10.pl @@ -4,8 +4,8 @@ use blib; package MyWidget; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); use LCDRange; use CannonField; @@ -13,10 +13,10 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange(this, "angle"); $angle->setRange(5, 70); @@ -26,18 +26,18 @@ sub NEW { my $cannonField = CannonField(this, "cannonField"); - $cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect($cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - $cannonField->connect($force, SIGNAL('valueChanged(int)'), SLOT('setForce(int)')); - $force->connect($cannonField, SIGNAL('forceChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)')); + $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($cannonField, 1, 1); $grid->setColStretch(1, 10); - my $leftBox = Qt::VBoxLayout; + my $leftBox = TQt::VBoxLayout; $grid->addLayout($leftBox, 1, 0); $leftBox->addWidget($angle); $leftBox->addWidget($force); @@ -48,11 +48,11 @@ sub NEW { } package main; -use Qt; +use TQt; use MyWidget; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t11/CannonField.pm b/PerlQt/tutorials/t11/CannonField.pm index 7ddfb24..0806f66 100644 --- a/PerlQt/tutorials/t11/CannonField.pm +++ b/PerlQt/tutorials/t11/CannonField.pm @@ -1,16 +1,16 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals angleChanged => ['int'], forceChanged => ['int']; -use Qt::slots +use TQt::slots setAngle => ['int'], setForce => ['int'], shoot => [], moveShot => []; -use Qt::attributes qw( +use TQt::attributes qw( ang f @@ -30,11 +30,11 @@ sub NEW { ang = 45; f = 0; timerCount = 0; - autoShootTimer = Qt::Timer(this, "movement handler"); - this->connect(autoShootTimer, SIGNAL('timeout()'), SLOT('moveShot()')); + autoShootTimer = TQt::Timer(this, "movement handler"); + this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()')); shoot_ang = 0; shoot_f = 0; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); } sub setAngle { @@ -64,7 +64,7 @@ sub shoot { } sub moveShot { - my $r = Qt::Region(shotRect()); + my $r = TQt::Region(shotRect()); timerCount++; my $shotR = shotRect(); @@ -72,7 +72,7 @@ sub moveShot { if($shotR->x > width() || $shotR->y > height()) { autoShootTimer->stop; } else { - $r = $r->unite(Qt::Region($shotR)); + $r = $r->unite(TQt::Region($shotR)); } repaint($r); } @@ -80,7 +80,7 @@ sub moveShot { sub paintEvent { my $e = shift; my $updateR = $e->rect; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); paintCannon($p) if $updateR->intersects(cannonRect()); paintShot($p) if autoShootTimer->isActive and $updateR->intersects(shotRect()); @@ -93,20 +93,20 @@ sub paintShot { $p->drawRect(shotRect()); } -my $barrelRect = Qt::Rect(33, -4, 15, 8); +my $barrelRect = TQt::Rect(33, -4, 15, 8); sub paintCannon { my $p = shift; my $cr = cannonRect(); - my $pix = Qt::Pixmap($cr->size); + my $pix = TQt::Pixmap($cr->size); $pix->fill(this, $cr->topLeft); - my $tmp = Qt::Painter($pix); + my $tmp = TQt::Painter($pix); $tmp->setBrush(&blue); $tmp->setPen(&NoPen); $tmp->translate(0, $pix->height - 1); - $tmp->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $tmp->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $tmp->rotate(- ang); $tmp->drawRect($barrelRect); $tmp->end; @@ -115,7 +115,7 @@ sub paintCannon { } sub cannonRect { - my $r = Qt::Rect(0, 0, 50, 50); + my $r = TQt::Rect(0, 0, 50, 50); $r->moveBottomLeft(rect()->bottomLeft); return $r; } @@ -134,13 +134,13 @@ sub shotRect { my $x = $x0 + $velx*$time; my $y = $y0 + $vely*$time - 0.5*$gravity*$time**2; - my $r = Qt::Rect(0, 0, 6, 6); - $r->moveCenter(Qt::Point(int($x), height() - 1 - int($y))); + my $r = TQt::Rect(0, 0, 6, 6); + $r->moveCenter(TQt::Point(int($x), height() - 1 - int($y))); return $r; } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t11/LCDRange.pm b/PerlQt/tutorials/t11/LCDRange.pm index be0f8ec..ab63af0 100644 --- a/PerlQt/tutorials/t11/LCDRange.pm +++ b/PerlQt/tutorials/t11/LCDRange.pm @@ -1,26 +1,26 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int'], setRange => ['int', 'int']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider ); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); } diff --git a/PerlQt/tutorials/t11/t11.pl b/PerlQt/tutorials/t11/t11.pl index 84d762d..d493b1e 100644 --- a/PerlQt/tutorials/t11/t11.pl +++ b/PerlQt/tutorials/t11/t11.pl @@ -4,8 +4,8 @@ use blib; package MyWidget; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); use LCDRange; use CannonField; @@ -13,10 +13,10 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange(this, "angle"); $angle->setRange(5, 70); @@ -26,28 +26,28 @@ sub NEW { my $cannonField = CannonField(this, "cannonField"); - $cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect($cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - $cannonField->connect($force, SIGNAL('valueChanged(int)'), SLOT('setForce(int)')); - $force->connect($cannonField, SIGNAL('forceChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)')); + $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)')); - my $shoot = Qt::PushButton('&Shoot', this, "shoot"); - $shoot->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $shoot = TQt::PushButton('&Shoot', this, "shoot"); + $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - $cannonField->connect($shoot, SIGNAL('clicked()'), SLOT('shoot()')); + $cannonField->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('shoot()')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($cannonField, 1, 1); $grid->setColStretch(1, 10); - my $leftBox = Qt::VBoxLayout; + my $leftBox = TQt::VBoxLayout; $grid->addLayout($leftBox, 1, 0); $leftBox->addWidget($angle); $leftBox->addWidget($force); - my $topBox = Qt::HBoxLayout; + my $topBox = TQt::HBoxLayout; $grid->addLayout($topBox, 0, 1); $topBox->addWidget($shoot); $topBox->addStretch(1); @@ -58,11 +58,11 @@ sub NEW { } package main; -use Qt; +use TQt; use MyWidget; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t12/CannonField.pm b/PerlQt/tutorials/t12/CannonField.pm index df4eb96..6cc1529 100644 --- a/PerlQt/tutorials/t12/CannonField.pm +++ b/PerlQt/tutorials/t12/CannonField.pm @@ -1,18 +1,18 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals hit => [], missed => [], angleChanged => ['int'], forceChanged => ['int']; -use Qt::slots +use TQt::slots setAngle => ['int'], setForce => ['int'], shoot => [], moveShot => []; -use Qt::attributes qw( +use TQt::attributes qw( ang f @@ -34,12 +34,12 @@ sub NEW { ang = 45; f = 0; timerCount = 0; - autoShootTimer = Qt::Timer(this, "movement handler"); - this->connect(autoShootTimer, SIGNAL('timeout()'), SLOT('moveShot()')); + autoShootTimer = TQt::Timer(this, "movement handler"); + this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()')); shoot_ang = 0; shoot_f = 0; - target = Qt::Point(0, 0); - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + target = TQt::Point(0, 0); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); newTarget(); } @@ -70,14 +70,14 @@ sub shoot { } sub newTarget { - my $r = Qt::Region(targetRect()); - target = Qt::Point(200 + int(rand(190)), + my $r = TQt::Region(targetRect()); + target = TQt::Point(200 + int(rand(190)), 10 + int(rand(255))); - repaint($r->unite(Qt::Region(targetRect()))); + repaint($r->unite(TQt::Region(targetRect()))); } sub moveShot { - my $r = Qt::Region(shotRect()); + my $r = TQt::Region(shotRect()); timerCount++; my $shotR = shotRect(); @@ -89,7 +89,7 @@ sub moveShot { autoShootTimer->stop; emit missed(); } else { - $r = $r->unite(Qt::Region($shotR)); + $r = $r->unite(TQt::Region($shotR)); } repaint($r); } @@ -97,7 +97,7 @@ sub moveShot { sub paintEvent { my $e = shift; my $updateR = $e->rect; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); paintCannon($p) if $updateR->intersects(cannonRect()); paintShot($p) if autoShootTimer->isActive and $updateR->intersects(shotRect()); @@ -118,20 +118,20 @@ sub paintTarget { $p->drawRect(targetRect()); } -my $barrelRect = Qt::Rect(33, -4, 15, 8); +my $barrelRect = TQt::Rect(33, -4, 15, 8); sub paintCannon { my $p = shift; my $cr = cannonRect(); - my $pix = Qt::Pixmap($cr->size); + my $pix = TQt::Pixmap($cr->size); $pix->fill(this, $cr->topLeft); - my $tmp = Qt::Painter($pix); + my $tmp = TQt::Painter($pix); $tmp->setBrush(&blue); $tmp->setPen(&NoPen); $tmp->translate(0, $pix->height - 1); - $tmp->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $tmp->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $tmp->rotate(- ang); $tmp->drawRect($barrelRect); $tmp->end; @@ -140,7 +140,7 @@ sub paintCannon { } sub cannonRect { - my $r = Qt::Rect(0, 0, 50, 50); + my $r = TQt::Rect(0, 0, 50, 50); $r->moveBottomLeft(rect()->bottomLeft); return $r; } @@ -159,19 +159,19 @@ sub shotRect { my $x = $x0 + $velx*$time; my $y = $y0 + $vely*$time - 0.5*$gravity*$time**2; - my $r = Qt::Rect(0, 0, 6, 6); - $r->moveCenter(Qt::Point(int($x), height() - 1 - int($y))); + my $r = TQt::Rect(0, 0, 6, 6); + $r->moveCenter(TQt::Point(int($x), height() - 1 - int($y))); return $r; } sub targetRect { - my $r = Qt::Rect(0, 0, 20, 10); - $r->moveCenter(Qt::Point(target->x, height() - 1 - target->y)); + my $r = TQt::Rect(0, 0, 20, 10); + $r->moveCenter(TQt::Point(target->x, height() - 1 - target->y)); return $r; } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t12/LCDRange.pm b/PerlQt/tutorials/t12/LCDRange.pm index 3562fee..d3a5166 100644 --- a/PerlQt/tutorials/t12/LCDRange.pm +++ b/PerlQt/tutorials/t12/LCDRange.pm @@ -1,14 +1,14 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int'], setRange => ['int', 'int'], setText => ['const char*']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider label ); @@ -25,17 +25,17 @@ sub NEW { sub init { - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - label = Qt::Label(" ", this, "label"); + label = TQt::Label(" ", this, "label"); label->setAlignment(&AlignCenter); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); } diff --git a/PerlQt/tutorials/t12/t12.pl b/PerlQt/tutorials/t12/t12.pl index 87c50be..e8072ef 100644 --- a/PerlQt/tutorials/t12/t12.pl +++ b/PerlQt/tutorials/t12/t12.pl @@ -4,8 +4,8 @@ use blib; package MyWidget; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); use LCDRange; use CannonField; @@ -13,10 +13,10 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange("ANGLE", this, "angle"); $angle->setRange(5, 70); @@ -26,28 +26,28 @@ sub NEW { my $cannonField = CannonField(this, "cannonField"); - $cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect($cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - $cannonField->connect($force, SIGNAL('valueChanged(int)'), SLOT('setForce(int)')); - $force->connect($cannonField, SIGNAL('forceChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)')); + $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)')); - my $shoot = Qt::PushButton('&Shoot', this, "shoot"); - $shoot->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $shoot = TQt::PushButton('&Shoot', this, "shoot"); + $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - $cannonField->connect($shoot, SIGNAL('clicked()'), SLOT('shoot()')); + $cannonField->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('shoot()')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($cannonField, 1, 1); $grid->setColStretch(1, 10); - my $leftBox = Qt::VBoxLayout; + my $leftBox = TQt::VBoxLayout; $grid->addLayout($leftBox, 1, 0); $leftBox->addWidget($angle); $leftBox->addWidget($force); - my $topBox = Qt::HBoxLayout; + my $topBox = TQt::HBoxLayout; $grid->addLayout($topBox, 0, 1); $topBox->addWidget($shoot); $topBox->addStretch(1); @@ -58,11 +58,11 @@ sub NEW { } package main; -use Qt; +use TQt; use MyWidget; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t13/CannonField.pm b/PerlQt/tutorials/t13/CannonField.pm index a1475e5..ec220bc 100644 --- a/PerlQt/tutorials/t13/CannonField.pm +++ b/PerlQt/tutorials/t13/CannonField.pm @@ -1,20 +1,20 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals hit => [], missed => [], angleChanged => ['int'], forceChanged => ['int'], canShoot => ['bool']; -use Qt::slots +use TQt::slots setAngle => ['int'], setForce => ['int'], shoot => [], moveShot => [], newTarget => []; -use Qt::attributes qw( +use TQt::attributes qw( ang f @@ -39,13 +39,13 @@ sub NEW { ang = 45; f = 0; timerCount = 0; - autoShootTimer = Qt::Timer(this, "movement handler"); - this->connect(autoShootTimer, SIGNAL('timeout()'), SLOT('moveShot()')); + autoShootTimer = TQt::Timer(this, "movement handler"); + this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()')); shoot_ang = 0; shoot_f = 0; - target = Qt::Point(0, 0); + target = TQt::Point(0, 0); gameEnded = 0; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); newTarget(); } @@ -77,10 +77,10 @@ sub shoot { } sub newTarget { - my $r = Qt::Region(targetRect()); - target = Qt::Point(200 + int(rand(190)), + my $r = TQt::Region(targetRect()); + target = TQt::Point(200 + int(rand(190)), 10 + int(rand(255))); - repaint($r->unite(Qt::Region(targetRect()))); + repaint($r->unite(TQt::Region(targetRect()))); } sub setGameOver { @@ -98,7 +98,7 @@ sub restartGame { } sub moveShot { - my $r = Qt::Region(shotRect()); + my $r = TQt::Region(shotRect()); timerCount++; my $shotR = shotRect(); @@ -112,7 +112,7 @@ sub moveShot { emit missed(); emit canShoot(1); } else { - $r = $r->unite(Qt::Region($shotR)); + $r = $r->unite(TQt::Region($shotR)); } repaint($r); } @@ -120,11 +120,11 @@ sub moveShot { sub paintEvent { my $e = shift; my $updateR = $e->rect; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); if(gameEnded) { $p->setPen(&black); - $p->setFont(Qt::Font("Courier", 48, &Qt::Font::Bold)); + $p->setFont(TQt::Font("Courier", 48, &TQt::Font::Bold)); $p->drawText(rect(), &AlignCenter, "Game Over"); } paintCannon($p) if $updateR->intersects(cannonRect()); @@ -146,20 +146,20 @@ sub paintTarget { $p->drawRect(targetRect()); } -my $barrelRect = Qt::Rect(33, -4, 15, 8); +my $barrelRect = TQt::Rect(33, -4, 15, 8); sub paintCannon { my $p = shift; my $cr = cannonRect(); - my $pix = Qt::Pixmap($cr->size); + my $pix = TQt::Pixmap($cr->size); $pix->fill(this, $cr->topLeft); - my $tmp = Qt::Painter($pix); + my $tmp = TQt::Painter($pix); $tmp->setBrush(&blue); $tmp->setPen(&NoPen); $tmp->translate(0, $pix->height - 1); - $tmp->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $tmp->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $tmp->rotate(- ang); $tmp->drawRect($barrelRect); $tmp->end; @@ -168,7 +168,7 @@ sub paintCannon { } sub cannonRect { - my $r = Qt::Rect(0, 0, 50, 50); + my $r = TQt::Rect(0, 0, 50, 50); $r->moveBottomLeft(rect()->bottomLeft); return $r; } @@ -187,21 +187,21 @@ sub shotRect { my $x = $x0 + $velx*$time; my $y = $y0 + $vely*$time - 0.5*$gravity*$time**2; - my $r = Qt::Rect(0, 0, 6, 6); - $r->moveCenter(Qt::Point(int($x), height() - 1 - int($y))); + my $r = TQt::Rect(0, 0, 6, 6); + $r->moveCenter(TQt::Point(int($x), height() - 1 - int($y))); return $r; } sub targetRect { - my $r = Qt::Rect(0, 0, 20, 10); - $r->moveCenter(Qt::Point(target->x, height() - 1 - target->y)); + my $r = TQt::Rect(0, 0, 20, 10); + $r->moveCenter(TQt::Point(target->x, height() - 1 - target->y)); return $r; } sub isShooting { autoShootTimer->isActive } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t13/GameBoard.pm b/PerlQt/tutorials/t13/GameBoard.pm index 1c4ab71..52f5e9b 100644 --- a/PerlQt/tutorials/t13/GameBoard.pm +++ b/PerlQt/tutorials/t13/GameBoard.pm @@ -1,13 +1,13 @@ package GameBoard; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots fire => [], hit => [], missed => [], newGame => []; -use Qt::attributes qw( +use TQt::attributes qw( hits shotsLeft cannonField @@ -19,10 +19,10 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange("ANGLE", this, "angle"); $angle->setRange(5, 70); @@ -32,43 +32,43 @@ sub NEW { cannonField = CannonField(this, "cannonField"); - cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect(cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect(cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - cannonField->connect($force, SIGNAL('valueChanged(int)'), SLOT('setForce(int)')); - $force->connect(cannonField, SIGNAL('forceChanged(int)'), SLOT('setValue(int)')); + cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)')); + $force->connect(cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)')); - this->connect(cannonField, SIGNAL('hit()'), SLOT('hit()')); - this->connect(cannonField, SIGNAL('missed()'), SLOT('missed()')); + this->connect(cannonField, TQT_SIGNAL('hit()'), TQT_SLOT('hit()')); + this->connect(cannonField, TQT_SIGNAL('missed()'), TQT_SLOT('missed()')); - my $shoot = Qt::PushButton('&Shoot', this, "shoot"); - $shoot->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $shoot = TQt::PushButton('&Shoot', this, "shoot"); + $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - this->connect($shoot, SIGNAL('clicked()'), SLOT('fire()')); + this->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('fire()')); - $shoot->connect(cannonField, SIGNAL('canShoot(bool)'), SLOT('setEnabled(bool)')); + $shoot->connect(cannonField, TQT_SIGNAL('canShoot(bool)'), TQT_SLOT('setEnabled(bool)')); - my $restart = Qt::PushButton('&New Game', this, "newgame"); - $restart->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $restart = TQt::PushButton('&New Game', this, "newgame"); + $restart->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - this->connect($restart, SIGNAL('clicked()'), SLOT('newGame()')); + this->connect($restart, TQT_SIGNAL('clicked()'), TQT_SLOT('newGame()')); - hits = Qt::LCDNumber(2, this, "hits"); - shotsLeft = Qt::LCDNumber(2, this, "shotsleft"); - my $hitsL = Qt::Label("HITS", this, "hitsLabel"); - my $shotsLeftL = Qt::Label("SHOTS LEFT", this, "shotsLeftLabel"); + hits = TQt::LCDNumber(2, this, "hits"); + shotsLeft = TQt::LCDNumber(2, this, "shotsleft"); + my $hitsL = TQt::Label("HITS", this, "hitsLabel"); + my $shotsLeftL = TQt::Label("SHOTS LEFT", this, "shotsLeftLabel"); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget(cannonField, 1, 1); $grid->setColStretch(1, 10); - my $leftBox = Qt::VBoxLayout; + my $leftBox = TQt::VBoxLayout; $grid->addLayout($leftBox, 1, 0); $leftBox->addWidget($angle); $leftBox->addWidget($force); - my $topBox = Qt::HBoxLayout; + my $topBox = TQt::HBoxLayout; $grid->addLayout($topBox, 0, 1); $topBox->addWidget($shoot); $topBox->addWidget(hits); diff --git a/PerlQt/tutorials/t13/LCDRange.pm b/PerlQt/tutorials/t13/LCDRange.pm index b08827e..1647e85 100644 --- a/PerlQt/tutorials/t13/LCDRange.pm +++ b/PerlQt/tutorials/t13/LCDRange.pm @@ -1,14 +1,14 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots setValue => ['int'], setRange => ['int', 'int'], setText => ['const char*']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider label ); @@ -25,21 +25,21 @@ sub NEW { sub init { - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - label = Qt::Label(" ", this, "label"); + label = TQt::Label(" ", this, "label"); label->setAlignment(&AlignCenter); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); - my $l = Qt::VBoxLayout(this); + my $l = TQt::VBoxLayout(this); $l->addWidget($lcd, 1); $l->addWidget(slider); $l->addWidget(label); diff --git a/PerlQt/tutorials/t13/t13.pl b/PerlQt/tutorials/t13/t13.pl index b0f5c25..ef412ab 100644 --- a/PerlQt/tutorials/t13/t13.pl +++ b/PerlQt/tutorials/t13/t13.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl -w use strict; use blib; -use Qt; +use TQt; use GameBoard; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $gb = GameBoard; $gb->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t14/CannonField.pm b/PerlQt/tutorials/t14/CannonField.pm index 05fdbce..cbf675d 100644 --- a/PerlQt/tutorials/t14/CannonField.pm +++ b/PerlQt/tutorials/t14/CannonField.pm @@ -1,14 +1,14 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals hit => [], missed => [], angleChanged => ['int'], forceChanged => ['int'], canShoot => ['bool']; -use Qt::slots +use TQt::slots setAngle => ['int'], setForce => ['int'], shoot => [], @@ -16,7 +16,7 @@ use Qt::slots newTarget => [], setGameOver => [], restartGame => []; -use Qt::attributes qw( +use TQt::attributes qw( ang f @@ -42,14 +42,14 @@ sub NEW { ang = 45; f = 0; timerCount = 0; - autoShootTimer = Qt::Timer(this, "movement handler"); - this->connect(autoShootTimer, SIGNAL('timeout()'), SLOT('moveShot()')); + autoShootTimer = TQt::Timer(this, "movement handler"); + this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()')); shoot_ang = 0; shoot_f = 0; - target = Qt::Point(0, 0); + target = TQt::Point(0, 0); gameEnded = 0; barrelPressed = 0; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); newTarget(); } @@ -81,10 +81,10 @@ sub shoot { } sub newTarget { - my $r = Qt::Region(targetRect()); - target = Qt::Point(200 + int(rand(190)), + my $r = TQt::Region(targetRect()); + target = TQt::Point(200 + int(rand(190)), 10 + int(rand(255))); - repaint($r->unite(Qt::Region(targetRect()))); + repaint($r->unite(TQt::Region(targetRect()))); } sub setGameOver { @@ -102,7 +102,7 @@ sub restartGame { } sub moveShot { - my $r = Qt::Region(shotRect()); + my $r = TQt::Region(shotRect()); timerCount++; my $shotR = shotRect(); @@ -117,7 +117,7 @@ sub moveShot { emit missed(); emit canShoot(1); } else { - $r = $r->unite(Qt::Region($shotR)); + $r = $r->unite(TQt::Region($shotR)); } repaint($r); } @@ -146,11 +146,11 @@ sub mouseReleaseEvent { sub paintEvent { my $e = shift; my $updateR = $e->rect; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); if(gameEnded) { $p->setPen(&black); - $p->setFont(Qt::Font("Courier", 48, &Qt::Font::Bold)); + $p->setFont(TQt::Font("Courier", 48, &TQt::Font::Bold)); $p->drawText(rect(), &AlignCenter, "Game Over"); } paintCannon($p) if $updateR->intersects(cannonRect()); @@ -180,20 +180,20 @@ sub paintBarrier { $p->drawRect(barrierRect()); } -my $barrelRect = Qt::Rect(33, -4, 15, 8); +my $barrelRect = TQt::Rect(33, -4, 15, 8); sub paintCannon { my $p = shift; my $cr = cannonRect(); - my $pix = Qt::Pixmap($cr->size); + my $pix = TQt::Pixmap($cr->size); $pix->fill(this, $cr->topLeft); - my $tmp = Qt::Painter($pix); + my $tmp = TQt::Painter($pix); $tmp->setBrush(&blue); $tmp->setPen(&NoPen); $tmp->translate(0, $pix->height - 1); - $tmp->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $tmp->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $tmp->rotate(- ang); $tmp->drawRect($barrelRect); $tmp->end; @@ -202,7 +202,7 @@ sub paintCannon { } sub cannonRect { - my $r = Qt::Rect(0, 0, 50, 50); + my $r = TQt::Rect(0, 0, 50, 50); $r->moveBottomLeft(rect()->bottomLeft); return $r; } @@ -221,24 +221,24 @@ sub shotRect { my $x = $x0 + $velx*$time; my $y = $y0 + $vely*$time - 0.5*$gravity*$time**2; - my $r = Qt::Rect(0, 0, 6, 6); - $r->moveCenter(Qt::Point(int($x), height() - 1 - int($y))); + my $r = TQt::Rect(0, 0, 6, 6); + $r->moveCenter(TQt::Point(int($x), height() - 1 - int($y))); return $r; } sub targetRect { - my $r = Qt::Rect(0, 0, 20, 10); - $r->moveCenter(Qt::Point(target->x, height() - 1 - target->y)); + my $r = TQt::Rect(0, 0, 20, 10); + $r->moveCenter(TQt::Point(target->x, height() - 1 - target->y)); return $r; } sub barrierRect { - return Qt::Rect(145, height() - 100, 15, 100); + return TQt::Rect(145, height() - 100, 15, 100); } sub barrelHit { my $p = shift; - my $mtx = Qt::WMatrix; + my $mtx = TQt::WMatrix; $mtx->translate(0, height() - 1); $mtx->rotate(- ang); $mtx = $mtx->invert; @@ -247,10 +247,10 @@ sub barrelHit { sub isShooting { autoShootTimer->isActive } -sub sizeHint { Qt::Size(400, 300) } +sub sizeHint { TQt::Size(400, 300) } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t14/GameBoard.pm b/PerlQt/tutorials/t14/GameBoard.pm index 96f9cbb..a81deef 100644 --- a/PerlQt/tutorials/t14/GameBoard.pm +++ b/PerlQt/tutorials/t14/GameBoard.pm @@ -1,13 +1,13 @@ package GameBoard; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots fire => [], hit => [], missed => [], newGame => []; -use Qt::attributes qw( +use TQt::attributes qw( hits shotsLeft cannonField @@ -19,10 +19,10 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange("ANGLE", this, "angle"); $angle->setRange(5, 70); @@ -30,56 +30,56 @@ sub NEW { my $force = LCDRange("FORCE", this, "force"); $force->setRange(10, 50); - my $box = Qt::VBox(this, "cannonFrame"); + my $box = TQt::VBox(this, "cannonFrame"); $box->setFrameStyle($box->WinPanel | $box->Sunken); cannonField = CannonField($box, "cannonField"); - cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect(cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect(cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - cannonField->connect($force, SIGNAL('valueChanged(int)'), SLOT('setForce(int)')); - $force->connect(cannonField, SIGNAL('forceChanged(int)'), SLOT('setValue(int)')); + cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)')); + $force->connect(cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)')); - this->connect(cannonField, SIGNAL('hit()'), SLOT('hit()')); - this->connect(cannonField, SIGNAL('missed()'), SLOT('missed()')); + this->connect(cannonField, TQT_SIGNAL('hit()'), TQT_SLOT('hit()')); + this->connect(cannonField, TQT_SIGNAL('missed()'), TQT_SLOT('missed()')); - my $shoot = Qt::PushButton('&Shoot', this, "shoot"); - $shoot->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $shoot = TQt::PushButton('&Shoot', this, "shoot"); + $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - this->connect($shoot, SIGNAL('clicked()'), SLOT('fire()')); + this->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('fire()')); - $shoot->connect(cannonField, SIGNAL('canShoot(bool)'), SLOT('setEnabled(bool)')); + $shoot->connect(cannonField, TQT_SIGNAL('canShoot(bool)'), TQT_SLOT('setEnabled(bool)')); - my $restart = Qt::PushButton('&New Game', this, "newgame"); - $restart->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $restart = TQt::PushButton('&New Game', this, "newgame"); + $restart->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - this->connect($restart, SIGNAL('clicked()'), SLOT('newGame()')); + this->connect($restart, TQT_SIGNAL('clicked()'), TQT_SLOT('newGame()')); - hits = Qt::LCDNumber(2, this, "hits"); - shotsLeft = Qt::LCDNumber(2, this, "shotsleft"); - my $hitsL = Qt::Label("HITS", this, "hitsLabel"); - my $shotsLeftL = Qt::Label("SHOTS LEFT", this, "shotsLeftLabel"); + hits = TQt::LCDNumber(2, this, "hits"); + shotsLeft = TQt::LCDNumber(2, this, "shotsleft"); + my $hitsL = TQt::Label("HITS", this, "hitsLabel"); + my $shotsLeftL = TQt::Label("SHOTS LEFT", this, "shotsLeftLabel"); - my $accel = Qt::Accel(this); - $accel->connectItem($accel->insertItem(Qt::KeySequence(int &Key_Enter)), - this, SLOT('fire()')); - $accel->connectItem($accel->insertItem(Qt::KeySequence(int &Key_Return)), - this, SLOT('fire()')); - $accel->connectItem($accel->insertItem(Qt::KeySequence(int &CTRL+&Key_Q)), - Qt::app, SLOT('quit()')); + my $accel = TQt::Accel(this); + $accel->connectItem($accel->insertItem(TQt::KeySequence(int &Key_Enter)), + this, TQT_SLOT('fire()')); + $accel->connectItem($accel->insertItem(TQt::KeySequence(int &Key_Return)), + this, TQT_SLOT('fire()')); + $accel->connectItem($accel->insertItem(TQt::KeySequence(int &CTRL+&Key_Q)), + TQt::app, TQT_SLOT('quit()')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($box, 1, 1); $grid->setColStretch(1, 10); - my $leftBox = Qt::VBoxLayout; + my $leftBox = TQt::VBoxLayout; $grid->addLayout($leftBox, 1, 0); $leftBox->addWidget($angle); $leftBox->addWidget($force); - my $topBox = Qt::HBoxLayout; + my $topBox = TQt::HBoxLayout; $grid->addLayout($topBox, 0, 1); $topBox->addWidget($shoot); $topBox->addWidget(hits); diff --git a/PerlQt/tutorials/t14/LCDRange.pm b/PerlQt/tutorials/t14/LCDRange.pm index b08827e..1647e85 100644 --- a/PerlQt/tutorials/t14/LCDRange.pm +++ b/PerlQt/tutorials/t14/LCDRange.pm @@ -1,14 +1,14 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::slots setValue => ['int'], setRange => ['int', 'int'], setText => ['const char*']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider label ); @@ -25,21 +25,21 @@ sub NEW { sub init { - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - label = Qt::Label(" ", this, "label"); + label = TQt::Label(" ", this, "label"); label->setAlignment(&AlignCenter); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); - my $l = Qt::VBoxLayout(this); + my $l = TQt::VBoxLayout(this); $l->addWidget($lcd, 1); $l->addWidget(slider); $l->addWidget(label); diff --git a/PerlQt/tutorials/t14/t14.pl b/PerlQt/tutorials/t14/t14.pl index b0f5c25..ef412ab 100644 --- a/PerlQt/tutorials/t14/t14.pl +++ b/PerlQt/tutorials/t14/t14.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl -w use strict; use blib; -use Qt; +use TQt; use GameBoard; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $gb = GameBoard; $gb->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t2/t2.pl b/PerlQt/tutorials/t2/t2.pl index 970ccb4..c7b76e4 100644 --- a/PerlQt/tutorials/t2/t2.pl +++ b/PerlQt/tutorials/t2/t2.pl @@ -1,15 +1,15 @@ #!/usr/bin/perl -w use strict; use blib; -use Qt; +use TQt; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); -my $quit = Qt::PushButton("Quit", undef); +my $quit = TQt::PushButton("Quit", undef); $quit->resize(75, 30); -$quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); +$quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); -$a->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); +$a->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); $a->setMainWidget($quit); $quit->show; diff --git a/PerlQt/tutorials/t3/t3.pl b/PerlQt/tutorials/t3/t3.pl index bdd27fd..24fcdf0 100644 --- a/PerlQt/tutorials/t3/t3.pl +++ b/PerlQt/tutorials/t3/t3.pl @@ -1,17 +1,17 @@ #!/usr/bin/perl -w use strict; use blib; -use Qt; +use TQt; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); -my $box = Qt::VBox; +my $box = TQt::VBox; $box->resize(200, 120); -my $quit = Qt::PushButton("Quit", $box); -$quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); +my $quit = TQt::PushButton("Quit", $box); +$quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); -$a->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); +$a->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); $a->setMainWidget($box); $box->show; diff --git a/PerlQt/tutorials/t4/t4.pl b/PerlQt/tutorials/t4/t4.pl index 889a96a..b4b0b1e 100644 --- a/PerlQt/tutorials/t4/t4.pl +++ b/PerlQt/tutorials/t4/t4.pl @@ -3,8 +3,8 @@ use strict; use blib; package MyWidget; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); sub NEW { shift->SUPER::NEW(@_); @@ -12,17 +12,17 @@ sub NEW { setMinimumSize(200, 120); setMaximumSize(200, 120); - my $quit = Qt::PushButton("Quit", this, "quit"); + my $quit = TQt::PushButton("Quit", this, "quit"); $quit->setGeometry(62, 40, 75, 30); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); } package main; use MyWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 200, 120); diff --git a/PerlQt/tutorials/t5/t5.pl b/PerlQt/tutorials/t5/t5.pl index d2dc201..9990c3e 100644 --- a/PerlQt/tutorials/t5/t5.pl +++ b/PerlQt/tutorials/t5/t5.pl @@ -3,30 +3,30 @@ use strict; use blib; package MyWidget; -use Qt; -use Qt::isa qw(Qt::VBox); +use TQt; +use TQt::isa qw(TQt::VBox); sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - my $slider = Qt::Slider(&Horizontal, this, "slider"); + my $slider = TQt::Slider(&Horizontal, this, "slider"); $slider->setRange(0, 99); $slider->setValue(0); - $lcd->connect($slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); + $lcd->connect($slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); } package main; use MyWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $a->setMainWidget($w); diff --git a/PerlQt/tutorials/t6/t6.pl b/PerlQt/tutorials/t6/t6.pl index 210626a..b50c415 100644 --- a/PerlQt/tutorials/t6/t6.pl +++ b/PerlQt/tutorials/t6/t6.pl @@ -3,33 +3,33 @@ use strict; use blib; package LCDRange; -use Qt; -use Qt::isa qw(Qt::VBox); +use TQt; +use TQt::isa qw(TQt::VBox); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); - my $slider = Qt::Slider(&Horizontal, this, "slider"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); + my $slider = TQt::Slider(&Horizontal, this, "slider"); $slider->setRange(0, 99); $slider->setValue(0); - $lcd->connect($slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); + $lcd->connect($slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); } package MyWidget; -use Qt; -use Qt::isa qw(Qt::VBox); +use TQt; +use TQt::isa qw(TQt::VBox); use LCDRange; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); - my $grid = Qt::Grid(4, this); + my $grid = TQt::Grid(4, this); for(0..3) { for(0..3) { @@ -41,7 +41,7 @@ sub NEW { package main; use MyWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $a->setMainWidget($w); diff --git a/PerlQt/tutorials/t7/LCDRange.pm b/PerlQt/tutorials/t7/LCDRange.pm index 8a79e39..9bc48cb 100644 --- a/PerlQt/tutorials/t7/LCDRange.pm +++ b/PerlQt/tutorials/t7/LCDRange.pm @@ -1,22 +1,22 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots setValue => ['int']; -use Qt::signals valueChanged => ['int']; -use Qt::attributes qw(slider); +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int']; +use TQt::signals valueChanged => ['int']; +use TQt::attributes qw(slider); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - my $slider = Qt::Slider(&Horizontal, this, "slider"); + my $slider = TQt::Slider(&Horizontal, this, "slider"); slider = $slider; slider->setRange(0, 99); slider->setValue(0); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); } sub value { slider->value } diff --git a/PerlQt/tutorials/t7/t7.pl b/PerlQt/tutorials/t7/t7.pl index c798e28..0d0d0d2 100644 --- a/PerlQt/tutorials/t7/t7.pl +++ b/PerlQt/tutorials/t7/t7.pl @@ -3,28 +3,28 @@ use strict; use blib; package MyWidget; -use Qt; -use Qt::isa qw(Qt::VBox); +use TQt; +use TQt::isa qw(TQt::VBox); use LCDRange; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); - my $grid = Qt::Grid(4, this); + my $grid = TQt::Grid(4, this); my $previous; for my $r (0..3) { for my $c (0..3) { my $lr = LCDRange($grid); $previous->connect( - $lr, SIGNAL('valueChanged(int)'), - SLOT('setValue(int)')) if $previous; + $lr, TQT_SIGNAL('valueChanged(int)'), + TQT_SLOT('setValue(int)')) if $previous; $previous = $lr; } } @@ -33,7 +33,7 @@ sub NEW { package main; use MyWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $a->setMainWidget($w); $w->show; diff --git a/PerlQt/tutorials/t8/CannonField.pm b/PerlQt/tutorials/t8/CannonField.pm index 28e4986..1c23244 100644 --- a/PerlQt/tutorials/t8/CannonField.pm +++ b/PerlQt/tutorials/t8/CannonField.pm @@ -1,12 +1,12 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals angleChanged => ['int']; -use Qt::slots +use TQt::slots setAngle => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( ang ); use POSIX qw(atan); @@ -17,7 +17,7 @@ sub NEW { shift->SUPER::NEW(@_); ang = 45; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); } sub setAngle { @@ -32,12 +32,12 @@ sub setAngle { sub paintEvent { my $s = "Angle = " . ang; - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); $p->drawText(200, 200, $s); } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t8/LCDRange.pm b/PerlQt/tutorials/t8/LCDRange.pm index be0f8ec..ab63af0 100644 --- a/PerlQt/tutorials/t8/LCDRange.pm +++ b/PerlQt/tutorials/t8/LCDRange.pm @@ -1,26 +1,26 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int'], setRange => ['int', 'int']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider ); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); } diff --git a/PerlQt/tutorials/t8/t8.pl b/PerlQt/tutorials/t8/t8.pl index 51967ca..620f912 100644 --- a/PerlQt/tutorials/t8/t8.pl +++ b/PerlQt/tutorials/t8/t8.pl @@ -4,8 +4,8 @@ use blib; package MyWidget; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); use LCDRange; use CannonField; @@ -13,20 +13,20 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange(this, "angle"); $angle->setRange(5, 70); my $cannonField = CannonField(this, "cannonField"); - $cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect($cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($angle, 1, 0, &AlignTop); $grid->addWidget($cannonField, 1, 1); @@ -37,10 +37,10 @@ sub NEW { } package main; -use Qt; +use TQt; use MyWidget; -my $a = Qt::Application(\@ARGV); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 500, 355); diff --git a/PerlQt/tutorials/t9/CannonField.pm b/PerlQt/tutorials/t9/CannonField.pm index e12489a..1500480 100644 --- a/PerlQt/tutorials/t9/CannonField.pm +++ b/PerlQt/tutorials/t9/CannonField.pm @@ -1,12 +1,12 @@ package CannonField; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); -use Qt::signals +use TQt; +use TQt::isa qw(TQt::Widget); +use TQt::signals angleChanged => ['int']; -use Qt::slots +use TQt::slots setAngle => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( ang ); use POSIX qw(atan); @@ -17,7 +17,7 @@ sub NEW { shift->SUPER::NEW(@_); ang = 45; - setPalette(Qt::Palette(Qt::Color(250, 250, 200))); + setPalette(TQt::Palette(TQt::Color(250, 250, 200))); } sub setAngle { @@ -31,18 +31,18 @@ sub setAngle { } sub paintEvent { - my $p = Qt::Painter(this); + my $p = TQt::Painter(this); $p->setBrush(&blue); $p->setPen(&NoPen); $p->translate(0, rect()->bottom); - $p->drawPie(Qt::Rect(-35, -35, 70, 70), 0, 90*16); + $p->drawPie(TQt::Rect(-35, -35, 70, 70), 0, 90*16); $p->rotate(- ang); - $p->drawRect(Qt::Rect(33, -4, 15, 8)); + $p->drawRect(TQt::Rect(33, -4, 15, 8)); } sub sizePolicy { - Qt::SizePolicy(&Qt::SizePolicy::Expanding, &Qt::SizePolicy::Expanding); + TQt::SizePolicy(&TQt::SizePolicy::Expanding, &TQt::SizePolicy::Expanding); } 1; diff --git a/PerlQt/tutorials/t9/LCDRange.pm b/PerlQt/tutorials/t9/LCDRange.pm index be0f8ec..ab63af0 100644 --- a/PerlQt/tutorials/t9/LCDRange.pm +++ b/PerlQt/tutorials/t9/LCDRange.pm @@ -1,26 +1,26 @@ package LCDRange; use strict; -use Qt; -use Qt::isa qw(Qt::VBox); -use Qt::slots +use TQt; +use TQt::isa qw(TQt::VBox); +use TQt::slots setValue => ['int'], setRange => ['int', 'int']; -use Qt::signals +use TQt::signals valueChanged => ['int']; -use Qt::attributes qw( +use TQt::attributes qw( slider ); sub NEW { shift->SUPER::NEW(@_); - my $lcd = Qt::LCDNumber(2, this, "lcd"); + my $lcd = TQt::LCDNumber(2, this, "lcd"); - slider = Qt::Slider(&Horizontal, this, "slider"); + slider = TQt::Slider(&Horizontal, this, "slider"); slider->setRange(0, 99); slider->setValue(0); - $lcd->connect(slider, SIGNAL('valueChanged(int)'), SLOT('display(int)')); - this->connect(slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)')); + $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)')); + this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)')); setFocusProxy(slider); } diff --git a/PerlQt/tutorials/t9/t9.pl b/PerlQt/tutorials/t9/t9.pl index 192041c..779d859 100644 --- a/PerlQt/tutorials/t9/t9.pl +++ b/PerlQt/tutorials/t9/t9.pl @@ -4,8 +4,8 @@ use blib; package MyWidget; use strict; -use Qt; -use Qt::isa qw(Qt::Widget); +use TQt; +use TQt::isa qw(TQt::Widget); use LCDRange; use CannonField; @@ -13,20 +13,20 @@ use CannonField; sub NEW { shift->SUPER::NEW(@_); - my $quit = Qt::PushButton("&Quit", this, "quit"); - $quit->setFont(Qt::Font("Times", 18, &Qt::Font::Bold)); + my $quit = TQt::PushButton("&Quit", this, "quit"); + $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold)); - Qt::app->connect($quit, SIGNAL('clicked()'), SLOT('quit()')); + TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()')); my $angle = LCDRange(this, "angle"); $angle->setRange(5, 70); my $cannonField = CannonField(this, "cannonField"); - $cannonField->connect($angle, SIGNAL('valueChanged(int)'), SLOT('setAngle(int)')); - $angle->connect($cannonField, SIGNAL('angleChanged(int)'), SLOT('setValue(int)')); + $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)')); + $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)')); - my $grid = Qt::GridLayout(this, 2, 2, 10); + my $grid = TQt::GridLayout(this, 2, 2, 10); $grid->addWidget($quit, 0, 0); $grid->addWidget($angle, 1, 0, &AlignTop); $grid->addWidget($cannonField, 1, 1); @@ -37,11 +37,11 @@ sub NEW { } package main; -use Qt; +use TQt; use MyWidget; -Qt::Application::setColorSpec(&Qt::Application::CustomColor); -my $a = Qt::Application(\@ARGV); +TQt::Application::setColorSpec(&TQt::Application::CustomColor); +my $a = TQt::Application(\@ARGV); my $w = MyWidget; $w->setGeometry(100, 100, 500, 355); @@ -1,5 +1,5 @@ -PerlQt is a Perl Object Oriented interface to Trolltech's Qt v3.x - a well known +PerlTQt is a Perl Object Oriented interface to Trolltech's TQt v3.x - a well known C++ GUI toolkit. See INSTALL for quick installation instructions @@ -7,7 +7,7 @@ See INSTALL for quick installation instructions See doc/en/index.html or doc/fr/index.html for installation procedure and detailed documentation. -See also PerlQt/tutorials and PerlQt/examples to get started. +See also PerlTQt/tutorials and PerlTQt/examples to get started. @@ -16,7 +16,7 @@ Requirements : - Perl >= 5.6 - - Qt >= 3.0 + - TQt >= 3.0 - GNU tools : automake(>=1.5), autoconf (>=2.13), aclocal... diff --git a/acinclude.m4 b/acinclude.m4 index ad3c9ac..8b26963 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -41,7 +41,7 @@ dnl Internal subroutine of AC_PATH_X. dnl Set ac_x_includes and/or ac_x_libraries. AC_DEFUN(KDE_PATH_X_DIRECT, [ -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) if test "$ac_x_includes" = NO; then # Guess where to find include files, by looking for this one X11 .h file. @@ -238,22 +238,22 @@ AC_DEFUN(KDE_FIND_PATH, fi ]) -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, +AC_DEFUN(KDE_TQMOC_ERROR_MESSAGE, [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. + AC_MSG_ERROR([No TQt meta object compiler (moc) found! +Please check whether you installed TQt correctly. You need to have a running moc binary. configure tried to run $ac_cv_path_moc and the test didn't succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running +the environment variable TQMOC to the right one before running configure. ]) ]) AC_DEFUN(KDE_UIC_ERROR_MESSAGE, [ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. + AC_MSG_WARN([No TQt ui compiler (uic) found! +Please check whether you installed TQt correctly. You need to have a running uic binary. configure tried to run $ac_cv_path_uic and the test didn't succeed. If configure shouldn't have tried this one, set @@ -295,10 +295,10 @@ EOT dnl ------------------------------------------------------------------------ dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $QTDIR/bin, and some more usual places +dnl in $TQTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_MOC_UIC, +AC_DEFUN(AC_PATH_TQT_TQMOC_UIC, [ qt_bindirs="" for dir in $kde_qt_dirs; do @@ -309,7 +309,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) + KDE_FIND_PATH(moc, TQMOC, [$qt_bindirs], [KDE_TQMOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) if test -z "$UIC_PATH" ; then @@ -331,7 +331,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, UIC="echo uic not available: " fi - AC_SUBST(MOC) + AC_SUBST(TQMOC) AC_SUBST(UIC) UIC_TR="i18n" @@ -373,7 +373,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile TQt and kdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -598,7 +598,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AC_DEFUN(AC_CREATE_KFSSTND, [ -AC_REQUIRE([AC_CHECK_RPATH]) +AC_RETQUIRE([AC_CHECK_RPATH]) AC_MSG_CHECKING([for KDE paths]) kde_result="" @@ -696,7 +696,7 @@ support]) ])) AC_SUBST(LIBCRYPT) if test $kde_have_crypt = yes; then - AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) + AC_DEFINE_UNTQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) fi AC_CHECK_SOCKLEN_T AC_LANG_C @@ -808,19 +808,19 @@ dnl ------------------------------------------------------------------------ dnl AC_DEFUN(K_PATH_X, [ -AC_REQUIRE([KDE_MISC_TESTS])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_MISC_TESTS])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_ARG_ENABLE( embedded, - [ --enable-embedded link to Qt-embedded, don't use X], + [ --enable-embedded link to TQt-embedded, don't use X], kde_use_qt_emb=$enableval, kde_use_qt_emb=no ) AC_ARG_ENABLE( qtopia, - [ --enable-qtopia link to Qt-embedded, link to the Qtopia Environment], + [ --enable-qtopia link to TQt-embedded, link to the TQtopia Environment], kde_use_qt_emb_palm=$enableval, kde_use_qt_emb_palm=no ) @@ -982,13 +982,13 @@ them either.]) fi LIB_XEXT="-lXext" -QTE_NORTTI="" +TQTE_NORTTI="" else dnl We're using QT Embedded - CPPFLAGS=-DQWS + CPPFLAGS=-DTQWS CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" + TQTE_NORTTI="-fno-rtti -DTQWS" X_PRE_LIBS="" LIB_X11="" LIB_XEXT="" @@ -1005,7 +1005,7 @@ else AC_SUBST(x_includes) AC_SUBST(x_libraries) fi -AC_SUBST(QTE_NORTTI) +AC_SUBST(TQTE_NORTTI) AC_SUBST(LIB_XEXT) @@ -1013,9 +1013,9 @@ AC_LANG_RESTORE ]) -AC_DEFUN(KDE_PRINT_QT_PROGRAM, +AC_DEFUN(KDE_PRINT_TQT_PROGRAM, [ -AC_REQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" #include <qglobal.h> @@ -1030,7 +1030,7 @@ EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1054,20 +1054,20 @@ int main() { EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); + TQStringList *t = new TQStringList(); + TTQ_UNUSED(t); EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF - QString s; + TQString s; s.setLatin1("Elvis is alive", 14); EOF fi fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); + (void)TQStyleFactory::create(TQString::null); + TQCursor c(TQt::WhatsThisCursor); EOF fi cat >> conftest.$ac_ext <<EOF @@ -1079,7 +1079,7 @@ EOF AC_DEFUN(KDE_USE_QT, [ if test -z "$1"; then - # Current default Qt version: 3.1 + # Current default TQt version: 3.1 kde_qtver=3 kde_qtsubver=1 else @@ -1097,16 +1097,16 @@ fi if test -z "$2"; then if test "$kde_qtver" = "2"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" + kde_qt_minversion=">= TQt 2.2.2" else - kde_qt_minversion=">= Qt 2.0.2" + kde_qt_minversion=">= TQt 2.0.2" fi fi if test "$kde_qtver" = "3"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 3.1 (20021021)" + kde_qt_minversion=">= TQt 3.1 (20021021)" else - kde_qt_minversion=">= Qt 3.0" + kde_qt_minversion=">= TQt 3.0" fi fi if test "$kde_qtver" = "1"; then @@ -1119,40 +1119,40 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring=$3 fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi if test $kde_qtver = 2; then - kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" fi if test $kde_qtver = 1; then - kde_qt_dirs="$QTDIR /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt" fi ]) -AC_DEFUN(KDE_CHECK_QT_DIRECT, +AC_DEFUN(KDE_CHECK_TQT_DIRECT, [ -AC_REQUIRE([KDE_USE_QT]) -AC_MSG_CHECKING([if Qt compiles without flags]) +AC_RETQUIRE([KDE_USE_QT]) +AC_MSG_CHECKING([if TQt compiles without flags]) AC_CACHE_VAL(kde_cv_qt_direct, [ AC_LANG_SAVE @@ -1175,7 +1175,7 @@ export LD_LIBRARY_PATH LIBRARY_PATH= export LIBRARY_PATH -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then kde_cv_qt_direct="yes" @@ -1207,24 +1207,24 @@ fi ]) dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl Try to find the TQt headers and libraries. +dnl $(TQT_LDFLAGS) will be -Lqtliblocation (if needed) +dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_1_3, +AC_DEFUN(AC_PATH_TQT_1_3, [ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([KDE_USE_QT]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_CHECK_LIB64]) dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. +dnl Add configure flag to enable linking to MT version of TQt library. dnl ------------------------------------------------------------------------ AC_ARG_ENABLE( mt, - [ --disable-mt link to non-threaded Qt (deprecated)], + [ --disable-mt link to non-threaded TQt (deprecated)], kde_use_qt_mt=$enableval, [ if test $kde_qtver = 3; then @@ -1235,7 +1235,7 @@ AC_ARG_ENABLE( ] ) -USING_QT_MT="" +USING_TQT_MT="" dnl ------------------------------------------------------------------------ dnl If we not get --disable-qt-mt then adjust some vars for the host. @@ -1246,7 +1246,7 @@ KDE_MT_LIBS= if test "x$kde_use_qt_mt" = "xyes"; then KDE_CHECK_THREADING if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" + CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" KDE_MT_LDFLAGS="$USE_THREADS" KDE_MT_LIBS="$LIBPTHREAD" else @@ -1259,19 +1259,19 @@ AC_SUBST(KDE_MT_LIBS) kde_qt_was_given=yes dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. +dnl If we haven't been told how to link to TQt, we work it out for ourselves. dnl ------------------------------------------------------------------------ -if test -z "$LIBQT_GLOB"; then +if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then - LIBQT_GLOB="libqte.*" + LIBTQT_GLOB="libqte.*" else - LIBQT_GLOB="libqt.*" + LIBTQT_GLOB="libqt.*" fi fi if test -z "$LIBQT"; then dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. +dnl If we got --enable-embedded then adjust the TQt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then qtlib="qte" @@ -1285,23 +1285,23 @@ else kde_lib_qt_set=yes fi -if test -z "$LIBQPE"; then +if test -z "$LIBTQPE"; then dnl ------------------------------------------------------------ dnl If we got --enable-palmtop then add -lqpe to the link line dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" + LIB_TQPE="-lqpe" else - LIB_QPE="" + LIB_TQPE="" fi else - LIB_QPE="" + LIB_TQPE="" fi fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-qt-mt then adjust the TQt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1312,26 +1312,26 @@ if test "x$kde_use_qt_mt" = "xyes"; then LIBQT="$qtlib-mt" kde_int_qt="$qtlib-mt" fi - LIBQT_GLOB="lib$qtlib-mt.*" - USING_QT_MT="using -mt" + LIBTQT_GLOB="lib$qtlib-mt.*" + USING_TQT_MT="using -mt" else LIBQT="-l$qtlib" fi if test $kde_qtver != 1; then - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JPEG]) LIBQT="$LIBQT $LIBPNG $LIBJPEG" fi if test $kde_qtver = 3; then - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) LIBQT="$LIBQT $LIBDL" kde_int_qt="$kde_int_qt $LIBDL" fi -AC_MSG_CHECKING([for Qt]) +AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -1340,14 +1340,14 @@ ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" qt_includes="" AC_ARG_WITH(qt-dir, - [ --with-qt-dir=DIR where the root of Qt is installed ], + [ --with-qt-dir=DIR where the root of TQt is installed ], [ ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_bindir="$withval"/bin ]) AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR where the Qt includes are. ], + [ --with-qt-includes=DIR where the TQt includes are. ], [ ac_qt_includes="$withval" ]) @@ -1355,19 +1355,19 @@ AC_ARG_WITH(qt-includes, kde_qt_libs_given=no AC_ARG_WITH(qt-libraries, - [ --with-qt-libraries=DIR where the Qt library is installed.], + [ --with-qt-libraries=DIR where the TQt library is installed.], [ ac_qt_libraries="$withval" kde_qt_libs_given=yes ]) AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations +[#try to guess TQt locations qt_incdirs="" for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" +qt_incdirs="$TQTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" fi @@ -1385,15 +1385,15 @@ qt_libdirs="" for dir in $kde_qt_dirs; do qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" done -qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libqt.* doesn't exist + # if the TQt was given, the chance is too big that libqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBQT_GLOB}" + try="ls -1 $dir/${LIBTQT_GLOB}" if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi done fi @@ -1411,7 +1411,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" LIBS="$LIBS $LIBQT $KDE_MT_LIBS" -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then rm -f conftest* @@ -1439,14 +1439,14 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then else if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" +Make sure that you have compiled TQt with thread support!" ac_qt_notfound="(library $qtlib-mt)"; else ac_qt_notfound="(library $qtlib)"; fi fi - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! + AC_MSG_ERROR([TQt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! For more details about this problem, look at the end of config.log.$missing_qt_mt]) else have_qt="yes" @@ -1460,39 +1460,39 @@ if test "$have_qt" != yes; then else ac_cv_have_qt="have_qt=yes \ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) + AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_TQT_MT]) qt_libraries="$ac_qt_libraries" qt_includes="$ac_qt_includes" fi if test ! "$kde_qt_libs_given" = "yes"; then -KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) +KDE_CHECK_TQT_DIRECT(qt_libraries= ,[]) fi AC_SUBST(qt_libraries) AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" + TQT_LDFLAGS="" else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$all_libraries $QT_LDFLAGS" + TQT_LDFLAGS="-L$qt_libraries" + all_libraries="$all_libraries $TQT_LDFLAGS" fi test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" -AC_SUBST(QT_INCLUDES) -AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_SUBST(TQT_INCLUDES) +AC_SUBST(TQT_LDFLAGS) +AC_PATH_TQT_TQMOC_UIC -KDE_CHECK_QT_JPEG +KDE_CHECK_TQT_JPEG if test "x$kde_use_qt_emb" != "xyes"; then LIB_QT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)' @@ -1502,19 +1502,19 @@ fi test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" AC_SUBST(LIB_QT) -AC_SUBST(LIB_QPE) +AC_SUBST(LIB_TQPE) AC_SUBST(kde_qtver) ]) AC_DEFUN(AC_PATH_QT, [ -AC_PATH_QT_1_3 +AC_PATH_TQT_1_3 ]) AC_DEFUN(KDE_CHECK_UIC_PLUGINS, [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_RETQUIRE([AC_PATH_TQT_TQMOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1524,7 +1524,7 @@ AC_CACHE_VAL(kde_cv_uic_plugins, cat > actest.ui << EOF <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NewConnectionDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <widget class="KLineEdit"> <property name="name"> <cstring>testInput</cstring> @@ -1624,8 +1624,8 @@ dnl AC_DEFUN(AC_BASE_PATH_KDE, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_PATH_QT])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH AC_MSG_CHECKING([for KDE]) @@ -1762,7 +1762,7 @@ fi AC_SUBST(KDE_LDFLAGS) AC_SUBST(KDE_INCLUDES) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) all_libraries="$all_libraries $USER_LDFLAGS" all_includes="$all_includes $USER_INCLUDES" @@ -1886,7 +1886,7 @@ For more details about this problem, look at the end of config.log.]) AC_LANG_RESTORE ]) -AC_DEFUN(KDE_CHECK_KDEQTADDON, +AC_DEFUN(KDE_CHECK_KDETQTADDON, [ AC_MSG_CHECKING(for kde-qt-addon) AC_CACHE_VAL(kde_cv_have_kdeqtaddon, @@ -1903,7 +1903,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, #include <qdom.h> ], [ - QDomDocument doc; + TQDomDocument doc; ], kde_cv_have_kdeqtaddon=yes, kde_cv_have_kdeqtaddon=no @@ -1924,13 +1924,13 @@ fi AC_DEFUN(KDE_CHECK_KIMGIO, [ - AC_REQUIRE([AC_BASE_PATH_KDE]) - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - AC_REQUIRE([AC_FIND_TIFF]) - AC_REQUIRE([AC_FIND_JPEG]) - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JASPER]) - AC_REQUIRE([KDE_CREATE_LIBS_ALIASES]) + AC_RETQUIRE([AC_BASE_PATH_KDE]) + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) + AC_RETQUIRE([AC_FIND_TIFF]) + AC_RETQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JASPER]) + AC_RETQUIRE([KDE_CREATE_LIBS_ALIASES]) if test "$1" = "existance"; then AC_LANG_SAVE @@ -1955,9 +1955,9 @@ AC_DEFUN(KDE_CHECK_KIMGIO, AC_DEFUN(KDE_CREATE_LIBS_ALIASES, [ - AC_REQUIRE([KDE_MISC_TESTS]) - AC_REQUIRE([KDE_CHECK_LIBDL]) - AC_REQUIRE([K_PATH_X]) + AC_RETQUIRE([KDE_MISC_TESTS]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([K_PATH_X]) if test $kde_qtver = 3; then AC_SUBST(LIB_KDECORE, "-lkdecore") @@ -2329,7 +2329,7 @@ LIBS="$ac_save_LIBS" ])dnl if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) + AC_DEFINE_UNTQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) fi @@ -2400,7 +2400,7 @@ dnl continue with a warning (the user will get no jpeg support in khtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) + AC_DEFINE_UNTQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) else if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then AC_MSG_WARN([ @@ -2430,10 +2430,10 @@ AH_VERBATIM(_AC_CHECK_JPEG, ]) ]) -AC_DEFUN(KDE_CHECK_QT_JPEG, +AC_DEFUN(KDE_CHECK_TQT_JPEG, [ if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) +AC_MSG_CHECKING([if TQt needs $LIBJPEG]) AC_CACHE_VAL(kde_cv_qt_jpeg, [ AC_LANG_SAVE @@ -2448,7 +2448,7 @@ AC_TRY_LINK( [ int argc; char** argv; - QApplication app(argc, argv);], + TQApplication app(argc, argv);], eval "kde_cv_qt_jpeg=no", eval "kde_cv_qt_jpeg=yes") LIBS="$ac_save_LIBS" @@ -2469,7 +2469,7 @@ fi AC_DEFUN(AC_FIND_ZLIB, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for libz]) AC_CACHE_VAL(ac_cv_lib_z, [ @@ -2489,7 +2489,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if test ! "$ac_cv_lib_z" = no; then - AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) + AC_DEFINE_UNTQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) LIBZ="$ac_cv_lib_z" AC_SUBST(LIBZ) AC_MSG_RESULT($ac_cv_lib_z) @@ -2540,7 +2540,7 @@ if test "$kde_cv_libtiff_$1" = "no"; then else LIBTIFF="$kde_cv_libtiff_$1" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) + AC_DEFINE_UNTQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) $2 fi @@ -2548,10 +2548,10 @@ fi AC_DEFUN(AC_FIND_TIFF, [ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) KDE_TRY_TIFFLIB(tiff, [], KDE_TRY_TIFFLIB(tiff34)) @@ -2562,8 +2562,8 @@ AC_SUBST(LIBTIFF) AC_DEFUN(AC_FIND_PNG, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_ZLIB]) AC_MSG_CHECKING([for libpng]) AC_CACHE_VAL(ac_cv_lib_png, [ @@ -2592,7 +2592,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) + AC_DEFINE_UNTQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) LIBPNG="$ac_cv_lib_png" AC_SUBST(LIBPNG) AC_MSG_RESULT($ac_cv_lib_png) @@ -2606,8 +2606,8 @@ fi AC_DEFUN(AC_FIND_JASPER, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_JPEG]) AC_MSG_CHECKING([for jasper 1.600]) AC_CACHE_VAL(ac_cv_jasper, [ @@ -2630,7 +2630,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) + AC_DEFINE_UNTQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) LIB_JASPER="$ac_cv_jasper" AC_MSG_RESULT($ac_cv_jasper) else @@ -2642,7 +2642,7 @@ AC_SUBST(LIB_JASPER) AC_DEFUN(AC_CHECK_BOOL, [ - AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) + AC_DEFINE_UNTQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) ]) AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, @@ -2669,7 +2669,7 @@ fi AC_MSG_RESULT($ac_cv_gnu_extensions) if test "$ac_cv_gnu_extensions" = "yes"; then - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) + AC_DEFINE_UNTQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) fi ]) @@ -2889,7 +2889,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, fi if test "$CXX" = "KCC"; then dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( + dnl because doing so is binary incompatible and TQt by default links with exceptions :-( dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) @@ -2959,7 +2959,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, KDE_CHECK_CLOSURE KDE_CHECK_NMCHECK - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) + ifdef([AM_DEPENDENCIES], AC_RETQUIRE([KDE_ADD_DEPENDENCIES]), []) ]) AC_DEFUN(KDE_ADD_DEPENDENCIES, @@ -2971,12 +2971,12 @@ AC_DEFUN(KDE_ADD_DEPENDENCIES, dnl just a wrapper to clean up configure.in AC_DEFUN(KDE_PROG_LIBTOOL, [ -AC_REQUIRE([AC_CHECK_COMPILERS]) -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) +AC_RETQUIRE([AC_CHECK_COMPILERS]) +AC_RETQUIRE([AC_ENABLE_SHARED]) +AC_RETQUIRE([AC_ENABLE_STATIC]) -AC_REQUIRE([AC_LIBTOOL_DLOPEN]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_LIBTOOL_DLOPEN]) +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_LANG_SAVE AC_LANG_C @@ -3026,7 +3026,7 @@ AC_DEFUN(KDE_CHECK_LIB64, libdir="$libdir${kdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) + AC_DEFINE_UNTQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) fi ]) @@ -3107,10 +3107,10 @@ getsockname(0,(struct sockaddr*)0, &a); AC_MSG_RESULT($ac_cv_socklen_t) if test "$ac_cv_socklen_t" != "socklen_t"; then - AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t, + AC_DEFINE_UNTQUOTED(socklen_t, $ac_cv_socklen_t, [Define the real type of socklen_t]) fi - AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define]) + AC_DEFINE_UNTQUOTED(ksize_t, socklen_t, [Compatibility define]) ]) @@ -3262,14 +3262,14 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE], # Stephan Kulow: I put a KDE in it to avoid name conflicts AC_DEFUN(AM_KDE_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([AM_KDE_WITH_NLS])dnl + [AC_RETQUIRE([AC_PROG_MAKE_SET])dnl + AC_RETQUIRE([AC_PROG_RANLIB])dnl + AC_RETQUIRE([AC_HEADER_STDC])dnl + AC_RETQUIRE([AC_TYPE_OFF_T])dnl + AC_RETQUIRE([AC_TYPE_SIZE_T])dnl + AC_RETQUIRE([AC_FUNC_ALLOCA])dnl + AC_RETQUIRE([AC_FUNC_MMAP])dnl + AC_RETQUIRE([AM_KDE_WITH_NLS])dnl AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ __argz_count __argz_stringify __argz_next]) @@ -3324,8 +3324,8 @@ __argz_count __argz_stringify __argz_next]) ]) AC_DEFUN(AC_HAVE_XPM, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= test -z "$XPM_INCLUDE" && XPM_INCLUDE= @@ -3380,8 +3380,8 @@ AC_DEFUN(AC_HAVE_XPM, ]) AC_DEFUN(AC_HAVE_DPMS, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= @@ -3468,8 +3468,8 @@ AC_DEFUN(AC_HAVE_DPMS, ]) AC_DEFUN(AC_HAVE_GL, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$GL_LDFLAGS" && GL_LDFLAGS= test -z "$GL_INCLUDE" && GL_INCLUDE= @@ -3477,7 +3477,7 @@ AC_DEFUN(AC_HAVE_GL, AC_ARG_WITH(gl, [ --without-gl disable 3D GL modes], gl_test=$withval, gl_test="yes") if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. + # GL and TQt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no @@ -3551,7 +3551,7 @@ AC_DEFUN(AC_HAVE_GL, dnl shadow password and PAM magic - maintained by ossi@kde.org AC_DEFUN(KDE_PAM, [ - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) AC_ARG_WITH(pam, [ --with-pam[=ARG] enable support for PAM: ARG=[yes|no|service name]], @@ -3618,13 +3618,13 @@ You may want to enforce it by using --with-pam.]) ]) if test -n "$$3_PAM_SERVICE"; then AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) - AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) + AC_DEFINE_UNTQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) fi AC_SUBST($3_PAM_SERVICE) ]) AC_DEFUN(KDE_SHADOWPASSWD, [ - AC_REQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_PAM]) AC_CHECK_LIB(shadow, getspent, [ LIBSHADOW="-lshadow" @@ -3681,9 +3681,9 @@ AC_DEFUN(KDE_SHADOWPASSWD, [ ]) AC_DEFUN(KDE_PASSWDLIBS, [ - AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT - AC_REQUIRE([KDE_PAM]) - AC_REQUIRE([KDE_SHADOWPASSWD]) + AC_RETQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT + AC_RETQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_SHADOWPASSWD]) if test "x$use_pam" = "xyes"; then PASSWDLIBS="$PAMLIBS" @@ -3746,11 +3746,11 @@ if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then fi if test "$ac_cv_have_dlfcn" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) + AC_DEFINE_UNTQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) fi if test "$ac_cv_have_shload" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) + AC_DEFINE_UNTQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) fi if test "$enable_dlopen" = no ; then @@ -3769,7 +3769,7 @@ AC_MSG_CHECKING([dynamic loading]) eval "`egrep '^build_libtool_libs=' libtool`" if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then dynamic_loading=yes - AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) + AC_DEFINE_UNTQUOTED(HAVE_DYNAMIC_LOADING) else dynamic_loading=no fi @@ -3821,8 +3821,8 @@ fi AC_DEFUN(KDE_CHECK_MICO, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_MISC_TESTS]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_MISC_TESTS]) AC_MSG_CHECKING(for MICO) if test -z "$MICODIR"; then @@ -3930,7 +3930,7 @@ AC_SUBST(idldir) AC_DEFUN(KDE_CHECK_MINI_STL, [ -AC_REQUIRE([KDE_CHECK_MICO]) +AC_RETQUIRE([KDE_CHECK_MICO]) AC_MSG_CHECKING(if we use mico's mini-STL) AC_CACHE_VAL(kde_cv_have_mini_stl, @@ -4035,8 +4035,8 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION, AC_DEFUN(KDE_CHECK_THREADING, [ - AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) - AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) + AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) + AC_RETQUIRE([KDE_CHECK_PTHREAD_OPTION]) dnl default is yes if libpthread is found and no if no libpthread is available if test -z "$LIBPTHREAD"; then if test -z "$USE_THREADS"; then @@ -4131,9 +4131,9 @@ AC_MSG_RESULT($ac_python_dir) AC_DEFUN(KDE_CHECK_PYTHON_INTERN, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) +AC_RETQUIRE([KDE_CHECK_PYTHON_DIR]) if test -z "$1"; then version="1.5" @@ -4245,7 +4245,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_sgi) if test "$kde_cv_stl_type_sgi" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) + AC_DEFINE_UNTQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) fi ]) @@ -4267,7 +4267,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_hp) if test "$kde_cv_stl_type_hp" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) + AC_DEFINE_UNTQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) fi ]) @@ -4291,9 +4291,9 @@ AC_DEFUN(KDE_CHECK_STL, AC_LANG_RESTORE ]) -AC_DEFUN(AC_FIND_QIMGIO, - [AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_DEFUN(AC_FIND_TQIMGIO, + [AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for qimgio]) AC_CACHE_VAL(ac_cv_lib_qimgio, [ @@ -4308,7 +4308,7 @@ AC_TRY_RUN(dnl #include <qimageio.h> #include <qstring.h> int main() { - QString t = "hallo"; + TQString t = "hallo"; t.fill('t'); qInitImageIO(); } @@ -4321,10 +4321,10 @@ CXXFLAGS="$ac_save_CXXFLAGS" AC_LANG_RESTORE ])dnl if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then - LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" + LIBTQIMGIO="-lqimgio -lpng -lz $LIBJPEG" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) - AC_SUBST(LIBQIMGIO) + AC_DEFINE_UNTQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available]) + AC_SUBST(LIBTQIMGIO) else AC_MSG_RESULT(not found) fi @@ -4383,7 +4383,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE, ]) if test "$kde_cv_utmp_file" != "no"; then - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) + AC_DEFINE_UNTQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) $1 AC_MSG_RESULT($kde_cv_utmp_file) else @@ -4495,7 +4495,7 @@ AC_LANG_RESTORE ]) AC_MSG_RESULT($ac_cv_have_s_issock) if test "$ac_cv_have_s_issock" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) + AC_DEFINE_UNTQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) fi AH_VERBATIM(_ISSOCK, @@ -4544,7 +4544,7 @@ rm conftest.* ]) AC_MSG_RESULT($ac_cv_maxpathlen) -AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) +AC_DEFINE_UNTQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) ]) AC_DEFUN(KDE_CHECK_HEADER, @@ -4911,12 +4911,12 @@ if test "x$kde_java_bindir" != "xno"; then JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" AC_MSG_RESULT([java JDK in $kde_java_bindir]) else - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([java JRE in $kde_java_bindir]) fi else # no @@ -4962,7 +4962,7 @@ fi AC_SUBST(LEXLIB) ]) -AC_DEFUN(AC_PATH_QTOPIA, +AC_DEFUN(AC_PATH_TQTOPIA, [ dnl TODO: use AC_CACHE_VAL @@ -4979,19 +4979,19 @@ AC_DEFUN(AC_PATH_QTOPIA, qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - AC_REQUIRE([AC_PATH_QT]) + AC_RETQUIRE([AC_PATH_QT]) - AC_MSG_CHECKING([for Qtopia]) + AC_MSG_CHECKING([for TQtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) - kde_qtopia_dirs="$QPEDIR /opt/Qtopia" + kde_qtopia_dirs="$TQPEDIR /opt/TQtopia" ac_qtopia_incdir=NO AC_ARG_WITH(qtopia-dir, - [ --with-qtopia-dir=DIR where the root of Qtopia is installed ], + [ --with-qtopia-dir=DIR where the root of TQtopia is installed ], [ ac_qtopia_incdir="$withval"/include] ) qtopia_incdirs="" @@ -5008,17 +5008,17 @@ AC_DEFUN(AC_PATH_QTOPIA, ac_qtopia_incdir="$qtopia_incdir" if test -z "$qtopia_incdir"; then - AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) + AC_MSG_ERROR([Cannot find TQtopia headers. Please check your installation.]) fi - qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; - qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; - qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; + qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; + qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; + qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" if test "$qtopia_ver" -lt "$qtopia_minver"; then - AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr + AC_MSG_ERROR([found TQtopia version $qtopia_verstr but version $qtopia_minverstr is required.]) fi @@ -5030,8 +5030,8 @@ is required.]) ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LDFLAGS="$LDFLAGS $TQT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" @@ -5040,7 +5040,7 @@ is required.]) int main( int argc, char **argv ) { - QPEApplication app( argc, argv ); + TQPEApplication app( argc, argv ); return 0; } EOF @@ -5049,7 +5049,7 @@ EOF rm -f conftest* else rm -f conftest* - AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at + AC_MSG_ERROR([Cannot link small TQtopia Application. For more details look at the end of config.log]) fi @@ -5059,8 +5059,8 @@ the end of config.log]) AC_LANG_RESTORE - QTOPIA_INCLUDES="-I$qtopia_incdir" - AC_SUBST(QTOPIA_INCLUDES) + TQTOPIA_INCLUDES="-I$qtopia_incdir" + AC_SUBST(TQTOPIA_INCLUDES) AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) ]) @@ -5068,16 +5068,16 @@ the end of config.log]) AC_DEFUN(KDE_INIT_DOXYGEN, [ -AC_MSG_CHECKING([for Qt docs]) +AC_MSG_CHECKING([for TQt docs]) kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR) -AC_MSG_RESULT($QTDOCDIR) +AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], TQTDOCDIR) +AC_MSG_RESULT($TQTDOCDIR) -AC_SUBST(QTDOCDIR) +AC_SUBST(TQTDOCDIR) KDE_FIND_PATH(dot, DOT, [], []) if test -n "$DOT"; then @@ -5095,7 +5095,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) @@ -5191,7 +5191,7 @@ dnl AC_DEFUN(KDE_CHECK_SSL, [ LIBSSL="-lssl -lcrypto" -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) ac_ssl_includes=NO ac_ssl_libraries=NO ssl_libraries="" @@ -5375,8 +5375,8 @@ AC_SUBST(LIBSSL) AC_DEFUN(KDE_CHECK_STRLCPY, [ - AC_REQUIRE([AC_CHECK_STRLCAT]) - AC_REQUIRE([AC_CHECK_STRLCPY]) + AC_RETQUIRE([AC_CHECK_STRLCAT]) + AC_RETQUIRE([AC_CHECK_STRLCPY]) AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(unsigned long) @@ -5451,7 +5451,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) # AC_PROG_LIBTOOL # --------------- AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +[AC_RETQUIRE([_AC_PROG_LIBTOOL])dnl dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. AC_PROVIDE_IFELSE([AC_PROG_CXX], @@ -5481,7 +5481,7 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. # _AC_PROG_LIBTOOL # ---------------- AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +[AC_RETQUIRE([AC_LIBTOOL_SETUP])dnl AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl @@ -5501,29 +5501,29 @@ define([AC_PROG_LIBTOOL], []) # ---------------- AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([LT_AC_PROG_SED])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +AC_RETQUIRE([AC_ENABLE_SHARED])dnl +AC_RETQUIRE([AC_ENABLE_STATIC])dnl +AC_RETQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_PROG_LD])dnl +AC_RETQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_RETQUIRE([AC_PROG_NM])dnl +AC_RETQUIRE([LT_AC_PROG_SED])dnl + +AC_RETQUIRE([AC_PROG_LN_S])dnl +AC_RETQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +AC_RETQUIRE([AC_OBJEXT])dnl +AC_RETQUIRE([AC_EXEEXT])dnl dnl AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_PROG_ECHO_BACKSLASH case $host_os in @@ -5642,7 +5642,7 @@ _LT_AC_TAGCONFIG # _LT_AC_SYS_COMPILER # ------------------- AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl +[AC_RETQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -6073,7 +6073,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN], # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : [$4] else @@ -6161,7 +6161,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -6260,7 +6260,7 @@ fi # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -6311,7 +6311,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], # ----------------------------------------- # Check to see if we can do hard links to lock some files if needed AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl +[AC_RETQUIRE([_LT_AC_LOCK])dnl hard_links="nottested" if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then @@ -6901,7 +6901,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then for tagname in $tagnames; do IFS="$lt_save_ifs" # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in "") ;; *) AC_MSG_ERROR([invalid tag name: $tagname]) ;; @@ -7181,9 +7181,9 @@ AC_DEFUN([AC_PROG_LD], [assume the C compiler uses GNU ld @<:@default=no@:>@])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no]) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -7520,7 +7520,7 @@ NM="$lt_cv_path_NM" # ------------- # check for math library AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl +[AC_RETQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in *-*-beos* | *-*-cygwin* | *-*-pw32*) @@ -7610,15 +7610,15 @@ ifdef([AC_PROVIDE_IFELSE], # -------------- # enable support for C++ libraries AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) +[AC_RETQUIRE([_LT_AC_LANG_CXX]) ])# AC_LIBTOOL_CXX # _LT_AC_LANG_CXX # --------------- AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +[AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) ])# _LT_AC_LANG_CXX @@ -7626,7 +7626,7 @@ AC_REQUIRE([AC_PROG_CXXCPP]) # -------------- # enable support for GCJ libraries AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) +[AC_RETQUIRE([_LT_AC_LANG_GCJ]) ])# AC_LIBTOOL_GCJ @@ -7636,9 +7636,9 @@ AC_DEFUN([_LT_AC_LANG_GCJ], [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) + [ifdef([AC_PROG_GCJ],[AC_RETQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_RETQUIRE([A][M_PROG_GCJ])], + [AC_RETQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ])# _LT_AC_LANG_GCJ @@ -7646,7 +7646,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ], # -------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([AC_PROG_RC]) +[AC_RETQUIRE([AC_PROG_RC]) ])# AC_LIBTOOL_RC @@ -7766,8 +7766,8 @@ CC="$lt_save_CC" AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -9134,7 +9134,7 @@ fi # AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) # ------------------------------------------- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= @@ -9152,9 +9152,9 @@ fi # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) +[AC_RETQUIRE([AC_CANONICAL_HOST]) +AC_RETQUIRE([AC_PROG_NM]) +AC_RETQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. AC_MSG_CHECKING([command to parse $NM output from $compiler object]) AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], @@ -53,7 +53,7 @@ dnl Internal subroutine of AC_PATH_X. dnl Set ac_x_includes and/or ac_x_libraries. AC_DEFUN(KDE_PATH_X_DIRECT, [ -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) if test "$ac_x_includes" = NO; then # Guess where to find include files, by looking for this one X11 .h file. @@ -250,22 +250,22 @@ AC_DEFUN(KDE_FIND_PATH, fi ]) -AC_DEFUN(KDE_MOC_ERROR_MESSAGE, +AC_DEFUN(KDE_TQMOC_ERROR_MESSAGE, [ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. + AC_MSG_ERROR([No TQt meta object compiler (moc) found! +Please check whether you installed TQt correctly. You need to have a running moc binary. configure tried to run $ac_cv_path_moc and the test didn't succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running +the environment variable TQMOC to the right one before running configure. ]) ]) AC_DEFUN(KDE_UIC_ERROR_MESSAGE, [ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. + AC_MSG_WARN([No TQt ui compiler (uic) found! +Please check whether you installed TQt correctly. You need to have a running uic binary. configure tried to run $ac_cv_path_uic and the test didn't succeed. If configure shouldn't have tried this one, set @@ -307,10 +307,10 @@ EOT dnl ------------------------------------------------------------------------ dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $QTDIR/bin, and some more usual places +dnl in $TQTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_MOC_UIC, +AC_DEFUN(AC_PATH_TQT_TQMOC_UIC, [ qt_bindirs="" for dir in $kde_qt_dirs; do @@ -321,7 +321,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) + KDE_FIND_PATH(moc, TQMOC, [$qt_bindirs], [KDE_TQMOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) if test -z "$UIC_PATH" ; then @@ -343,7 +343,7 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, UIC="echo uic not available: " fi - AC_SUBST(MOC) + AC_SUBST(TQMOC) AC_SUBST(UIC) UIC_TR="i18n" @@ -385,7 +385,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile TQt and kdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -610,7 +610,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, AC_DEFUN(AC_CREATE_KFSSTND, [ -AC_REQUIRE([AC_CHECK_RPATH]) +AC_RETQUIRE([AC_CHECK_RPATH]) AC_MSG_CHECKING([for KDE paths]) kde_result="" @@ -708,7 +708,7 @@ support]) ])) AC_SUBST(LIBCRYPT) if test $kde_have_crypt = yes; then - AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) + AC_DEFINE_UNTQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function]) fi AC_CHECK_SOCKLEN_T AC_LANG_C @@ -820,19 +820,19 @@ dnl ------------------------------------------------------------------------ dnl AC_DEFUN(K_PATH_X, [ -AC_REQUIRE([KDE_MISC_TESTS])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_MISC_TESTS])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_ARG_ENABLE( embedded, - [ --enable-embedded link to Qt-embedded, don't use X], + [ --enable-embedded link to TQt-embedded, don't use X], kde_use_qt_emb=$enableval, kde_use_qt_emb=no ) AC_ARG_ENABLE( qtopia, - [ --enable-qtopia link to Qt-embedded, link to the Qtopia Environment], + [ --enable-qtopia link to TQt-embedded, link to the TQtopia Environment], kde_use_qt_emb_palm=$enableval, kde_use_qt_emb_palm=no ) @@ -994,13 +994,13 @@ them either.]) fi LIB_XEXT="-lXext" -QTE_NORTTI="" +TQTE_NORTTI="" else dnl We're using QT Embedded - CPPFLAGS=-DQWS + CPPFLAGS=-DTQWS CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" + TQTE_NORTTI="-fno-rtti -DTQWS" X_PRE_LIBS="" LIB_X11="" LIB_XEXT="" @@ -1017,7 +1017,7 @@ else AC_SUBST(x_includes) AC_SUBST(x_libraries) fi -AC_SUBST(QTE_NORTTI) +AC_SUBST(TQTE_NORTTI) AC_SUBST(LIB_XEXT) @@ -1025,9 +1025,9 @@ AC_LANG_RESTORE ]) -AC_DEFUN(KDE_PRINT_QT_PROGRAM, +AC_DEFUN(KDE_PRINT_TQT_PROGRAM, [ -AC_REQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" #include <qglobal.h> @@ -1042,7 +1042,7 @@ EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1066,20 +1066,20 @@ int main() { EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); + TQStringList *t = new TQStringList(); + TTQ_UNUSED(t); EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF - QString s; + TQString s; s.setLatin1("Elvis is alive", 14); EOF fi fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF - (void)QStyleFactory::create(QString::null); - QCursor c(Qt::WhatsThisCursor); + (void)TQStyleFactory::create(TQString::null); + TQCursor c(TQt::WhatsThisCursor); EOF fi cat >> conftest.$ac_ext <<EOF @@ -1091,7 +1091,7 @@ EOF AC_DEFUN(KDE_USE_QT, [ if test -z "$1"; then - # Current default Qt version: 3.1 + # Current default TQt version: 3.1 kde_qtver=3 kde_qtsubver=1 else @@ -1109,16 +1109,16 @@ fi if test -z "$2"; then if test "$kde_qtver" = "2"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" + kde_qt_minversion=">= TQt 2.2.2" else - kde_qt_minversion=">= Qt 2.0.2" + kde_qt_minversion=">= TQt 2.0.2" fi fi if test "$kde_qtver" = "3"; then if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 3.1 (20021021)" + kde_qt_minversion=">= TQt 3.1 (20021021)" else - kde_qt_minversion=">= Qt 3.0" + kde_qt_minversion=">= TQt 3.0" fi fi if test "$kde_qtver" = "1"; then @@ -1131,40 +1131,40 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x030100" + kde_qt_verstring="TQT_VERSION >= 0x030100" else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring=$3 fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi if test $kde_qtver = 2; then - kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" fi if test $kde_qtver = 1; then - kde_qt_dirs="$QTDIR /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt" fi ]) -AC_DEFUN(KDE_CHECK_QT_DIRECT, +AC_DEFUN(KDE_CHECK_TQT_DIRECT, [ -AC_REQUIRE([KDE_USE_QT]) -AC_MSG_CHECKING([if Qt compiles without flags]) +AC_RETQUIRE([KDE_USE_QT]) +AC_MSG_CHECKING([if TQt compiles without flags]) AC_CACHE_VAL(kde_cv_qt_direct, [ AC_LANG_SAVE @@ -1187,7 +1187,7 @@ export LD_LIBRARY_PATH LIBRARY_PATH= export LIBRARY_PATH -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then kde_cv_qt_direct="yes" @@ -1219,24 +1219,24 @@ fi ]) dnl ------------------------------------------------------------------------ -dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl Try to find the TQt headers and libraries. +dnl $(TQT_LDFLAGS) will be -Lqtliblocation (if needed) +dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl -AC_DEFUN(AC_PATH_QT_1_3, +AC_DEFUN(AC_PATH_TQT_1_3, [ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([KDE_USE_QT]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([KDE_USE_QT]) +AC_RETQUIRE([KDE_CHECK_LIB64]) dnl ------------------------------------------------------------------------ -dnl Add configure flag to enable linking to MT version of Qt library. +dnl Add configure flag to enable linking to MT version of TQt library. dnl ------------------------------------------------------------------------ AC_ARG_ENABLE( mt, - [ --disable-mt link to non-threaded Qt (deprecated)], + [ --disable-mt link to non-threaded TQt (deprecated)], kde_use_qt_mt=$enableval, [ if test $kde_qtver = 3; then @@ -1247,7 +1247,7 @@ AC_ARG_ENABLE( ] ) -USING_QT_MT="" +USING_TQT_MT="" dnl ------------------------------------------------------------------------ dnl If we not get --disable-qt-mt then adjust some vars for the host. @@ -1258,7 +1258,7 @@ KDE_MT_LIBS= if test "x$kde_use_qt_mt" = "xyes"; then KDE_CHECK_THREADING if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" + CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" KDE_MT_LDFLAGS="$USE_THREADS" KDE_MT_LIBS="$LIBPTHREAD" else @@ -1271,19 +1271,19 @@ AC_SUBST(KDE_MT_LIBS) kde_qt_was_given=yes dnl ------------------------------------------------------------------------ -dnl If we haven't been told how to link to Qt, we work it out for ourselves. +dnl If we haven't been told how to link to TQt, we work it out for ourselves. dnl ------------------------------------------------------------------------ -if test -z "$LIBQT_GLOB"; then +if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then - LIBQT_GLOB="libqte.*" + LIBTQT_GLOB="libqte.*" else - LIBQT_GLOB="libqt.*" + LIBTQT_GLOB="libqt.*" fi fi if test -z "$LIBQT"; then dnl ------------------------------------------------------------ -dnl If we got --enable-embedded then adjust the Qt library name. +dnl If we got --enable-embedded then adjust the TQt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then qtlib="qte" @@ -1297,23 +1297,23 @@ else kde_lib_qt_set=yes fi -if test -z "$LIBQPE"; then +if test -z "$LIBTQPE"; then dnl ------------------------------------------------------------ dnl If we got --enable-palmtop then add -lqpe to the link line dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then if test "x$kde_use_qt_emb_palm" = "xyes"; then - LIB_QPE="-lqpe" + LIB_TQPE="-lqpe" else - LIB_QPE="" + LIB_TQPE="" fi else - LIB_QPE="" + LIB_TQPE="" fi fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-qt-mt then adjust the TQt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1324,26 +1324,26 @@ if test "x$kde_use_qt_mt" = "xyes"; then LIBQT="$qtlib-mt" kde_int_qt="$qtlib-mt" fi - LIBQT_GLOB="lib$qtlib-mt.*" - USING_QT_MT="using -mt" + LIBTQT_GLOB="lib$qtlib-mt.*" + USING_TQT_MT="using -mt" else LIBQT="-l$qtlib" fi if test $kde_qtver != 1; then - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JPEG]) LIBQT="$LIBQT $LIBPNG $LIBJPEG" fi if test $kde_qtver = 3; then - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) LIBQT="$LIBQT $LIBDL" kde_int_qt="$kde_int_qt $LIBDL" fi -AC_MSG_CHECKING([for Qt]) +AC_MSG_CHECKING([for TQt]) if test "x$kde_use_qt_emb" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -1352,14 +1352,14 @@ ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" qt_includes="" AC_ARG_WITH(qt-dir, - [ --with-qt-dir=DIR where the root of Qt is installed ], + [ --with-qt-dir=DIR where the root of TQt is installed ], [ ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_bindir="$withval"/bin ]) AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR where the Qt includes are. ], + [ --with-qt-includes=DIR where the TQt includes are. ], [ ac_qt_includes="$withval" ]) @@ -1367,19 +1367,19 @@ AC_ARG_WITH(qt-includes, kde_qt_libs_given=no AC_ARG_WITH(qt-libraries, - [ --with-qt-libraries=DIR where the Qt library is installed.], + [ --with-qt-libraries=DIR where the TQt library is installed.], [ ac_qt_libraries="$withval" kde_qt_libs_given=yes ]) AC_CACHE_VAL(ac_cv_have_qt, -[#try to guess Qt locations +[#try to guess TQt locations qt_incdirs="" for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" +qt_incdirs="$TQTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" fi @@ -1397,15 +1397,15 @@ qt_libdirs="" for dir in $kde_qt_dirs; do qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" done -qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libqt.* doesn't exist + # if the TQt was given, the chance is too big that libqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBQT_GLOB}" + try="ls -1 $dir/${LIBTQT_GLOB}" if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi done fi @@ -1423,7 +1423,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" LIBS="$LIBS $LIBQT $KDE_MT_LIBS" -KDE_PRINT_QT_PROGRAM +KDE_PRINT_TQT_PROGRAM if AC_TRY_EVAL(ac_link) && test -s conftest; then rm -f conftest* @@ -1451,14 +1451,14 @@ if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then else if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" -Make sure that you have compiled Qt with thread support!" +Make sure that you have compiled TQt with thread support!" ac_qt_notfound="(library $qtlib-mt)"; else ac_qt_notfound="(library $qtlib)"; fi fi - AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! + AC_MSG_ERROR([TQt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! For more details about this problem, look at the end of config.log.$missing_qt_mt]) else have_qt="yes" @@ -1472,39 +1472,39 @@ if test "$have_qt" != yes; then else ac_cv_have_qt="have_qt=yes \ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT]) + AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_TQT_MT]) qt_libraries="$ac_qt_libraries" qt_includes="$ac_qt_includes" fi if test ! "$kde_qt_libs_given" = "yes"; then -KDE_CHECK_QT_DIRECT(qt_libraries= ,[]) +KDE_CHECK_TQT_DIRECT(qt_libraries= ,[]) fi AC_SUBST(qt_libraries) AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then - QT_LDFLAGS="" + TQT_LDFLAGS="" else - QT_LDFLAGS="-L$qt_libraries" - all_libraries="$all_libraries $QT_LDFLAGS" + TQT_LDFLAGS="-L$qt_libraries" + all_libraries="$all_libraries $TQT_LDFLAGS" fi test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" -AC_SUBST(QT_INCLUDES) -AC_SUBST(QT_LDFLAGS) -AC_PATH_QT_MOC_UIC +AC_SUBST(TQT_INCLUDES) +AC_SUBST(TQT_LDFLAGS) +AC_PATH_TQT_TQMOC_UIC -KDE_CHECK_QT_JPEG +KDE_CHECK_TQT_JPEG if test "x$kde_use_qt_emb" != "xyes"; then LIB_QT="$kde_int_qt $LIBJPEG_QT "' $(LIBRESOLV) $(LIBPNG) $(X_PRE_LIBS) -lXext $(LIB_X11) $(LIBSM)' @@ -1514,19 +1514,19 @@ fi test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" AC_SUBST(LIB_QT) -AC_SUBST(LIB_QPE) +AC_SUBST(LIB_TQPE) AC_SUBST(kde_qtver) ]) AC_DEFUN(AC_PATH_QT, [ -AC_PATH_QT_1_3 +AC_PATH_TQT_1_3 ]) AC_DEFUN(KDE_CHECK_UIC_PLUGINS, [ -AC_REQUIRE([AC_PATH_QT_MOC_UIC]) +AC_RETQUIRE([AC_PATH_TQT_TQMOC_UIC]) if test x$ac_uic_supports_libpath = xyes; then @@ -1536,7 +1536,7 @@ AC_CACHE_VAL(kde_cv_uic_plugins, cat > actest.ui << EOF <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>NewConnectionDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <widget class="KLineEdit"> <property name="name"> <cstring>testInput</cstring> @@ -1636,8 +1636,8 @@ dnl AC_DEFUN(AC_BASE_PATH_KDE, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_PATH_QT])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH AC_MSG_CHECKING([for KDE]) @@ -1774,7 +1774,7 @@ fi AC_SUBST(KDE_LDFLAGS) AC_SUBST(KDE_INCLUDES) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) all_libraries="$all_libraries $USER_LDFLAGS" all_includes="$all_includes $USER_INCLUDES" @@ -1898,7 +1898,7 @@ For more details about this problem, look at the end of config.log.]) AC_LANG_RESTORE ]) -AC_DEFUN(KDE_CHECK_KDEQTADDON, +AC_DEFUN(KDE_CHECK_KDETQTADDON, [ AC_MSG_CHECKING(for kde-qt-addon) AC_CACHE_VAL(kde_cv_have_kdeqtaddon, @@ -1915,7 +1915,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, #include <qdom.h> ], [ - QDomDocument doc; + TQDomDocument doc; ], kde_cv_have_kdeqtaddon=yes, kde_cv_have_kdeqtaddon=no @@ -1936,13 +1936,13 @@ fi AC_DEFUN(KDE_CHECK_KIMGIO, [ - AC_REQUIRE([AC_BASE_PATH_KDE]) - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) - AC_REQUIRE([AC_FIND_TIFF]) - AC_REQUIRE([AC_FIND_JPEG]) - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JASPER]) - AC_REQUIRE([KDE_CREATE_LIBS_ALIASES]) + AC_RETQUIRE([AC_BASE_PATH_KDE]) + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) + AC_RETQUIRE([AC_FIND_TIFF]) + AC_RETQUIRE([AC_FIND_JPEG]) + AC_RETQUIRE([AC_FIND_PNG]) + AC_RETQUIRE([AC_FIND_JASPER]) + AC_RETQUIRE([KDE_CREATE_LIBS_ALIASES]) if test "$1" = "existance"; then AC_LANG_SAVE @@ -1967,9 +1967,9 @@ AC_DEFUN(KDE_CHECK_KIMGIO, AC_DEFUN(KDE_CREATE_LIBS_ALIASES, [ - AC_REQUIRE([KDE_MISC_TESTS]) - AC_REQUIRE([KDE_CHECK_LIBDL]) - AC_REQUIRE([K_PATH_X]) + AC_RETQUIRE([KDE_MISC_TESTS]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([K_PATH_X]) if test $kde_qtver = 3; then AC_SUBST(LIB_KDECORE, "-lkdecore") @@ -2341,7 +2341,7 @@ LIBS="$ac_save_LIBS" ])dnl if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) + AC_DEFINE_UNTQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) fi @@ -2412,7 +2412,7 @@ dnl continue with a warning (the user will get no jpeg support in khtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) + AC_DEFINE_UNTQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg]) else if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then AC_MSG_WARN([ @@ -2442,10 +2442,10 @@ AH_VERBATIM(_AC_CHECK_JPEG, ]) ]) -AC_DEFUN(KDE_CHECK_QT_JPEG, +AC_DEFUN(KDE_CHECK_TQT_JPEG, [ if test -n "$LIBJPEG"; then -AC_MSG_CHECKING([if Qt needs $LIBJPEG]) +AC_MSG_CHECKING([if TQt needs $LIBJPEG]) AC_CACHE_VAL(kde_cv_qt_jpeg, [ AC_LANG_SAVE @@ -2460,7 +2460,7 @@ AC_TRY_LINK( [ int argc; char** argv; - QApplication app(argc, argv);], + TQApplication app(argc, argv);], eval "kde_cv_qt_jpeg=no", eval "kde_cv_qt_jpeg=yes") LIBS="$ac_save_LIBS" @@ -2481,7 +2481,7 @@ fi AC_DEFUN(AC_FIND_ZLIB, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for libz]) AC_CACHE_VAL(ac_cv_lib_z, [ @@ -2501,7 +2501,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if test ! "$ac_cv_lib_z" = no; then - AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) + AC_DEFINE_UNTQUOTED(HAVE_LIBZ, 1, [Define if you have libz]) LIBZ="$ac_cv_lib_z" AC_SUBST(LIBZ) AC_MSG_RESULT($ac_cv_lib_z) @@ -2552,7 +2552,7 @@ if test "$kde_cv_libtiff_$1" = "no"; then else LIBTIFF="$kde_cv_libtiff_$1" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) + AC_DEFINE_UNTQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff]) $2 fi @@ -2560,10 +2560,10 @@ fi AC_DEFUN(AC_FIND_TIFF, [ -AC_REQUIRE([K_PATH_X]) -AC_REQUIRE([AC_FIND_ZLIB]) -AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([K_PATH_X]) +AC_RETQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) KDE_TRY_TIFFLIB(tiff, [], KDE_TRY_TIFFLIB(tiff34)) @@ -2574,8 +2574,8 @@ AC_SUBST(LIBTIFF) AC_DEFUN(AC_FIND_PNG, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_ZLIB]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_ZLIB]) AC_MSG_CHECKING([for libpng]) AC_CACHE_VAL(ac_cv_lib_png, [ @@ -2604,7 +2604,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) + AC_DEFINE_UNTQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng]) LIBPNG="$ac_cv_lib_png" AC_SUBST(LIBPNG) AC_MSG_RESULT($ac_cv_lib_png) @@ -2618,8 +2618,8 @@ fi AC_DEFUN(AC_FIND_JASPER, [ -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) -AC_REQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([AC_FIND_JPEG]) AC_MSG_CHECKING([for jasper 1.600]) AC_CACHE_VAL(ac_cv_jasper, [ @@ -2642,7 +2642,7 @@ LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" ])dnl if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then - AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) + AC_DEFINE_UNTQUOTED(HAVE_JASPER, 1, [Define if you have jasper]) LIB_JASPER="$ac_cv_jasper" AC_MSG_RESULT($ac_cv_jasper) else @@ -2654,7 +2654,7 @@ AC_SUBST(LIB_JASPER) AC_DEFUN(AC_CHECK_BOOL, [ - AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) + AC_DEFINE_UNTQUOTED(HAVE_BOOL, 1, [You _must_ have bool]) ]) AC_DEFUN(AC_CHECK_GNU_EXTENSIONS, @@ -2681,7 +2681,7 @@ fi AC_MSG_RESULT($ac_cv_gnu_extensions) if test "$ac_cv_gnu_extensions" = "yes"; then - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) + AC_DEFINE_UNTQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions]) fi ]) @@ -2901,7 +2901,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, fi if test "$CXX" = "KCC"; then dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( + dnl because doing so is binary incompatible and TQt by default links with exceptions :-( dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"]) dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= ) @@ -2971,7 +2971,7 @@ AC_DEFUN(AC_CHECK_COMPILERS, KDE_CHECK_CLOSURE KDE_CHECK_NMCHECK - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) + ifdef([AM_DEPENDENCIES], AC_RETQUIRE([KDE_ADD_DEPENDENCIES]), []) ]) AC_DEFUN(KDE_ADD_DEPENDENCIES, @@ -2983,12 +2983,12 @@ AC_DEFUN(KDE_ADD_DEPENDENCIES, dnl just a wrapper to clean up configure.in AC_DEFUN(KDE_PROG_LIBTOOL, [ -AC_REQUIRE([AC_CHECK_COMPILERS]) -AC_REQUIRE([AC_ENABLE_SHARED]) -AC_REQUIRE([AC_ENABLE_STATIC]) +AC_RETQUIRE([AC_CHECK_COMPILERS]) +AC_RETQUIRE([AC_ENABLE_SHARED]) +AC_RETQUIRE([AC_ENABLE_STATIC]) -AC_REQUIRE([AC_LIBTOOL_DLOPEN]) -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_LIBTOOL_DLOPEN]) +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_LANG_SAVE AC_LANG_C @@ -3038,7 +3038,7 @@ AC_DEFUN(KDE_CHECK_LIB64, libdir="$libdir${kdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) + AC_DEFINE_UNTQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories) AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) fi ]) @@ -3119,10 +3119,10 @@ getsockname(0,(struct sockaddr*)0, &a); AC_MSG_RESULT($ac_cv_socklen_t) if test "$ac_cv_socklen_t" != "socklen_t"; then - AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t, + AC_DEFINE_UNTQUOTED(socklen_t, $ac_cv_socklen_t, [Define the real type of socklen_t]) fi - AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define]) + AC_DEFINE_UNTQUOTED(ksize_t, socklen_t, [Compatibility define]) ]) @@ -3274,14 +3274,14 @@ AC_DEFUN([AM_FUNC_ERROR_AT_LINE], # Stephan Kulow: I put a KDE in it to avoid name conflicts AC_DEFUN(AM_KDE_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([AM_KDE_WITH_NLS])dnl + [AC_RETQUIRE([AC_PROG_MAKE_SET])dnl + AC_RETQUIRE([AC_PROG_RANLIB])dnl + AC_RETQUIRE([AC_HEADER_STDC])dnl + AC_RETQUIRE([AC_TYPE_OFF_T])dnl + AC_RETQUIRE([AC_TYPE_SIZE_T])dnl + AC_RETQUIRE([AC_FUNC_ALLOCA])dnl + AC_RETQUIRE([AC_FUNC_MMAP])dnl + AC_RETQUIRE([AM_KDE_WITH_NLS])dnl AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h]) AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \ __argz_count __argz_stringify __argz_next]) @@ -3336,8 +3336,8 @@ __argz_count __argz_stringify __argz_next]) ]) AC_DEFUN(AC_HAVE_XPM, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$XPM_LDFLAGS" && XPM_LDFLAGS= test -z "$XPM_INCLUDE" && XPM_INCLUDE= @@ -3392,8 +3392,8 @@ AC_DEFUN(AC_HAVE_XPM, ]) AC_DEFUN(AC_HAVE_DPMS, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS= test -z "$DPMS_INCLUDE" && DPMS_INCLUDE= @@ -3480,8 +3480,8 @@ AC_DEFUN(AC_HAVE_DPMS, ]) AC_DEFUN(AC_HAVE_GL, - [AC_REQUIRE_CPP()dnl - AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) + [AC_RETQUIRE_CPP()dnl + AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) test -z "$GL_LDFLAGS" && GL_LDFLAGS= test -z "$GL_INCLUDE" && GL_INCLUDE= @@ -3489,7 +3489,7 @@ AC_DEFUN(AC_HAVE_GL, AC_ARG_WITH(gl, [ --without-gl disable 3D GL modes], gl_test=$withval, gl_test="yes") if test "x$kde_use_qt_emb" = "xyes"; then - # GL and Qt Embedded is a no-go for now. + # GL and TQt Embedded is a no-go for now. ac_cv_have_gl=no elif test "x$gl_test" = xno; then ac_cv_have_gl=no @@ -3563,7 +3563,7 @@ AC_DEFUN(AC_HAVE_GL, dnl shadow password and PAM magic - maintained by ossi@kde.org AC_DEFUN(KDE_PAM, [ - AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_RETQUIRE([KDE_CHECK_LIBDL]) AC_ARG_WITH(pam, [ --with-pam[=ARG] enable support for PAM: ARG=[yes|no|service name]], @@ -3630,13 +3630,13 @@ You may want to enforce it by using --with-pam.]) ]) if test -n "$$3_PAM_SERVICE"; then AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE]) - AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) + AC_DEFINE_UNTQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2]) fi AC_SUBST($3_PAM_SERVICE) ]) AC_DEFUN(KDE_SHADOWPASSWD, [ - AC_REQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_PAM]) AC_CHECK_LIB(shadow, getspent, [ LIBSHADOW="-lshadow" @@ -3693,9 +3693,9 @@ AC_DEFUN(KDE_SHADOWPASSWD, [ ]) AC_DEFUN(KDE_PASSWDLIBS, [ - AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT - AC_REQUIRE([KDE_PAM]) - AC_REQUIRE([KDE_SHADOWPASSWD]) + AC_RETQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT + AC_RETQUIRE([KDE_PAM]) + AC_RETQUIRE([KDE_SHADOWPASSWD]) if test "x$use_pam" = "xyes"; then PASSWDLIBS="$PAMLIBS" @@ -3758,11 +3758,11 @@ if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then fi if test "$ac_cv_have_dlfcn" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) + AC_DEFINE_UNTQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn]) fi if test "$ac_cv_have_shload" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) + AC_DEFINE_UNTQUOTED(HAVE_SHLOAD, 1, [Define if you have shload]) fi if test "$enable_dlopen" = no ; then @@ -3781,7 +3781,7 @@ AC_MSG_CHECKING([dynamic loading]) eval "`egrep '^build_libtool_libs=' libtool`" if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then dynamic_loading=yes - AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING) + AC_DEFINE_UNTQUOTED(HAVE_DYNAMIC_LOADING) else dynamic_loading=no fi @@ -3833,8 +3833,8 @@ fi AC_DEFUN(KDE_CHECK_MICO, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_MISC_TESTS]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_MISC_TESTS]) AC_MSG_CHECKING(for MICO) if test -z "$MICODIR"; then @@ -3942,7 +3942,7 @@ AC_SUBST(idldir) AC_DEFUN(KDE_CHECK_MINI_STL, [ -AC_REQUIRE([KDE_CHECK_MICO]) +AC_RETQUIRE([KDE_CHECK_MICO]) AC_MSG_CHECKING(if we use mico's mini-STL) AC_CACHE_VAL(kde_cv_have_mini_stl, @@ -4047,8 +4047,8 @@ AC_DEFUN(KDE_CHECK_PTHREAD_OPTION, AC_DEFUN(KDE_CHECK_THREADING, [ - AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) - AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION]) + AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) + AC_RETQUIRE([KDE_CHECK_PTHREAD_OPTION]) dnl default is yes if libpthread is found and no if no libpthread is available if test -z "$LIBPTHREAD"; then if test -z "$USE_THREADS"; then @@ -4143,9 +4143,9 @@ AC_MSG_RESULT($ac_python_dir) AC_DEFUN(KDE_CHECK_PYTHON_INTERN, [ -AC_REQUIRE([KDE_CHECK_LIBDL]) -AC_REQUIRE([KDE_CHECK_LIBPTHREAD]) -AC_REQUIRE([KDE_CHECK_PYTHON_DIR]) +AC_RETQUIRE([KDE_CHECK_LIBDL]) +AC_RETQUIRE([KDE_CHECK_LIBPTHREAD]) +AC_RETQUIRE([KDE_CHECK_PYTHON_DIR]) if test -z "$1"; then version="1.5" @@ -4257,7 +4257,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_sgi) if test "$kde_cv_stl_type_sgi" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) + AC_DEFINE_UNTQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI]) fi ]) @@ -4279,7 +4279,7 @@ using namespace std; AC_MSG_RESULT($kde_cv_stl_type_hp) if test "$kde_cv_stl_type_hp" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) + AC_DEFINE_UNTQUOTED(HAVE_HP_STL, 1, [Define if you have a STL implementation by HP]) fi ]) @@ -4303,9 +4303,9 @@ AC_DEFUN(KDE_CHECK_STL, AC_LANG_RESTORE ]) -AC_DEFUN(AC_FIND_QIMGIO, - [AC_REQUIRE([AC_FIND_JPEG]) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_DEFUN(AC_FIND_TQIMGIO, + [AC_RETQUIRE([AC_FIND_JPEG]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) AC_MSG_CHECKING([for qimgio]) AC_CACHE_VAL(ac_cv_lib_qimgio, [ @@ -4320,7 +4320,7 @@ AC_TRY_RUN(dnl #include <qimageio.h> #include <qstring.h> int main() { - QString t = "hallo"; + TQString t = "hallo"; t.fill('t'); qInitImageIO(); } @@ -4333,10 +4333,10 @@ CXXFLAGS="$ac_save_CXXFLAGS" AC_LANG_RESTORE ])dnl if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then - LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG" + LIBTQIMGIO="-lqimgio -lpng -lz $LIBJPEG" AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available]) - AC_SUBST(LIBQIMGIO) + AC_DEFINE_UNTQUOTED(HAVE_TQIMGIO, 1, [Define if you have the TQt extension qimgio available]) + AC_SUBST(LIBTQIMGIO) else AC_MSG_RESULT(not found) fi @@ -4395,7 +4395,7 @@ AC_DEFUN(AC_CHECK_UTMP_FILE, ]) if test "$kde_cv_utmp_file" != "no"; then - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) + AC_DEFINE_UNTQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) $1 AC_MSG_RESULT($kde_cv_utmp_file) else @@ -4507,7 +4507,7 @@ AC_LANG_RESTORE ]) AC_MSG_RESULT($ac_cv_have_s_issock) if test "$ac_cv_have_s_issock" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) + AC_DEFINE_UNTQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.]) fi AH_VERBATIM(_ISSOCK, @@ -4556,7 +4556,7 @@ rm conftest.* ]) AC_MSG_RESULT($ac_cv_maxpathlen) -AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) +AC_DEFINE_UNTQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] ) ]) AC_DEFUN(KDE_CHECK_HEADER, @@ -4923,12 +4923,12 @@ if test "x$kde_java_bindir" != "xno"; then JAVAC=$kde_java_bindir/javac JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" AC_MSG_RESULT([java JDK in $kde_java_bindir]) else - AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) + AC_DEFINE_UNTQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_MSG_RESULT([java JRE in $kde_java_bindir]) fi else # no @@ -4974,7 +4974,7 @@ fi AC_SUBST(LEXLIB) ]) -AC_DEFUN(AC_PATH_QTOPIA, +AC_DEFUN(AC_PATH_TQTOPIA, [ dnl TODO: use AC_CACHE_VAL @@ -4991,19 +4991,19 @@ AC_DEFUN(AC_PATH_QTOPIA, qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat" qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat" - AC_REQUIRE([AC_PATH_QT]) + AC_RETQUIRE([AC_PATH_QT]) - AC_MSG_CHECKING([for Qtopia]) + AC_MSG_CHECKING([for TQtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) - kde_qtopia_dirs="$QPEDIR /opt/Qtopia" + kde_qtopia_dirs="$TQPEDIR /opt/TQtopia" ac_qtopia_incdir=NO AC_ARG_WITH(qtopia-dir, - [ --with-qtopia-dir=DIR where the root of Qtopia is installed ], + [ --with-qtopia-dir=DIR where the root of TQtopia is installed ], [ ac_qtopia_incdir="$withval"/include] ) qtopia_incdirs="" @@ -5020,17 +5020,17 @@ AC_DEFUN(AC_PATH_QTOPIA, ac_qtopia_incdir="$qtopia_incdir" if test -z "$qtopia_incdir"; then - AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.]) + AC_MSG_ERROR([Cannot find TQtopia headers. Please check your installation.]) fi - qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; - qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; - qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; + qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION "\(.*\)\..*\..*".*,\1,p'`; + qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`; + qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*TQPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`; qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat" qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat" if test "$qtopia_ver" -lt "$qtopia_minver"; then - AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr + AC_MSG_ERROR([found TQtopia version $qtopia_verstr but version $qtopia_minverstr is required.]) fi @@ -5042,8 +5042,8 @@ is required.]) ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" - LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LDFLAGS="$LDFLAGS $TQT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" @@ -5052,7 +5052,7 @@ is required.]) int main( int argc, char **argv ) { - QPEApplication app( argc, argv ); + TQPEApplication app( argc, argv ); return 0; } EOF @@ -5061,7 +5061,7 @@ EOF rm -f conftest* else rm -f conftest* - AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at + AC_MSG_ERROR([Cannot link small TQtopia Application. For more details look at the end of config.log]) fi @@ -5071,8 +5071,8 @@ the end of config.log]) AC_LANG_RESTORE - QTOPIA_INCLUDES="-I$qtopia_incdir" - AC_SUBST(QTOPIA_INCLUDES) + TQTOPIA_INCLUDES="-I$qtopia_incdir" + AC_SUBST(TQTOPIA_INCLUDES) AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir]) ]) @@ -5080,16 +5080,16 @@ the end of config.log]) AC_DEFUN(KDE_INIT_DOXYGEN, [ -AC_MSG_CHECKING([for Qt docs]) +AC_MSG_CHECKING([for TQt docs]) kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR) -AC_MSG_RESULT($QTDOCDIR) +AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], TQTDOCDIR) +AC_MSG_RESULT($TQTDOCDIR) -AC_SUBST(QTDOCDIR) +AC_SUBST(TQTDOCDIR) KDE_FIND_PATH(dot, DOT, [], []) if test -n "$DOT"; then @@ -5107,7 +5107,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) @@ -5203,7 +5203,7 @@ dnl AC_DEFUN(KDE_CHECK_SSL, [ LIBSSL="-lssl -lcrypto" -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([KDE_CHECK_LIB64]) ac_ssl_includes=NO ac_ssl_libraries=NO ssl_libraries="" @@ -5387,8 +5387,8 @@ AC_SUBST(LIBSSL) AC_DEFUN(KDE_CHECK_STRLCPY, [ - AC_REQUIRE([AC_CHECK_STRLCAT]) - AC_REQUIRE([AC_CHECK_STRLCPY]) + AC_RETQUIRE([AC_CHECK_STRLCAT]) + AC_RETQUIRE([AC_CHECK_STRLCPY]) AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(unsigned long) @@ -5441,7 +5441,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)]) # AC_PROG_LIBTOOL # --------------- AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +[AC_RETQUIRE([_AC_PROG_LIBTOOL])dnl dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. AC_PROVIDE_IFELSE([AC_PROG_CXX], @@ -5471,7 +5471,7 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. # _AC_PROG_LIBTOOL # ---------------- AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +[AC_RETQUIRE([AC_LIBTOOL_SETUP])dnl AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl @@ -5491,29 +5491,29 @@ define([AC_PROG_LIBTOOL], []) # ---------------- AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([LT_AC_PROG_SED])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +AC_RETQUIRE([AC_ENABLE_SHARED])dnl +AC_RETQUIRE([AC_ENABLE_STATIC])dnl +AC_RETQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_PROG_LD])dnl +AC_RETQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_RETQUIRE([AC_PROG_NM])dnl +AC_RETQUIRE([LT_AC_PROG_SED])dnl + +AC_RETQUIRE([AC_PROG_LN_S])dnl +AC_RETQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +AC_RETQUIRE([AC_OBJEXT])dnl +AC_RETQUIRE([AC_EXEEXT])dnl dnl AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_PROG_ECHO_BACKSLASH case $host_os in @@ -5632,7 +5632,7 @@ _LT_AC_TAGCONFIG # _LT_AC_SYS_COMPILER # ------------------- AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl +[AC_RETQUIRE([AC_PROG_CC])dnl # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -6063,7 +6063,7 @@ AC_DEFUN([_LT_AC_CHECK_DLFCN], # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : [$4] else @@ -6151,7 +6151,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +[AC_RETQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -6250,7 +6250,7 @@ fi # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -6301,7 +6301,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], # ----------------------------------------- # Check to see if we can do hard links to lock some files if needed AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl +[AC_RETQUIRE([_LT_AC_LOCK])dnl hard_links="nottested" if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then @@ -6891,7 +6891,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then for tagname in $tagnames; do IFS="$lt_save_ifs" # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in "") ;; *) AC_MSG_ERROR([invalid tag name: $tagname]) ;; @@ -7171,9 +7171,9 @@ AC_DEFUN([AC_PROG_LD], [assume the C compiler uses GNU ld @<:@default=no@:>@])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no]) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_RETQUIRE([AC_PROG_CC])dnl +AC_RETQUIRE([AC_CANONICAL_HOST])dnl +AC_RETQUIRE([AC_CANONICAL_BUILD])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -7510,7 +7510,7 @@ NM="$lt_cv_path_NM" # ------------- # check for math library AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl +[AC_RETQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in *-*-beos* | *-*-cygwin* | *-*-pw32*) @@ -7600,15 +7600,15 @@ ifdef([AC_PROVIDE_IFELSE], # -------------- # enable support for C++ libraries AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) +[AC_RETQUIRE([_LT_AC_LANG_CXX]) ])# AC_LIBTOOL_CXX # _LT_AC_LANG_CXX # --------------- AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +[AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) ])# _LT_AC_LANG_CXX @@ -7616,7 +7616,7 @@ AC_REQUIRE([AC_PROG_CXXCPP]) # -------------- # enable support for GCJ libraries AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) +[AC_RETQUIRE([_LT_AC_LANG_GCJ]) ])# AC_LIBTOOL_GCJ @@ -7626,9 +7626,9 @@ AC_DEFUN([_LT_AC_LANG_GCJ], [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) + [ifdef([AC_PROG_GCJ],[AC_RETQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_RETQUIRE([A][M_PROG_GCJ])], + [AC_RETQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ])# _LT_AC_LANG_GCJ @@ -7636,7 +7636,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ], # -------------- # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([AC_PROG_RC]) +[AC_RETQUIRE([AC_PROG_RC]) ])# AC_LIBTOOL_RC @@ -7752,8 +7752,8 @@ CC="$lt_save_CC" AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) +AC_RETQUIRE([AC_PROG_CXX]) +AC_RETQUIRE([AC_PROG_CXXCPP]) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -9112,7 +9112,7 @@ fi # AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) # ------------------------------------------- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_RETQUIRE([_LT_AC_SYS_COMPILER])dnl _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= @@ -9130,9 +9130,9 @@ fi # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) +[AC_RETQUIRE([AC_CANONICAL_HOST]) +AC_RETQUIRE([AC_PROG_NM]) +AC_RETQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. AC_MSG_CHECKING([command to parse $NM output from $compiler object]) AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], @@ -10893,8 +10893,8 @@ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_RETQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_RETQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -10922,12 +10922,12 @@ m4_ifval([$2], AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNTQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNTQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl +AC_RETQUIRE([AM_SANITY_CHECK])dnl +AC_RETQUIRE([AC_ARG_PROGRAM])dnl AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) @@ -10938,8 +10938,8 @@ AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP # We need awk for the "check" target. The system "awk" is bad on # some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_RETQUIRE([AC_PROG_AWK])dnl +AC_RETQUIRE([AC_PROG_MAKE_SET])dnl _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], @@ -10990,7 +10990,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_RETQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.7.2])]) @@ -11127,7 +11127,7 @@ AC_MSG_RESULT(yes)]) # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) +[AC_RETQUIRE([AM_MISSING_HAS_RUN]) $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) @@ -11137,7 +11137,7 @@ AC_SUBST($1)]) # Define MISSING if not defined so far and test if it supports --run. # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +[AC_RETQUIRE([AM_AUX_DIR_EXPAND])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -11235,7 +11235,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # 02111-1307, USA. AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +[AC_RETQUIRE([AM_AUX_DIR_EXPAND])dnl install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) @@ -11266,7 +11266,7 @@ AC_SUBST(install_sh)]) # always use install-sh in `make install-strip', and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +[AC_RETQUIRE([AM_PROG_INSTALL_SH])dnl # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right # tool to use in cross-compilation environments, therefore Automake @@ -11312,15 +11312,15 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # NAME is "CC", "CXX", "GCJ", or "OBJC". # We try a few techniques and use that to set a single cache variable. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# We don't AC_RETQUIRE the corresponding AC_PROG_CC since the latter was # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular # dependency, and given that the user is not expected to run this macro, # just rely on AC_PROG_CC. AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +[AC_RETQUIRE([AM_SET_DEPDIR])dnl +AC_RETQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_RETQUIRE([AM_MAKE_INCLUDE])dnl +AC_RETQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], @@ -11396,7 +11396,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_RETQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], [rm -f .deps 2>/dev/null mkdir .deps 2>/dev/null @@ -11498,7 +11498,7 @@ done # AM_OUTPUT_DEPENDENCY_COMMANDS # ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. +# This macro should only be invoked once -- use via AC_RETQUIRE. # # This code is only required when automatic dependency tracking # is enabled. FIXME. This creates each `.P' file that we will @@ -11598,8 +11598,8 @@ AC_PREREQ(2.50) # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a # "missing" invocation, for better error output. AC_DEFUN([AM_PROG_LEX], -[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl +[AC_RETQUIRE([AM_MISSING_HAS_RUN])dnl +AC_RETQUIRE([AC_PROG_LEX])dnl if test "$LEX" = :; then LEX=${am_missing_run}flex fi]) diff --git a/configure.in b/configure.in index 4d9b50a..46c2dd3 100644 --- a/configure.in +++ b/configure.in @@ -38,7 +38,7 @@ dnl Perform program name transformation AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(PerlQt, 3.008) dnl searches for some needed programs +AM_INIT_AUTOMAKE(PerlTQt, 3.008) dnl searches for some needed programs KDE_SET_PREFIX @@ -69,8 +69,8 @@ dnl AC_DEFUN(AC_BASE_PATH_INSTALL, [ AC_PREREQ([2.13]) -AC_REQUIRE([AC_PATH_QT])dnl -AC_REQUIRE([KDE_CHECK_LIB64]) +AC_RETQUIRE([AC_PATH_QT])dnl +AC_RETQUIRE([KDE_CHECK_LIB64]) AC_CHECK_RPATH dnl PQT @@ -214,7 +214,7 @@ dnl /PQT AC_SUBST(KDE_LDFLAGS) AC_SUBST(KDE_INCLUDES) -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS]) +AC_RETQUIRE([KDE_CHECK_EXTRA_LIBS]) all_libraries="$all_libraries $USER_LDFLAGS" all_includes="$all_includes $USER_INCLUDES" @@ -233,7 +233,7 @@ dnl------------------------------- AC_DEFUN(KDE_CHECK_SMOKE, [ -AC_MSG_CHECKING(for SmokeQt) +AC_MSG_CHECKING(for SmokeTQt) AC_CACHE_VAL(kde_have_smokeqt, [ @@ -318,10 +318,10 @@ dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU> AC_DEFUN(MDL_HAVE_OPENGL, [ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) - AC_REQUIRE([MDL_CHECK_LIBM]) + AC_RETQUIRE([AC_PROG_CC]) + AC_RETQUIRE([AC_PATH_X]) + AC_RETQUIRE([AC_PATH_XTRA]) + AC_RETQUIRE([MDL_CHECK_LIBM]) AC_CACHE_CHECK([for OpenGL], mdl_cv_have_OpenGL, [ @@ -429,7 +429,7 @@ dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU> # AC_CHECK_LIBM - check for math library AC_DEFUN(MDL_CHECK_LIBM, -[AC_REQUIRE([AC_CANONICAL_HOST])dnl +[AC_RETQUIRE([AC_CANONICAL_HOST])dnl LIBM= case "$host" in *-*-beos* | *-*-cygwin*) @@ -462,7 +462,7 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( GL, - [ --disable-GL do not try to compile Qt's OpenGL module in smoke], + [ --disable-GL do not try to compile TQt's OpenGL module in smoke], kde_enable_GL=$enableval, kde_enable_GL=yes ) @@ -489,13 +489,13 @@ AC_SUBST(KDE_HAVE_GL) KDE_CREATE_SUBDIRSLIST AC_SUBST(USE_RPATH) -AC_CONFIG_FILES(PerlQt/Makefile.PL, [cd PerlQt && perl Makefile.PL INSTALLDIRS=vendor && cd ..]) +AC_CONFIG_FILES(PerlTQt/Makefile.PL, [cd PerlTQt && perl Makefile.PL INSTALLDIRS=vendor && cd ..]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([puic/Makefile]) AC_ARG_WITH( threshold, - [ --with-threshold[=ARG] Qt tests threshold ARG=[0..15] Default:14 Lower=more tests], + [ --with-threshold[=ARG] TQt tests threshold ARG=[0..15] Default:14 Lower=more tests], [ qt_test_threshold="$withval" ], [ qt_test_threshold=14 ] ) @@ -1236,7 +1236,7 @@ sub pretty_file_list () # First, loop over the qunks gathering all the tag/branch names. # We'll put them all in non_unanimous_tags, and take out the # unanimous ones later. - QUNKREF: + TQUNKREF: foreach my $qunkref (@qunkrefs) { # Keep track of whether all the files in this commit were in the @@ -2265,7 +2265,7 @@ on getting anonymous CVS access to this script. Maintainer: Karl Fogel <kfogel@red-bean.com> Please report bugs to <bug-cvs2cl@red-bean.com>. -=head1 PREREQUISITES +=head1 PRERETQUISITES This script requires C<Text::Wrap>, C<Time::Local>, and C<File::Basename>. diff --git a/doc/en/Makefile b/doc/en/Makefile index 1d300c0..536536a 100644 --- a/doc/en/Makefile +++ b/doc/en/Makefile @@ -1,6 +1,6 @@ -index.html: PerlQt.pod - pod2html --css ../css/pod.css PerlQt.pod > index.html +index.html: PerlTQt.pod + pod2html --css ../css/pod.css PerlTQt.pod > index.html perl -pi -e 's/cgibin/cgi-bin/' index.html perl -pi -e 's/#http/http/g' index.html rm -f pod2*~~ diff --git a/doc/en/PerlQt.pod b/doc/en/PerlQt.pod index b05a0a9..5593aa9 100644 --- a/doc/en/PerlQt.pod +++ b/doc/en/PerlQt.pod @@ -1,39 +1,39 @@ -=head1 Programming PerlQt +=head1 Programming PerlTQt B<Germain Garand> -This document describes a set of Perl bindings for the Qt toolkit. Contact +This document describes a set of Perl bindings for the TQt toolkit. Contact the author at <germain@ebooksfrance.com> =head1 Introduction -PerlQt-3 is Ashley Winters' full featured object oriented interface to -L<Trolltech|"http://www.trolltech.com">'s C++ Qt toolkit v3.0. +PerlTQt-3 is Ashley Winters' full featured object oriented interface to +L<Trolltech|"http://www.trolltech.com">'s C++ TQt toolkit v3.0. It is based on the L<SMOKE|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> -library, a language independent low-level wrapper generated from Qt headers by +library, a language independent low-level wrapper generated from TQt headers by Richard Dale's L<kalyptus|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/kalyptus"> thanks to David Faure's module. -This document describes the principles of PerlQt programming. +This document describes the principles of PerlTQt programming. It assumes you have some basic Perl Object Oriented programming knowledge. Some C++ knowledge is recommended but not required. -It would mostly help you to find your way through L<Qt's +It would mostly help you to find your way through L<TQt's excellent documentation|"http://doc.trolltech.com"> which is our ultimate and only reference. -If Qt is installed on your system, then you most probably -also have its documentation. Try the C<$QTDIR/bin/assistant> program. +If TQt is installed on your system, then you most probably +also have its documentation. Try the C<$TQTDIR/bin/assistant> program. =head1 Installation =head2 Requirements -To compile and use PerlQt, you'll need : +To compile and use PerlTQt, you'll need : =over 4 @@ -51,25 +51,25 @@ L<Perl E<gt>= v5.6.0|"http://www.perl.org"> =item * -L<Qt E<gt>= +L<TQt E<gt>= v3.0|"http://www.trolltech.com/developer/download/qt-x11.html"> =item * -L<SmokeQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> +L<SmokeTQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> The SMOKE library (Scripting Meta Object Kompiler) is part of L<KDE|"http://www.kde.org">'s B<kdebindings> module. You may want to check if a precompiled version of this module exists for your system. -PerlQt is packaged with its own copy, so you don't need to check it out. +PerlTQt is packaged with its own copy, so you don't need to check it out. =back -Perl and Qt's installation is out of the scope of this document. Please refer +Perl and TQt's installation is out of the scope of this document. Please refer to those projects' documentation. =head2 Compilation -PerlQt uses GNU's Autoconf framework. However, the standard ./configure script is preferably driven +PerlTQt uses GNU's Autoconf framework. However, the standard ./configure script is preferably driven by the Makefile.PL wrapper. All options are forwarded to ./configure : perl Makefile.PL @@ -81,7 +81,7 @@ Then : make install -This will install PerlQt, Puic and Smoke (if needed), as well as the pqtsh and pqtapi utilities. +This will install PerlTQt, Puic and Smoke (if needed), as well as the pqtsh and pqtapi utilities. The preferred install location for SMOKE and Puic is in the KDE3 file system. If you don't have KDE3 installed, specify a location with C<configure>'s @@ -91,13 +91,13 @@ C<--prefix> option. e.g: =head2 Troubleshooting and Configure Options -If Smoke's linking fails or your Qt library was built with very specific +If Smoke's linking fails or your TQt library was built with very specific options, run Makefile.PL again with: perl Makefile.PL --with-threshold=0 When building smoke, configure will check for OpenGL and try to compile -support for it if it is properly installed and supported by Qt. +support for it if it is properly installed and supported by TQt. You may disable this checking with: @@ -110,9 +110,9 @@ it, specify: --without-Mesa -=head2 How to install PerlQt with user rights +=head2 How to install PerlTQt with user rights -To install PerlQt without super-user rights, simply follow this procedure: +To install PerlTQt without super-user rights, simply follow this procedure: =over 4 @@ -128,11 +128,11 @@ The above would install the Smoke library in ~/lib and the puic binary in ~/bin Reconfigure the Perl module so that it doesn't target the standard perl hierarchy: - cd PerlQt + cd PerlTQt perl Makefile.PL PREFIX=~ cd .. -Beware : this is not the same Makefile.PL as above, but the one located in the ./PerlQt +Beware : this is not the same Makefile.PL as above, but the one located in the ./PerlTQt subdirectory =item * @@ -154,9 +154,9 @@ or at the top of your program: =back -=head1 Anatomy of PerlQt +=head1 Anatomy of PerlTQt -A typical Qt program using GUI components is based on an event loop. +A typical TQt program using GUI components is based on an event loop. This basically means that such a program is no more envisioned as a straight flow where you would need to handle yourself every single events (such as a @@ -168,15 +168,15 @@ define what objects methods need to be called when an event occurs, and then start the main event loop. That's all! -Qt will handle all events and dispatch them to the correct subroutine. +TQt will handle all events and dispatch them to the correct subroutine. -Lets see how this process is implemented in a minimal PerlQt program. +Lets see how this process is implemented in a minimal PerlTQt program. =head2 Hello World - 1: use Qt; - 2: my $a = Qt::Application(\@ARGV); - 3: my $hello = Qt::PushButton("Hello World!", undef); + 1: use TQt; + 2: my $a = TQt::Application(\@ARGV); + 3: my $hello = TQt::PushButton("Hello World!", undef); 4: $hello->resize(160, 25); 5: $a->setMainWidget($hello); 6: $hello->show; @@ -186,16 +186,16 @@ Lets see how this process is implemented in a minimal PerlQt program. <br/> <div class='image'><img src="../images/ex1.png"/></div> -This program first loads the Qt interface [line 1] and creates the application +This program first loads the TQt interface [line 1] and creates the application object, passing it a reference to the command line arguments array C<@ARGV> [l.2]. This application object is unique, and may later be accessed from -anywhere through the B<Qt::app()> pointer. +anywhere through the B<TQt::app()> pointer. At line 3, we create a PushButton, which has no parent (i.e : it won't be contained nor owned by another widget). Therefore, we pass to the constructor an B<undef> value for the parent argument, -which is PerlQt's way of passing a Null pointer. +which is PerlTQt's way of passing a Null pointer. After some layouting at [l.4], we tell the application object that our main widget is this PushButton [l.5]... that way, it will know that closing the @@ -211,51 +211,51 @@ B<Syntax elements summary :> =item 1 -All Qt classes are accessed through the prefix B<Qt::>, which replaces the -initial B<Q> of Qt classes. -When browsing the L<Qt +All TQt classes are accessed through the prefix B<TQt::>, which replaces the +initial B<Q> of TQt classes. +When browsing the L<TQt documentation|"http://doc.trolltech.com>, you simply need to change the -name of classes so that B<QFoo> reads B<Qt::Foo>. +name of classes so that B<TQFoo> reads B<TQt::Foo>. =item 2 An object is created by calling the B<constructor> of the class. It has the same name as the class itself. -You don't need to say C<new Qt::Foo> or C<Qt::Foo-E<gt>new()> as most Perl +You don't need to say C<new TQt::Foo> or C<TQt::Foo-E<gt>new()> as most Perl programmers would have expected. Instead, you just say : - my $object = Qt::<classname>(arg_1, ..., arg_n); + my $object = TQt::<classname>(arg_1, ..., arg_n); If you don't need to pass any argument to the constructor, simply say : - my $object = Qt::<classname>; + my $object = TQt::<classname>; =item 3 Whenever you need to pass a Null pointer as an argument, use Perl's B<undef> keyword. Do not pass zero. - Beware: this is by far the most common error in PerlQt programs. + Beware: this is by far the most common error in PerlTQt programs. Pointers are arguments preceded by an B<*> -character in Qt's documentation (e.g: "C<QWidget * widget>"). +character in TQt's documentation (e.g: "C<TQWidget * widget>"). =back =head2 Inheritance and Objects -Before we can discuss how Perl subroutines can be called back from Qt, we need -to introduce PerlQt's inheritance mechanism. +Before we can discuss how Perl subroutines can be called back from TQt, we need +to introduce PerlTQt's inheritance mechanism. -PerlQt was designed to couple as tightly as possible Qt's simplicity and Perl's +PerlTQt was designed to couple as tightly as possible TQt's simplicity and Perl's power and flexibility. In order to achieve that goal, the classical Object Oriented Perl paradigm had -to be extended, much in the same way than Qt itself +to be extended, much in the same way than TQt itself had to extend C++'s paradigm with B<metaobjects>. =head3 A Custom Widget @@ -266,8 +266,8 @@ of PushButton: 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); 6: 7: sub NEW 8: { @@ -279,29 +279,29 @@ of PushButton: 14: 15: package main; 16: - 17: use Qt; + 17: use TQt; 18: use Button; 19: - 20: my $a = Qt::Application(\@ARGV); + 20: my $a = TQt::Application(\@ARGV); 21: my $w = Button("Hello World!", undef); 22: $a->setMainWidget($w); 23: $w->show; 24: exit $a->exec; Here, we want to create our own version of the PushButton widget. -Therefore, we create a new package for it [l.3] and import Qt [l.4]. +Therefore, we create a new package for it [l.3] and import TQt [l.4]. We now want to declare our widget as subclassing PushButton. -This is done through the use of the C<Qt::isa> pragma [l.5], which accepts a -list of one or more parent Qt classes. +This is done through the use of the C<TQt::isa> pragma [l.5], which accepts a +list of one or more parent TQt classes. It is now time to create a B<constructor> for our new widget. This is done by creating a subroutine called B<NEW> I<(note the capitalized -form, which differentate it from the usual "new" constructor. PerlQt's NEW +form, which differentate it from the usual "new" constructor. PerlTQt's NEW constructor is called >B<implicitly>I< as can be seen on line 21)>. Since we want our widget to call its parent's constructor first, we call the -B<superclass's constructor> (here: Qt::PushButton) on line 9, passing it all +B<superclass's constructor> (here: TQt::PushButton) on line 9, passing it all arguments we received. At this time, a class instance has been created and stored into a special @@ -316,7 +316,7 @@ When building a new composite widget, you may just create its different parts inside B<my> variables, since widgets are only deleted by their parents and not necessarily when their container goes out of scope. -In other words, PerlQt performs clever reference counting to prevent +In other words, PerlTQt performs clever reference counting to prevent indesirable deletion of objects. Now, you'll often want to keep an access to those parts from anywhere inside @@ -328,15 +328,15 @@ checking... Here come B<Attributes>. Attributes are data holders where you can store any kind of properties for your object. -Declaring new attributes is done through the C<use Qt::attributes> pragma, as is +Declaring new attributes is done through the C<use TQt::attributes> pragma, as is demonstrated in the following package implementation : 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw( + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw( 7: itsTime 8: pData 9: ); @@ -344,7 +344,7 @@ demonstrated in the following package implementation : 11: sub NEW 12: { 13: shift->SUPER::NEW(@_[0..2]); - 14: itsTime = Qt::Time; + 14: itsTime = TQt::Time; 15: itsTime->start; 16: pData = " Foo "; 17: } @@ -362,7 +362,7 @@ demonstrated in the following package implementation : <div class='image'><img src="../images/ex2.png"/></div> -An attribute itsTime is declared at line 7, and loaded with a C<Qt::Time> object +An attribute itsTime is declared at line 7, and loaded with a C<TQt::Time> object at line 14. Since we reimplement the virtual function "resizeEvent" [l.19]. @@ -376,11 +376,11 @@ B<Recapitulation> =item * -In order to inherit a Qt class, a package must contain a -C<use Qt::isa> pragma. +In order to inherit a TQt class, a package must contain a +C<use TQt::isa> pragma. e.g: - use Qt::isa "Qt::widget"; + use TQt::isa "TQt::widget"; =item * @@ -441,7 +441,7 @@ construct is also available, but will pass the object as first argument. Whenever you need to store a contained object in your package, you may define it as an B<Attribute> : - use Qt::attributes qw( + use TQt::attributes qw( firstAttribute ... lastAttribute); @@ -456,21 +456,21 @@ and then use it as a convenient accessor : To reimplement a B<virtual function>, simply create a B<sub> with the same name in your object. -Existing virtual functions are marked as such in Qt's documentation +Existing virtual functions are marked as such in TQt's documentation (they are prefixed with the "virtual" keyword). -You can inspect what virtual function names are being called by Qt at runtime by -putting a C<use Qt::debug qw( virtual )> statement at the top of your program. +You can inspect what virtual function names are being called by TQt at runtime by +putting a C<use TQt::debug qw( virtual )> statement at the top of your program. =back =head2 Signals and Slots -We'll now learn how Qt objects can communicate with each other, +We'll now learn how TQt objects can communicate with each other, allowing an event occuring, for instance, in a given widget to trigger the execution of one or several subroutines anywhere inside your program. -Most other toolkits use callbacks for that purpose, but Qt has a much more +Most other toolkits use callbacks for that purpose, but TQt has a much more powerful and flexible mechanism called B<Signals and Slots>. Signals and slots are used for communication between objects. @@ -482,23 +482,23 @@ recorder deck can start to record when it receives a signal wired to it's input slot, and it doesn't need to know that this signal is also received by a CD recorder device, or listened through headphones. -A Qt component behaves just like that. It has several output B<Signals> and +A TQt component behaves just like that. It has several output B<Signals> and several input B<Slots> - and each signal can be connected to an unlimited number of listening slots of the same type, wether they are inside or outside the component. The general syntax of this connection process is either : -Qt::Object::connect( sender, SIGNAL 'mysignal(arg_type)', -receiver, SLOT 'myslot(arg_type)'); +TQt::Object::connect( sender, TQT_SIGNAL 'mysignal(arg_type)', +receiver, TQT_SLOT 'myslot(arg_type)'); or -myObject->connect( sender, SIGNAL 'mysignal(arg_type)', SLOT +myObject->connect( sender, TQT_SIGNAL 'mysignal(arg_type)', TQT_SLOT 'myslot(arg_type)'); This mechanism can be extended at will by the declaration of custom Signals and -Slots, through the C<use Qt::signals> and C<use Qt::slots> pragma +Slots, through the C<use TQt::signals> and C<use TQt::slots> pragma (see also the other syntax, later on). Each declared slot will call the corresponding subroutine in your object, @@ -509,22 +509,22 @@ B<As an example, lets rewrite again our Button package :> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw(itsTime); - 7: use Qt::slots + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw(itsTime); + 7: use TQt::slots 8: wasClicked => [], 9: change => ['int', 'int']; - 10: use Qt::signals + 10: use TQt::signals 11: changeIt => ['int', 'int']; 12: 13: sub NEW 14: { 15: shift->SUPER::NEW(@_[0..2]); - 16: itsTime = Qt::Time; + 16: itsTime = TQt::Time; 17: itsTime->start; - 18: this->connect(this, SIGNAL 'clicked()', SLOT 'wasClicked()'); - 19: this->connect(this, SIGNAL 'changeIt(int,int)', SLOT 'change(int,int)'); + 18: this->connect(this, TQT_SIGNAL 'clicked()', TQT_SLOT 'wasClicked()'); + 19: this->connect(this, TQT_SIGNAL 'changeIt(int,int)', TQT_SLOT 'change(int,int)'); 20: } 21: 22: sub wasClicked @@ -545,7 +545,7 @@ B<As an example, lets rewrite again our Button package :> In this package, we define two extra slots and one extra signal. -We know from the Qt Documentation that a clicked PushButton emits a C<clicked()> +We know from the TQt Documentation that a clicked PushButton emits a C<clicked()> signal, so we connect it to our new slot at line 18. We also connect our signal C<changeIt> to our own C<change> slot- which is @@ -556,9 +556,9 @@ triggers the C<wasClicked()> slot. C<wasClicked> then proceeds to emit the C<changeIt(int,int)> signal [l.27], hence triggering the C<change(int,int)> slot with two arguments. -Finally, since PerlQt-3.008, an alternative syntax can be used to declare Signals and Slots: +Finally, since PerlTQt-3.008, an alternative syntax can be used to declare Signals and Slots: - sub a_slot : SLOT(int, QString) + sub a_slot : TQT_SLOT(int, TQString) { $int = shift; $string = shift; @@ -567,19 +567,19 @@ Finally, since PerlQt-3.008, an alternative syntax can be used to declare Signal and - sub a_signal : SIGNAL(QString); + sub a_signal : TQT_SIGNAL(TQString); This syntax is perfectly compatible with the traditional -C<use Qt::signals> and C<use Qt::slots> declarations. +C<use TQt::signals> and C<use TQt::slots> declarations. Eventually, it can prove good programming practice to mix both syntaxes, by first declaring -Signals/Slots with C<use Qt::slots/signals>, then repeat this declaration +Signals/Slots with C<use TQt::slots/signals>, then repeat this declaration in the actual implementation with the second syntax. Declarations will be checked for consistency at compile time, and any mismatch in arguments would trigger a warning. -=head1 RAD prototyping with Qt Designer and Puic +=head1 RAD prototyping with TQt Designer and Puic =head2 Introduction @@ -587,27 +587,27 @@ in arguments would trigger a warning. =item * Note: -As of PerlQt-3.008, a separate PerlQt plugin for Qt Designer is available, -bringing full integration, syntax highlighting, code completion and allowing to run/debug your PerlQt project +As of PerlTQt-3.008, a separate PerlTQt plugin for TQt Designer is available, +bringing full integration, syntax highlighting, code completion and allowing to run/debug your PerlTQt project entirely from the Designer GUI. Nevertheless, the below is still accurate with regard to puic command line interaction -and with regard to using Qt Designer I<without> the specific plugin. +and with regard to using TQt Designer I<without> the specific plugin. =back -As efficient and intuitive as Qt can be, building a complete GUI from scratch +As efficient and intuitive as TQt can be, building a complete GUI from scratch is often a tedious task. -Hopefully, Qt comes with a very sophisticated GUI Builder named Qt +Hopefully, TQt comes with a very sophisticated GUI Builder named TQt Designer, which is close to a complete integrated development environment. It features Project management, drag'n drop GUI building, a complete object browser, graphical interconnection of signals and slots, and much much more. -Qt Designer's output is XML which can be parsed by several command line tools, -among whose is B<puic> (the PerlQt User Interface Compiler). +TQt Designer's output is XML which can be parsed by several command line tools, +among whose is B<puic> (the PerlTQt User Interface Compiler). Assuming you have already built an interface file with the Designer, -translating it to a PerlQt program is simply a matter of issuing +translating it to a PerlTQt program is simply a matter of issuing one command : puic -x -o program.pl program.ui @@ -632,7 +632,7 @@ If you need to B<embed images or icons>, it can be done in two ways =item * Inline embedding For this, you need to check the "Edit->Form Settings->Pixmaps->Save inline" -checkbox inside Qt Designer. +checkbox inside TQt Designer. Then : puic -x -o F<program.pl> F<program.ui> =item * Image Collection @@ -643,7 +643,7 @@ puic -o F<Collection.pm> -embed F<unique_identifier> F<image-1> ... F<image-n> Then add a C<use Collection.pm> statement to your program's main package. -If you've created a project file in Qt Designer, and added all images +If you've created a project file in TQt Designer, and added all images you want to group (through "Project->Image Collection"), you'll find all those images inside the directory where your project file (*.pro) is stored, under /images. @@ -671,7 +671,7 @@ Instead, you may : =item * Write slots implementation in the Designer -In Qt Designer, select the I<Source> tab of the B<Object Explorer>. +In TQt Designer, select the I<Source> tab of the B<Object Explorer>. There you can see a tree-like representation of your classes. Now if you double-click on the I<Slots/public> entry, you are prompted with a dialog where you can create a new custom slot for @@ -744,8 +744,8 @@ or =head1 More development tools -PerlQt comes bundled with two simple programs that can help you to find your way through -the Qt API: +PerlTQt comes bundled with two simple programs that can help you to find your way through +the TQt API: =head2 pqtapi @@ -756,14 +756,14 @@ pqtapi is a commandline driven introspection tool. options: -r <re> : find all functions matching regular expression/keyword <re> -i : together with -r, performs a case insensitive search - -v : print PerlQt and Qt versions + -v : print PerlTQt and TQt versions -h : print this help message e.g: $>pqtapi -ir 'setpoint.* int' - void QCanvasLine::setPoints(int, int, int, int) - void QPointArray::setPoint(uint, int, int) + void TQCanvasLine::setPoints(int, int, int, int) + void TQPointArray::setPoint(uint, int, int) =head2 pqtsh @@ -780,7 +780,7 @@ Templated classes aren't available yet (classes derived from templated classes a =head1 Credits -PerlQt-3 is (c) 2002 Ashley Winters (and (c) 2003 Germain Garand) +PerlTQt-3 is (c) 2002 Ashley Winters (and (c) 2003 Germain Garand) Kalyptus and the Smoke generation engine are (c) David Faure and Richard Dale @@ -791,9 +791,9 @@ The mentioned software is released under the GNU Public Licence v.2 or later. =head1 Appendix 1 : C++ conventions and their Perl counterpart -Whenever you want to use a class/method described in Qt's -L<documentation|"http://doc.trolltech.com"> (see also the 'assistant' program bundled with Qt) -from PerlQt, you need to follow some simple translation rules. +Whenever you want to use a class/method described in TQt's +L<documentation|"http://doc.trolltech.com"> (see also the 'assistant' program bundled with TQt) +from PerlTQt, you need to follow some simple translation rules. =over 4 @@ -803,9 +803,9 @@ from PerlQt, you need to follow some simple translation rules. =item * -All classnames are changed from a B<Q> prefix in Qt to a B<Qt::> prefix +All classnames are changed from a B<Q> prefix in TQt to a B<TQt::> prefix in Perl. -e.g: QComboBox is named Qt::ComboBox within PerlQt. +e.g: TQComboBox is named TQt::ComboBox within PerlTQt. =back @@ -816,15 +816,15 @@ e.g: QComboBox is named Qt::ComboBox within PerlQt. =item * Functions referenced as B<static> are accessed directly, and not through -an object. Thus the static function Foo in class QBar would be accessed from -PerlQt as +an object. Thus the static function Foo in class TQBar would be accessed from +PerlTQt as - Qt::Bar::Foo( arg-1,...,arg-n); + TQt::Bar::Foo( arg-1,...,arg-n); The only notable exceptions are : - qApp() will map to Qt::app() - qVersion() will map to Qt::version() # not really needed anymore: we have qVersion(). See Global Functions below. + qApp() will map to TQt::app() + qVersion() will map to TQt::version() # not really needed anymore: we have qVersion(). See Global Functions below. =item * @@ -834,7 +834,7 @@ e.g: $widget->show; -There are no fundamental differences between methods and signals, however PerlQt +There are no fundamental differences between methods and signals, however PerlTQt provides the B<emit> keyword as a convenient mnemonic, so that it is clear you are emitting a signal : @@ -849,17 +849,17 @@ are emitting a signal : =item * By value When an argument isn't preceded by the B<&> or B<*> character, it is passed by -value. For all basic types such as int, char, float and double, PerlQt will +value. For all basic types such as int, char, float and double, PerlTQt will automatically convert litteral and scalar values to the corresponding C++ type. Thus for a constructor prototype written as follow in the documentation : - QSize ( int w, int h ) + TQSize ( int w, int h ) You'd say : - Qt::Size(8, 12); + TQt::Size(8, 12); =item * By reference @@ -868,12 +868,12 @@ When an argument is preceded by the B<&> character, it means a reference to an object or to a type is expected. You may either provide a variable name or a temporary object : - $keyseq = Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $keyseq = TQt::keySequence( &TQt::CTRL + &TQt::F3 ); $widget->setAccel( $keyseq ); or - $widget->setAccel(Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $widget->setAccel(TQt::keySequence( &TQt::CTRL + &TQt::F3 ); If the argument isn't qualified as B<const> (constant), it means the passed object may be altered during the process - you must then provide a variable. @@ -902,7 +902,7 @@ where C<Strange> is the generic enumeration name, and C<Apple>, C<Orange>, C<Lemon> its possible values, which are only aliases for numbers (here 0, 1 and 2). -Access to enumerations values in Perl Qt is very similar to a static function +Access to enumerations values in Perl TQt is very similar to a static function call. In fact, it B<is> a static function call. Therefore, since you probably want to avoid some readability problems, we @@ -910,110 +910,110 @@ recommend the use of the alternate function call syntax : C<&function>. Lets now go back to our C<Strange> example. -If its definition was encountered in the class C<QFruits>, you'd write from -PerlQt : +If its definition was encountered in the class C<TQFruits>, you'd write from +PerlTQt : - $apple_plus_orange = &Qt::Fruit::Apple + &Qt::Fruit::Orange; + $apple_plus_orange = &TQt::Fruit::Apple + &TQt::Fruit::Orange; =item Operators -Within PerlQt, B<operators overloading> works transparently. -If a given operator is overloaded in a Qt class (which means using it triggers a custom method) -it will behave identically in PerlQt. +Within PerlTQt, B<operators overloading> works transparently. +If a given operator is overloaded in a TQt class (which means using it triggers a custom method) +it will behave identically in PerlTQt. Beware though that due to limitations of the Smoke binding library, not all overloaded operators are -available in PerlQt. +available in PerlTQt. You can check the availability of a given operator by using the pqtapi program. Also, due to outstanding differences between C++'s and Perl's object paradigm, the copy constructor operator (a.k.a '=') has been disabled. e.g-1: '+=' overload - $p1 = Qt::Point(10, 10) - $p2 = Qt::Point(30,40) + $p1 = TQt::Point(10, 10) + $p2 = TQt::Point(30,40) $p2 += $p1; # $p2 becomes (40,50) e.g-2: '<<' overload - $f = Qt::File("example"); + $f = TQt::File("example"); $f->open( IO_WriteOnly ); # see 'Constants' below - $s = Qt::TextStream( $f ); + $s = TQt::TextStream( $f ); $s << "What can I do with " << 12 << " apples?"; =item Constants -Qt doesn't use many constants, but there is at least one place where they are used : for setting +TQt doesn't use many constants, but there is at least one place where they are used : for setting Input/Output flags on files. -In order to avoid the namespace pollution induced by global constants, PerlQt group them in the B<Qt::constants> module. +In order to avoid the namespace pollution induced by global constants, PerlTQt group them in the B<TQt::constants> module. For instance, requesting the importation of all IO constants into the current namespace would be done with: - use Qt::constants; + use TQt::constants; You may also import specific symbols: - use Qt::constants qw( IO_ReadOnly IO_WriteOnly ); + use TQt::constants qw( IO_ReadOnly IO_WriteOnly ); =item Global Functions -Qt has also some utilitarian functions such as bitBlt, qCompress, etc. +TQt has also some utilitarian functions such as bitBlt, qCompress, etc. Those were global scope functions and have been grouped in a common namespace: -C<Qt::GlobalSpace>. +C<TQt::GlobalSpace>. Hence, you shall access this namespace either with a fully qualified call: - Qt::GlobalSpace::qUncompress( $buffer ) + TQt::GlobalSpace::qUncompress( $buffer ) Or directly, after importation in the current namespace: - use Qt::GlobalSpace; + use TQt::GlobalSpace; qUncompress( $buffer ) Of course, you may selectively import a few functions: - use Qt::GlobalSpace qw( qUncompress bitBlt ) + use TQt::GlobalSpace qw( qUncompress bitBlt ) B<Note:> GlobalSpace has also operators, such has the one performing an addition on two -Qt::Point(). Those operators are called automatically. +TQt::Point(). Those operators are called automatically. e.g: - $p1 = Qt::Point(10, 10) + Qt::Point(20, 20) + $p1 = TQt::Point(10, 10) + TQt::Point(20, 20) =back =head1 Appendix 2 : Internationalization -PerlQt handles internationalization by always converting B<QString> back to B<utf8> in Perl. +PerlTQt handles internationalization by always converting B<TQString> back to B<utf8> in Perl. -Conversions from Perl strings to QStrings are made according to context : +Conversions from Perl strings to TQStrings are made according to context : =over 4 =item * If the Perl string is already utf8-encoded -then the string will be converted straight to QString. +then the string will be converted straight to TQString. This is the most convenient and seemless way of internationalizing your application. Typically, one would just enable the use of utf8 in source code with the C<use utf8> pragma and write its application with an utf8 aware editor. =item * If the string isn't tagged as utf8, and the B<use locale> pragma is not set -then the string will be converted to QString's utf8 from B<ISO-Latin-1>. +then the string will be converted to TQString's utf8 from B<ISO-Latin-1>. =item * If the string isn't tagged as utf8 and the B<use locale> pragma is set -then the string will be converted to QString's utf8 according to the currently set B<locale>. +then the string will be converted to TQString's utf8 according to the currently set B<locale>. =back Once a string contains utf8, you can convert it back to any locale by setting up B<converters> : - $tr1=Qt::TextCodec::codecForLocale(); # this one will use current locale - $tr2=Qt::TextCodec::codecForName("KOI8-R"); # that one forces a specific locale (Russian) + $tr1=TQt::TextCodec::codecForLocale(); # this one will use current locale + $tr2=TQt::TextCodec::codecForName("KOI8-R"); # that one forces a specific locale (Russian) - print $tr1->fromUnicode(Qt::DateTime::currentDateTime()->toString)."\n\n"; + print $tr1->fromUnicode(TQt::DateTime::currentDateTime()->toString)."\n\n"; print $tr2->fromUnicode($my_utf8_string); Or, with Perl >= 5.8.0, you may use Perl's B<Encode> modules (see C<perldoc Encode>). @@ -1023,20 +1023,20 @@ Or, with Perl >= 5.8.0, you may use Perl's B<Encode> modules (see C<perldoc Enco Developers who don't want to use UTF-8 or want to temporarily disable UTF-8 marshalling for handling legacy programs may use the B<use bytes> pragma (and the corresponding B<no bytes>). -Within the scope of this pragma, QStrings are marshalled back to ISO-Latin1 (default) or to your locale +Within the scope of this pragma, TQStrings are marshalled back to ISO-Latin1 (default) or to your locale (if B<use locale> has been set). Frivole use of this pragma is strongly discouraged as it ruins worldwide standardization efforts. =head1 Appendix 3 : Debugging Channels -The B<Qt::debug> module offers various debugging channels/features. +The B<TQt::debug> module offers various debugging channels/features. - use Qt::debug; + use TQt::debug; - use Qt::debug qw|calls autoload verbose|; + use TQt::debug qw|calls autoload verbose|; -With the simple C<use Qt::debug> statement, the B<verbose> and B<ambiguous> channels are activated. +With the simple C<use TQt::debug> statement, the B<verbose> and B<ambiguous> channels are activated. If you specify a list of channels within the use statement, then only the specified channels will be enabled. B<Available channels :> @@ -1056,33 +1056,33 @@ Together with B<ambiguous>, tell you the nearest matches in case a method or function call fails. e.g: - use Qt; - use Qt::debug; - $a= Qt::Application(\@ARGV); + use TQt; + use TQt::debug; + $a= TQt::Application(\@ARGV); $a->libraryPath("foo"); --- No method to call for : - QApplication::libraryPath('foo') + TQApplication::libraryPath('foo') Closer candidates are : - static void QApplication::addLibraryPath(const QString&) - static QStringList QApplication::libraryPaths() - static void QApplication::removeLibraryPath(const QString&) - static void QApplication::setLibraryPaths(const QStringList&) + static void TQApplication::addLibraryPath(const TQString&) + static TQStringList TQApplication::libraryPaths() + static void TQApplication::removeLibraryPath(const TQString&) + static void TQApplication::setLibraryPaths(const TQStringList&) =item * calls -For every call, tell what corresponding Qt method is called +For every call, tell what corresponding TQt method is called (detailing the arguments if B<verbose> is on). =item * autoload Track the intermediate code between a method invocation in Perl -and its resolution to either a Qt or Perl call. +and its resolution to either a TQt or Perl call. =item * gc Give informations about garbage collection -whenever a Qt object is deleted and/or a Perl object is destroyed +whenever a TQt object is deleted and/or a Perl object is destroyed =item * virtual @@ -1100,46 +1100,46 @@ Enable all channels A marshaller is a piece of "glue code" translating a given datatype to another. -Within PerlQt, most Qt objects keep their object nature, so that one may invoke methods on them. +Within PerlTQt, most TQt objects keep their object nature, so that one may invoke methods on them. However, some classes and datatypes map so naturally to some Perl types that keeping their object nature would would feel unnatural and clumsy. -For instance, instead of returning a Qt::StringList object, which would require an iterator to retrieve its content, -PerlQt will translate it to an array reference containing all the object's strings. +For instance, instead of returning a TQt::StringList object, which would require an iterator to retrieve its content, +PerlTQt will translate it to an array reference containing all the object's strings. -In the other way, instead of providing a Qt::StringList object as an argument of a method, one would simply +In the other way, instead of providing a TQt::StringList object as an argument of a method, one would simply provide the reference to an array of Perl strings. -Here is the list of Marshallers as of PerlQt-3.008 : +Here is the list of Marshallers as of PerlTQt-3.008 : ----------------------------------------------------------------- float, double <=> Perl real (NV) char, uchar, int, uint, enum long, ulong, short, ushort <=> Perl integer (IV) - QString, -&, -* => Perl string (utf8) - QString, -&, -* <= Perl string (utf8 or iso-latin1 or locale) - QCString, -&, -* <=> Perl string (utf8 or bytes, according to content or "bytes" pragma) - QByteArray, -&, -* <=> Perl string (bytes) - QStringList, -&, -* => Reference to an array of Perl strings (utf8) - QString, -&, -* => Perl string (utf8 or iso-latin1 or locale) + TQString, -&, -* => Perl string (utf8) + TQString, -&, -* <= Perl string (utf8 or iso-latin1 or locale) + TQCString, -&, -* <=> Perl string (utf8 or bytes, according to content or "bytes" pragma) + TQByteArray, -&, -* <=> Perl string (bytes) + TQStringList, -&, -* => Reference to an array of Perl strings (utf8) + TQString, -&, -* => Perl string (utf8 or iso-latin1 or locale) int&, -* <=> Perl integer (IV) bool&, -* <=> Perl boolean char* <=> Perl string (bytes) char** <= Reference to an array of Perl strings (bytes) uchar* <= Perl string (bytes) - QRgb* <= Reference to an array of Perl integers (IV) - QCOORD* <= Reference to an array of Perl integers (IV) + TQRgb* <= Reference to an array of Perl integers (IV) + TQCOORD* <= Reference to an array of Perl integers (IV) void* <=> Reference to a Perl integer (IV) - QValueList<int>, - *, - & <=> Reference to an array of Perl integers (IV) - QCanvasItemList, - *, - & => Reference to an array of Qt::CanvasItem - QWidgetList, - *, - & <=> Reference to an array of Qt::Widget - QObjectList, - *, - & <=> Reference to an array of Qt::Object - QFileInfoList, - *, - & <=> Reference to an array of Qt::FileInfo - QPtrList<QTab>, - *, - & <=> Reference to an array of Qt::Tab - QPtrList<QToolBar>, - *, - & <=> Reference to an array of Qt::ToolBar - QPtrList<QNetworkOperation>, - *, - & <=> Reference to an array of Qt::NetworkOperation - QPtrList<QDockWindow>, - *, - & <=> Reference to an array of Qt::DockWindow - (QUObject*) + TQValueList<int>, - *, - & <=> Reference to an array of Perl integers (IV) + TQCanvasItemList, - *, - & => Reference to an array of TQt::CanvasItem + TQWidgetList, - *, - & <=> Reference to an array of TQt::Widget + TQObjectList, - *, - & <=> Reference to an array of TQt::Object + TQFileInfoList, - *, - & <=> Reference to an array of TQt::FileInfo + TQPtrList<TQTab>, - *, - & <=> Reference to an array of TQt::Tab + TQPtrList<TQToolBar>, - *, - & <=> Reference to an array of TQt::ToolBar + TQPtrList<TQNetworkOperation>, - *, - & <=> Reference to an array of TQt::NetworkOperation + TQPtrList<TQDockWindow>, - *, - & <=> Reference to an array of TQt::DockWindow + (TQUObject*) diff --git a/doc/en/index.html b/doc/en/index.html index 6a4cc7b..4386c5d 100644 --- a/doc/en/index.html +++ b/doc/en/index.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>Programming PerlQt</title> +<title>Programming PerlTQt</title> <link rel="stylesheet" href="../css/pod.css" type="text/css" /> <link rev="made" href="mailto:root@localhost" /> </head> @@ -13,7 +13,7 @@ <ul> - <li><a href="#programming_perlqt">Programming PerlQt</a></li> + <li><a href="#programming_perlqt">Programming PerlTQt</a></li> <li><a href="#introduction">Introduction</a></li> <li><a href="#installation">Installation</a></li> <ul> @@ -21,10 +21,10 @@ <li><a href="#requirements">Requirements</a></li> <li><a href="#compilation">Compilation</a></li> <li><a href="#troubleshooting_and_configure_options">Troubleshooting and Configure Options</a></li> - <li><a href="#how_to_install_perlqt_with_user_rights">How to install PerlQt with user rights</a></li> + <li><a href="#how_to_install_perlqt_with_user_rights">How to install PerlTQt with user rights</a></li> </ul> - <li><a href="#anatomy_of_perlqt">Anatomy of PerlQt</a></li> + <li><a href="#anatomy_of_perlqt">Anatomy of PerlTQt</a></li> <ul> <li><a href="#hello_world">Hello World</a></li> @@ -38,7 +38,7 @@ <li><a href="#signals_and_slots">Signals and Slots</a></li> </ul> - <li><a href="#rad_prototyping_with_qt_designer_and_puic">RAD prototyping with Qt Designer and Puic</a></li> + <li><a href="#rad_prototyping_with_qt_designer_and_puic">RAD prototyping with TQt Designer and Puic</a></li> <ul> <li><a href="#introduction">Introduction</a></li> @@ -74,29 +74,29 @@ <hr /> <p> </p> -<h1><a name="programming_perlqt">Programming PerlQt</a></h1> +<h1><a name="programming_perlqt">Programming PerlTQt</a></h1> <p><strong>Germain Garand</strong></p> -<p>This document describes a set of Perl bindings for the Qt toolkit. Contact +<p>This document describes a set of Perl bindings for the TQt toolkit. Contact the author at <<a href="mailto:germain@ebooksfrance.com">germain@ebooksfrance.com</a>></p> <p> </p> <hr /> <h1><a name="introduction">Introduction</a></h1> -<p>PerlQt-3 is Ashley Winters' full featured object oriented interface to -<a href="http://www.trolltech.com">Trolltech</a>'s C++ Qt toolkit v3.0.</p> +<p>PerlTQt-3 is Ashley Winters' full featured object oriented interface to +<a href="http://www.trolltech.com">Trolltech</a>'s C++ TQt toolkit v3.0.</p> <p>It is based on the <a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SMOKE</a> -library, a language independent low-level wrapper generated from Qt headers by +library, a language independent low-level wrapper generated from TQt headers by Richard Dale's <a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/kalyptus">kalyptus</a> thanks to David Faure's module.</p> -<p>This document describes the principles of PerlQt programming. +<p>This document describes the principles of PerlTQt programming. It assumes you have some basic Perl Object Oriented programming knowledge.</p> <p>Some C++ knowledge is recommended but not required. -It would mostly help you to find your way through <a href="http://doc.trolltech.com">Qt's excellent documentation</a> which is our +It would mostly help you to find your way through <a href="http://doc.trolltech.com">TQt's excellent documentation</a> which is our ultimate and only reference. -If Qt is installed on your system, then you most probably -also have its documentation. Try the <code>$QTDIR/bin/assistant</code> program.</p> +If TQt is installed on your system, then you most probably +also have its documentation. Try the <code>$TQTDIR/bin/assistant</code> program.</p> <p> </p> <hr /> @@ -104,7 +104,7 @@ also have its documentation. Try the <code>$QTDIR/bin/assistant</code> program.< <p> </p> <h2><a name="requirements">Requirements</a></h2> -<p>To compile and use PerlQt, you'll need :</p> +<p>To compile and use PerlTQt, you'll need :</p> <ul> <li></li> a POSIX system @@ -116,21 +116,21 @@ GNU tools : automake(>=1.5), autoconf (>=2.13), aclocal... <a href="http://www.perl.org">Perl >= v5.6.0</a> <p></p> <li></li> -<a href="http://www.trolltech.com/developer/download/qtx11.html">Qt >= v3.0</a> +<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt >= v3.0</a> <p></p> <li></li> -<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a> +<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a> The SMOKE library (Scripting Meta Object Kompiler) is part of <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong> module. You may want to check if a precompiled version of this module exists for your system. -PerlQt is packaged with its own copy, so you don't need to check it out. +PerlTQt is packaged with its own copy, so you don't need to check it out. <p></p></ul> -<p>Perl and Qt's installation is out of the scope of this document. Please refer +<p>Perl and TQt's installation is out of the scope of this document. Please refer to those projects' documentation.</p> <p> </p> <h2><a name="compilation">Compilation</a></h2> -<p>PerlQt uses GNU's Autoconf framework. However, the standard ./configure script is preferably driven +<p>PerlTQt uses GNU's Autoconf framework. However, the standard ./configure script is preferably driven by the Makefile.PL wrapper. All options are forwarded to ./configure :</p> <pre> perl Makefile.PL</pre> @@ -140,7 +140,7 @@ Then :</p> make</pre> <pre> make install</pre> -<p>This will install PerlQt, Puic and Smoke (if needed), as well as the pqtsh and pqtapi utilities.</p> +<p>This will install PerlTQt, Puic and Smoke (if needed), as well as the pqtsh and pqtapi utilities.</p> <p>The preferred install location for SMOKE and Puic is in the KDE3 file system. If you don't have KDE3 installed, specify a location with <code>configure</code>'s <code>--prefix</code> option. e.g:</p> @@ -149,12 +149,12 @@ If you don't have KDE3 installed, specify a location with <code>configure</code> <p> </p> <h2><a name="troubleshooting_and_configure_options">Troubleshooting and Configure Options</a></h2> -<p>If Smoke's linking fails or your Qt library was built with very specific +<p>If Smoke's linking fails or your TQt library was built with very specific options, run Makefile.PL again with:</p> <pre> perl Makefile.PL --with-threshold=0</pre> <p>When building smoke, configure will check for OpenGL and try to compile -support for it if it is properly installed and supported by Qt.</p> +support for it if it is properly installed and supported by TQt.</p> <p>You may disable this checking with:</p> <pre> --disable-GL</pre> @@ -166,8 +166,8 @@ it, specify:</p> --without-Mesa</pre> <p> </p> -<h2><a name="how_to_install_perlqt_with_user_rights">How to install PerlQt with user rights</a></h2> -<p>To install PerlQt without super-user rights, simply follow this procedure:</p> +<h2><a name="how_to_install_perlqt_with_user_rights">How to install PerlTQt with user rights</a></h2> +<p>To install PerlTQt without super-user rights, simply follow this procedure:</p> <ul> <li></li> Perform a normal configuration, specifying as prefix a directory where you have write permissions : @@ -178,10 +178,10 @@ Perform a normal configuration, specifying as prefix a directory where you have <li></li> Reconfigure the Perl module so that it doesn't target the standard perl hierarchy: <pre> - cd PerlQt + cd PerlTQt perl Makefile.PL PREFIX=~ cd ..</pre> -<p>Beware : this is not the same Makefile.PL as above, but the one located in the ./PerlQt +<p>Beware : this is not the same Makefile.PL as above, but the one located in the ./PerlTQt subdirectory</p> <p></p> <li></li> @@ -200,8 +200,8 @@ This can be done either on the command line:</p> <p> </p> <hr /> -<h1><a name="anatomy_of_perlqt">Anatomy of PerlQt</a></h1> -<p>A typical Qt program using GUI components is based on an event loop.</p> +<h1><a name="anatomy_of_perlqt">Anatomy of PerlTQt</a></h1> +<p>A typical TQt program using GUI components is based on an event loop.</p> <p>This basically means that such a program is no more envisioned as a straight flow where you would need to handle yourself every single events (such as a mouse click or a key press).</p> @@ -210,29 +210,29 @@ uses, define what objects methods need to be called when an event occurs, and then start the main event loop.</p> <p>That's all! -Qt will handle all events and dispatch them to the correct subroutine.</p> -<p>Lets see how this process is implemented in a minimal PerlQt program.</p> +TQt will handle all events and dispatch them to the correct subroutine.</p> +<p>Lets see how this process is implemented in a minimal PerlTQt program.</p> <p> </p> <h2><a name="hello_world">Hello World</a></h2> <pre> - 1: use Qt; - 2: my $a = Qt::Application(\@ARGV); - 3: my $hello = Qt::PushButton("Hello World!", undef); + 1: use TQt; + 2: my $a = TQt::Application(\@ARGV); + 3: my $hello = TQt::PushButton("Hello World!", undef); 4: $hello->resize(160, 25); 5: $a->setMainWidget($hello); 6: $hello->show; 7: exit $a->exec;</pre> <br/> -<div class='image'><img src="../images/ex1.png"/></div><p>This program first loads the Qt interface [line 1] and creates the application +<div class='image'><img src="../images/ex1.png"/></div><p>This program first loads the TQt interface [line 1] and creates the application object, passing it a reference to the command line arguments array <code>@ARGV</code> [l.2]. This application object is unique, and may later be accessed from -anywhere through the <strong>Qt::app()</strong> pointer.</p> +anywhere through the <strong>TQt::app()</strong> pointer.</p> <p>At line 3, we create a PushButton, which has no parent (i.e : it won't be contained nor owned by another widget). Therefore, we pass to the constructor an <strong>undef</strong> value for the parent argument, -which is PerlQt's way of passing a Null pointer.</p> +which is PerlTQt's way of passing a Null pointer.</p> <p>After some layouting at [l.4], we tell the application object that our main widget is this PushButton [l.5]... that way, it will know that closing the window associated with this widget means : <em>quit the application</em>.</p> @@ -242,39 +242,39 @@ to start the application loop [l.7].</p> <p><strong>Syntax elements summary :</strong></p> <ol> <li></li> -All Qt classes are accessed through the prefix <strong>Qt::</strong>, which replaces the -initial <strong>Q</strong> of Qt classes. -When browsing the <a href="http://doc.trolltech.com">Qt documentation</a>, you simply need to change the -name of classes so that <strong>QFoo</strong> reads <strong>Qt::Foo</strong>. +All TQt classes are accessed through the prefix <strong>TQt::</strong>, which replaces the +initial <strong>Q</strong> of TQt classes. +When browsing the <a href="http://doc.trolltech.com">TQt documentation</a>, you simply need to change the +name of classes so that <strong>TQFoo</strong> reads <strong>TQt::Foo</strong>. <p></p> <li></li> An object is created by calling the <strong>constructor</strong> of the class. It has the same name as the class itself. -<p>You don't need to say <code>new Qt::Foo</code> or <code>Qt::Foo->new()</code> as most Perl +<p>You don't need to say <code>new TQt::Foo</code> or <code>TQt::Foo->new()</code> as most Perl programmers would have expected.</p> <p>Instead, you just say :</p> <pre> - my $object = Qt::<classname>(arg_1, ..., arg_n);</pre> + my $object = TQt::<classname>(arg_1, ..., arg_n);</pre> <p>If you don't need to pass any argument to the constructor, simply say :</p> <pre> - my $object = Qt::<classname>;</pre> + my $object = TQt::<classname>;</pre> <p></p> <li></li> Whenever you need to pass a Null pointer as an argument, use Perl's <strong>undef</strong> keyword. Do not pass zero. - Beware: this is by far the most common error in PerlQt programs. + Beware: this is by far the most common error in PerlTQt programs. <p>Pointers are arguments preceded by an <strong>*</strong> -character in Qt's documentation (e.g: ``<code>QWidget * widget</code>'').</p> +character in TQt's documentation (e.g: ``<code>TQWidget * widget</code>'').</p> <p></p></ol> <p> </p> <h2><a name="inheritance_and_objects">Inheritance and Objects</a></h2> -<p>Before we can discuss how Perl subroutines can be called back from Qt, we need -to introduce PerlQt's inheritance mechanism.</p> -<p>PerlQt was designed to couple as tightly as possible Qt's simplicity and Perl's +<p>Before we can discuss how Perl subroutines can be called back from TQt, we need +to introduce PerlTQt's inheritance mechanism.</p> +<p>PerlTQt was designed to couple as tightly as possible TQt's simplicity and Perl's power and flexibility.</p> <p>In order to achieve that goal, the classical Object Oriented Perl paradigm had -to be extended, much in the same way than Qt itself +to be extended, much in the same way than TQt itself had to extend C++'s paradigm with <strong>metaobjects</strong>.</p> <p> </p> @@ -285,8 +285,8 @@ of PushButton:</p> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); 6: 7: sub NEW 8: { @@ -298,25 +298,25 @@ of PushButton:</p> 14: 15: package main; 16: - 17: use Qt; + 17: use TQt; 18: use Button; 19: - 20: my $a = Qt::Application(\@ARGV); + 20: my $a = TQt::Application(\@ARGV); 21: my $w = Button("Hello World!", undef); 22: $a->setMainWidget($w); 23: $w->show; 24: exit $a->exec;</pre> <p>Here, we want to create our own version of the PushButton widget. -Therefore, we create a new package for it [l.3] and import Qt [l.4].</p> +Therefore, we create a new package for it [l.3] and import TQt [l.4].</p> <p>We now want to declare our widget as subclassing PushButton. -This is done through the use of the <code>Qt::isa</code> pragma [l.5], which accepts a -list of one or more parent Qt classes.</p> +This is done through the use of the <code>TQt::isa</code> pragma [l.5], which accepts a +list of one or more parent TQt classes.</p> <p>It is now time to create a <strong>constructor</strong> for our new widget. This is done by creating a subroutine called <strong>NEW</strong> <em>(note the capitalized -form, which differentate it from the usual ``new'' constructor. PerlQt's NEW +form, which differentate it from the usual ``new'' constructor. PerlTQt's NEW constructor is called </em><strong>implicitly</strong><em> as can be seen on line 21)</em>.</p> <p>Since we want our widget to call its parent's constructor first, we call the -<strong>superclass's constructor</strong> (here: Qt::PushButton) on line 9, passing it all +<strong>superclass's constructor</strong> (here: TQt::PushButton) on line 9, passing it all arguments we received.</p> <p>At this time, a class instance has been created and stored into a special object holder named <strong>this</strong> (not <code>$this</code> but really just <code>this</code>).</p> @@ -328,7 +328,7 @@ indifferently say <code>method()</code> or <code>this->method()</code>;</p> <p>When building a new composite widget, you may just create its different parts inside <strong>my</strong> variables, since widgets are only deleted by their parents and not necessarily when their container goes out of scope.</p> -<p>In other words, PerlQt performs clever reference counting to prevent +<p>In other words, PerlTQt performs clever reference counting to prevent indesirable deletion of objects.</p> <p>Now, you'll often want to keep an access to those parts from anywhere inside your package. @@ -337,15 +337,15 @@ but that isn't really convenient and you don't have any compile time checking...</p> <p>Here come <strong>Attributes</strong>. Attributes are data holders where you can store any kind of properties for your object.</p> -<p>Declaring new attributes is done through the <code>use Qt::attributes</code> pragma, as is +<p>Declaring new attributes is done through the <code>use TQt::attributes</code> pragma, as is demonstrated in the following package implementation :</p> <pre> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw( + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw( 7: itsTime 8: pData 9: ); @@ -353,7 +353,7 @@ demonstrated in the following package implementation :</p> 11: sub NEW 12: { 13: shift->SUPER::NEW(@_[0..2]); - 14: itsTime = Qt::Time; + 14: itsTime = TQt::Time; 15: itsTime->start; 16: pData = " Foo "; 17: } @@ -366,7 +366,7 @@ demonstrated in the following package implementation :</p> 24: 25: 1;</pre> <br/> -<div class='image'><img src="../images/ex2.png"/></div><p>An attribute itsTime is declared at line 7, and loaded with a <code>Qt::Time</code> object +<div class='image'><img src="../images/ex2.png"/></div><p>An attribute itsTime is declared at line 7, and loaded with a <code>TQt::Time</code> object at line 14.</p> <p>Since we reimplement the virtual function ``resizeEvent'' [l.19]. each time the main widget is resized, this function will be triggered and @@ -375,13 +375,13 @@ attributes we defined [l.22].</p> <p><strong>Recapitulation</strong></p> <ul> <li></li> -In order to inherit a Qt class, a package must contain a -<code>use Qt::isa</code> pragma. +In order to inherit a TQt class, a package must contain a +<code>use TQt::isa</code> pragma. e.g: <pre> - use Qt::isa "Qt::widget";</pre> + use TQt::isa "TQt::widget";</pre> <p></p> <li></li> The object constructor is named <strong>NEW</strong> and is implicitly called. @@ -432,7 +432,7 @@ you'd use the specal attribute SUPER :</p> Whenever you need to store a contained object in your package, you may define it as an <strong>Attribute</strong> : <pre> - use Qt::attributes qw( + use TQt::attributes qw( firstAttribute ... lastAttribute);</pre> @@ -444,18 +444,18 @@ as an <strong>Attribute</strong> : <li></li> To reimplement a <strong>virtual function</strong>, simply create a <strong>sub</strong> with the same name in your object. -<p>Existing virtual functions are marked as such in Qt's documentation +<p>Existing virtual functions are marked as such in TQt's documentation (they are prefixed with the ``virtual'' keyword).</p> -<p>You can inspect what virtual function names are being called by Qt at runtime by -putting a <code>use Qt::debug qw( virtual )</code> statement at the top of your program.</p> +<p>You can inspect what virtual function names are being called by TQt at runtime by +putting a <code>use TQt::debug qw( virtual )</code> statement at the top of your program.</p> <p></p></ul> <p> </p> <h2><a name="signals_and_slots">Signals and Slots</a></h2> -<p>We'll now learn how Qt objects can communicate with each other, +<p>We'll now learn how TQt objects can communicate with each other, allowing an event occuring, for instance, in a given widget to trigger the execution of one or several subroutines anywhere inside your program.</p> -<p>Most other toolkits use callbacks for that purpose, but Qt has a much more +<p>Most other toolkits use callbacks for that purpose, but TQt has a much more powerful and flexible mechanism called <strong>Signals and Slots</strong>.</p> <p>Signals and slots are used for communication between objects.</p> <p>This can be thought off as something similar to the wiring between several Hi-fI @@ -464,18 +464,18 @@ emitted wether a listening device is connected to them or not. Also, a tape recorder deck can start to record when it receives a signal wired to it's input slot, and it doesn't need to know that this signal is also received by a CD recorder device, or listened through headphones.</p> -<p>A Qt component behaves just like that. It has several output <strong>Signals</strong> and +<p>A TQt component behaves just like that. It has several output <strong>Signals</strong> and several input <strong>Slots</strong> - and each signal can be connected to an unlimited number of listening slots of the same type, wether they are inside or outside the component.</p> <p>The general syntax of this connection process is either :</p> -<p>Qt::Object::connect( sender, SIGNAL 'mysignal(arg_type)', -receiver, SLOT 'myslot(arg_type)');</p> +<p>TQt::Object::connect( sender, TQT_SIGNAL 'mysignal(arg_type)', +receiver, TQT_SLOT 'myslot(arg_type)');</p> <p>or</p> -<p>myObject->connect( sender, SIGNAL 'mysignal(arg_type)', SLOT +<p>myObject->connect( sender, TQT_SIGNAL 'mysignal(arg_type)', TQT_SLOT 'myslot(arg_type)');</p> <p>This mechanism can be extended at will by the declaration of custom Signals and -Slots, through the <code>use Qt::signals</code> and <code>use Qt::slots</code> pragma +Slots, through the <code>use TQt::signals</code> and <code>use TQt::slots</code> pragma (see also the other syntax, later on).</p> <p>Each declared slot will call the corresponding subroutine in your object, each declared signal can be raised through the <strong>emit</strong> keyword.</p> @@ -484,22 +484,22 @@ each declared signal can be raised through the <strong>emit</strong> keyword.</p 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw(itsTime); - 7: use Qt::slots + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw(itsTime); + 7: use TQt::slots 8: wasClicked => [], 9: change => ['int', 'int']; - 10: use Qt::signals + 10: use TQt::signals 11: changeIt => ['int', 'int']; 12: 13: sub NEW 14: { 15: shift->SUPER::NEW(@_[0..2]); - 16: itsTime = Qt::Time; + 16: itsTime = TQt::Time; 17: itsTime->start; - 18: this->connect(this, SIGNAL 'clicked()', SLOT 'wasClicked()'); - 19: this->connect(this, SIGNAL 'changeIt(int,int)', SLOT 'change(int,int)'); + 18: this->connect(this, TQT_SIGNAL 'clicked()', TQT_SLOT 'wasClicked()'); + 19: this->connect(this, TQT_SIGNAL 'changeIt(int,int)', TQT_SLOT 'change(int,int)'); 20: } 21: 22: sub wasClicked @@ -518,7 +518,7 @@ each declared signal can be raised through the <strong>emit</strong> keyword.</p 35: 36: 1;</pre> <p>In this package, we define two extra slots and one extra signal.</p> -<p>We know from the Qt Documentation that a clicked PushButton emits a <code>clicked()</code> +<p>We know from the TQt Documentation that a clicked PushButton emits a <code>clicked()</code> signal, so we connect it to our new slot at line 18.</p> <p>We also connect our signal <code>changeIt</code> to our own <code>change</code> slot- which is quite stupid, but as an example.</p> @@ -526,9 +526,9 @@ quite stupid, but as an example.</p> triggers the <code>wasClicked()</code> slot. <code>wasClicked</code> then proceeds to emit the <code>changeIt(int,int)</code> signal [l.27], hence triggering the <code>change(int,int)</code> slot with two arguments.</p> -<p>Finally, since PerlQt-3.008, an alternative syntax can be used to declare Signals and Slots:</p> +<p>Finally, since PerlTQt-3.008, an alternative syntax can be used to declare Signals and Slots:</p> <pre> - sub a_slot : SLOT(int, QString) + sub a_slot : TQT_SLOT(int, TQString) { $int = shift; $string = shift; @@ -536,40 +536,40 @@ slot with two arguments.</p> }</pre> <p>and</p> <pre> - sub a_signal : SIGNAL(QString);</pre> + sub a_signal : TQT_SIGNAL(TQString);</pre> <p>This syntax is perfectly compatible with the traditional -<code>use Qt::signals</code> and <code>use Qt::slots</code> declarations.</p> +<code>use TQt::signals</code> and <code>use TQt::slots</code> declarations.</p> <p>Eventually, it can prove good programming practice to mix both syntaxes, by first declaring -Signals/Slots with <code>use Qt::slots/signals</code>, then repeat this declaration +Signals/Slots with <code>use TQt::slots/signals</code>, then repeat this declaration in the actual implementation with the second syntax.</p> <p>Declarations will be checked for consistency at compile time, and any mismatch in arguments would trigger a warning.</p> <p> </p> <hr /> -<h1><a name="rad_prototyping_with_qt_designer_and_puic">RAD prototyping with Qt Designer and Puic</a></h1> +<h1><a name="rad_prototyping_with_qt_designer_and_puic">RAD prototyping with TQt Designer and Puic</a></h1> <p> </p> <h2><a name="introduction">Introduction</a></h2> <ul> <li><strong><a name="item_note%3a">Note:</a></strong><br /> </li> -As of PerlQt-3.008, a separate PerlQt plugin for Qt Designer is available, -bringing full integration, syntax highlighting, code completion and allowing to run/debug your PerlQt project +As of PerlTQt-3.008, a separate PerlTQt plugin for TQt Designer is available, +bringing full integration, syntax highlighting, code completion and allowing to run/debug your PerlTQt project entirely from the Designer GUI. Nevertheless, the below is still accurate with regard to puic command line interaction -and with regard to using Qt Designer <em>without</em> the specific plugin. +and with regard to using TQt Designer <em>without</em> the specific plugin. <p></p></ul> -<p>As efficient and intuitive as Qt can be, building a complete GUI from scratch +<p>As efficient and intuitive as TQt can be, building a complete GUI from scratch is often a tedious task.</p> -<p>Hopefully, Qt comes with a very sophisticated GUI Builder named Qt +<p>Hopefully, TQt comes with a very sophisticated GUI Builder named TQt Designer, which is close to a complete integrated development environment. It features Project management, drag'n drop GUI building, a complete object browser, graphical interconnection of signals and slots, and much much more.</p> -<p>Qt Designer's output is XML which can be parsed by several command line tools, -among whose is <strong>puic</strong> (the PerlQt User Interface Compiler).</p> +<p>TQt Designer's output is XML which can be parsed by several command line tools, +among whose is <strong>puic</strong> (the PerlTQt User Interface Compiler).</p> <p>Assuming you have already built an interface file with the Designer, -translating it to a PerlQt program is simply a matter of issuing +translating it to a PerlTQt program is simply a matter of issuing one command :</p> <pre> puic -x -o program.pl program.ui</pre> @@ -589,7 +589,7 @@ program.</p> <li><strong><a name="item_inline_embedding">Inline embedding</a></strong><br /> </li> For this, you need to check the ``Edit->Form Settings->Pixmaps->Save inline'' -checkbox inside Qt Designer. +checkbox inside TQt Designer. Then : puic -x -o <em>program.pl</em> <em>program.ui</em> <p></p> <li><strong><a name="item_image_collection">Image Collection</a></strong><br /> @@ -597,7 +597,7 @@ Then : puic -x -o <em>program.pl</em> <em>program.ui</em> This option is more complex but also far more powerful and clean. <p>puic -o <em>Collection.pm</em> -embed <em>unique_identifier</em> <em>image-1</em> ... <em>image-n</em></p> <p>Then add a <code>use Collection.pm</code> statement to your program's main package.</p> -<p>If you've created a project file in Qt Designer, and added all images +<p>If you've created a project file in TQt Designer, and added all images you want to group (through ``Project->Image Collection''), you'll find all those images inside the directory where your project file (*.pro) is stored, under /images. @@ -619,7 +619,7 @@ up doing lot of copy-paste.</p> <ul> <li><strong><a name="item_write_slots_implementation_in_the_designer">Write slots implementation in the Designer</a></strong><br /> </li> -In Qt Designer, select the <em>Source</em> tab of the <strong>Object Explorer</strong>. +In TQt Designer, select the <em>Source</em> tab of the <strong>Object Explorer</strong>. There you can see a tree-like representation of your classes. Now if you double-click on the <em>Slots/public</em> entry, you are prompted with a dialog where you can create a new custom slot for @@ -682,8 +682,8 @@ parent module, and your child will inherit those changes.</p> </p> <hr /> <h1><a name="more_development_tools">More development tools</a></h1> -<p>PerlQt comes bundled with two simple programs that can help you to find your way through -the Qt API:</p> +<p>PerlTQt comes bundled with two simple programs that can help you to find your way through +the TQt API:</p> <p> </p> <h2><a name="pqtapi">pqtapi</a></h2> @@ -694,13 +694,13 @@ the Qt API:</p> options: -r <re> : find all functions matching regular expression/keyword <re> -i : together with -r, performs a case insensitive search - -v : print PerlQt and Qt versions + -v : print PerlTQt and TQt versions -h : print this help message</pre> <p>e.g:</p> <pre> $>pqtapi -ir 'setpoint.* int' - void QCanvasLine::setPoints(int, int, int, int) - void QPointArray::setPoint(uint, int, int)</pre> + void TQCanvasLine::setPoints(int, int, int, int) + void TQPointArray::setPoint(uint, int, int)</pre> <p> </p> <h2><a name="pqtsh">pqtsh</a></h2> @@ -716,7 +716,7 @@ It is fairly self explanatory and includes an interactive example (<code>Help-&g </p> <hr /> <h1><a name="credits">Credits</a></h1> -<p>PerlQt-3 is (c) 2002 Ashley Winters (and (c) 2003 Germain Garand)</p> +<p>PerlTQt-3 is (c) 2002 Ashley Winters (and (c) 2003 Germain Garand)</p> <p>Kalyptus and the Smoke generation engine are (c) David Faure and Richard Dale</p> <p>Puic is (c) TrollTech AS., Phil Thompson and Germain Garand,</p> <p>The mentioned software is released under the GNU Public Licence v.2 or later.</p> @@ -724,31 +724,31 @@ It is fairly self explanatory and includes an interactive example (<code>Help-&g </p> <hr /> <h1><a name="appendix_1_:_c++_conventions_and_their_perl_counterpart">Appendix 1 : C++ conventions and their Perl counterpart</a></h1> -<p>Whenever you want to use a class/method described in Qt's -<a href="http://doc.trolltech.com">documentation</a> (see also the 'assistant' program bundled with Qt) -from PerlQt, you need to follow some simple translation rules.</p> +<p>Whenever you want to use a class/method described in TQt's +<a href="http://doc.trolltech.com">documentation</a> (see also the 'assistant' program bundled with TQt) +from PerlTQt, you need to follow some simple translation rules.</p> <dl> <dt><strong><a name="item_classnames">Classnames</a></strong><br /> </dt> <ul> <li></li> -All classnames are changed from a <strong>Q</strong> prefix in Qt to a <strong>Qt::</strong> prefix +All classnames are changed from a <strong>Q</strong> prefix in TQt to a <strong>TQt::</strong> prefix in Perl. -e.g: QComboBox is named Qt::ComboBox within PerlQt. +e.g: TQComboBox is named TQt::ComboBox within PerlTQt. <p></p></ul> <dt><strong><a name="item_functions">Functions</a></strong><br /> </dt> <ul> <li></li> Functions referenced as <strong>static</strong> are accessed directly, and not through -an object. Thus the static function Foo in class QBar would be accessed from -PerlQt as +an object. Thus the static function Foo in class TQBar would be accessed from +PerlTQt as <pre> - Qt::Bar::Foo( arg-1,...,arg-n);</pre> + TQt::Bar::Foo( arg-1,...,arg-n);</pre> <p>The only notable exceptions are :</p> <pre> - qApp() will map to Qt::app() - qVersion() will map to Qt::version() # not really needed anymore: we have qVersion(). See Global Functions below.</pre> + qApp() will map to TQt::app() + qVersion() will map to TQt::version() # not really needed anymore: we have qVersion(). See Global Functions below.</pre> <p></p> <li></li> Functions referenced as <strong>members</strong> or <strong>Signals</strong> are accessed through an object @@ -756,7 +756,7 @@ with the <strong>-></strong> operator. e.g: <pre> $widget->show;</pre> -<p>There are no fundamental differences between methods and signals, however PerlQt +<p>There are no fundamental differences between methods and signals, however PerlTQt provides the <strong>emit</strong> keyword as a convenient mnemonic, so that it is clear you are emitting a signal :</p> <pre> @@ -768,14 +768,14 @@ are emitting a signal :</p> <li><strong><a name="item_by_value">By value</a></strong><br /> </li> When an argument isn't preceded by the <strong>&</strong> or <strong>*</strong> character, it is passed by -value. For all basic types such as int, char, float and double, PerlQt will +value. For all basic types such as int, char, float and double, PerlTQt will automatically convert litteral and scalar values to the corresponding C++ type. <p>Thus for a constructor prototype written as follow in the documentation :</p> <pre> - QSize ( int w, int h )</pre> + TQSize ( int w, int h )</pre> <p>You'd say :</p> <pre> - Qt::Size(8, 12);</pre> + TQt::Size(8, 12);</pre> <p></p> <li><strong><a name="item_by_reference">By reference</a></strong><br /> </li> @@ -783,12 +783,12 @@ When an argument is preceded by the <strong>&</strong> character, it means a object or to a type is expected. You may either provide a variable name or a temporary object : <pre> - $keyseq = Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $keyseq = TQt::keySequence( &TQt::CTRL + &TQt::F3 ); $widget->setAccel( $keyseq ); or</pre> <pre> - $widget->setAccel(Qt::keySequence( &Qt::CTRL + &Qt::F3 );</pre> + $widget->setAccel(TQt::keySequence( &TQt::CTRL + &TQt::F3 );</pre> <p>If the argument isn't qualified as <strong>const</strong> (constant), it means the passed object may be altered during the process - you must then provide a variable.</p> <p></p> @@ -819,7 +819,7 @@ remember otherwise. and 2).</p> </dd> <dd> -<p>Access to enumerations values in Perl Qt is very similar to a static function +<p>Access to enumerations values in Perl TQt is very similar to a static function call. In fact, it <strong>is</strong> a static function call.</p> </dd> <dd> @@ -830,22 +830,22 @@ recommend the use of the alternate function call syntax : <code>&function</c <p>Lets now go back to our <code>Strange</code> example.</p> </dd> <dd> -<p>If its definition was encountered in the class <code>QFruits</code>, you'd write from -PerlQt :</p> +<p>If its definition was encountered in the class <code>TQFruits</code>, you'd write from +PerlTQt :</p> </dd> <dd> <pre> - $apple_plus_orange = &Qt::Fruit::Apple + &Qt::Fruit::Orange;</pre> + $apple_plus_orange = &TQt::Fruit::Apple + &TQt::Fruit::Orange;</pre> </dd> <p></p> <dt><strong><a name="item_operators">Operators</a></strong><br /> </dt> <dd> -Within PerlQt, <strong>operators overloading</strong> works transparently. -If a given operator is overloaded in a Qt class (which means using it triggers a custom method) -it will behave identically in PerlQt. +Within PerlTQt, <strong>operators overloading</strong> works transparently. +If a given operator is overloaded in a TQt class (which means using it triggers a custom method) +it will behave identically in PerlTQt. Beware though that due to limitations of the Smoke binding library, not all overloaded operators are -available in PerlQt. +available in PerlTQt. You can check the availability of a given operator by using the pqtapi program. Also, due to outstanding differences between C++'s and Perl's object paradigm, the copy constructor operator (a.k.a '=') has been disabled. @@ -855,62 +855,62 @@ has been disabled. </dd> <dd> <pre> - $p1 = Qt::Point(10, 10) - $p2 = Qt::Point(30,40) + $p1 = TQt::Point(10, 10) + $p2 = TQt::Point(30,40) $p2 += $p1; # $p2 becomes (40,50) e.g-2: '<<' overload</pre> </dd> <dd> <pre> - $f = Qt::File("example"); + $f = TQt::File("example"); $f->open( IO_WriteOnly ); # see 'Constants' below - $s = Qt::TextStream( $f ); + $s = TQt::TextStream( $f ); $s << "What can I do with " << 12 << " apples?";</pre> </dd> <p></p> <dt><strong><a name="item_constants">Constants</a></strong><br /> </dt> <dd> -Qt doesn't use many constants, but there is at least one place where they are used : for setting +TQt doesn't use many constants, but there is at least one place where they are used : for setting Input/Output flags on files. -In order to avoid the namespace pollution induced by global constants, PerlQt group them in the <strong>Qt::constants</strong> module. +In order to avoid the namespace pollution induced by global constants, PerlTQt group them in the <strong>TQt::constants</strong> module. For instance, requesting the importation of all IO constants into the current namespace would be done with: </dd> <dd> <pre> - use Qt::constants;</pre> + use TQt::constants;</pre> </dd> <dd> <p>You may also import specific symbols:</p> </dd> <dd> <pre> - use Qt::constants qw( IO_ReadOnly IO_WriteOnly );</pre> + use TQt::constants qw( IO_ReadOnly IO_WriteOnly );</pre> </dd> <p></p> <dt><strong><a name="item_global_functions">Global Functions</a></strong><br /> </dt> <dd> -Qt has also some utilitarian functions such as bitBlt, qCompress, etc. +TQt has also some utilitarian functions such as bitBlt, qCompress, etc. </dd> <dd> <p>Those were global scope functions and have been grouped in a common namespace: -<code>Qt::GlobalSpace</code>.</p> +<code>TQt::GlobalSpace</code>.</p> </dd> <dd> <p>Hence, you shall access this namespace either with a fully qualified call:</p> </dd> <dd> <pre> - Qt::GlobalSpace::qUncompress( $buffer )</pre> + TQt::GlobalSpace::qUncompress( $buffer )</pre> </dd> <dd> <p>Or directly, after importation in the current namespace:</p> </dd> <dd> <pre> - use Qt::GlobalSpace; + use TQt::GlobalSpace; qUncompress( $buffer )</pre> </dd> <dd> @@ -918,47 +918,47 @@ Qt has also some utilitarian functions such as bitBlt, qCompress, etc. </dd> <dd> <pre> - use Qt::GlobalSpace qw( qUncompress bitBlt )</pre> + use TQt::GlobalSpace qw( qUncompress bitBlt )</pre> </dd> <dd> <p><strong>Note:</strong> GlobalSpace has also operators, such has the one performing an addition on two -Qt::Point(). Those operators are called automatically.</p> +TQt::Point(). Those operators are called automatically.</p> </dd> <dd> <p>e.g:</p> </dd> <dd> <pre> - $p1 = Qt::Point(10, 10) + Qt::Point(20, 20)</pre> + $p1 = TQt::Point(10, 10) + TQt::Point(20, 20)</pre> </dd> <p></p></dl> <p> </p> <hr /> <h1><a name="appendix_2_:_internationalization">Appendix 2 : Internationalization</a></h1> -<p>PerlQt handles internationalization by always converting <strong>QString</strong> back to <strong>utf8</strong> in Perl.</p> -<p>Conversions from Perl strings to QStrings are made according to context :</p> +<p>PerlTQt handles internationalization by always converting <strong>TQString</strong> back to <strong>utf8</strong> in Perl.</p> +<p>Conversions from Perl strings to TQStrings are made according to context :</p> <ul> <li><strong><a name="item_if_the_perl_string_is_already_utf8%2dencoded">If the Perl string is already utf8-encoded</a></strong><br /> </li> -then the string will be converted straight to QString. +then the string will be converted straight to TQString. <p>This is the most convenient and seemless way of internationalizing your application. Typically, one would just enable the use of utf8 in source code with the <code>use utf8</code> pragma and write its application with an utf8 aware editor.</p> <p></p> <li><strong><a name="item_if_the_string_isn%27t_tagged_as_utf8%2c_and_the_us">If the string isn't tagged as utf8, and the <strong>use locale</strong> pragma is not set</a></strong><br /> </li> -then the string will be converted to QString's utf8 from <strong>ISO-Latin-1</strong>. +then the string will be converted to TQString's utf8 from <strong>ISO-Latin-1</strong>. <p></p> <li><strong><a name="item_if_the_string_isn%27t_tagged_as_utf8_and_the_use_l">If the string isn't tagged as utf8 and the <strong>use locale</strong> pragma is set</a></strong><br /> </li> -then the string will be converted to QString's utf8 according to the currently set <strong>locale</strong>. +then the string will be converted to TQString's utf8 according to the currently set <strong>locale</strong>. <p></p></ul> <p>Once a string contains utf8, you can convert it back to any locale by setting up <strong>converters</strong> :</p> <pre> - $tr1=Qt::TextCodec::codecForLocale(); # this one will use current locale - $tr2=Qt::TextCodec::codecForName("KOI8-R"); # that one forces a specific locale (Russian)</pre> + $tr1=TQt::TextCodec::codecForLocale(); # this one will use current locale + $tr2=TQt::TextCodec::codecForName("KOI8-R"); # that one forces a specific locale (Russian)</pre> <pre> - print $tr1->fromUnicode(Qt::DateTime::currentDateTime()->toString)."\n\n"; + print $tr1->fromUnicode(TQt::DateTime::currentDateTime()->toString)."\n\n"; print $tr2->fromUnicode($my_utf8_string);</pre> <p>Or, with Perl >= 5.8.0, you may use Perl's <strong>Encode</strong> modules (see <code>perldoc Encode</code>).</p> <p> @@ -966,19 +966,19 @@ then the string will be converted to QString's utf8 according to the currently s <h3><a name="disabling_utf8">disabling utf-8</a></h3> <p>Developers who don't want to use UTF-8 or want to temporarily disable UTF-8 marshalling for handling legacy programs may use the <strong>use bytes</strong> pragma (and the corresponding <strong>no bytes</strong>).</p> -<p>Within the scope of this pragma, QStrings are marshalled back to ISO-Latin1 (default) or to your locale +<p>Within the scope of this pragma, TQStrings are marshalled back to ISO-Latin1 (default) or to your locale (if <strong>use locale</strong> has been set).</p> <p>Frivole use of this pragma is strongly discouraged as it ruins worldwide standardization efforts.</p> <p> </p> <hr /> <h1><a name="appendix_3_:_debugging_channels">Appendix 3 : Debugging Channels</a></h1> -<p>The <strong>Qt::debug</strong> module offers various debugging channels/features.</p> +<p>The <strong>TQt::debug</strong> module offers various debugging channels/features.</p> <pre> - use Qt::debug;</pre> + use TQt::debug;</pre> <pre> - use Qt::debug qw|calls autoload verbose|;</pre> -<p>With the simple <code>use Qt::debug</code> statement, the <strong>verbose</strong> and <strong>ambiguous</strong> channels are activated. + use TQt::debug qw|calls autoload verbose|;</pre> +<p>With the simple <code>use TQt::debug</code> statement, the <strong>verbose</strong> and <strong>ambiguous</strong> channels are activated. If you specify a list of channels within the use statement, then only the specified channels will be enabled.</p> <p><strong>Available channels :</strong></p> <ul> @@ -994,33 +994,33 @@ Enable more verbose debugging. a method or function call fails. e.g:</p> <pre> - use Qt; - use Qt::debug; - $a= Qt::Application(\@ARGV); + use TQt; + use TQt::debug; + $a= TQt::Application(\@ARGV); $a->libraryPath("foo");</pre> <pre> --- No method to call for : - QApplication::libraryPath('foo') + TQApplication::libraryPath('foo') Closer candidates are : - static void QApplication::addLibraryPath(const QString&) - static QStringList QApplication::libraryPaths() - static void QApplication::removeLibraryPath(const QString&) - static void QApplication::setLibraryPaths(const QStringList&)</pre> + static void TQApplication::addLibraryPath(const TQString&) + static TQStringList TQApplication::libraryPaths() + static void TQApplication::removeLibraryPath(const TQString&) + static void TQApplication::setLibraryPaths(const TQStringList&)</pre> <p></p> <li><strong><a name="item_calls">calls</a></strong><br /> </li> -For every call, tell what corresponding Qt method is called +For every call, tell what corresponding TQt method is called (detailing the arguments if <strong>verbose</strong> is on). <p></p> <li><strong><a name="item_autoload">autoload</a></strong><br /> </li> Track the intermediate code between a method invocation in Perl -and its resolution to either a Qt or Perl call. +and its resolution to either a TQt or Perl call. <p></p> <li><strong><a name="item_gc">gc</a></strong><br /> </li> Give informations about garbage collection -whenever a Qt object is deleted and/or a Perl object is destroyed +whenever a TQt object is deleted and/or a Perl object is destroyed <p></p> <li><strong><a name="item_virtual">virtual</a></strong><br /> </li> @@ -1036,43 +1036,43 @@ Enable all channels <hr /> <h1><a name="appendix_4_:_marshallers">Appendix 4 : Marshallers</a></h1> <p>A marshaller is a piece of ``glue code'' translating a given datatype to another.</p> -<p>Within PerlQt, most Qt objects keep their object nature, so that one may invoke methods on them. +<p>Within PerlTQt, most TQt objects keep their object nature, so that one may invoke methods on them. However, some classes and datatypes map so naturally to some Perl types that keeping their object nature would would feel unnatural and clumsy.</p> -<p>For instance, instead of returning a Qt::StringList object, which would require an iterator to retrieve its content, -PerlQt will translate it to an array reference containing all the object's strings.</p> -<p>In the other way, instead of providing a Qt::StringList object as an argument of a method, one would simply +<p>For instance, instead of returning a TQt::StringList object, which would require an iterator to retrieve its content, +PerlTQt will translate it to an array reference containing all the object's strings.</p> +<p>In the other way, instead of providing a TQt::StringList object as an argument of a method, one would simply provide the reference to an array of Perl strings.</p> -<p>Here is the list of Marshallers as of PerlQt-3.008 :</p> +<p>Here is the list of Marshallers as of PerlTQt-3.008 :</p> <pre> ----------------------------------------------------------------- float, double <=> Perl real (NV) char, uchar, int, uint, enum long, ulong, short, ushort <=> Perl integer (IV) - QString, -&, -* => Perl string (utf8) - QString, -&, -* <= Perl string (utf8 or iso-latin1 or locale) - QCString, -&, -* <=> Perl string (utf8 or bytes, according to content or "bytes" pragma) - QByteArray, -&, -* <=> Perl string (bytes) - QStringList, -&, -* => Reference to an array of Perl strings (utf8) - QString, -&, -* => Perl string (utf8 or iso-latin1 or locale) + TQString, -&, -* => Perl string (utf8) + TQString, -&, -* <= Perl string (utf8 or iso-latin1 or locale) + TQCString, -&, -* <=> Perl string (utf8 or bytes, according to content or "bytes" pragma) + TQByteArray, -&, -* <=> Perl string (bytes) + TQStringList, -&, -* => Reference to an array of Perl strings (utf8) + TQString, -&, -* => Perl string (utf8 or iso-latin1 or locale) int&, -* <=> Perl integer (IV) bool&, -* <=> Perl boolean char* <=> Perl string (bytes) char** <= Reference to an array of Perl strings (bytes) uchar* <= Perl string (bytes) - QRgb* <= Reference to an array of Perl integers (IV) - QCOORD* <= Reference to an array of Perl integers (IV) + TQRgb* <= Reference to an array of Perl integers (IV) + TQCOORD* <= Reference to an array of Perl integers (IV) void* <=> Reference to a Perl integer (IV) - QValueList<int>, - *, - & <=> Reference to an array of Perl integers (IV) - QCanvasItemList, - *, - & => Reference to an array of Qt::CanvasItem - QWidgetList, - *, - & <=> Reference to an array of Qt::Widget - QObjectList, - *, - & <=> Reference to an array of Qt::Object - QFileInfoList, - *, - & <=> Reference to an array of Qt::FileInfo - QPtrList<QTab>, - *, - & <=> Reference to an array of Qt::Tab - QPtrList<QToolBar>, - *, - & <=> Reference to an array of Qt::ToolBar - QPtrList<QNetworkOperation>, - *, - & <=> Reference to an array of Qt::NetworkOperation - QPtrList<QDockWindow>, - *, - & <=> Reference to an array of Qt::DockWindow - (QUObject*) + TQValueList<int>, - *, - & <=> Reference to an array of Perl integers (IV) + TQCanvasItemList, - *, - & => Reference to an array of TQt::CanvasItem + TQWidgetList, - *, - & <=> Reference to an array of TQt::Widget + TQObjectList, - *, - & <=> Reference to an array of TQt::Object + TQFileInfoList, - *, - & <=> Reference to an array of TQt::FileInfo + TQPtrList<TQTab>, - *, - & <=> Reference to an array of TQt::Tab + TQPtrList<TQToolBar>, - *, - & <=> Reference to an array of TQt::ToolBar + TQPtrList<TQNetworkOperation>, - *, - & <=> Reference to an array of TQt::NetworkOperation + TQPtrList<TQDockWindow>, - *, - & <=> Reference to an array of TQt::DockWindow + (TQUObject*) </pre> diff --git a/doc/fr/Makefile b/doc/fr/Makefile index 1d300c0..536536a 100644 --- a/doc/fr/Makefile +++ b/doc/fr/Makefile @@ -1,6 +1,6 @@ -index.html: PerlQt.pod - pod2html --css ../css/pod.css PerlQt.pod > index.html +index.html: PerlTQt.pod + pod2html --css ../css/pod.css PerlTQt.pod > index.html perl -pi -e 's/cgibin/cgi-bin/' index.html perl -pi -e 's/#http/http/g' index.html rm -f pod2*~~ diff --git a/doc/fr/PerlQt.pod b/doc/fr/PerlQt.pod index 5036239..b92cbdf 100644 --- a/doc/fr/PerlQt.pod +++ b/doc/fr/PerlQt.pod @@ -1,43 +1,43 @@ -=head1 Programmer avec PerlQt +=head1 Programmer avec PerlTQt B<Germain Garand> traduit par B<Stéphane Payrard>, révisé et augmenté par l'auteur. -Ce document décrit l'interface Perl au toolkit Qt 3.x. Contacter +Ce document décrit l'interface Perl au toolkit TQt 3.x. Contacter l'auteur à <germain@ebooksfrance.com> ou le traducteur à <stef@mongueurs.net>. Vous trouverez le document original sur le site L<perlqt.sourceforge.net|"http://perlqt.sourceforge.net"> =head1 Introduction -PerlQt-3, crée par Ashley Winters, est une interface perl aux composants -graphiques (et non graphiques) fournis par Qt3. +PerlTQt-3, crée par Ashley Winters, est une interface perl aux composants +graphiques (et non graphiques) fournis par TQt3. -Le toolkit Qt 3.0 auquel PerlQt accède à été écrit en C++ par la société +Le toolkit TQt 3.0 auquel PerlTQt accède à été écrit en C++ par la société Trolltech: L<Trolltech|"http://www.trolltech.com">. -PerlQt3 est fondé sur la librairie +PerlTQt3 est fondé sur la librairie L<SMOKE|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">, une surcouche fine indépendante du langage. Cette couche a été générée -à partir des fichiers d'en tête de Qt par le +à partir des fichiers d'en tête de TQt par le L<kalyptus|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/kalyptus"> de Richard Dale grâce au module de David Faure. -Le présent document décrit les principes de la programmation PerlQt. +Le présent document décrit les principes de la programmation PerlTQt. Vous devez avoir des notions de programmation orientée objet en Perl pour le lire. Une connaissance de C++ est recommandée mais non requise. Avec celle de l'anglais, elle vous facilitera la consultation des L<manuels -en ligne de Qt|"http://doc.trolltech.com">. Ladite documentation est +en ligne de TQt|"http://doc.trolltech.com">. Ladite documentation est la seule référence qui fasse autorité. -Si Qt est installé sur votre système, sa documentation l'est -certainement aussi : voyez le programme $QTDIR/bin/assistant. +Si TQt est installé sur votre système, sa documentation l'est +certainement aussi : voyez le programme $TQTDIR/bin/assistant. =head1 Installation =head2 Conditions requises -Pour compiler et utiliser PerlQt, vous devez avoir: +Pour compiler et utiliser PerlTQt, vous devez avoir: =over 4 @@ -52,17 +52,17 @@ L<Perl E<gt>= v5.6.0|"http://www.perl.org"> =item * -L<Qt E<gt>= +L<TQt E<gt>= v3.0|"http://www.trolltech.com/developer/download/qt-x11.html"> =item * -L<SmokeQt +L<SmokeTQt 1.2.1|"http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke"> La librarie SMOKE (Scripting Meta Object Kompiler) fait partie du module L<KDE|"http://www.kde.org">'s B<kdebindings>. Vous pouvez vérifier si une version précompilée de ce module existe pour votre système. Mais -perlQt inclut une copie, donc la version précompilée n'est pas +perlTQt inclut une copie, donc la version précompilée n'est pas nécessaire. =item * @@ -71,23 +71,23 @@ Les outils GNU : automake(>=1.5), autoconf (>=2.13), aclocal... =back -L'installation de Perl et de Qt sont en dehors du sujet du présent +L'installation de Perl et de TQt sont en dehors du sujet du présent document. Se référer aux documentations respectives de ces logiciels. -=head2 Compilation de PerlQt +=head2 Compilation de PerlTQt Les instructions de cette section présupposent que le répertoire courant est -le répertoire racine de l'arborescence des sources de PerlQt. +le répertoire racine de l'arborescence des sources de PerlTQt. -PerlQt utilise le système GNU Autoconf, mais il est préférable de le lancer via +PerlTQt utilise le système GNU Autoconf, mais il est préférable de le lancer via le script standard C<Makefile.PL> : perl Makefile.PL -B<N.B :> Si la variable d'environnement B<QTDIR> n'est pas définie, vous devrez -peut-être spécifier manuellement l'emplacement de Qt à l'aide de l'option : +B<N.B :> Si la variable d'environnement B<TQTDIR> n'est pas définie, vous devrez +peut-être spécifier manuellement l'emplacement de TQt à l'aide de l'option : - --with-qtdir=/emplacement/de/Qt + --with-qtdir=/emplacement/de/TQt Si la bibliothèque SMOKE est manquante, C<configure> générera ses sources dans un sous-répertoire. @@ -96,7 +96,7 @@ un sous-répertoire. make install -Cela installera PerlQt, Puic et les utilitaires pqtsh et pqtapi. +Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi. Le lieu d'installation privilégié de SMOKE et de PUIC est le système de fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas @@ -122,14 +122,14 @@ Ceci installera Smoke dans ~/lib et puic dans ~/bin =item * -Reconfigurez le module PerlQt pour qu'il ne s'installe pas dans la hiérarchie Perl ordinaire : +Reconfigurez le module PerlTQt pour qu'il ne s'installe pas dans la hiérarchie Perl ordinaire : - cd PerlQt + cd PerlTQt perl Makefile.PL PREFIX=~ cd .. Attention : il ne s'agit pas du Makefile.PL situé à la racine de l'arborescence mais bien de celui -situé dans le sous-répertoire PerlQt +situé dans le sous-répertoire PerlTQt =item * @@ -137,7 +137,7 @@ Lancez la compilation et l'installation make && make install -Pour exécuter des programmes PerlQt, il vous faudra désormais indiquer à Perl l'emplacement de cette hiérarchie externe, +Pour exécuter des programmes PerlTQt, il vous faudra désormais indiquer à Perl l'emplacement de cette hiérarchie externe, à l'aide d'une ligne de la forme : perl -Mlib="~/local/lib/perl/5.x.x" programme.pl @@ -148,29 +148,29 @@ où 5.x.x représente la version de Perl utilisée, ligne qui peut également être p =back -=head1 Anatomie de PerlQt +=head1 Anatomie de PerlTQt -Un programme Qt typique utilisant des composants GUI est fondé sur une +Un programme TQt typique utilisant des composants GUI est fondé sur une boucle événementielle. Il ne se comporte pas comme une suite séquentielle d'instructions où vous devriez gérer vous-même chaque événement (tels que le clic de la souris ou l'enfoncement d'une touche). -Au lieu de cela, vous créez un objet B<Qt::Application> et les composants +Au lieu de cela, vous créez un objet B<TQt::Application> et les composants du GUI qu'il utilise, puis vous définissez les méthodes d'objet à appeler lors de l'occurrence d'un événement, puis démarrez la boucle événementielle. -C'est tout. Qt gérera les événements et les dirigera vers les +C'est tout. TQt gérera les événements et les dirigera vers les routines appropriées. -Voyons un programme PerlQt minimal. +Voyons un programme PerlTQt minimal. =head2 Hello World - 1: use Qt; - 2: my $a = Qt::Application(\@ARGV); - 3: my $hello = Qt::PushButton("Hello World!", undef); + 1: use TQt; + 2: my $a = TQt::Application(\@ARGV); + 3: my $hello = TQt::PushButton("Hello World!", undef); 4: $hello->resize(160, 25); 5: $a->setMainWidget($hello); 6: $hello->show; @@ -180,15 +180,15 @@ Voyons un programme PerlQt minimal. <br/> <div class='image'><img src="../images/ex1.png"/></div> -Ce programme charge d'abord le module Qt [line 1] puis crée l'objet +Ce programme charge d'abord le module TQt [line 1] puis crée l'objet application B<$a> en lui passant une référence au tableau C<@ARGV> contenant les arguments de la ligne de commande [l.2]. Cet objet application est unique pour un interpréteur Perl donné et peut être -ensuite accédé par la fonction pure B<Qt::app()>. +ensuite accédé par la fonction pure B<TQt::app()>. La ligne 3, crée un PushButton orphelin (c.à.d sans parent: non contenu dans un autre widget) dont nous passons la valeur B<undef> -comme argument pour le parent. B<undef> est l'équivalent perlQt d'un +comme argument pour le parent. B<undef> est l'équivalent perlTQt d'un pointeur null en C++. Après les instructions de "mise en page" [l.4], nous indiquons à @@ -206,26 +206,26 @@ B<Sommaire de la syntaxe :> =item 1 -Les classes PerlQt sont accessibles par le préfixe B<Qt::> au lieu du -B<Q> initial des classes Qt en C++. En consultant la L<documentation -Qt|"http://doc.trolltech.com">, vous devez donc mentalement changer le -nom d'une clasee B<QFoo> en B<Qt::Foo>. +Les classes PerlTQt sont accessibles par le préfixe B<TQt::> au lieu du +B<Q> initial des classes TQt en C++. En consultant la L<documentation +TQt|"http://doc.trolltech.com">, vous devez donc mentalement changer le +nom d'une clasee B<TQFoo> en B<TQt::Foo>. =item 2 De manière similaire à C++, un objet est créé par l'appel d'un B<constructeur> de même nom que la classe dont il est une méthode. -Vous ne devez donc pas dire C<new Qt::Foo> ou C<Qt::Foo-E<gt>new()> +Vous ne devez donc pas dire C<new TQt::Foo> ou C<TQt::Foo-E<gt>new()> contrairement à l'usage commun en Perl. Dites simplement: - my $object = Qt::<classname>(arg_1, ..., arg_n); + my $object = TQt::<classname>(arg_1, ..., arg_n); Un constructeur sans argument s'énonce encore plus brièvement : - my $object = Qt::<classname>; + my $object = TQt::<classname>; =item 3 @@ -234,18 +234,18 @@ Comme il a déjà été dit, l'équivalent Perl d'un pointeur C++ est le mot-clé Perl B<undef>. Les pointeurs sont les arguments précédés par le caractère B<*> dans la -documentation Qt (Par exemple: "C<QWidget* widget>"). +documentation TQt (Par exemple: "C<TQWidget* widget>"). =back =head2 L'héritage et les objets -Avant d'expliquer comment les routines Perl peuvent être appelées de Qt, -parlons du mécanisme d'héritage vu de PerlQt. +Avant d'expliquer comment les routines Perl peuvent être appelées de TQt, +parlons du mécanisme d'héritage vu de PerlTQt. -PerlQt est conçu pour allier la simplicité de Qt à la puissance et à la -flexibilité de Perl. Pour ce faire, PerlQt étend le paradigme objet de -Perl pour mimer Qt et son mécanisme de B<métaobjets>. +PerlTQt est conçu pour allier la simplicité de TQt à la puissance et à la +flexibilité de Perl. Pour ce faire, PerlTQt étend le paradigme objet de +Perl pour mimer TQt et son mécanisme de B<métaobjets>. =head3 Un Widget personnalisé @@ -255,8 +255,8 @@ de PushButton: 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); 6: 7: sub NEW 8: { @@ -268,29 +268,29 @@ de PushButton: 14: 15: package main; 16: - 17: use Qt; + 17: use TQt; 18: use Button; 19: - 20: my $a = Qt::Application(\@ARGV); + 20: my $a = TQt::Application(\@ARGV); 21: my $w = Button("Hello World!", undef); 22: $a->setMainWidget($w); 23: $w->show; 24: exit $a->exec; Pour implanter notre propre version de PushButton, nous créons un nouveau -package [l.3] et importons Qt [l.4]. +package [l.3] et importons TQt [l.4]. -Nous utilisons le pragma C<Qt::isa> [l.5] pour déclarer notre widget +Nous utilisons le pragma C<TQt::isa> [l.5] pour déclarer notre widget comme sous-classe de PushButton. Ce pragma accepte une liste de une ou plusieurs classes dont dérive la classe à définir. Créons maintenant un constructeur pour notre nouveau widget en écrivant une routine appelée B<NEW> I<(notez les majuscules qui marquent une méthode différente du constructeur "new" usuel)>. -Le constructeur PerlQt est appelé B<implicitement> I<comme ligne 21>. +Le constructeur PerlTQt est appelé B<implicitement> I<comme ligne 21>. Note widget doit d'abord appeler le constructeur de sa classe de base -(ici: Qt::PushButton) à la ligne 9, avec tous les arguments que nous +(ici: TQt::PushButton) à la ligne 9, avec tous les arguments que nous avons reçus. Nous créons ainsi un objet instance de notre classe. Cette objet est @@ -309,7 +309,7 @@ ses différents composants à l'intérieur de variables de scope lexical par leur parent et non nécessairement quand leur conteneur disparaît du scope. -En d'autres termes, PerlQt utilise un système de comptage de +En d'autres termes, PerlTQt utilise un système de comptage de références pour gérer la destruction des objets. Souvent cependant, vous souhaiterez accéder aux composants de votre objet depuis @@ -320,23 +320,23 @@ l'objet lui-même. Mais cette syntaxe s'avère peu pratique à l'usage et beaucoup trop libre - il n'y a pas de vérification à la compilation de sorte que vous pouvez accéder à des clefs non existantes sans déclencher d'erreur. -En lieu et place de cette syntaxe, PerlQt introduit le concept d'B<attributs>. +En lieu et place de cette syntaxe, PerlTQt introduit le concept d'B<attributs>. Les attributs sont de simples variables perl, écrites sans le signe dollar initial, et pouvant contenir toute donnée qui est une propriété de votre objet. Leur principal avantage est de fournir une syntaxe très rapide et vérifiable à la compilation. Pour définir et pouvoir utiliser de nouveaux attributs, il suffit d'utiliser -le pragma C<use Qt::attributes>, suivi d'une liste des noms d'attributs souhaités. +le pragma C<use TQt::attributes>, suivi d'une liste des noms d'attributs souhaités. Ainsi: 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw( + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw( 7: itsTime 8: pData 9: ); @@ -344,7 +344,7 @@ Ainsi: 11: sub NEW 12: { 13: shift->SUPER::NEW(@_[0..2]); - 14: itsTime = Qt::Time; + 14: itsTime = TQt::Time; 15: itsTime->start; 16: pData->{'key'} = " Foo "; 17: } @@ -362,7 +362,7 @@ Ainsi: <div class='image'><img src="../images/ex2.png"/></div> -L'attribut itsTime est déclaré à la ligne 7 et initialisé par un objet C<Qt::Time> +L'attribut itsTime est déclaré à la ligne 7 et initialisé par un objet C<TQt::Time> à la ligne 14. Puisque nous réimplémentons la fonction virtuelle "resizeEvent" @@ -377,12 +377,12 @@ B<Récapitulation> =item * -Pour hériter d'une classe Qt, un package doit contenir un -pragma C<use Qt::isa>. +Pour hériter d'une classe TQt, un package doit contenir un +pragma C<use TQt::isa>. Ainsi: - use Qt::isa "Qt::widget"; + use TQt::isa "TQt::widget"; =item * @@ -443,7 +443,7 @@ est possible, mais qu'elle passe l'objet comme premier argument. Lorsque vous devez stocker dans votre package un objet contenu, vous devez le définir comme B<attribut> : - use Qt::attributes qw( + use TQt::attributes qw( firstAttribute ... lastAttribute); @@ -466,22 +466,22 @@ Pour réimplémenter une B<fonction virtuelle>, créez simplement une B<sub> de même nom que cette fonction. Les fonctions virtuelles existantes sont marquées comme telles dans -la documentation de Qt (ce sont les méthodes précédées du mot clef "virtual"). +la documentation de TQt (ce sont les méthodes précédées du mot clef "virtual"). -Vous pouvez visualiser les noms de méthodes virtuelles que Qt tentera d'appeler -dans votre classe en plaçant C<use Qt::debug qw|virtual|> en tête de +Vous pouvez visualiser les noms de méthodes virtuelles que TQt tentera d'appeler +dans votre classe en plaçant C<use TQt::debug qw|virtual|> en tête de votre programme. =back =head2 Signaux et Slots -Voyons maintenant comment les objets Qt peuvent communiquer entre eux +Voyons maintenant comment les objets TQt peuvent communiquer entre eux de manière à ce qu'un événement concernant un objet puisse déclencher l'exécution d'une routine en un quelconque endroit de votre programme. Dans d'autres toolkits, les callbacks (appels en retour) sont généralement -utilisés à cet effet. Mais Qt dispose d'un mécanisme beaucoup plus puissant +utilisés à cet effet. Mais TQt dispose d'un mécanisme beaucoup plus puissant et plus flexible : les B<Signaux et Slots>. On peut se le représenter comme le cablage entre les composants d'une @@ -492,7 +492,7 @@ pour commencer à enregistrer, et il ne cherchera pas à savoir s'il est l'unique destinataire de ce signal ou si ce dernier est aussi reçu par un graveur de CD ou écouté au casque. -Un composant Qt se comporte comme notre amplificateur ou notre +Un composant TQt se comporte comme notre amplificateur ou notre magnétophone. Il a des sorties ou B<Signaux> et des entrées ou B<Slots>. Chaque sortie (signal) est connectable à un nombre illimité d'entrées (slots). La sortie d'un composant peut être potentiellement @@ -501,18 +501,18 @@ branchée à toute entrée d'un composant (y compris lui-même), La syntaxe de ce système de connexion est soit: -Qt::Object::connect( envoyeur, SIGNAL 'mon_signal(types_d_arguments)', -recepteur, SLOT 'monslot(types_d_arguments)'); +TQt::Object::connect( envoyeur, TQT_SIGNAL 'mon_signal(types_d_arguments)', +recepteur, TQT_SLOT 'monslot(types_d_arguments)'); soit: -unObjet->connect( envoyeur, SIGNAL 'mon_signal(types_d_arguments)', +unObjet->connect( envoyeur, TQT_SIGNAL 'mon_signal(types_d_arguments)', SLOT 'monslot(types_d_arguments)'); Dans le second cas, le récepteur est omis car c'est l'objet lui-même, Ce mécanisme est extensible à volonté par la déclaration de nouveaux Signaux et -Slots par l'usage des pragma C<use Qt::signals> et C<use Qt::slots> +Slots par l'usage des pragma C<use TQt::signals> et C<use TQt::slots> (voir aussi la deuxième syntaxe décrite plus bas). Chaque slot déclaré appellera la routine correspondante de votre @@ -523,22 +523,22 @@ B<Réécrivons encore notre exemple pour illustrer nos propos :> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw(itsTime); - 7: use Qt::slots + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw(itsTime); + 7: use TQt::slots 8: aEteClicke => [], 9: changement => ['int', 'int']; - 10: use Qt::signals + 10: use TQt::signals 11: changeLe => ['int', 'int']; 12: 13: sub NEW 14: { 15: shift->SUPER::NEW(@_[0..2]); - 16: itsTime = Qt::Time; + 16: itsTime = TQt::Time; 17: itsTime->start; - 18: this->connect(this, SIGNAL 'clicked()', SLOT 'aEteClicke()'); - 19: this->connect(this, SIGNAL 'changeLe(int,int)', SLOT 'changement(int,int)'); + 18: this->connect(this, TQT_SIGNAL 'clicked()', TQT_SLOT 'aEteClicke()'); + 19: this->connect(this, TQT_SIGNAL 'changeLe(int,int)', TQT_SLOT 'changement(int,int)'); 20: } 21: 22: sub aEteClicke @@ -560,7 +560,7 @@ B<Réécrivons encore notre exemple pour illustrer nos propos :> Nous définissons dans ce package deux nouveaux slots et un nouveau signal. -La documentation Qt nous dit que tout PushButton clické émet un signal +La documentation TQt nous dit que tout PushButton clické émet un signal C<clicked()> ; nous le connectons donc à notre nouveau slot [ligne 18]. Nous connectons aussi notre signal C<ChangeLe> à notre slot @@ -571,9 +571,9 @@ C<clicked()> est émit et déclenche le slot C<aEteClicke()>. C<aEteClicke()> émet à son tour le signal C<changeLe(int,int)>[l.27], appelant de ce fait le slot C<changement(int,int)>, avec deux arguments. -Enfin, il existe une syntaxe alternative introduite dans PerlQt-3.008 : +Enfin, il existe une syntaxe alternative introduite dans PerlTQt-3.008 : - sub un_slot : SLOT(int, QString) + sub un_slot : TQT_SLOT(int, TQString) { $int = shift; $string = shift; @@ -582,17 +582,17 @@ Enfin, il existe une syntaxe alternative introduite dans PerlQt-3.008 : et - sub un_signal : SIGNAL(QString); + sub un_signal : TQT_SIGNAL(TQString); Cette syntaxe est parfaitement compatible avec la déclaration par le biais de -C<use Qt::signals> et C<use Qt::slots>. +C<use TQt::signals> et C<use TQt::slots>. Il peut d'ailleurs d'avérer très profitable pour la clarté du programme de déclarer tout d'abord -les signaux/slots au moyen de C<use Qt::slots/signals>, puis de rappeler cette déclaration au niveau de +les signaux/slots au moyen de C<use TQt::slots/signals>, puis de rappeler cette déclaration au niveau de l'implémentation à l'aide de la seconde syntaxe. Les déclarations seront alors vérifiées à la compilation, et le moindre conflit générera un avertissement. -=head1 Développement rapide (RAD) avec Qt Designer et Puic +=head1 Développement rapide (RAD) avec TQt Designer et Puic =head2 Introduction @@ -601,30 +601,30 @@ générera un avertissement. =item * N.B: -Depuis la version 3.008, il existe un plugin spécifique à PerlQt pour Qt Designer. +Depuis la version 3.008, il existe un plugin spécifique à PerlTQt pour TQt Designer. Ce plugin (disponible sur les pages internet du projet) apporte le confort d'une intégration poussée, la coloration syntaxique Perl, la complétion automatique, et permet de lancer et déboguer un projet sans quitter l'interface du Designer. Ce qui suit reste néanmoins parfaitement valable pour ce qui est de l'utilisation de puic en ligne de commande, -et pour l'utilisation de Qt Designer I<sans> le plugin spécifique. +et pour l'utilisation de TQt Designer I<sans> le plugin spécifique. =back -Aussi puissant et intuitif que soit Qt, écrire une GUI complète reste un exercice +Aussi puissant et intuitif que soit TQt, écrire une GUI complète reste un exercice fastidieux. -Heureusement, Qt est fourni avec un constructeur de GUI sophistiqué -appelé Qt Designer qui est quasiment un environnement de développement +Heureusement, TQt est fourni avec un constructeur de GUI sophistiqué +appelé TQt Designer qui est quasiment un environnement de développement intégré. Il comporte la gestion de Projets, la création d'un GUI par des actions de "drag and drop", un butineur d'objet complet, l'interconnexion graphique de signaux et de slots, et plus encore. -L'information générée par Qt Designer's est en format XML et peut donc +L'information générée par TQt Designer's est en format XML et peut donc être parsée par différentes commandes comme dont B<puic> (le -compilateur d'interface utilisateur PerlQt). +compilateur d'interface utilisateur PerlTQt). Supposons que vous avez déja construit un fichier d'interface avec -Qt Designer, la transcription en un programme PerlQt se fait par +TQt Designer, la transcription en un programme PerlTQt se fait par la simple exécution de la commande : puic -x -o program.pl program.ui @@ -648,7 +648,7 @@ Il y a deux manières d'inclure des B<images ou icônes>: =item * Inclusion Inline A cette fin, nous devons sélectionner "Edit->Form -Settings->Pixmaps->Save inline" dans Qt Designer et executer ensuite: +Settings->Pixmaps->Save inline" dans TQt Designer et executer ensuite: puic -x -o F<program.pl> F<program.ui> @@ -662,7 +662,7 @@ Cette stratégie est plus complexe, mais plus propre et plus puissante. Ajoutez l'instruction C<use Collection.pm> dans le package principal de votre programme. -Si vous avez créé un fichier projet dans Qt Designer et ajouté toutes +Si vous avez créé un fichier projet dans TQt Designer et ajouté toutes les images dans un groupe (par "Project->Image Collection"), vous disposez ensuite de ces images dans le répertoire où votre fichier projet (*.pro) est stocké, dans le sous-répertoire B<image>. Vous pouvez @@ -690,7 +690,7 @@ Voici une meilleure méthode : =item * Écrire l'implémentation de slots dans le Designer -Dans Qt Designer, selectionnez l'onglet I<Source> dans l'explorateur +Dans TQt Designer, selectionnez l'onglet I<Source> dans l'explorateur d'objets (B<Object Explorer>). Vous pouvez ainsi voir représentées sous forme d'arbre les classes que vous avez générées. Maintenant, si vous cliquez deux fois sur l'entrée I<Slots/public>, @@ -768,7 +768,7 @@ ou =head1 Autres outils de développement -PerlQt comprend également deux programmes pouvant vous aider à maîtriser l'API de Qt : +PerlTQt comprend également deux programmes pouvant vous aider à maîtriser l'API de TQt : =head2 pqtapi @@ -779,14 +779,14 @@ pqtapi est un outil d'introspection en ligne de commande. options: -r <re> : chercher les méthodes correspondant à l'expression régulière <re> -i : avec -r, effectue une recherche insensible à la casse - -v : afficher les versions de PerlQt et de Qt + -v : afficher les versions de PerlTQt et de TQt -h : afficher ce message d'aide ex: $>pqtapi -ir 'setpoint.* int' - void QCanvasLine::setPoints(int, int, int, int) - void QPointArray::setPoint(uint, int, int) + void TQCanvasLine::setPoints(int, int, int, int) + void TQPointArray::setPoint(uint, int, int) =head2 pqtsh @@ -799,19 +799,19 @@ Un exemple dynamique est accessible dans l'entrée de menu C<Help-E<gt>Example>. =head1 Limitations -Les classes à modèle (templates) ne sont pas encore accessibles par PerlQt. +Les classes à modèle (templates) ne sont pas encore accessibles par PerlTQt. En revanche, les classes dérivées de classes à modèle sont disponibles. Vous pouvez reconnaître ce type de classe en ce que leurs arguments comprennent un type générique placé entre les signes "<" et ">". ex: - QDictIterator ( const QDict<type> & dict ) + TQDictIterator ( const TQDict<type> & dict ) =head1 Crédits -PerlQt-3 est (c) 2002 Ashley Winters (et (c) 2003 Germain Garand) +PerlTQt-3 est (c) 2002 Ashley Winters (et (c) 2003 Germain Garand) Kalyptus et l'engin de génération Smoke sont (c) David Faure and Richard Dale @@ -822,9 +822,9 @@ Ledit logiciel est délivré sous la GNU Public Licence v.2 or later. =head1 Appendice: Les conventions de C++ et leur traduction en Perl -Lorsque vous voulez utiliser depuis PerlQt une classe ou méthode décrite -dans la L<documentation|"http://doc.trolltech.com"> Qt (voyez aussi le programme -$QTDIR/bin/assistant livré avec Qt), vous devez suivre des règles de translation simples. +Lorsque vous voulez utiliser depuis PerlTQt une classe ou méthode décrite +dans la L<documentation|"http://doc.trolltech.com"> TQt (voyez aussi le programme +$TQTDIR/bin/assistant livré avec TQt), vous devez suivre des règles de translation simples. =over 4 @@ -834,9 +834,9 @@ $QTDIR/bin/assistant livré avec Qt), vous devez suivre des règles de translation =item * -Les noms de classes utilisent le préfixe B<Qt::> au lieu de B<Q> pour -être conforme à l'usage Perl. Ainsi: QComboBox est nommé Qt::ComboBox -dans PerlQt. +Les noms de classes utilisent le préfixe B<TQt::> au lieu de B<Q> pour +être conforme à l'usage Perl. Ainsi: TQComboBox est nommé TQt::ComboBox +dans PerlTQt. =back @@ -847,10 +847,10 @@ dans PerlQt. =item * Les fonctions décrites comme B<static> sont accédées directement et non -à travers un objet. Ainsi la fonction statique Foo de la classe B<QBar> -peut être accédée de PerlQt par +à travers un objet. Ainsi la fonction statique Foo de la classe B<TQBar> +peut être accédée de PerlTQt par - Qt::Bar::Foo( arg-1,...,arg-n); + TQt::Bar::Foo( arg-1,...,arg-n); =item * @@ -862,7 +862,7 @@ Par exemple: $widget->show; Il n'y a pas de différence fondamentale entre les méthodes et les -signaux, néanmoins PerlQt fournit le mot-clé B<emit> comme une +signaux, néanmoins PerlTQt fournit le mot-clé B<emit> comme une mnémonique pratique pour rendre clair que vous émettez un signal : emit $button->clicked; @@ -877,17 +877,17 @@ mnémonique pratique pour rendre clair que vous émettez un signal : Lorsqu'un argument n'est pas précédé par un des caractères B<&> or B<*>, il est passé par valeur. Pour tous les types basiques tels que -int, char, float and double, PerlQt convertira automatiquement les +int, char, float and double, PerlTQt convertira automatiquement les valeurs litérales et scalaires dans le type correspondants C++. Ainsi pour le prototype d'un constructeur écrit dans la documentation comme ceci: - QSize ( int w, int h ) + TQSize ( int w, int h ) Vous écrirez : - Qt::Size(8, 12); + TQt::Size(8, 12); =item * Par référence @@ -895,12 +895,12 @@ Lorsqu'un argument est précédé par le caractère B<&>, Il est une référence à un objet ou à un type. Vous pouvez alors fournir un nom de variable ou un objet temporaire : - $keyseq = Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $keyseq = TQt::keySequence( &TQt::CTRL + &TQt::F3 ); $widget->setAccel( $keyseq ); ou - $widget->setAccel(Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $widget->setAccel(TQt::keySequence( &TQt::CTRL + &TQt::F3 ); Si l'argument n'est I<pas> qualifié par B<const> (constante), l'argument est un objet qui peut être altéré par la méthode, vous devez @@ -909,7 +909,7 @@ donc passer une variable. =item * Par pointeur Lorsqu'un argument est précédé par le caractère B<*>, -un pointeur vers un objet ou un type est attendu. En PerlQt, vous +un pointeur vers un objet ou un type est attendu. En PerlTQt, vous pouvez fournir un nom de variable ou le mot clé B<undef> à la place du pointer Null. @@ -932,7 +932,7 @@ C<Apple>, C<Orange> et C<Lemon> ses valeurs possible , qui sont des aliases pour des nombres (ici 0, 1 et 2) -L'accès aux valeurs d'énumération en Perl Qt est un appel +L'accès aux valeurs d'énumération en Perl TQt est un appel de fonction statique. Donc, si vous voulez éviter des prblèmes de lisibilité, nous vous @@ -942,29 +942,29 @@ pour marquer l'utilisation d'un alias d'énumération: C<&fonction>. Revenons à notre exemple C<Strange>. -Si nous rencontrons sa définition dans la classe C<QFruits>, vous -écrirez en PerlQt : +Si nous rencontrons sa définition dans la classe C<TQFruits>, vous +écrirez en PerlTQt : - $pomme_plus_orange = &Qt::Fruit::Pomme + &Qt::Fruit::Orange; + $pomme_plus_orange = &TQt::Fruit::Pomme + &TQt::Fruit::Orange; =item Opérateurs -Dans PerlQt, la B<surcharge d'opérateurs> fonctionne de manière transparente. -Si un opérateur est surchargé dans une classe Qt (ce qui signifie que son utilisation +Dans PerlTQt, la B<surcharge d'opérateurs> fonctionne de manière transparente. +Si un opérateur est surchargé dans une classe TQt (ce qui signifie que son utilisation déclenchera un appel de méthode, au lieu d'utiliser l'opérateur générique) -il sera également surchargé dans PerlQt. +il sera également surchargé dans PerlTQt. ex-1: surcharge de '+=' - $p1 = Qt::Point(10, 10) - $p2 = Qt::Point(30,40) + $p1 = TQt::Point(10, 10) + $p2 = TQt::Point(30,40) $p2 += $p1; # $p2 devient (40,50) ex-2: surcharge de '<<' - $f = Qt::File("example"); + $f = TQt::File("example"); $f->open( IO_WriteOnly ); # voir l'entrée 'Constantes' plus bas - $s = Qt::TextStream( $f ); + $s = TQt::TextStream( $f ); $s << "Que faire avec " << 12 << " pommes ?"; @@ -974,62 +974,62 @@ Perl est très différent de C++ en matière de copie d'objets. =item Constantes -Qt n'utilise pas beaucoup de constantes, mais on en trouve cependant dans le module d'Entrées/Sorties, +TQt n'utilise pas beaucoup de constantes, mais on en trouve cependant dans le module d'Entrées/Sorties, où elles font office de drapeaux pour les modes d'ouverture de fichiers. Pour éviter de polluer inutilement l'espace de nom, nous avons regroupé les constantes dans le module -B<Qt::constants>, d'où elles seront chargées à la demande. +B<TQt::constants>, d'où elles seront chargées à la demande. Ainsi, pour importer l'ensemble des constantes d'E/S, on écrira : - use Qt::constants; + use TQt::constants; Et pour importer quelques symboles seulement : - use Qt::constants qw( IO_ReadOnly IO_WriteOnly ); + use TQt::constants qw( IO_ReadOnly IO_WriteOnly ); =item Fonctions globales -Qt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. +TQt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. Ces fonctions ont été rassemblées dans un espace de nom commun: -C<Qt::GlobalSpace>. +C<TQt::GlobalSpace>. Vous pourrez donc y accéder soit par un appel pleinement qualifié : - Qt::GlobalSpace::qUncompress( $buffer ) + TQt::GlobalSpace::qUncompress( $buffer ) Soit en important préalablement ces fonctions dans l'espace de nom courant : - use Qt::GlobalSpace; + use TQt::GlobalSpace; qUncompress( $buffer ) Bien entendu, vous pouvez aussi n'importer que les fonctions souhaitées : - use Qt::GlobalSpace qw( qUncompress bitBlt ) + use TQt::GlobalSpace qw( qUncompress bitBlt ) B<N.B:> GlobalSpace renferme également des opérateurs de portée globale, tels -celui permettant d'aditionner deux Qt::Point(). Ces opérateurs seront appelés +celui permettant d'aditionner deux TQt::Point(). Ces opérateurs seront appelés automatiquement. ex: - $p1 = Qt::Point(10, 10) + Qt::Point(20, 20) + $p1 = TQt::Point(10, 10) + TQt::Point(20, 20) =back =head1 Annexe 2 : Internationalisation -PerlQt résout les problèmes d'internationalisation en convertissant systématiquement les B<QString> -de Qt en B<utf8> côté Perl. +PerlTQt résout les problèmes d'internationalisation en convertissant systématiquement les B<TQString> +de TQt en B<utf8> côté Perl. -Les conversions en sens inverse, depuis Perl vers Qt sont traitées différemment suivant le contexte : +Les conversions en sens inverse, depuis Perl vers TQt sont traitées différemment suivant le contexte : =over 4 =item * Si la chaîne de caractère est déjà marquée comme étant utf8 -alors elle sera convertie en QString directement. +alors elle sera convertie en TQString directement. C'est la manière privilégiée d'opérer, et la plus simple : Il vous suffit d'insérer un pragma B<use utf8> en tête de vos programmes, puis d'utiliser un éditeur de @@ -1038,23 +1038,23 @@ Les chaînes seront marquées par Perl automatiquement. =item * Si la chaîne n'est pas marquée comme utf8, et le pragma 'use locale' n'est pas actif -alors la conversion en QString se fera depuis l'B<ISO-Latin-1>. +alors la conversion en TQString se fera depuis l'B<ISO-Latin-1>. =item * Si la chaîne n'est pas marquée comme utf8, et le pragma 'use locale' est actif -alors la conversion en QString se fera depuis votre B<locale>. +alors la conversion en TQString se fera depuis votre B<locale>. =back Lorsque des chaînes contiennent de l'utf8, Perl adapte automatiquement ses opérateurs pour que leur gestion soit entièrement transparente (comprendre opaque, comme toujours...). Cependant, vous pourrez avoir besoin à l'occasion de les transcrire en d'autres jeux d'encodage. -Ceci peut se faire soit avec Qt : +Ceci peut se faire soit avec TQt : - $tr1=Qt::TextCodec::codecForLocale(); # ceci utilisera la locale en vigueur - $tr2=Qt::TextCodec::codecForName("KOI8-R"); # ceci force l'emploi d'une locale spécifique (Russe) + $tr1=TQt::TextCodec::codecForLocale(); # ceci utilisera la locale en vigueur + $tr2=TQt::TextCodec::codecForName("KOI8-R"); # ceci force l'emploi d'une locale spécifique (Russe) - print $tr1->fromUnicode(Qt::DateTime::currentDateTime()->toString)."\n\n"; + print $tr1->fromUnicode(TQt::DateTime::currentDateTime()->toString)."\n\n"; print $tr2->fromUnicode($une_chaine_utf8); Soit avec les outils de Perl (pour perl >= 5.8.0). @@ -1066,7 +1066,7 @@ Les programmeurs souhaitant désactiver temporairement l'encodage utf8 (pour la gestion de programmes externes ou de modules anciens ne supportant pas cet encodage) pourront utiliser le pragma B<use bytes> (et sa réciproque : B<no bytes>). -Dans la portée de ce pragma, les conversions depuis QString vers les chaînes Perl se feront en ISO-Latin1 +Dans la portée de ce pragma, les conversions depuis TQString vers les chaînes Perl se feront en ISO-Latin1 (par défaut) ou suivant la locale en vigueur (si B<use locale> est actif). Notez bien qu'il est préférable de I<ne pas utiliser ce pragma à la légère>, en ce qu'il ruine totalement les @@ -1075,14 +1075,14 @@ Il est très préférable de corriger les programmes fautifs. =head1 Annexe 3 : Canaux de déboguage -Le module B<Qt::debug> offre divers canaux de déboguage permettant de filtrer +Le module B<TQt::debug> offre divers canaux de déboguage permettant de filtrer le flux conséquent d'informations disponibles pour l'adapter à vos besoins. - use Qt::debug; + use TQt::debug; - use Qt::debug qw|calls autoload verbose|; + use TQt::debug qw|calls autoload verbose|; -Avec le pragma C<use Qt::debug>, seuls les canaux B<verbose> et B<ambiguous> sont activés. +Avec le pragma C<use TQt::debug>, seuls les canaux B<verbose> et B<ambiguous> sont activés. Si vous le faites suivre d'une liste précise de canaux, seuls ceux-ci seront affichés. B<Liste et descriptif des canaux :> @@ -1102,32 +1102,32 @@ Utilisé avec B<ambiguous>, vous donnera les correspondances les plus proches lor ex: - use Qt; - use Qt::debug; - $a= Qt::Application(\@ARGV); + use TQt; + use TQt::debug; + $a= TQt::Application(\@ARGV); $a->libraryPath("chose"); --- No method to call for : - QApplication::libraryPath('chose') + TQApplication::libraryPath('chose') Closer candidates are : - static void QApplication::addLibraryPath(const QString&) - static QStringList QApplication::libraryPaths() - static void QApplication::removeLibraryPath(const QString&) - static void QApplication::setLibraryPaths(const QStringList&) + static void TQApplication::addLibraryPath(const TQString&) + static TQStringList TQApplication::libraryPaths() + static void TQApplication::removeLibraryPath(const TQString&) + static void TQApplication::setLibraryPaths(const TQStringList&) =item * calls -Pour chaque appel de méthode, vous dira quelle méthode Qt est finalement appelée, +Pour chaque appel de méthode, vous dira quelle méthode TQt est finalement appelée, en précisant les arguments si B<verbose> est actif. =item * autoload -Détaille le passage dans le code intermédiaire faisant la jonction entre Perl et Qt. +Détaille le passage dans le code intermédiaire faisant la jonction entre Perl et TQt. =item * gc Donne des informations sur la collection des déchets, c'est à dire sur la destruction des objets, -qu'ils soient détruits depuis Perl ou Qt. +qu'ils soient détruits depuis Perl ou TQt. =item * virtual @@ -1144,46 +1144,46 @@ Activer tous les canaux. Un marshalleur est un convertisseur permettant de transcrire un type de données en un autre. -Dans PerlQt, la plupart des objets Qt gardent leurs propriétés d'objet, ce qui permet d'invoquer leurs méthodes +Dans PerlTQt, la plupart des objets TQt gardent leurs propriétés d'objet, ce qui permet d'invoquer leurs méthodes et de changer leurs propriétés comme il se doit. Cependant, il arrive que l'objet d'origine corresponde à ce point à un type natif de Perl qu'il serait malséant d'utiliser l'interface C++ et beaucoup plus naturel de lui substituer son équivalent. Ici interviennent les marshalleurs. -Plutôt que de retourner un objet Qt::StringList, qui serait délicat à manipuler, -PerlQt le transformera en référence de liste Perl. +Plutôt que de retourner un objet TQt::StringList, qui serait délicat à manipuler, +PerlTQt le transformera en référence de liste Perl. Dès lors, tous les opérateurs de manipulation de liste pourront lui être appliqué : on gagne en densité, en cohérence et en simplicité. Cette transformation s'appliquera aussi en sens inverse, et n'importe quelle liste de chaînes Perl -pourra être donnée en argument à une méthode attendant une Qt::StringList. +pourra être donnée en argument à une méthode attendant une TQt::StringList. - Liste des marshalleurs (PerlQt-3.008) + Liste des marshalleurs (PerlTQt-3.008) ----------------------------------------------------------------- float, double <=> réel Perl (NV) char, uchar, int, uint, enum long, ulong, short, ushort <=> entier Perl (IV) - QString, -&, -* => chaîne Perl (utf8) - QString, -&, -* <= chaîne Perl (utf8 ou iso-latin1 ou locale) - QCString, -&, -* <=> chaîne Perl (utf8 ou octets, suivant contenu ou pragma "bytes") - QStringList, -&, -* => référence à une liste de chaînes Perl (utf8) - QByteArray, -&, -* <=> chaîne Perl (octets) + TQString, -&, -* => chaîne Perl (utf8) + TQString, -&, -* <= chaîne Perl (utf8 ou iso-latin1 ou locale) + TQCString, -&, -* <=> chaîne Perl (utf8 ou octets, suivant contenu ou pragma "bytes") + TQStringList, -&, -* => référence à une liste de chaînes Perl (utf8) + TQByteArray, -&, -* <=> chaîne Perl (octets) int&, -* <=> entier Perl (IV) bool&, -* <=> booléen Perl char* <=> chaîne Perl (octets) char** <= référence à une liste de chaînes Perl (octets) uchar* <= chaîne Perl(octets) - QRgb* <= référence à une liste d'entiers Perl (IV) - QCOORD* <= référence à une liste d'entiers Perl (IV) + TQRgb* <= référence à une liste d'entiers Perl (IV) + TQCOORD* <= référence à une liste d'entiers Perl (IV) void* <=> référence à un entier Perl (IV) - QValueList<int>, - *, - & <=> référence à une liste d'entiers Perl (IV) - QCanvasItemList, - *, - & => réference à une liste de Qt::CanvasItem - QWidgetList, - *, - & <=> réference à une liste de Qt::Widget - QObjectList, - *, - & <=> réference à une liste de Qt::Object - QFileInfoList, - *, - & <=> réference à une liste de Qt::FileInfo - QPtrList<QTab>, - *, - & <=> réference à une liste de Qt::Tab - QPtrList<QToolBar>, - *, - & <=> réference à une liste de Qt::ToolBar - QPtrList<QNetworkOperation>, - *, - & <=> réference à une liste de Qt::NetworkOperation - QPtrList<QDockWindow>, - *, - & <=> réference à une liste de Qt::DockWindow - (QUObject*) + TQValueList<int>, - *, - & <=> référence à une liste d'entiers Perl (IV) + TQCanvasItemList, - *, - & => réference à une liste de TQt::CanvasItem + TQWidgetList, - *, - & <=> réference à une liste de TQt::Widget + TQObjectList, - *, - & <=> réference à une liste de TQt::Object + TQFileInfoList, - *, - & <=> réference à une liste de TQt::FileInfo + TQPtrList<TQTab>, - *, - & <=> réference à une liste de TQt::Tab + TQPtrList<TQToolBar>, - *, - & <=> réference à une liste de TQt::ToolBar + TQPtrList<TQNetworkOperation>, - *, - & <=> réference à une liste de TQt::NetworkOperation + TQPtrList<TQDockWindow>, - *, - & <=> réference à une liste de TQt::DockWindow + (TQUObject*) diff --git a/doc/fr/index.html b/doc/fr/index.html index 2f5e788..18fde1c 100644 --- a/doc/fr/index.html +++ b/doc/fr/index.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>Programmer avec PerlQt</title> +<title>Programmer avec PerlTQt</title> <link rel="stylesheet" href="../css/pod.css" type="text/css" /> <link rev="made" href="mailto:root@localhost" /> </head> @@ -13,17 +13,17 @@ <ul> - <li><a href="#programmer_avec_perlqt">Programmer avec PerlQt</a></li> + <li><a href="#programmer_avec_perlqt">Programmer avec PerlTQt</a></li> <li><a href="#introduction">Introduction</a></li> <li><a href="#installation">Installation</a></li> <ul> <li><a href="#conditions_requises">Conditions requises</a></li> - <li><a href="#compilation_de_perlqt">Compilation de PerlQt</a></li> + <li><a href="#compilation_de_perlqt">Compilation de PerlTQt</a></li> <li><a href="#installation_avec_les_droits_d'utilisateur">Installation avec les droits d'utilisateur</a></li> </ul> - <li><a href="#anatomie_de_perlqt">Anatomie de PerlQt</a></li> + <li><a href="#anatomie_de_perlqt">Anatomie de PerlTQt</a></li> <ul> <li><a href="#hello_world">Hello World</a></li> @@ -37,7 +37,7 @@ <li><a href="#signaux_et_slots">Signaux et Slots</a></li> </ul> - <li><a href="#développement_rapide_(rad)_avec_qt_designer_et_puic">Développement rapide (RAD) avec Qt Designer et Puic</a></li> + <li><a href="#développement_rapide_(rad)_avec_qt_designer_et_puic">Développement rapide (RAD) avec TQt Designer et Puic</a></li> <ul> <li><a href="#introduction">Introduction</a></li> @@ -73,9 +73,9 @@ <hr /> <p> </p> -<h1><a name="programmer_avec_perlqt">Programmer avec PerlQt</a></h1> +<h1><a name="programmer_avec_perlqt">Programmer avec PerlTQt</a></h1> <p><strong>Germain Garand</strong> traduit par <strong>Stéphane Payrard</strong>, révisé et augmenté par l'auteur.</p> -<p>Ce document décrit l'interface Perl au toolkit Qt 3.x. Contacter +<p>Ce document décrit l'interface Perl au toolkit TQt 3.x. Contacter l'auteur à <<a href="mailto:germain@ebooksfrance.com">germain@ebooksfrance.com</a>> ou le traducteur à <<a href="mailto:stef@mongueurs.net">stef@mongueurs.net</a>>. Vous trouverez le document original sur le site <a href="http://perlqt.sourceforge.net">perlqt.sourceforge.net</a></p> @@ -83,23 +83,23 @@ l'auteur à <<a href="mailto:germain@ebooksfrance.com">germain@ebooksfrance.co </p> <hr /> <h1><a name="introduction">Introduction</a></h1> -<p>PerlQt-3, crée par Ashley Winters, est une interface perl aux composants -graphiques (et non graphiques) fournis par Qt3.</p> -<p>Le toolkit Qt 3.0 auquel PerlQt accède à été écrit en C++ par la société +<p>PerlTQt-3, crée par Ashley Winters, est une interface perl aux composants +graphiques (et non graphiques) fournis par TQt3.</p> +<p>Le toolkit TQt 3.0 auquel PerlTQt accède à été écrit en C++ par la société Trolltech: <a href="http://www.trolltech.com">Trolltech</a>.</p> -<p>PerlQt3 est fondé sur la librairie +<p>PerlTQt3 est fondé sur la librairie <a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SMOKE</a>, une surcouche fine indépendante du langage. Cette couche a été générée -à partir des fichiers d'en tête de Qt par le +à partir des fichiers d'en tête de TQt par le <a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/kalyptus">kalyptus</a> de Richard Dale grâce au module de David Faure.</p> -<p>Le présent document décrit les principes de la programmation PerlQt. +<p>Le présent document décrit les principes de la programmation PerlTQt. Vous devez avoir des notions de programmation orientée objet en Perl pour le lire. Une connaissance de C++ est recommandée mais non requise. Avec -celle de l'anglais, elle vous facilitera la consultation des <a href="http://doc.trolltech.com">manuels en ligne de Qt</a>. Ladite documentation est +celle de l'anglais, elle vous facilitera la consultation des <a href="http://doc.trolltech.com">manuels en ligne de TQt</a>. Ladite documentation est la seule référence qui fasse autorité.</p> -<p>Si Qt est installé sur votre système, sa documentation l'est -certainement aussi : voyez le programme $QTDIR/bin/assistant.</p> +<p>Si TQt est installé sur votre système, sa documentation l'est +certainement aussi : voyez le programme $TQTDIR/bin/assistant.</p> <p> </p> <hr /> @@ -107,7 +107,7 @@ certainement aussi : voyez le programme $QTDIR/bin/assistant.</p> <p> </p> <h2><a name="conditions_requises">Conditions requises</a></h2> -<p>Pour compiler et utiliser PerlQt, vous devez avoir:</p> +<p>Pour compiler et utiliser PerlTQt, vous devez avoir:</p> <ul> <li></li> un système conforme à la norme POSIX. @@ -116,41 +116,41 @@ un système conforme à la norme POSIX. <a href="http://www.perl.org">Perl >= v5.6.0</a> <p></p> <li></li> -<a href="http://www.trolltech.com/developer/download/qtx11.html">Qt >= v3.0</a> +<a href="http://www.trolltech.com/developer/download/qtx11.html">TQt >= v3.0</a> <p></p> <li></li> -<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeQt 1.2.1</a> La +<a href="http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebindings/smoke">SmokeTQt 1.2.1</a> La librarie SMOKE (Scripting Meta Object Kompiler) fait partie du module <a href="http://www.kde.org">KDE</a>'s <strong>kdebindings</strong>. Vous pouvez vérifier si une version précompilée de ce module existe pour votre système. Mais -perlQt inclut une copie, donc la version précompilée n'est pas +perlTQt inclut une copie, donc la version précompilée n'est pas nécessaire. <p></p> <li></li> Les outils GNU : automake(>=1.5), autoconf (>=2.13), aclocal... <p></p></ul> -<p>L'installation de Perl et de Qt sont en dehors du sujet du présent +<p>L'installation de Perl et de TQt sont en dehors du sujet du présent document. Se référer aux documentations respectives de ces logiciels.</p> <p> </p> -<h2><a name="compilation_de_perlqt">Compilation de PerlQt</a></h2> +<h2><a name="compilation_de_perlqt">Compilation de PerlTQt</a></h2> <p>Les instructions de cette section présupposent que le répertoire courant est -le répertoire racine de l'arborescence des sources de PerlQt.</p> -<p>PerlQt utilise le système GNU Autoconf, mais il est préférable de le lancer via +le répertoire racine de l'arborescence des sources de PerlTQt.</p> +<p>PerlTQt utilise le système GNU Autoconf, mais il est préférable de le lancer via le script standard <code>Makefile.PL</code> :</p> <pre> perl Makefile.PL</pre> -<p><strong>N.B :</strong> Si la variable d'environnement <strong>QTDIR</strong> n'est pas définie, vous devrez -peut-être spécifier manuellement l'emplacement de Qt à l'aide de l'option :</p> +<p><strong>N.B :</strong> Si la variable d'environnement <strong>TQTDIR</strong> n'est pas définie, vous devrez +peut-être spécifier manuellement l'emplacement de TQt à l'aide de l'option :</p> <pre> - --with-qtdir=/emplacement/de/Qt</pre> + --with-qtdir=/emplacement/de/TQt</pre> <p>Si la bibliothèque SMOKE est manquante, <code>configure</code> générera ses sources dans un sous-répertoire.</p> <pre> make</pre> <pre> make install</pre> -<p>Cela installera PerlQt, Puic et les utilitaires pqtsh et pqtapi.</p> +<p>Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.</p> <p>Le lieu d'installation privilégié de SMOKE et de PUIC est le système de fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas définie), spécifier ce lieu avec l'option <code>--prefix</code> de <code>configure</code>'s. Ainsi :</p> @@ -170,19 +170,19 @@ dans laquelle la bibliothèque Smoke et l'exécutable 'puic' seront installés : <p>Ceci installera Smoke dans ~/lib et puic dans ~/bin</p> <p></p> <li></li> -Reconfigurez le module PerlQt pour qu'il ne s'installe pas dans la hiérarchie Perl ordinaire : +Reconfigurez le module PerlTQt pour qu'il ne s'installe pas dans la hiérarchie Perl ordinaire : <pre> - cd PerlQt + cd PerlTQt perl Makefile.PL PREFIX=~ cd ..</pre> <p>Attention : il ne s'agit pas du Makefile.PL situé à la racine de l'arborescence mais bien de celui -situé dans le sous-répertoire PerlQt</p> +situé dans le sous-répertoire PerlTQt</p> <p></p> <li></li> Lancez la compilation et l'installation <pre> make && make install</pre> -<p>Pour exécuter des programmes PerlQt, il vous faudra désormais indiquer à Perl l'emplacement de cette hiérarchie externe, +<p>Pour exécuter des programmes PerlTQt, il vous faudra désormais indiquer à Perl l'emplacement de cette hiérarchie externe, à l'aide d'une ligne de la forme :</p> <pre> perl -Mlib="~/local/lib/perl/5.x.x" programme.pl</pre> @@ -193,38 +193,38 @@ Lancez la compilation et l'installation <p> </p> <hr /> -<h1><a name="anatomie_de_perlqt">Anatomie de PerlQt</a></h1> -<p>Un programme Qt typique utilisant des composants GUI est fondé sur une +<h1><a name="anatomie_de_perlqt">Anatomie de PerlTQt</a></h1> +<p>Un programme TQt typique utilisant des composants GUI est fondé sur une boucle événementielle.</p> <p>Il ne se comporte pas comme une suite séquentielle d'instructions où vous devriez gérer vous-même chaque événement (tels que le clic de la souris ou l'enfoncement d'une touche).</p> -<p>Au lieu de cela, vous créez un objet <strong>Qt::Application</strong> et les composants +<p>Au lieu de cela, vous créez un objet <strong>TQt::Application</strong> et les composants du GUI qu'il utilise, puis vous définissez les méthodes d'objet à appeler lors de l'occurrence d'un événement, puis démarrez la boucle événementielle.</p> -<p>C'est tout. Qt gérera les événements et les dirigera vers les +<p>C'est tout. TQt gérera les événements et les dirigera vers les routines appropriées.</p> -<p>Voyons un programme PerlQt minimal.</p> +<p>Voyons un programme PerlTQt minimal.</p> <p> </p> <h2><a name="hello_world">Hello World</a></h2> <pre> - 1: use Qt; - 2: my $a = Qt::Application(\@ARGV); - 3: my $hello = Qt::PushButton("Hello World!", undef); + 1: use TQt; + 2: my $a = TQt::Application(\@ARGV); + 3: my $hello = TQt::PushButton("Hello World!", undef); 4: $hello->resize(160, 25); 5: $a->setMainWidget($hello); 6: $hello->show; 7: exit $a->exec;</pre> <br/> -<div class='image'><img src="../images/ex1.png"/></div><p>Ce programme charge d'abord le module Qt [line 1] puis crée l'objet +<div class='image'><img src="../images/ex1.png"/></div><p>Ce programme charge d'abord le module TQt [line 1] puis crée l'objet application <strong>$a</strong> en lui passant une référence au tableau <code>@ARGV</code> contenant les arguments de la ligne de commande [l.2]. Cet objet application est unique pour un interpréteur Perl donné et peut être -ensuite accédé par la fonction pure <strong>Qt::app()</strong>.</p> +ensuite accédé par la fonction pure <strong>TQt::app()</strong>.</p> <p>La ligne 3, crée un PushButton orphelin (c.à.d sans parent: non contenu dans un autre widget) dont nous passons la valeur <strong>undef</strong> -comme argument pour le parent. <strong>undef</strong> est l'équivalent perlQt d'un +comme argument pour le parent. <strong>undef</strong> est l'équivalent perlTQt d'un pointeur null en C++.</p> <p>Après les instructions de ``mise en page'' [l.4], nous indiquons à l'objet application que le widget principal est ce @@ -236,36 +236,36 @@ appelle la méthode <strong>show</strong> [l.6] et lance la boucle <p><strong>Sommaire de la syntaxe :</strong></p> <ol> <li></li> -Les classes PerlQt sont accessibles par le préfixe <strong>Qt::</strong> au lieu du -<strong>Q</strong> initial des classes Qt en C++. En consultant la <a href="http://doc.trolltech.com">documentation Qt</a>, vous devez donc mentalement changer le -nom d'une clasee <strong>QFoo</strong> en <strong>Qt::Foo</strong>. +Les classes PerlTQt sont accessibles par le préfixe <strong>TQt::</strong> au lieu du +<strong>Q</strong> initial des classes TQt en C++. En consultant la <a href="http://doc.trolltech.com">documentation TQt</a>, vous devez donc mentalement changer le +nom d'une clasee <strong>TQFoo</strong> en <strong>TQt::Foo</strong>. <p></p> <li></li> De manière similaire à C++, un objet est créé par l'appel d'un <strong>constructeur</strong> de même nom que la classe dont il est une méthode. -<p>Vous ne devez donc pas dire <code>new Qt::Foo</code> ou <code>Qt::Foo->new()</code> +<p>Vous ne devez donc pas dire <code>new TQt::Foo</code> ou <code>TQt::Foo->new()</code> contrairement à l'usage commun en Perl.</p> <p>Dites simplement:</p> <pre> - my $object = Qt::<classname>(arg_1, ..., arg_n);</pre> + my $object = TQt::<classname>(arg_1, ..., arg_n);</pre> <p>Un constructeur sans argument s'énonce encore plus brièvement :</p> <pre> - my $object = Qt::<classname>;</pre> + my $object = TQt::<classname>;</pre> <p></p> <li></li> Comme il a déjà été dit, l'équivalent Perl d'un pointeur C++ est le mot-clé Perl <strong>undef</strong>. <p>Les pointeurs sont les arguments précédés par le caractère <strong>*</strong> dans la -documentation Qt (Par exemple: ``<code>QWidget* widget</code>'').</p> +documentation TQt (Par exemple: ``<code>TQWidget* widget</code>'').</p> <p></p></ol> <p> </p> <h2><a name="l'héritage_et_les_objets">L'héritage et les objets</a></h2> -<p>Avant d'expliquer comment les routines Perl peuvent être appelées de Qt, -parlons du mécanisme d'héritage vu de PerlQt.</p> -<p>PerlQt est conçu pour allier la simplicité de Qt à la puissance et à la -flexibilité de Perl. Pour ce faire, PerlQt étend le paradigme objet de -Perl pour mimer Qt et son mécanisme de <strong>métaobjets</strong>.</p> +<p>Avant d'expliquer comment les routines Perl peuvent être appelées de TQt, +parlons du mécanisme d'héritage vu de PerlTQt.</p> +<p>PerlTQt est conçu pour allier la simplicité de TQt à la puissance et à la +flexibilité de Perl. Pour ce faire, PerlTQt étend le paradigme objet de +Perl pour mimer TQt et son mécanisme de <strong>métaobjets</strong>.</p> <p> </p> <h3><a name="un_widget_personnalisé">Un Widget personnalisé</a></h3> @@ -275,8 +275,8 @@ de PushButton:</p> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); 6: 7: sub NEW 8: { @@ -288,25 +288,25 @@ de PushButton:</p> 14: 15: package main; 16: - 17: use Qt; + 17: use TQt; 18: use Button; 19: - 20: my $a = Qt::Application(\@ARGV); + 20: my $a = TQt::Application(\@ARGV); 21: my $w = Button("Hello World!", undef); 22: $a->setMainWidget($w); 23: $w->show; 24: exit $a->exec;</pre> <p>Pour implanter notre propre version de PushButton, nous créons un nouveau -package [l.3] et importons Qt [l.4].</p> -<p>Nous utilisons le pragma <code>Qt::isa</code> [l.5] pour déclarer notre widget +package [l.3] et importons TQt [l.4].</p> +<p>Nous utilisons le pragma <code>TQt::isa</code> [l.5] pour déclarer notre widget comme sous-classe de PushButton. Ce pragma accepte une liste de une ou plusieurs classes dont dérive la classe à définir.</p> <p>Créons maintenant un constructeur pour notre nouveau widget en écrivant une routine appelée <strong>NEW</strong> <em>(notez les majuscules qui marquent une méthode différente du constructeur ``new'' usuel)</em>. -Le constructeur PerlQt est appelé <strong>implicitement</strong> <em>comme ligne 21</em>.</p> +Le constructeur PerlTQt est appelé <strong>implicitement</strong> <em>comme ligne 21</em>.</p> <p>Note widget doit d'abord appeler le constructeur de sa classe de base -(ici: Qt::PushButton) à la ligne 9, avec tous les arguments que nous +(ici: TQt::PushButton) à la ligne 9, avec tous les arguments que nous avons reçus.</p> <p>Nous créons ainsi un objet instance de notre classe. Cette objet est accessible par la fonction <strong>this</strong> (Attention: ce n'est pas la @@ -322,7 +322,7 @@ ses différents composants à l'intérieur de variables de scope lexical (c.à.d déclarées par <strong>my</strong>) puisque les widgets sont seulement détruits par leur parent et non nécessairement quand leur conteneur disparaît du scope.</p> -<p>En d'autres termes, PerlQt utilise un système de comptage de +<p>En d'autres termes, PerlTQt utilise un système de comptage de références pour gérer la destruction des objets.</p> <p>Souvent cependant, vous souhaiterez accéder aux composants de votre objet depuis un tout autre endroit que celui où vous l'avez créé (par exemple pour modifier une @@ -331,20 +331,20 @@ propose de stocker une référence à ces composants dans la table associative (has l'objet lui-même. Mais cette syntaxe s'avère peu pratique à l'usage et beaucoup trop libre - il n'y a pas de vérification à la compilation de sorte que vous pouvez accéder à des clefs non existantes sans déclencher d'erreur.</p> -<p>En lieu et place de cette syntaxe, PerlQt introduit le concept d'<strong>attributs</strong>.</p> +<p>En lieu et place de cette syntaxe, PerlTQt introduit le concept d'<strong>attributs</strong>.</p> <p>Les attributs sont de simples variables perl, écrites sans le signe dollar initial, et pouvant contenir toute donnée qui est une propriété de votre objet. Leur principal avantage est de fournir une syntaxe très rapide et vérifiable à la compilation.</p> <p>Pour définir et pouvoir utiliser de nouveaux attributs, il suffit d'utiliser -le pragma <code>use Qt::attributes</code>, suivi d'une liste des noms d'attributs souhaités. +le pragma <code>use TQt::attributes</code>, suivi d'une liste des noms d'attributs souhaités. Ainsi:</p> <pre> 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw( + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw( 7: itsTime 8: pData 9: ); @@ -352,7 +352,7 @@ Ainsi:</p> 11: sub NEW 12: { 13: shift->SUPER::NEW(@_[0..2]); - 14: itsTime = Qt::Time; + 14: itsTime = TQt::Time; 15: itsTime->start; 16: pData->{'key'} = " Foo "; 17: } @@ -365,7 +365,7 @@ Ainsi:</p> 24: 25: 1;</pre> <br/> -<div class='image'><img src="../images/ex2.png"/></div><p>L'attribut itsTime est déclaré à la ligne 7 et initialisé par un objet <code>Qt::Time</code> +<div class='image'><img src="../images/ex2.png"/></div><p>L'attribut itsTime est déclaré à la ligne 7 et initialisé par un objet <code>TQt::Time</code> à la ligne 14.</p> <p>Puisque nous réimplémentons la fonction virtuelle ``resizeEvent'' [l.19], chaque fois que le widget principal est redimensionné, cette @@ -375,11 +375,11 @@ nous avons définis [1.22].</p> <p><strong>Récapitulation</strong></p> <ul> <li></li> -Pour hériter d'une classe Qt, un package doit contenir un -pragma <code>use Qt::isa</code>. +Pour hériter d'une classe TQt, un package doit contenir un +pragma <code>use TQt::isa</code>. <p>Ainsi:</p> <pre> - use Qt::isa "Qt::widget";</pre> + use TQt::isa "TQt::widget";</pre> <p></p> <li></li> Le constructeur d'objet est nommé <strong>NEW</strong> et est appelé implicitement. @@ -430,7 +430,7 @@ partir d'une classe dérivée, utilisez l'attribut spécial SUPER :</p> Lorsque vous devez stocker dans votre package un objet contenu, vous devez le définir comme <strong>attribut</strong> : <pre> - use Qt::attributes qw( + use TQt::attributes qw( firstAttribute ... lastAttribute);</pre> @@ -449,19 +449,19 @@ l'objet <strong>this</strong>, ce qui rend les tournures ``unAttribut->foncti Pour réimplémenter une <strong>fonction virtuelle</strong>, créez simplement une <strong>sub</strong> de même nom que cette fonction. <p>Les fonctions virtuelles existantes sont marquées comme telles dans -la documentation de Qt (ce sont les méthodes précédées du mot clef ``virtual'').</p> -<p>Vous pouvez visualiser les noms de méthodes virtuelles que Qt tentera d'appeler -dans votre classe en plaçant <code>use Qt::debug qw|virtual|</code> en tête de +la documentation de TQt (ce sont les méthodes précédées du mot clef ``virtual'').</p> +<p>Vous pouvez visualiser les noms de méthodes virtuelles que TQt tentera d'appeler +dans votre classe en plaçant <code>use TQt::debug qw|virtual|</code> en tête de votre programme.</p> <p></p></ul> <p> </p> <h2><a name="signaux_et_slots">Signaux et Slots</a></h2> -<p>Voyons maintenant comment les objets Qt peuvent communiquer entre eux +<p>Voyons maintenant comment les objets TQt peuvent communiquer entre eux de manière à ce qu'un événement concernant un objet puisse déclencher l'exécution d'une routine en un quelconque endroit de votre programme.</p> <p>Dans d'autres toolkits, les callbacks (appels en retour) sont généralement -utilisés à cet effet. Mais Qt dispose d'un mécanisme beaucoup plus puissant +utilisés à cet effet. Mais TQt dispose d'un mécanisme beaucoup plus puissant et plus flexible : les <strong>Signaux et Slots</strong>.</p> <p>On peut se le représenter comme le cablage entre les composants d'une chaîne Hi-Fi. Un amplificateur, par exemple, émet des signaux de sortie @@ -470,20 +470,20 @@ Un magnétophone peut attendre un signal sur sa prise d'entrée pour commencer à enregistrer, et il ne cherchera pas à savoir s'il est l'unique destinataire de ce signal ou si ce dernier est aussi reçu par un graveur de CD ou écouté au casque.</p> -<p>Un composant Qt se comporte comme notre amplificateur ou notre +<p>Un composant TQt se comporte comme notre amplificateur ou notre magnétophone. Il a des sorties ou <strong>Signaux</strong> et des entrées ou <strong>Slots</strong>. Chaque sortie (signal) est connectable à un nombre illimité d'entrées (slots). La sortie d'un composant peut être potentiellement branchée à toute entrée d'un composant (y compris lui-même),</p> <p>La syntaxe de ce système de connexion est soit:</p> -<p>Qt::Object::connect( envoyeur, SIGNAL 'mon_signal(types_d_arguments)', -recepteur, SLOT 'monslot(types_d_arguments)');</p> +<p>TQt::Object::connect( envoyeur, TQT_SIGNAL 'mon_signal(types_d_arguments)', +recepteur, TQT_SLOT 'monslot(types_d_arguments)');</p> <p>soit:</p> -<p>unObjet->connect( envoyeur, SIGNAL 'mon_signal(types_d_arguments)', +<p>unObjet->connect( envoyeur, TQT_SIGNAL 'mon_signal(types_d_arguments)', SLOT 'monslot(types_d_arguments)');</p> <p>Dans le second cas, le récepteur est omis car c'est l'objet lui-même,</p> <p>Ce mécanisme est extensible à volonté par la déclaration de nouveaux Signaux et -Slots par l'usage des pragma <code>use Qt::signals</code> et <code>use Qt::slots</code> +Slots par l'usage des pragma <code>use TQt::signals</code> et <code>use TQt::slots</code> (voir aussi la deuxième syntaxe décrite plus bas).</p> <p>Chaque slot déclaré appellera la routine correspondante de votre objet. Chaque signal déclaré peut être déclenché via le mot-clé <strong>emit</strong>.</p> @@ -492,22 +492,22 @@ objet. Chaque signal déclaré peut être déclenché via le mot-clé <strong>emit</st 1: use strict; 2: 3: package Button; - 4: use Qt; - 5: use Qt::isa qw(Qt::PushButton); - 6: use Qt::attributes qw(itsTime); - 7: use Qt::slots + 4: use TQt; + 5: use TQt::isa qw(TQt::PushButton); + 6: use TQt::attributes qw(itsTime); + 7: use TQt::slots 8: aEteClicke => [], 9: changement => ['int', 'int']; - 10: use Qt::signals + 10: use TQt::signals 11: changeLe => ['int', 'int']; 12: 13: sub NEW 14: { 15: shift->SUPER::NEW(@_[0..2]); - 16: itsTime = Qt::Time; + 16: itsTime = TQt::Time; 17: itsTime->start; - 18: this->connect(this, SIGNAL 'clicked()', SLOT 'aEteClicke()'); - 19: this->connect(this, SIGNAL 'changeLe(int,int)', SLOT 'changement(int,int)'); + 18: this->connect(this, TQT_SIGNAL 'clicked()', TQT_SLOT 'aEteClicke()'); + 19: this->connect(this, TQT_SIGNAL 'changeLe(int,int)', TQT_SLOT 'changement(int,int)'); 20: } 21: 22: sub aEteClicke @@ -526,7 +526,7 @@ objet. Chaque signal déclaré peut être déclenché via le mot-clé <strong>emit</st 35: 36: 1;</pre> <p>Nous définissons dans ce package deux nouveaux slots et un nouveau signal.</p> -<p>La documentation Qt nous dit que tout PushButton clické émet un signal +<p>La documentation TQt nous dit que tout PushButton clické émet un signal <code>clicked()</code> ; nous le connectons donc à notre nouveau slot [ligne 18].</p> <p>Nous connectons aussi notre signal <code>ChangeLe</code> à notre slot <code>changement</code>.</p> @@ -534,9 +534,9 @@ objet. Chaque signal déclaré peut être déclenché via le mot-clé <strong>emit</st <code>clicked()</code> est émit et déclenche le slot <code>aEteClicke()</code>. <code>aEteClicke()</code> émet à son tour le signal <code>changeLe(int,int)</code>[l.27], appelant de ce fait le slot <code>changement(int,int)</code>, avec deux arguments.</p> -<p>Enfin, il existe une syntaxe alternative introduite dans PerlQt-3.008 :</p> +<p>Enfin, il existe une syntaxe alternative introduite dans PerlTQt-3.008 :</p> <pre> - sub un_slot : SLOT(int, QString) + sub un_slot : TQT_SLOT(int, TQString) { $int = shift; $string = shift; @@ -544,43 +544,43 @@ appelant de ce fait le slot <code>changement(int,int)</code>, avec deux argument }</pre> <p>et</p> <pre> - sub un_signal : SIGNAL(QString);</pre> + sub un_signal : TQT_SIGNAL(TQString);</pre> <p>Cette syntaxe est parfaitement compatible avec la déclaration par le biais de -<code>use Qt::signals</code> et <code>use Qt::slots</code>. +<code>use TQt::signals</code> et <code>use TQt::slots</code>. Il peut d'ailleurs d'avérer très profitable pour la clarté du programme de déclarer tout d'abord -les signaux/slots au moyen de <code>use Qt::slots/signals</code>, puis de rappeler cette déclaration au niveau de +les signaux/slots au moyen de <code>use TQt::slots/signals</code>, puis de rappeler cette déclaration au niveau de l'implémentation à l'aide de la seconde syntaxe. Les déclarations seront alors vérifiées à la compilation, et le moindre conflit générera un avertissement.</p> <p> </p> <hr /> -<h1><a name="développement_rapide_(rad)_avec_qt_designer_et_puic">Développement rapide (RAD) avec Qt Designer et Puic</a></h1> +<h1><a name="développement_rapide_(rad)_avec_qt_designer_et_puic">Développement rapide (RAD) avec TQt Designer et Puic</a></h1> <p> </p> <h2><a name="introduction">Introduction</a></h2> <ul> <li><strong><a name="item_n%2eb%3a">N.B:</a></strong><br /> </li> -Depuis la version 3.008, il existe un plugin spécifique à PerlQt pour Qt Designer. +Depuis la version 3.008, il existe un plugin spécifique à PerlTQt pour TQt Designer. Ce plugin (disponible sur les pages internet du projet) apporte le confort d'une intégration poussée, la coloration syntaxique Perl, la complétion automatique, et permet de lancer et déboguer un projet sans quitter l'interface du Designer. Ce qui suit reste néanmoins parfaitement valable pour ce qui est de l'utilisation de puic en ligne de commande, -et pour l'utilisation de Qt Designer <em>sans</em> le plugin spécifique. +et pour l'utilisation de TQt Designer <em>sans</em> le plugin spécifique. <p></p></ul> -<p>Aussi puissant et intuitif que soit Qt, écrire une GUI complète reste un exercice +<p>Aussi puissant et intuitif que soit TQt, écrire une GUI complète reste un exercice fastidieux.</p> -<p>Heureusement, Qt est fourni avec un constructeur de GUI sophistiqué -appelé Qt Designer qui est quasiment un environnement de développement +<p>Heureusement, TQt est fourni avec un constructeur de GUI sophistiqué +appelé TQt Designer qui est quasiment un environnement de développement intégré. Il comporte la gestion de Projets, la création d'un GUI par des actions de ``drag and drop'', un butineur d'objet complet, l'interconnexion graphique de signaux et de slots, et plus encore.</p> -<p>L'information générée par Qt Designer's est en format XML et peut donc +<p>L'information générée par TQt Designer's est en format XML et peut donc être parsée par différentes commandes comme dont <strong>puic</strong> (le -compilateur d'interface utilisateur PerlQt).</p> +compilateur d'interface utilisateur PerlTQt).</p> <p>Supposons que vous avez déja construit un fichier d'interface avec -Qt Designer, la transcription en un programme PerlQt se fait par +TQt Designer, la transcription en un programme PerlTQt se fait par la simple exécution de la commande :</p> <pre> puic -x -o program.pl program.ui</pre> @@ -598,7 +598,7 @@ principal à fins de test,</p> <li><strong><a name="item_inclusion_inline">Inclusion Inline</a></strong><br /> </li> A cette fin, nous devons sélectionner ``Edit->Form -Settings->Pixmaps->Save inline'' dans Qt Designer et executer ensuite: +Settings->Pixmaps->Save inline'' dans TQt Designer et executer ensuite: <pre> puic -x -o F<program.pl> F<program.ui></pre> <p></p> @@ -609,7 +609,7 @@ Cette stratégie est plus complexe, mais plus propre et plus puissante. puic -o F<Collection.pm> -embed F<unique_identifier> F<image-1> ... F<image-n></pre> <p>Ajoutez l'instruction <code>use Collection.pm</code> dans le package principal de votre programme.</p> -<p>Si vous avez créé un fichier projet dans Qt Designer et ajouté toutes +<p>Si vous avez créé un fichier projet dans TQt Designer et ajouté toutes les images dans un groupe (par ``Project->Image Collection''), vous disposez ensuite de ces images dans le répertoire où votre fichier projet (*.pro) est stocké, dans le sous-répertoire <strong>image</strong>. Vous pouvez @@ -632,7 +632,7 @@ manuellement ou vous devrez faire des copier-coller intensifs.</p> <ul> <li><strong><a name="item_écrire_l%27implémentation_de_slots_dans_le_designe">Écrire l'implémentation de slots dans le Designer</a></strong><br /> </li> -Dans Qt Designer, selectionnez l'onglet <em>Source</em> dans l'explorateur +Dans TQt Designer, selectionnez l'onglet <em>Source</em> dans l'explorateur d'objets (<strong>Object Explorer</strong>). Vous pouvez ainsi voir représentées sous forme d'arbre les classes que vous avez générées. Maintenant, si vous cliquez deux fois sur l'entrée <em>Slots/public</em>, @@ -698,7 +698,7 @@ manuellement form1.ui puisqu'il serait écrasé)</p> </p> <hr /> <h1><a name="autres_outils_de_développement">Autres outils de développement</a></h1> -<p>PerlQt comprend également deux programmes pouvant vous aider à maîtriser l'API de Qt :</p> +<p>PerlTQt comprend également deux programmes pouvant vous aider à maîtriser l'API de TQt :</p> <p> </p> <h2><a name="pqtapi">pqtapi</a></h2> @@ -709,13 +709,13 @@ manuellement form1.ui puisqu'il serait écrasé)</p> options: -r <re> : chercher les méthodes correspondant à l'expression régulière <re> -i : avec -r, effectue une recherche insensible à la casse - -v : afficher les versions de PerlQt et de Qt + -v : afficher les versions de PerlTQt et de TQt -h : afficher ce message d'aide</pre> <p>ex:</p> <pre> $>pqtapi -ir 'setpoint.* int' - void QCanvasLine::setPoints(int, int, int, int) - void QPointArray::setPoint(uint, int, int)</pre> + void TQCanvasLine::setPoints(int, int, int, int) + void TQPointArray::setPoint(uint, int, int)</pre> <p> </p> <h2><a name="pqtsh">pqtsh</a></h2> @@ -726,17 +726,17 @@ Un exemple dynamique est accessible dans l'entrée de menu <code>Help->Example </p> <hr /> <h1><a name="limitations">Limitations</a></h1> -<p>Les classes à modèle (templates) ne sont pas encore accessibles par PerlQt. +<p>Les classes à modèle (templates) ne sont pas encore accessibles par PerlTQt. En revanche, les classes dérivées de classes à modèle sont disponibles.</p> <p>Vous pouvez reconnaître ce type de classe en ce que leurs arguments comprennent un type générique placé entre les signes ``<'' et ``>''.</p> <p>ex: - QDictIterator ( const QDict<type> & dict )</p> + TQDictIterator ( const TQDict<type> & dict )</p> <p> </p> <hr /> <h1><a name="crédits">Crédits</a></h1> -<p>PerlQt-3 est (c) 2002 Ashley Winters (et (c) 2003 Germain Garand)</p> +<p>PerlTQt-3 est (c) 2002 Ashley Winters (et (c) 2003 Germain Garand)</p> <p>Kalyptus et l'engin de génération Smoke sont (c) David Faure and Richard Dale</p> <p>Puic is (c) TrollTech AS., Phil Thompson et Germain Garand,</p> <p>Ledit logiciel est délivré sous la GNU Public Licence v.2 or later.</p> @@ -744,27 +744,27 @@ les signes ``<'' et ``>''.</p> </p> <hr /> <h1><a name="appendice:_les_conventions_de_c++_et_leur_traduction_en_perl">Appendice: Les conventions de C++ et leur traduction en Perl</a></h1> -<p>Lorsque vous voulez utiliser depuis PerlQt une classe ou méthode décrite -dans la <a href="http://doc.trolltech.com">documentation</a> Qt (voyez aussi le programme -$QTDIR/bin/assistant livré avec Qt), vous devez suivre des règles de translation simples.</p> +<p>Lorsque vous voulez utiliser depuis PerlTQt une classe ou méthode décrite +dans la <a href="http://doc.trolltech.com">documentation</a> TQt (voyez aussi le programme +$TQTDIR/bin/assistant livré avec TQt), vous devez suivre des règles de translation simples.</p> <dl> <dt><strong><a name="item_noms_de_classe">Noms de classe</a></strong><br /> </dt> <ul> <li></li> -Les noms de classes utilisent le préfixe <strong>Qt::</strong> au lieu de <strong>Q</strong> pour -être conforme à l'usage Perl. Ainsi: QComboBox est nommé Qt::ComboBox -dans PerlQt. +Les noms de classes utilisent le préfixe <strong>TQt::</strong> au lieu de <strong>Q</strong> pour +être conforme à l'usage Perl. Ainsi: TQComboBox est nommé TQt::ComboBox +dans PerlTQt. <p></p></ul> <dt><strong><a name="item_fonctions">Fonctions</a></strong><br /> </dt> <ul> <li></li> Les fonctions décrites comme <strong>static</strong> sont accédées directement et non -à travers un objet. Ainsi la fonction statique Foo de la classe <strong>QBar</strong> -peut être accédée de PerlQt par +à travers un objet. Ainsi la fonction statique Foo de la classe <strong>TQBar</strong> +peut être accédée de PerlTQt par <pre> - Qt::Bar::Foo( arg-1,...,arg-n);</pre> + TQt::Bar::Foo( arg-1,...,arg-n);</pre> <p></p> <li></li> Les fonctions décrites comme <strong>members</strong> ou <strong>Signals</strong> sont @@ -774,7 +774,7 @@ Par exemple: <pre> $widget->show;</pre> <p>Il n'y a pas de différence fondamentale entre les méthodes et les -signaux, néanmoins PerlQt fournit le mot-clé <strong>emit</strong> comme une +signaux, néanmoins PerlTQt fournit le mot-clé <strong>emit</strong> comme une mnémonique pratique pour rendre clair que vous émettez un signal :</p> <pre> emit $button->clicked;</pre> @@ -786,14 +786,14 @@ mnémonique pratique pour rendre clair que vous émettez un signal :</p> </li> Lorsqu'un argument n'est pas précédé par un des caractères <strong>&</strong> or <strong>*</strong>, il est passé par valeur. Pour tous les types basiques tels que -int, char, float and double, PerlQt convertira automatiquement les +int, char, float and double, PerlTQt convertira automatiquement les valeurs litérales et scalaires dans le type correspondants C++. <p>Ainsi pour le prototype d'un constructeur écrit dans la documentation comme ceci: - QSize ( int w, int h )</p> + TQSize ( int w, int h )</p> <p>Vous écrirez :</p> <pre> - Qt::Size(8, 12);</pre> + TQt::Size(8, 12);</pre> <p></p> <li><strong><a name="item_par_référence">Par référence</a></strong><br /> </li> @@ -801,11 +801,11 @@ Lorsqu'un argument est précédé par le caractère <strong>&</strong>, Il est u référence à un objet ou à un type. Vous pouvez alors fournir un nom de variable ou un objet temporaire : <pre> - $keyseq = Qt::keySequence( &Qt::CTRL + &Qt::F3 ); + $keyseq = TQt::keySequence( &TQt::CTRL + &TQt::F3 ); $widget->setAccel( $keyseq );</pre> <p>ou</p> <pre> - $widget->setAccel(Qt::keySequence( &Qt::CTRL + &Qt::F3 );</pre> + $widget->setAccel(TQt::keySequence( &TQt::CTRL + &TQt::F3 );</pre> <p>Si l'argument n'est <em>pas</em> qualifié par <strong>const</strong> (constante), l'argument est un objet qui peut être altéré par la méthode, vous devez donc passer une variable.</p> @@ -813,7 +813,7 @@ donc passer une variable.</p> <li><strong><a name="item_par_pointeur">Par pointeur</a></strong><br /> </li> Lorsqu'un argument est précédé par le caractère <strong>*</strong>, -un pointeur vers un objet ou un type est attendu. En PerlQt, vous +un pointeur vers un objet ou un type est attendu. En PerlTQt, vous pouvez fournir un nom de variable ou le mot clé <strong>undef</strong> à la place du pointer Null. <p>De plus, si l'argument est const, l'objet passé en argument est en @@ -839,7 +839,7 @@ dont il serait autrement difficile de se souvenir: nombres (ici 0, 1 et 2)</p> </dd> <dd> -<p>L'accès aux valeurs d'énumération en Perl Qt est un appel +<p>L'accès aux valeurs d'énumération en Perl TQt est un appel de fonction statique.</p> </dd> <dd> @@ -851,29 +851,29 @@ pour marquer l'utilisation d'un alias d'énumération: <code>&fonction</code>. <p>Revenons à notre exemple <code>Strange</code>.</p> </dd> <dd> -<p>Si nous rencontrons sa définition dans la classe <code>QFruits</code>, vous -écrirez en PerlQt :</p> +<p>Si nous rencontrons sa définition dans la classe <code>TQFruits</code>, vous +écrirez en PerlTQt :</p> </dd> <dd> <pre> - $pomme_plus_orange = &Qt::Fruit::Pomme + &Qt::Fruit::Orange;</pre> + $pomme_plus_orange = &TQt::Fruit::Pomme + &TQt::Fruit::Orange;</pre> </dd> <p></p> <dt><strong><a name="item_opérateurs">Opérateurs</a></strong><br /> </dt> <dd> -Dans PerlQt, la <strong>surcharge d'opérateurs</strong> fonctionne de manière transparente. -Si un opérateur est surchargé dans une classe Qt (ce qui signifie que son utilisation +Dans PerlTQt, la <strong>surcharge d'opérateurs</strong> fonctionne de manière transparente. +Si un opérateur est surchargé dans une classe TQt (ce qui signifie que son utilisation déclenchera un appel de méthode, au lieu d'utiliser l'opérateur générique) -il sera également surchargé dans PerlQt. +il sera également surchargé dans PerlTQt. </dd> <dd> <p>ex-1: surcharge de '+='</p> </dd> <dd> <pre> - $p1 = Qt::Point(10, 10) - $p2 = Qt::Point(30,40) + $p1 = TQt::Point(10, 10) + $p2 = TQt::Point(30,40) $p2 += $p1; # $p2 devient (40,50)</pre> </dd> <dd> @@ -881,9 +881,9 @@ il sera également surchargé dans PerlQt. </dd> <dd> <pre> - $f = Qt::File("example"); + $f = TQt::File("example"); $f->open( IO_WriteOnly ); # voir l'entrée 'Constantes' plus bas - $s = Qt::TextStream( $f ); + $s = TQt::TextStream( $f ); $s << "Que faire avec " << 12 << " pommes ?";</pre> </dd> <dd> @@ -895,50 +895,50 @@ Perl est très différent de C++ en matière de copie d'objets.</p> <dt><strong><a name="item_constantes">Constantes</a></strong><br /> </dt> <dd> -Qt n'utilise pas beaucoup de constantes, mais on en trouve cependant dans le module d'Entrées/Sorties, +TQt n'utilise pas beaucoup de constantes, mais on en trouve cependant dans le module d'Entrées/Sorties, où elles font office de drapeaux pour les modes d'ouverture de fichiers. </dd> <dd> <p>Pour éviter de polluer inutilement l'espace de nom, nous avons regroupé les constantes dans le module -<strong>Qt::constants</strong>, d'où elles seront chargées à la demande.</p> +<strong>TQt::constants</strong>, d'où elles seront chargées à la demande.</p> </dd> <dd> <p>Ainsi, pour importer l'ensemble des constantes d'E/S, on écrira :</p> </dd> <dd> <pre> - use Qt::constants;</pre> + use TQt::constants;</pre> </dd> <dd> <p>Et pour importer quelques symboles seulement :</p> </dd> <dd> <pre> - use Qt::constants qw( IO_ReadOnly IO_WriteOnly );</pre> + use TQt::constants qw( IO_ReadOnly IO_WriteOnly );</pre> </dd> <p></p> <dt><strong><a name="item_fonctions_globales">Fonctions globales</a></strong><br /> </dt> <dd> -Qt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. +TQt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. </dd> <dd> <p>Ces fonctions ont été rassemblées dans un espace de nom commun: -<code>Qt::GlobalSpace</code>.</p> +<code>TQt::GlobalSpace</code>.</p> </dd> <dd> <p>Vous pourrez donc y accéder soit par un appel pleinement qualifié :</p> </dd> <dd> <pre> - Qt::GlobalSpace::qUncompress( $buffer )</pre> + TQt::GlobalSpace::qUncompress( $buffer )</pre> </dd> <dd> <p>Soit en important préalablement ces fonctions dans l'espace de nom courant :</p> </dd> <dd> <pre> - use Qt::GlobalSpace; + use TQt::GlobalSpace; qUncompress( $buffer )</pre> </dd> <dd> @@ -946,11 +946,11 @@ Qt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. </dd> <dd> <pre> - use Qt::GlobalSpace qw( qUncompress bitBlt )</pre> + use TQt::GlobalSpace qw( qUncompress bitBlt )</pre> </dd> <dd> <p><strong>N.B:</strong> GlobalSpace renferme également des opérateurs de portée globale, tels -celui permettant d'aditionner deux Qt::Point(). Ces opérateurs seront appelés +celui permettant d'aditionner deux TQt::Point(). Ces opérateurs seront appelés automatiquement.</p> </dd> <dd> @@ -958,20 +958,20 @@ automatiquement.</p> </dd> <dd> <pre> - $p1 = Qt::Point(10, 10) + Qt::Point(20, 20)</pre> + $p1 = TQt::Point(10, 10) + TQt::Point(20, 20)</pre> </dd> <p></p></dl> <p> </p> <hr /> <h1><a name="annexe_2_:_internationalisation">Annexe 2 : Internationalisation</a></h1> -<p>PerlQt résout les problèmes d'internationalisation en convertissant systématiquement les <strong>QString</strong> -de Qt en <strong>utf8</strong> côté Perl.</p> -<p>Les conversions en sens inverse, depuis Perl vers Qt sont traitées différemment suivant le contexte :</p> +<p>PerlTQt résout les problèmes d'internationalisation en convertissant systématiquement les <strong>TQString</strong> +de TQt en <strong>utf8</strong> côté Perl.</p> +<p>Les conversions en sens inverse, depuis Perl vers TQt sont traitées différemment suivant le contexte :</p> <ul> <li><strong><a name="item_si_la_chaîne_de_caractère_est_déjà_marquée_comme_é">Si la chaîne de caractère est déjà marquée comme étant utf8</a></strong><br /> </li> -alors elle sera convertie en QString directement. +alors elle sera convertie en TQString directement. <p>C'est la manière privilégiée d'opérer, et la plus simple : Il vous suffit d'insérer un pragma <strong>use utf8</strong> en tête de vos programmes, puis d'utiliser un éditeur de texte supportant l'utf8 (quasiment tous de nos jours) pour élaborer votre code source. @@ -979,21 +979,21 @@ Les chaînes seront marquées par Perl automatiquement.</p> <p></p> <li><strong><a name="item_si_la_chaîne_n%27est_pas_marquée_comme_utf8%2c_et_">Si la chaîne n'est pas marquée comme utf8, et le pragma 'use locale' n'est pas actif</a></strong><br /> </li> -alors la conversion en QString se fera depuis l'<strong>ISO-Latin-1</strong>. +alors la conversion en TQString se fera depuis l'<strong>ISO-Latin-1</strong>. <p></p> <li><strong>Si la chaîne n'est pas marquée comme utf8, et le pragma 'use locale' est actif</strong><br /> </li> -alors la conversion en QString se fera depuis votre <strong>locale</strong>. +alors la conversion en TQString se fera depuis votre <strong>locale</strong>. <p></p></ul> <p>Lorsque des chaînes contiennent de l'utf8, Perl adapte automatiquement ses opérateurs pour que leur gestion soit entièrement transparente (comprendre opaque, comme toujours...). Cependant, vous pourrez avoir besoin à l'occasion de les transcrire en d'autres jeux d'encodage. -Ceci peut se faire soit avec Qt :</p> +Ceci peut se faire soit avec TQt :</p> <pre> - $tr1=Qt::TextCodec::codecForLocale(); # ceci utilisera la locale en vigueur - $tr2=Qt::TextCodec::codecForName("KOI8-R"); # ceci force l'emploi d'une locale spécifique (Russe)</pre> + $tr1=TQt::TextCodec::codecForLocale(); # ceci utilisera la locale en vigueur + $tr2=TQt::TextCodec::codecForName("KOI8-R"); # ceci force l'emploi d'une locale spécifique (Russe)</pre> <pre> - print $tr1->fromUnicode(Qt::DateTime::currentDateTime()->toString)."\n\n"; + print $tr1->fromUnicode(TQt::DateTime::currentDateTime()->toString)."\n\n"; print $tr2->fromUnicode($une_chaine_utf8);</pre> <p>Soit avec les outils de Perl (pour perl >= 5.8.0). Se reporter à ce sujet à la documentation du module <strong>Encode</strong> (<code>perldoc Encode</code>).</p> @@ -1003,7 +1003,7 @@ Se reporter à ce sujet à la documentation du module <strong>Encode</strong> (<co <p>Les programmeurs souhaitant désactiver temporairement l'encodage utf8 (pour la gestion de programmes externes ou de modules anciens ne supportant pas cet encodage) pourront utiliser le pragma <strong>use bytes</strong> (et sa réciproque : <strong>no bytes</strong>).</p> -<p>Dans la portée de ce pragma, les conversions depuis QString vers les chaînes Perl se feront en ISO-Latin1 +<p>Dans la portée de ce pragma, les conversions depuis TQString vers les chaînes Perl se feront en ISO-Latin1 (par défaut) ou suivant la locale en vigueur (si <strong>use locale</strong> est actif).</p> <p>Notez bien qu'il est préférable de <em>ne pas utiliser ce pragma à la légère</em>, en ce qu'il ruine totalement les efforts de standardisations autour d'utf8 entrepris depuis plusieurs années déjà. @@ -1012,13 +1012,13 @@ Il est très préférable de corriger les programmes fautifs.</p> </p> <hr /> <h1><a name="annexe_3_:_canaux_de_déboguage">Annexe 3 : Canaux de déboguage</a></h1> -<p>Le module <strong>Qt::debug</strong> offre divers canaux de déboguage permettant de filtrer +<p>Le module <strong>TQt::debug</strong> offre divers canaux de déboguage permettant de filtrer le flux conséquent d'informations disponibles pour l'adapter à vos besoins.</p> <pre> - use Qt::debug;</pre> + use TQt::debug;</pre> <pre> - use Qt::debug qw|calls autoload verbose|;</pre> -<p>Avec le pragma <code>use Qt::debug</code>, seuls les canaux <strong>verbose</strong> et <strong>ambiguous</strong> sont activés. + use TQt::debug qw|calls autoload verbose|;</pre> +<p>Avec le pragma <code>use TQt::debug</code>, seuls les canaux <strong>verbose</strong> et <strong>ambiguous</strong> sont activés. Si vous le faites suivre d'une liste précise de canaux, seuls ceux-ci seront affichés.</p> <p><strong>Liste et descriptif des canaux :</strong></p> <ul> @@ -1033,32 +1033,32 @@ Donner davantage d'informations. <p>Utilisé avec <strong>ambiguous</strong>, vous donnera les correspondances les plus proches lorsqu'un appel de méthode échoue.</p> <p>ex:</p> <pre> - use Qt; - use Qt::debug; - $a= Qt::Application(\@ARGV); + use TQt; + use TQt::debug; + $a= TQt::Application(\@ARGV); $a->libraryPath("chose");</pre> <pre> --- No method to call for : - QApplication::libraryPath('chose') + TQApplication::libraryPath('chose') Closer candidates are : - static void QApplication::addLibraryPath(const QString&) - static QStringList QApplication::libraryPaths() - static void QApplication::removeLibraryPath(const QString&) - static void QApplication::setLibraryPaths(const QStringList&)</pre> + static void TQApplication::addLibraryPath(const TQString&) + static TQStringList TQApplication::libraryPaths() + static void TQApplication::removeLibraryPath(const TQString&) + static void TQApplication::setLibraryPaths(const TQStringList&)</pre> <p></p> <li><strong><a name="item_calls">calls</a></strong><br /> </li> -Pour chaque appel de méthode, vous dira quelle méthode Qt est finalement appelée, +Pour chaque appel de méthode, vous dira quelle méthode TQt est finalement appelée, en précisant les arguments si <strong>verbose</strong> est actif. <p></p> <li><strong><a name="item_autoload">autoload</a></strong><br /> </li> -Détaille le passage dans le code intermédiaire faisant la jonction entre Perl et Qt. +Détaille le passage dans le code intermédiaire faisant la jonction entre Perl et TQt. <p></p> <li><strong><a name="item_gc">gc</a></strong><br /> </li> Donne des informations sur la collection des déchets, c'est à dire sur la destruction des objets, -qu'ils soient détruits depuis Perl ou Qt. +qu'ils soient détruits depuis Perl ou TQt. <p></p> <li><strong><a name="item_virtual">virtual</a></strong><br /> </li> @@ -1074,46 +1074,46 @@ Activer tous les canaux. <hr /> <h1><a name="annexe_4_:_marshalleurs">Annexe 4 : Marshalleurs</a></h1> <p>Un marshalleur est un convertisseur permettant de transcrire un type de données en un autre.</p> -<p>Dans PerlQt, la plupart des objets Qt gardent leurs propriétés d'objet, ce qui permet d'invoquer leurs méthodes +<p>Dans PerlTQt, la plupart des objets TQt gardent leurs propriétés d'objet, ce qui permet d'invoquer leurs méthodes et de changer leurs propriétés comme il se doit. Cependant, il arrive que l'objet d'origine corresponde à ce point à un type natif de Perl qu'il serait malséant d'utiliser l'interface C++ et beaucoup plus naturel de lui substituer son équivalent.</p> <p>Ici interviennent les marshalleurs. -Plutôt que de retourner un objet Qt::StringList, qui serait délicat à manipuler, -PerlQt le transformera en référence de liste Perl. +Plutôt que de retourner un objet TQt::StringList, qui serait délicat à manipuler, +PerlTQt le transformera en référence de liste Perl. Dès lors, tous les opérateurs de manipulation de liste pourront lui être appliqué : on gagne en densité, en cohérence et en simplicité.</p> <p>Cette transformation s'appliquera aussi en sens inverse, et n'importe quelle liste de chaînes Perl -pourra être donnée en argument à une méthode attendant une Qt::StringList.</p> +pourra être donnée en argument à une méthode attendant une TQt::StringList.</p> <pre> - Liste des marshalleurs (PerlQt-3.008) + Liste des marshalleurs (PerlTQt-3.008) ----------------------------------------------------------------- float, double <=> réel Perl (NV) char, uchar, int, uint, enum long, ulong, short, ushort <=> entier Perl (IV) - QString, -&, -* => chaîne Perl (utf8) - QString, -&, -* <= chaîne Perl (utf8 ou iso-latin1 ou locale) - QCString, -&, -* <=> chaîne Perl (utf8 ou octets, suivant contenu ou pragma "bytes") - QStringList, -&, -* => référence à une liste de chaînes Perl (utf8) - QByteArray, -&, -* <=> chaîne Perl (octets) + TQString, -&, -* => chaîne Perl (utf8) + TQString, -&, -* <= chaîne Perl (utf8 ou iso-latin1 ou locale) + TQCString, -&, -* <=> chaîne Perl (utf8 ou octets, suivant contenu ou pragma "bytes") + TQStringList, -&, -* => référence à une liste de chaînes Perl (utf8) + TQByteArray, -&, -* <=> chaîne Perl (octets) int&, -* <=> entier Perl (IV) bool&, -* <=> booléen Perl char* <=> chaîne Perl (octets) char** <= référence à une liste de chaînes Perl (octets) uchar* <= chaîne Perl(octets) - QRgb* <= référence à une liste d'entiers Perl (IV) - QCOORD* <= référence à une liste d'entiers Perl (IV) + TQRgb* <= référence à une liste d'entiers Perl (IV) + TQCOORD* <= référence à une liste d'entiers Perl (IV) void* <=> référence à un entier Perl (IV) - QValueList<int>, - *, - & <=> référence à une liste d'entiers Perl (IV) - QCanvasItemList, - *, - & => réference à une liste de Qt::CanvasItem - QWidgetList, - *, - & <=> réference à une liste de Qt::Widget - QObjectList, - *, - & <=> réference à une liste de Qt::Object - QFileInfoList, - *, - & <=> réference à une liste de Qt::FileInfo - QPtrList<QTab>, - *, - & <=> réference à une liste de Qt::Tab - QPtrList<QToolBar>, - *, - & <=> réference à une liste de Qt::ToolBar - QPtrList<QNetworkOperation>, - *, - & <=> réference à une liste de Qt::NetworkOperation - QPtrList<QDockWindow>, - *, - & <=> réference à une liste de Qt::DockWindow - (QUObject*)</pre> + TQValueList<int>, - *, - & <=> référence à une liste d'entiers Perl (IV) + TQCanvasItemList, - *, - & => réference à une liste de TQt::CanvasItem + TQWidgetList, - *, - & <=> réference à une liste de TQt::Widget + TQObjectList, - *, - & <=> réference à une liste de TQt::Object + TQFileInfoList, - *, - & <=> réference à une liste de TQt::FileInfo + TQPtrList<TQTab>, - *, - & <=> réference à une liste de TQt::Tab + TQPtrList<TQToolBar>, - *, - & <=> réference à une liste de TQt::ToolBar + TQPtrList<TQNetworkOperation>, - *, - & <=> réference à une liste de TQt::NetworkOperation + TQPtrList<TQDockWindow>, - *, - & <=> réference à une liste de TQt::DockWindow + (TQUObject*)</pre> </body> diff --git a/doc/images/pqtsh.png b/doc/images/pqtsh.png Binary files differindex f5929b3..3e6bdbc 100644 --- a/doc/images/pqtsh.png +++ b/doc/images/pqtsh.png @@ -1,3 +1,3 @@ smoke -PerlQt +PerlTQt puic diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index 9f67a8c..6158567 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -1,7 +1,7 @@ 2003-08-30 Richard Dale <Richard_Dale@tipitina.demon.co.uk> * 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 <lypanov@kde.org> @@ -16,7 +16,7 @@ 2003-08-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Rewritten java code generation for a Dynamic Proxy based SMOKE adaptor version of QtJava. + * Rewritten java code generation for a Dynamic Proxy based SMOKE adaptor version of TQtJava. * Based on David Faure's SMOKE generation code in the '-fsmoke' option. 2003-08-11 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -41,7 +41,7 @@ * Added C# P/Invoke bindings generation option from Adam Treat 2002-02-10 Richard Dale <duke@tipitina.demon.co.uk> * 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 <duke@tipitina.demon.co.uk> @@ -56,7 +56,7 @@ * Perl .pig generation improved 2002-01-25 Richard Dale <duke@tipitina.demon.co.uk> * Added '-fperl' option to autogenerate .pig (Perl Interface - Generator) files, suitable for generating Ashley Winters' PerlQt/KDEQt + Generator) files, suitable for generating Ashley Winters' PerlTQt/KDETQt bindings 2002-01-23 Richard Dale <duke@tipitina.demon.co.uk> * Made dispose() public, added isDisposed() after SWT. diff --git a/kalyptus/README b/kalyptus/README index 373e400..d1d4c6e 100644 --- a/kalyptus/README +++ b/kalyptus/README @@ -3,12 +3,12 @@ KALYPTUS -- C, Objective-C and Java bindings generator Version 0.9 -KALYPTUS creates language bindings for Qt and KDE C++ libraries +KALYPTUS creates language bindings for TQt and KDE C++ libraries 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. @@ -47,7 +47,7 @@ JAVA Here are some of the shell commands that were used in the conversion process: -Remove any Q_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS from the +Remove any TTQ_OVERRIDE macros from the TQt headers, and remove EXPORT_DOCKCLASS from the KDE headers # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp' diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 1a7df3d..6cdc12d 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -56,7 +56,7 @@ $quiet = 0; $debug = 0; $debuggen = 0; $parseonly = 0; -$globalSpaceClassName = "QGlobalSpace"; +$globalSpaceClassName = "TQGlobalSpace"; $currentfile = ""; @@ -69,16 +69,16 @@ $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 @@ -104,29 +104,29 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_PLATINUM => '', _STYLE_SGI => '', _STYLE_WINDOWS => '', - QT_STATIC_CONST => 'static const', - Q_EXPORT => '', - Q_REFCOUNT => '', - QM_EXPORT_CANVAS => '', - QM_EXPORT_DNS => '', - QM_EXPORT_ICONVIEW => '', - QM_EXPORT_NETWORK => '', - QM_EXPORT_SQL => '', - QM_EXPORT_WORKSPACE => '', - QT_NO_REMOTE => 'QT_NO_REMOTE', - QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT', - Q_WS_X11 => 'Q_WS_X11', - Q_DISABLE_COPY => 'Q_DISABLE_COPY', - Q_WS_QWS => 'undef', - Q_WS_MAC => 'undef', - Q_OBJECT => <<'CODE', + TQT_STATIC_CONST => 'static const', + TTQ_EXPORT => '', + TTQ_REFCOUNT => '', + TQM_EXPORT_CANVAS => '', + TQM_EXPORT_DNS => '', + TQM_EXPORT_ICONVIEW => '', + TQM_EXPORT_NETWORK => '', + TQM_EXPORT_SQL => '', + TQM_EXPORT_WORKSPACE => '', + TQT_NO_REMOTE => 'TQT_NO_REMOTE', + TQT_ACCESSIBILITY_SUPPORT => 'TQT_ACCESSIBILITY_SUPPORT', + TTQ_WS_X11 => 'TTQ_WS_X11', + TTQ_DISABLE_COPY => 'TTQ_DISABLE_COPY', + TTQ_WS_TQWS => 'undef', + TTQ_WS_MAC => 'undef', + TTQ_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 }; @@ -222,11 +222,11 @@ if( $defines ) } } -# Check the %defines hash for QT_* symbols and compile the corresponding RE +# Check the %defines hash for TQT_* symbols and compile the corresponding RE # Otherwise, compile the default ones. Used for filtering in readCxxLine. -if ( my @qt_defines = map { ($_=~m/^QT_(.*)/)[0] } keys %defines) +if ( my @qt_defines = map { ($_=~m/^TQT_(.*)/)[0] } keys %defines) { - my $regexp = "m/^#\\s*ifn?def\\s+QT_(?:" . join('|', map { "\$qt_defines[$_]" } 0..$#qt_defines).")/o"; + my $regexp = "m/^#\\s*ifn?def\\s+TQT_(?:" . join('|', map { "\$qt_defines[$_]" } 0..$#qt_defines).")/o"; $match_qt_defines = eval "sub { my \$s=shift; \$s=~/^#\\s*if(n)?def/ || return 0; if(!\$1) { return \$s=~$regexp ? 0:1 } @@ -240,7 +240,7 @@ else sub { my $s = shift; - $s =~ m/^\#\s*ifndef\s+QT_NO_(?:REMOTE| # not in the default compile options + $s =~ m/^\#\s*ifndef\s+TQT_NO_(?:REMOTE| # not in the default compile options NIS| # ... XINERAMA| IMAGEIO_(?:MNG|JPEG)| @@ -328,7 +328,7 @@ sub parseFiles $cmd .= " -I $dir "; } - $cmd .= " -DQOBJECTDEFS_H $currentfile"; + $cmd .= " -DTQOBJECTDEFS_H $currentfile"; open( INPUT, "$cmd |" ) || croak "Can't preprocess $currentfile"; @@ -425,7 +425,7 @@ sub readSourceLine =head2 readCxxLine Reads a C++ source line, skipping comments, blank lines, - preprocessor tokens and the Q_OBJECT macro + preprocessor tokens and the TTQ_OBJECT macro =cut @@ -453,12 +453,12 @@ LOOP: } } - if ( $p =~ /^\s*Q_OBJECT/ ) { + if ( $p =~ /^\s*TTQ_OBJECT/ ) { push @inputqueue, @codeqobject; next; } # Hack, waiting for real handling of preprocessor defines - $p =~ s/QT_STATIC_CONST/static const/; + $p =~ s/TQT_STATIC_CONST/static const/; $p =~ s/KSVG_GET/KJS::Value get();/; $p =~ s/KSVG_BASECLASS_GET/KJS::Value get();/; $p =~ s/KSVG_BRIDGE/KJS::ObjectImp *bridge();/; @@ -471,15 +471,15 @@ LOOP: } next if ( $p =~ /^\s*$/s ); # blank lines -# || $p =~ /^\s*Q_OBJECT/ # QObject macro +# || $p =~ /^\s*TTQ_OBJECT/ # TQObject macro # ); # - next if ( $p =~ /^\s*Q_ENUMS/ # ignore Q_ENUMS - || $p =~ /^\s*Q_PROPERTY/ # and Q_PROPERTY - || $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE - || $p =~ /^\s*Q_SETS/ - || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ + next if ( $p =~ /^\s*TTQ_ENUMS/ # ignore TTQ_ENUMS + || $p =~ /^\s*TTQ_PROPERTY/ # and TTQ_PROPERTY + || $p =~ /^\s*TTQ_OVERRIDE/ # and TTQ_OVERRIDE + || $p =~ /^\s*TTQ_SETS/ + || $p =~ /^\s*TTQ_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*KSVG_/ # and KSVG stuff ;) @@ -502,14 +502,14 @@ LOOP: } else { # Skip platform-specific stuff, or #if 0 stuff - # or #else of something we parsed (e.g. for QKeySequence) - if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_WS_/ or - $p =~ m/^#\s*if\s+defined\(Q_OS_/ or - $p =~ m/^#\s*if\s+defined\(Q_CC_/ or - $p =~ m/^#\s*if\s+defined\(QT_THREAD_SUPPORT/ or + # or #else of something we parsed (e.g. for TQKeySequence) + if ( $p =~ m/^#\s*ifdef\s*TTQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TTQ_WS_/ or + $p =~ m/^#\s*if\s+defined\(TTQ_OS_/ or + $p =~ m/^#\s*if\s+defined\(TTQ_CC_/ or + $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or $p =~ m/^#\s*else/ or - $p =~ m/^#\s*if\s+defined\(Q_FULL_TEMPLATE_INSTANTIATION/ or + $p =~ m/^#\s*if\s+defined\(TTQ_FULL_TEMPLATE_INSTANTIATION/ or $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or &$match_qt_defines( $p ) or $p =~ m/^#\s*if\s+0\s+/ ) { @@ -519,7 +519,7 @@ LOOP: last if !defined $p; $if_depth++ if $p =~ m/^#\s*if/; $if_depth-- if $p =~ m/^#\s*endif/; - # Exit at #else in the #ifdef QT_NO_ACCEL/#else/#endif case + # Exit at #else in the #ifdef TQT_NO_ACCEL/#else/#endif case last if $if_depth == 1 && $p =~ m/^#\s*else\s/; #ignore elif for now print "Skipping ifdef'ed line: $p" if $debug; @@ -759,8 +759,8 @@ sub identifyDecl elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? - (?:\s*Q_PACKED)? - (?:\s*Q_REFCOUNT)? + (?:\s*TTQ_PACKED)? + (?:\s*TTQ_REFCOUNT)? \s+([\w_]+ # 3 name (?:<[\w_ :,]+?>)? # maybe explicit template # (eat chars between <> non-hungry) @@ -829,7 +829,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/; } @@ -1407,7 +1407,7 @@ sub newMethod } unless( $theSourceNode == $cSourceNode ) { $theSourceNode = $cSourceNode; - $opsNode->AddPropList( "Sources", $theSourceNode ); # sources are scattered across Qt + $opsNode->AddPropList( "Sources", $theSourceNode ); # sources are scattered across TQt } $parent = $opsNode; } @@ -1492,7 +1492,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/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 8549d39..3a1f53f 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -63,18 +63,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 @@ -93,54 +93,54 @@ 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, TQt 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', - 'Q_INT16' => 'short', - 'Q_INT32' => 'int', - 'Q_INT8' => 'char', - 'Q_LONG' => 'long', - 'Q_UINT16' => 'ushort', - 'Q_UINT32' => 'uint', - 'Q_UINT8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQRgb' => 'uint', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', + 'TTQ_INT16' => 'short', + 'TTQ_INT32' => 'int', + 'TTQ_INT8' => 'char', + 'TTQ_LONG' => 'long', + 'TTQ_UINT16' => 'ushort', + 'TTQ_UINT32' => 'uint', + 'TTQ_UINT8' => 'uchar', + 'TTQ_ULONG' => 'long', ); } @@ -155,10 +155,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); @@ -220,28 +220,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'); @@ -275,7 +275,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; @@ -330,20 +330,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 'TQtStaticMetaObjectFunction' # 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_TQSessionManager doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -368,7 +368,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/; @@ -423,8 +423,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. @@ -434,9 +434,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 ); @@ -536,7 +536,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"; #} @@ -645,7 +645,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"; @@ -661,7 +661,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; @@ -689,7 +689,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)"; @@ -891,18 +891,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"; @@ -1386,7 +1386,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; @@ -1408,7 +1408,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TTQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. @@ -1506,9 +1506,9 @@ sub prepareCaseDict($) { # Don't generate bindings for pure virtuals - we can't call them ;) $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' ); + # Bugfix for TQt-3.0.4: those methods are NOT implemented (report sent). + $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 ) { @@ -1615,7 +1615,7 @@ sub writeSmokeDataFile($) { for my $s (@super) { my $superClassName = join( "::", kdocAstUtil::heritage($s) ); next if !defined $classidx{$superClassName}; # inherits from unknown class, see below - next if $classidx{$superClassName} == $cur; # shouldn't happen in Qt + next if $classidx{$superClassName} == $cur; # shouldn't happen in TQt $cur = $classidx{$superClassName}; print OUT "\t case $cur: return (void*)($superClassName*)($className*)xptr;\n"; } @@ -1755,7 +1755,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/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 0de2480..8ba1996 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1,5 +1,5 @@ #*************************************************************************** -# kalyptusDataDict.pm - A Qt/KDE types data dictionary +# kalyptusDataDict.pm - A TQt/KDE types data dictionary # ------------------- # begin : Fri Oct 20 12:00:00 2000 # copyright : (C) 2000-2001 Lost Highway Ltd. All Rights Reserved. @@ -27,19 +27,19 @@ BEGIN { %interfacemap = ( -'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', +'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', @@ -50,13 +50,13 @@ BEGIN 'KXMLGUIBuilder' => 'KXMLGUIBuilderInterface', 'DCOPObject' => 'DCOPObjectInterface', 'KDevCore' => 'KDevCoreInterface', -'QSqlQuery' => 'QSqlQueryInterface', +'TQSqlQuery' => 'TQSqlQueryInterface', ); -# A hard coded type translation table (the idea from the Roberto Alsina's Qtc +# A hard coded type translation table (the idea from the Roberto Alsina's TQtc # python conversion scripts). The particular format used here makes it possible to use -# the same table with three different kdoc based Qt/KDE language binding generators; +# the same table with three different kdoc based TQt/KDE language binding generators; # C, Objective-C and Java. %ctypemap = ( @@ -1507,862 +1507,862 @@ 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&' => 'qt_QChar*' , -'QChar' => 'qt_QChar*' , -'QChar*' => 'qt_QChar*' , -'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*' , -'QGList&' => 'qt_QGList*' , -'QGList*' => 'qt_QGList*' , -'QGListIterator&' => 'qt_QGListIterator*' , -'QGListIterator*' => 'qt_QGListIterator*', -'QGPlugin*' => 'qt_QGPlugin*', -'QGPluginManager*' => 'qt_QGPluginManager*', -'QGVector&' => 'qt_QGVector*' , -'QGVector*' => 'qt_QGVector*' , -'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*', -'QMSG*' => 'QMSG*' , -'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*', -'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*', -'QStyleHintReturn*' => 'qt_QStyleHintReturn*', -'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*', -'Q_INT16&' => 'short', -'Q_INT16' => 'short', -'Q_INT32&' => 'int', -'Q_INT32' => 'int', -'Q_INT8&' => 'char', -'Q_INT8' => 'char', -'Q_LONG&' => 'long', -'Q_LONG' => 'long', -'Q_PACKED*' => 'void*', -'Q_UINT16&' => 'unsigned short', -'Q_UINT16' => 'unsigned short', -'Q_UINT32&' => 'unsigned int', -'Q_UINT32' => 'unsigned int', -'Q_UINT8&' => 'unsigned char', -'Q_UINT8' => 'unsigned char', -'Q_UINT8*' => 'unsigned char*' , -'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' , -'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*', -'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*', -'QtTableView*' => 'qt_QtTableView*', +'TQAccel*' => 'qt_TQAccel*', +'TQAccessible*' => 'qt_TQAccessible*', +'TQAccessibleFactoryInterface*' => 'qt_TQAccessibleFactoryInterface*', +'TQAccessibleInterface*' => 'qt_TQAccessibleInterface*', +'TQAccessibleInterface**' => 'qt_TQAccessibleInterface**', +'TQAccessibleObject*' => 'qt_TQAccessibleObject*', +'TQAction*' => 'qt_TQAction*' , +'TQActionGroup*' => 'qt_TQActionGroup*', +'TQApplication*' => 'qt_TQApplication*' , +'TQArabicCodec*' => 'qt_TQArabicCodec*', +'TQArray*' => 'qt_TQArray*', +'TQAsciiBucket*' => 'qt_TQAsciiBucket*', +'TQAsciiCache*' => 'qt_TQAsciiCache*', +'TQAsciiCacheIterator*' => 'qt_TQAsciiCacheIterator*', +'TQAsciiDict*' => 'qt_TQAsciiDict*', +'TQAsciiDictIterator*' => 'qt_TQAsciiDictIterator*', +'TQAsyncIO*' => 'qt_TQAsyncIO*', +'TQAuBucket*' => 'qt_TQAuBucket*' , +'TQAuServer*' => 'qt_TQAuServer*', +'TQBaseBucket*' => 'qt_TQBaseBucket*' , +'TQBig5Codec*' => 'qt_TQBig5Codec*', +'TQBitArray&' => 'qt_TQBitArray*' , +'TQBitArray' => 'qt_TQBitArray*' , +'TQBitArray*' => 'qt_TQBitArray*' , +'TQBitVal&' => 'qt_TQBitVal*' , +'TQBitVal' => 'qt_TQBitVal*' , +'TQBitVal*' => 'qt_TQBitVal*', +'TQBitmap&' => 'qt_TQBitmap *', +'TQBitmap' => 'qt_TQBitmap *', +'TQBitmap*' => 'qt_TQBitmap *', +'TQBoxLayout*' => 'qt_TQBoxLayout*', +'TQBrush&' => 'qt_TQBrush *', +'TQBrush' => 'qt_TQBrush*' , +'TQBrush*' => 'qt_TQBrush*' , +'TQBrushData*' => 'qt_TQBrushData*', +'TQBuffer*' => 'qt_TQBuffer*', +'TQButton*' => 'qt_TQButton *', +'TQButtonGroup*' => 'qt_TQButtonGroup*' , +'TQByteArray& arr ()' => 'qt_TQByteArray*', +'TQByteArray&' => 'qt_TQByteArray*' , +'TQByteArray' => 'qt_TQByteArray*', +'TQByteArray*' => 'qt_TQByteArray*', +'TQCDEStyle*' => 'qt_TQCDEStyle*', +'TQCOORD&' => 'short', +'TQCOORD' => 'short', +'TQCOORD*' => 'short *', +'TQCString&' => 'qt_TQCString*' , +'TQCString' => 'qt_TQCString*' , +'TQCString*' => 'qt_TQCString*' , +'TQCStringLess*' => 'qt_TQCStringLess*' , +'TQCStringList' => 'kde_TQCStringList*' , +'TQCache*' => 'qt_TQCache*', +'TQCacheIterator*' => 'qt_TQCacheIterator*', +'TQCanvas*' => 'qt_TQCanvas*' , +'TQCanvasEllipse*' => 'qt_TQCanvasEllipse*', +'TQCanvasItem*' => 'qt_TQCanvasItem*' , +'TQCanvasItemList' => 'qt_TQCanvasItemList*' , +'TQCanvasItemList*' => 'qt_TQCanvasItemList*', +'TQCanvasLine*' => 'qt_TQCanvasLine*', +'TQCanvasPixmap*' => 'qt_TQCanvasPixmap*' , +'TQCanvasPixmapArray*' => 'qt_TQCanvasPixmapArray*' , +'TQCanvasPolygon*' => 'qt_TQCanvasPolygon*', +'TQCanvasPolygonalItem*' => 'qt_TQCanvasPolygonalItem*', +'TQCanvasRectangle*' => 'qt_TQCanvasRectangle*', +'TQCanvasSpline*' => 'qt_TQCanvasSpline*', +'TQCanvasSprite*' => 'qt_TQCanvasSprite*', +'TQCanvasText*' => 'qt_TQCanvasText*', +'TQCanvasView*' => 'qt_TQCanvasView*' , +'TQChain*' => 'qt_TQChain*' , +'TQChar&' => 'qt_TQChar*' , +'TQChar' => 'qt_TQChar*' , +'TQChar*' => 'qt_TQChar*' , +'TQChar::Category' => 'int' , +'TQChar::Decomposition' => 'int' , +'TQChar::Direction' => 'int' , +'TQChar::Joining' => 'int' , +'TQCharRef&' => 'qt_TQCharRef*' , +'TQCharRef' => 'qt_TQCharRef*' , +'TQCharRef*' => 'qt_TQCharRef*', +'TQCheckBox*' => 'qt_TQCheckBox*', +'TQCheckListItem*' => 'qt_TQCheckListItem *', +'TQCheckTableItem*' => 'qt_TQCheckTableItem*', +'TQChildEvent*' => 'qt_TQChildEvent*' , +'TQClassInfo*' => 'qt_TQClassInfo*' , +'TQCleanupHandler*' => 'qt_TQCleanupHandler*', +'TQClipboard*' => 'qt_TQClipboard *', +'TQCloseEvent*' => 'qt_TQCloseEvent*' , +'TQCollection&' => 'qt_TQCollection*' , +'TQCollection*' => 'qt_TQCollection*', +'TQCollection::Item&' => 'void *' , +'TQCollection::Item' => 'void *' , +'TQColor &' => 'qt_TQColor *', +'TQColor&' => 'qt_TQColor *', +'TQColor&fillColor::white' => 'int' , +'TQColor&linkColor::blue' => 'int' , +'TQColor' => 'qt_TQColor *', +'TQColor*' => 'qt_TQColor*' , +'TQColorDialog*' => 'qt_TQColorDialog*', +'TQColorDrag*' => 'qt_TQColorDrag*', +'TQColorGroup&' => 'qt_TQColorGroup *', +'TQColorGroup' => 'qt_TQColorGroup*' , +'TQColorGroup*' => 'qt_TQColorGroup*' , +'TQColorGroup::ColorRole' => 'int' , +'TQComboBox*' => 'qt_TQComboBox*' , +'TQComboBox::Policy' => 'int' , +'TQComboBox::Policypolicy::AtBottom' => 'int' , +'TQComboTableItem*' => 'qt_TQComboTableItem*', +'TQCommonStyle*' => 'qt_TQCommonStyle*', +'TQCompactStyle*' => 'qt_TQCompactStyle*', +'TQComponentFactory*' => 'qt_TQComponentFactory*', +'TQComponentFactoryInterface*' => 'qt_TQComponentFactoryInterface*', +'TQComponentInterface*' => 'qt_TQComponentInterface*', +'TQComponentRegistration*' => 'qt_TQComponentRegistration*', +'TQComponentServerInterface*' => 'qt_TQComponentServerInterface*', +'TQConfigDB*' => 'qt_TQConfigDB*' , +'TQConfigDB*' => 'qt_TQConfigDB*' , +'TQConnection*' => 'qt_TQConnection*', +'TQConnectionList&' => 'qt_TQConnectionList*' , +'TQConnectionList*' => 'qt_TQConnectionList*' , +'TQConnectionListIt&' => 'qt_TQConnectionListIt*' , +'TQConnectionListIt*' => 'qt_TQConnectionListIt*', +'TQConstString' => 'qt_TQConstString*', +'TQConstString*' => 'qt_TQConstString*', +'TQContextMenuEvent*' => 'qt_TQContextMenuEvent*', +'TQCursor&' => 'qt_TQCursor *', +'TQCursor' => 'qt_TQCursor*' , +'TQCursor*' => 'qt_TQCursor *', +'TQCustomEvent*' => 'qt_TQCustomEvent*' , +'TQCustomMenuItem*' => 'qt_TQCustomMenuItem*' , +'TQDOM_NodeListPrivate*' => 'void*' , +'TQDOM_NodePrivate*' => 'void*' , +'TQDataBrowser*' => 'qt_TQDataBrowser*', +'TQDataPump*' => 'qt_TQDataPump*', +'TQDataSink*' => 'qt_TQDataSink*' , +'TQDataSource*' => 'qt_TQDataSource*' , +'TQDataStream&' => 'qt_TQDataStream *', +'TQDataStream*' => 'qt_TQDataStream*' , +'TQDataTable*' => 'qt_TQDataTable*', +'TQDataView*' => 'qt_TQDataView*', +'TQDate &' => 'qt_TQDate *', +'TQDate date()' => 'qt_TQDate*', +'TQDate&' => 'qt_TQDate *', +'TQDate' => 'qt_TQDate *', +'TQDate*' => 'qt_TQDate*', +'TQDateEdit*' => 'qt_TQDateEdit*', +'TQDateTime&' => 'qt_TQDateTime *', +'TQDateTime' => 'qt_TQDateTime *', +'TQDateTime*' => 'qt_TQDateTime*' , +'TQDateTimeEdit*' => 'qt_TQDateTimeEdit*', +'TQDateTimeEditBase*' => 'qt_TQDateTimeEditBase*', +'TQDesktopWidget*' => 'qt_TQDesktopWidget*', +'TQDial*' => 'qt_TQDial*', +'TQDialog*' => 'qt_TQDialog*', +'TQDict*' => 'qt_TQDict*', +'TQDictIterator*' => 'qt_TQDictIterator*', +'TQDir&' => 'qt_TQDir *', +'TQDir' => 'qt_TQDir *', +'TQDir*' => 'qt_TQDir *', +'TQDir::SortSpec&' => 'int' , +'TQDir::SortSpec' => 'int' , +'TQDirSortItem*' => 'qt_TQDirSortItem*', +'TQDiskFont*' => 'qt_TQDiskFont*', +'TQDispatchInterface*' => 'qt_TQDispatchInterface*', +'TQDns*' => 'qt_TQDns*', +'TQDnsSocket*' => 'qt_TQDnsSocket*', +'TQDockArea*' => 'qt_TQDockArea*', +'TQDockAreaLayout*' => 'qt_TQDockAreaLayout*', +'TQDockWindow*' => 'qt_TQDockWindow*', +'TQDomAttr&' => 'qt_TQDomAttr*' , +'TQDomAttr' => 'qt_TQDomAttr*' , +'TQDomAttr*' => 'qt_TQDomAttr*', +'TQDomCDATASection&' => 'qt_TQDomCDATASection*' , +'TQDomCDATASection' => 'qt_TQDomCDATASection*' , +'TQDomCDATASection*' => 'qt_TQDomCDATASection*', +'TQDomCharacterData&' => 'qt_TQDomCharacterData*' , +'TQDomCharacterData' => 'qt_TQDomCharacterData*' , +'TQDomCharacterData*' => 'qt_TQDomCharacterData*', +'TQDomComment&' => 'qt_TQDomComment*' , +'TQDomComment' => 'qt_TQDomComment*' , +'TQDomComment*' => 'qt_TQDomComment*', +'TQDomDocument&' => 'qt_TQDomDocument*' , +'TQDomDocument' => 'qt_TQDomDocument*' , +'TQDomDocument*' => 'qt_TQDomDocument*', +'TQDomDocumentFragment&' => 'qt_TQDomDocumentFragment*' , +'TQDomDocumentFragment' => 'qt_TQDomDocumentFragment*' , +'TQDomDocumentFragment*' => 'qt_TQDomDocumentFragment*', +'TQDomDocumentType&' => 'qt_TQDomDocumentType*' , +'TQDomDocumentType' => 'qt_TQDomDocumentType*' , +'TQDomDocumentType*' => 'qt_TQDomDocumentType*', +'TQDomElement&' => 'qt_TQDomElement*' , +'TQDomElement' => 'qt_TQDomElement*' , +'TQDomElement*' => 'qt_TQDomElement*', +'TQDomEntity&' => 'qt_TQDomEntity*' , +'TQDomEntity' => 'qt_TQDomEntity*' , +'TQDomEntity*' => 'qt_TQDomEntity*', +'TQDomEntityReference&' => 'qt_TQDomEntityReference*' , +'TQDomEntityReference' => 'qt_TQDomEntityReference*' , +'TQDomEntityReference*' => 'qt_TQDomEntityReference*', +'TQDomImplementation&' => 'qt_TQDomImplementation*' , +'TQDomImplementation' => 'qt_TQDomImplementation*' , +'TQDomImplementation*' => 'qt_TQDomImplementation*', +'TQDomNamedNodeMap&' => 'qt_TQDomNamedNodeMap*' , +'TQDomNamedNodeMap' => 'qt_TQDomNamedNodeMap*' , +'TQDomNamedNodeMap*' => 'qt_TQDomNamedNodeMap*', +'TQDomNode&' => 'qt_TQDomNode*' , +'TQDomNode' => 'qt_TQDomNode*' , +'TQDomNode*' => 'qt_TQDomNode*', +'TQDomNode::NodeType' => 'int', +'TQDomNodeList&' => 'qt_TQDomNodeList*' , +'TQDomNodeList' => 'qt_TQDomNodeList*' , +'TQDomNodeList*' => 'qt_TQDomNodeList*', +'TQDomNodePrivate*' => 'qt_TQDomNodePrivate*', +'TQDomNotation&' => 'qt_TQDomNotation*' , +'TQDomNotation' => 'qt_TQDomNotation*' , +'TQDomNotation*' => 'qt_TQDomNotation*', +'TQDomProcessingInstruction&' => 'qt_TQDomProcessingInstruction*' , +'TQDomProcessingInstruction' => 'qt_TQDomProcessingInstruction*' , +'TQDomProcessingInstruction*' => 'qt_TQDomProcessingInstruction*', +'TQDomText&' => 'qt_TQDomText*' , +'TQDomText' => 'qt_TQDomText*' , +'TQDomText*' => 'qt_TQDomText*', +'TQDoubleValidator*' => 'qt_TQDoubleValidator*', +'TQDragEnterEvent*' => 'qt_TQDragEnterEvent*' , +'TQDragLeaveEvent*' => 'qt_TQDragLeaveEvent*' , +'TQDragManager*' => 'qt_TQDragManager*', +'TQDragMoveEvent*' => 'qt_TQDragMoveEvent*' , +'TQDragObject*' => 'qt_TQDragObject*' , +'TQDragResponseEvent*' => 'qt_TQDragResponseEvent*', +'TQDropEvent*' => 'qt_TQDropEvent*' , +'TQDropSite*' => 'qt_TQDropSite*', +'TQEditorFactory*' => 'qt_TQEditorFactory*', +'TQErrorMessage*' => 'qt_TQErrorMessage*', +'TQEucJpCodec*' => 'qt_TQEucJpCodec*', +'TQEucKrCodec*' => 'qt_TQEucKrCodec*', +'TQEvent*' => 'qt_TQEvent *', +'TQEventLoop::ProcessEventsFlags' => 'uint', +'TQFeatureListInterface*' => 'qt_TQFeatureListInterface*', +'TQFile&' => 'qt_TQFile *', +'TQFile*' => 'qt_TQFile*' , +'TQFileDialog*' => 'qt_TQFileDialog*', +'TQFileIconProvider*' => 'qt_TQFileIconProvider*' , +'TQFileInfo&' => 'qt_TQFileInfo *', +'TQFileInfo*' => 'qt_TQFileInfo*', +'TQFileInfoList*' => 'qt_TQFileInfoList*' , +'TQFilePreview*' => 'qt_TQFilePreview*' , +'TQFocusData*' => 'qt_TQFocusData*' , +'TQFocusEvent*' => 'qt_TQFocusEvent*' , +'TQFont&' => 'qt_TQFont *', +'TQFont' => 'qt_TQFont *', +'TQFont*' => 'qt_TQFont *', +'TQFont::CharSet' => 'int', +'TQFont::CharSetcharset::Unicode' => 'int' , +'TQFont::StyleHint' => 'int', +'TQFontData&' => 'qt_TQFontData*' , +'TQFontDatabase*' => 'qt_TQFontDatabase*', +'TQFontDialog*' => 'qt_TQFontDialog*', +'TQFontInfo&' => 'qt_TQFontInfo *', +'TQFontInfo' => 'qt_TQFontInfo *', +'TQFontInfo*' => 'qt_TQFontInfo*', +'TQFontMetrics&' => 'qt_TQFontMetrics *', +'TQFontMetrics' => 'qt_TQFontMetrics *', +'TQFontMetrics*' => 'qt_TQFontMetrics*', +'TQFrame*' => 'qt_TQFrame*' , +'TQFtp*' => 'qt_TQFtp*', +'TQGArray&' => 'qt_TQGArray*' , +'TQGArray*' => 'qt_TQGArray*', +'TQGCache&' => 'qt_TQGCache*' , +'TQGCache*' => 'qt_TQGCache*', +'TQGCacheIterator&' => 'qt_TQGCacheIterator*' , +'TQGCacheIterator*' => 'qt_TQGCacheIterator*', +'TQGDict&' => 'qt_TQGDict*' , +'TQGDict*' => 'qt_TQGDict*', +'TQGDictIterator&' => 'qt_TQGDictIterator*' , +'TQGDictIterator*' => 'qt_TQGDictIterator*', +'TQGL*' => 'qt_TQGL*', +'TQGLColormap&' => 'qt_TQGLColormap*', +'TQGLColormap*' => 'qt_TQGLColormap*', +'TQGLContext*' => 'qt_TQGLContext*' , +'TQGLFormat&' => 'qt_TQGLFormat*' , +'TQGLFormat' => 'qt_TQGLFormat*' , +'TQGLFormat*' => 'qt_TQGLFormat*', +'TQGLWidget*' => 'qt_TQGLWidget*' , +'TQGLayoutIterator*' => 'qt_TQGLayoutIterator*' , +'TQGList&' => 'qt_TQGList*' , +'TQGList*' => 'qt_TQGList*' , +'TQGListIterator&' => 'qt_TQGListIterator*' , +'TQGListIterator*' => 'qt_TQGListIterator*', +'TQGPlugin*' => 'qt_TQGPlugin*', +'TQGPluginManager*' => 'qt_TQGPluginManager*', +'TQGVector&' => 'qt_TQGVector*' , +'TQGVector*' => 'qt_TQGVector*' , +'TQGbkCodec*' => 'qt_TQGbkCodec*', +'TQGfx*' => 'qt_TQGfx*' , +'TQGrid*' => 'qt_TQGrid*' , +'TQGrid::Direction' => 'int' , +'TQGridLayout*' => 'qt_TQGridLayout*', +'TQGridView*' => 'qt_TQGridView*', +'TQGroupBox*' => 'qt_TQGroupBox*', +'TQGuardedPtr*' => 'qt_TQGuardedPtr*', +'TQGuardedPtrPrivate*' => 'qt_TQGuardedPtrPrivate*', +'TQHBox*' => 'qt_TQHBox*' , +'TQHBoxLayout*' => 'qt_TQHBoxLayout*' , +'TQHButtonGroup*' => 'qt_TQHButtonGroup*', +'TQHGroupBox*' => 'qt_TQHGroupBox*', +'TQHeader*' => 'qt_TQHeader *', +'TQHebrewCodec*' => 'qt_TQHebrewCodec*', +'TQHideEvent*' => 'qt_TQHideEvent*' , +'TQHostAddress&' => 'qt_TQHostAddress*' , +'TQHostAddress' => 'qt_TQHostAddress*' , +'TQHostAddress*' => 'qt_TQHostAddress*' , +'TQHttp*' => 'qt_TQHttp*', +'TQIMEvent*' => 'qt_TQIMEvent*', +'TQIODevice*' => 'qt_TQIODevice *', +'TQIODevice::Offset' => 'int', +'TQIODeviceSource*' => 'qt_TQIODeviceSource*', +'TQIOManager*' => 'qt_TQIOManager*', +'TQIOWatch*' => 'qt_TQIOWatch*', +'TQIconDrag*' => 'qt_TQIconDrag*', +'TQIconDragItem&' => 'qt_TQIconDragItem*' , +'TQIconDragItem*' => 'qt_TQIconDragItem*', +'TQIconSet&' => 'qt_TQIconSet*' , +'TQIconSet' => 'qt_TQIconSet*' , +'TQIconSet*' => 'qt_TQIconSet*' , +'TQIconView*' => 'qt_TQIconView*' , +'TQIconViewItem*' => 'qt_TQIconViewItem*' , +'TQImage&' => 'qt_TQImage *', +'TQImage' => 'qt_TQImage *', +'TQImage*' => 'qt_TQImage*' , +'TQImageConsumer*' => 'qt_TQImageConsumer*' , +'TQImageData*' => 'qt_TQImageData*', +'TQImageDecoder*' => 'qt_TQImageDecoder*', +'TQImageDrag*' => 'qt_TQImageDrag*', +'TQImageFormat*' => 'qt_TQImageFormat*' , +'TQImageFormatInterface*' => 'qt_TQImageFormatInterface*', +'TQImageFormatPlugin*' => 'qt_TQImageFormatPlugin*', +'TQImageFormatType*' => 'qt_TQImageFormatType*' , +'TQImageIO*' => 'qt_TQImageIO*', +'TQImageTextKeyLang&' => 'qt_TQImageTextKeyLang*' , +'TQImageTextKeyLang*' => 'qt_TQImageTextKeyLang*', +'TQInputDialog*' => 'qt_TQInputDialog*', +'TQIntBucket*' => 'qt_TQIntBucket*', +'TQIntCache*' => 'qt_TQIntCache*', +'TQIntCacheIterator*' => 'qt_TQIntCacheIterator*', +'TQIntDict*' => 'qt_TQIntDict*', +'TQIntDictIterator*' => 'qt_TQIntDictIterator*', +'TQIntValidator*' => 'qt_TQIntValidator*', +'TQInterfaceListInterface*' => 'qt_TQInterfaceListInterface*', +'TQInterfacePtr*' => 'qt_TQInterfacePtr*', +'TQInterlaceStyle*' => 'qt_TQInterlaceStyle*', +'TQInternal*' => 'qt_TQInternal*', +'TQJisCodec*' => 'qt_TQJisCodec*', +'TQJpUnicodeConv*' => 'qt_TQJpUnicodeConv*' , +'TQKeyEvent*' => 'qt_TQKeyEvent*' , +'TQKeySequence&' => 'qt_TQKeySequence*', +'TQKeySequence' => 'qt_TQKeySequence*', +'TQKeySequence*' => 'qt_TQKeySequence*', +'TQKoi8Codec*' => 'qt_TQKoi8Codec*', +'TQLCDNumber*' => 'qt_TQLCDNumber*', +'TQLNode*' => 'qt_TQLNode*' , +'TQLabel*' => 'qt_TQLabel *', +'TQLayout*' => 'qt_TQLayout *', +'TQLayoutItem*' => 'qt_TQLayoutItem*' , +'TQLayoutIterator&' => 'qt_TQLayoutIterator*' , +'TQLayoutIterator' => 'qt_TQLayoutIterator*' , +'TQLayoutIterator*' => 'qt_TQLayoutIterator*', +'TQLibrary*' => 'qt_TQLibrary*', +'TQLibrary::Policy' => 'int', +'TQLibraryInterface*' => 'qt_TQLibraryInterface*', +'TQLineEdit*' => 'qt_TQLineEdit*' , +'TQLineEdit::EchoMode' => 'int' , +'TQList*' => 'qt_TQList*', +'TQListBox*' => 'qt_TQListBox *', +'TQListBoxItem*' => 'qt_TQListBoxItem *', +'TQListBoxPixmap*' => 'qt_TQListBoxPixmap*', +'TQListBoxText*' => 'qt_TQListBoxText*', +'TQListIterator*' => 'qt_TQListIterator*', +'TQListView*' => 'qt_TQListView *', +'TQListViewItem*&' => 'qt_TQListViewItem*', +'TQListViewItem*' => 'qt_TQListViewItem *', +'TQListViewItemIterator&' => 'qt_TQListViewItemIterator*' , +'TQListViewItemIterator' => 'qt_TQListViewItemIterator*' , +'TQListViewItemIterator*' => 'qt_TQListViewItemIterator*', +'TQLocalFs*' => 'qt_TQLocalFs*', +'TQMCPI*' => 'qt_TQMCPI*', +'TQMSG*' => 'TQMSG*' , +'TQMainWindow*' => 'qt_TQMainWindow*' , +'TQMainWindow::ToolBarDock' => 'int', +'TQMainWindow::ToolBarDock::Top' => 'int' , +'TQMap&' => 'qt_TQMap*' , +'TQMap*' => 'qt_TQMap*', +'TQMapConstIterator*' => 'qt_TQMapConstIterator*', +'TQMapIterator*' => 'qt_TQMapIterator*', +'TQMapNode*' => 'qt_TQMapNode*', +'TQMapNodeBase*&' => 'qt_TQMapNodeBase*' , +'TQMapNodeBase*' => 'qt_TQMapNodeBase*' , +'TQMapPrivate*' => 'qt_TQMapPrivate*', +'TQMapPrivateBase*' => 'qt_TQMapPrivateBase*' , +'TQMemArray*' => 'qt_TQMemArray*', +'TQMember' => 'qt_TQMember*' , +'TQMember*' => 'qt_TQMember*' , +'TQMenuBar*' => 'qt_TQMenuBar *', +'TQMenuData*' => 'qt_TQMenuData*', +'TQMenuData**' => 'qt_TQMenuData**' , +'TQMenuItem*' => 'qt_TQMenuItem *', +'TQMessageBox*' => 'qt_TQMessageBox*', +'TQMetaData*' => 'qt_TQMetaData*' , +'TQMetaData::Access*' => 'int*' , +'TQMetaEnum*' => 'qt_TQMetaEnum*' , +'TQMetaEnum::Item*' => 'int*' , +'TQMetaObject*&' => 'qt_TQMetaObject*', +'TQMetaObject*' => 'qt_TQMetaObject *', +'TQMetaObjectCleanUp*' => 'qt_TQMetaObjectCleanUp*', +'TQMetaObjectInit*' => 'qt_TQMetaObjectInit*', +'TQMetaProperty*' => 'qt_TQMetaProperty*' , +'TQMimeSource*' => 'qt_TQMimeSource*' , +'TQMimeSourceFactory*' => 'qt_TQMimeSourceFactory*' , +'TQMotifPlusStyle*' => 'qt_TQMotifPlusStyle*', +'TQMotifStyle*' => 'qt_TQMotifStyle*', +'TQMouseEvent*' => 'qt_TQMouseEvent*' , +'TQMoveEvent*' => 'qt_TQMoveEvent*' , +'TQMovie&' => 'qt_TQMovie *', +'TQMovie*' => 'qt_TQMovie *', +'TQMultiLineEdit*' => 'qt_TQMultiLineEdit*', +'TQMultiLineEditRow*' => 'qt_TQMultiLineEditRow*', +'TQMutex*' => 'qt_TQMutex*', +'TQNPInstance*' => 'qt_TQNPInstance*', +'TQNPStream*' => 'qt_TQNPStream*', +'TQNPWidget*' => 'qt_TQNPWidget*', +'TQNPlugin*' => 'qt_TQNPlugin*', +'TQNetworkOperation*' => 'qt_TQNetworkOperation*' , +'TQNetworkProtocol*' => 'qt_TQNetworkProtocol*' , +'TQNetworkProtocol::Operation' => 'int' , +'TQNetworkProtocol::State' => 'int' , +'TQNetworkProtocolFactory*' => 'qt_TQNetworkProtocolFactory*', +'TQNetworkProtocolFactoryBase*' => 'qt_TQNetworkProtocolFactoryBase*' , +'TQObject*' => 'qt_TQObject *', +'TQObjectCleanupHandler*' => 'qt_TQObjectCleanupHandler*', +'TQObjectDictionary&' => 'qt_TQObjectDictionary*' , +'TQObjectDictionary*' => 'qt_TQObjectDictionary*', +'TQObjectInterface*' => 'qt_TQObjectInterface*', +'TQObjectList&' => 'qt_TQObjectList*' , +'TQObjectList*' => 'qt_TQObjectList*', +'TQObjectListIt&' => 'qt_TQObjectListIt*' , +'TQObjectListIt*' => 'qt_TQObjectListIt*', +'TQPNGImagePacker*' => 'qt_TQPNGImagePacker*', +'TQPNGImageWriter*' => 'qt_TQPNGImageWriter*', +'TQPaintDevice*' => 'qt_TQPaintDevice *', +'TQPaintDeviceMetrics*' => 'qt_TQPaintDeviceMetrics*', +'TQPaintDeviceX11Data*' => 'qt_TQPaintDeviceX11Data*' , +'TQPaintEvent*' => 'qt_TQPaintEvent*' , +'TQPainter&' => 'qt_TQPainter*' , +'TQPainter*' => 'qt_TQPainter *', +'TQPair*' => 'qt_TQPair*', +'TQPalData*' => 'qt_TQPalData*', +'TQPalette&' => 'qt_TQPalette *', +'TQPalette' => 'qt_TQPalette *', +'TQPalette*' => 'qt_TQPalette *', +'TQPen&' => 'qt_TQPen *', +'TQPen' => 'qt_TQPen*' , +'TQPen*' => 'qt_TQPen*', +'TQPenData*' => 'qt_TQPenData*', +'TQPicture&' => 'qt_TQPicture *', +'TQPicture' => 'qt_TQPicture*', +'TQPicture*' => 'qt_TQPicture*', +'TQPicturePrivate*' => 'qt_TQPicturePrivate*', +'TQPixmap& pixmap()' => 'kde_TQPixmap*', +'TQPixmap&' => 'qt_TQPixmap *', +'TQPixmap' => 'qt_TQPixmap *', +'TQPixmap*' => 'qt_TQPixmap *', +'TQPixmap::Optimization' => 'int' , +'TQPixmap::Optimization' => 'int', +'TQPixmap::Optimization::DefaultOptim' => 'int' , +'TQPixmapCache*' => 'qt_TQPixmapCache*', +'TQPixmapData*' => 'qt_TQPixmapData*', +'TQPlatinumStyle*' => 'qt_TQPlatinumStyle*', +'TQPluginManager*' => 'qt_TQPluginManager*', +'TQPoint&' => 'qt_TQPoint*', +'TQPoint&pos()' => 'int' , +'TQPoint&pos::pos()' => 'int' , +'TQPoint' => 'qt_TQPoint*', +'TQPoint*' => 'qt_TQPoint*' , +'TQPointArray&' => 'qt_TQPointArray*', +'TQPointArray' => 'qt_TQPointArray*', +'TQPointArray*' => 'qt_TQPointArray*', +'TQPointVal&' => 'qt_TQPointVal*' , +'TQPointVal' => 'qt_TQPointVal*' , +'TQPolygonScanner*' => 'qt_TQPolygonScanner*', +'TQPopupMenu*' => 'qt_TQPopupMenu*', +'TQPrintDialog*' => 'qt_TQPrintDialog*', +'TQPrinter*' => 'qt_TQPrinter*' , +'TQPrinter::PrinterMode' => 'int', +'TQProcess*' => 'qt_TQProcess*', +'TQProgressBar*' => 'qt_TQProgressBar*', +'TQProgressDialog*' => 'qt_TQProgressDialog*', +'TQPtrBucket*' => 'qt_TQPtrBucket*', +'TQPtrCollection&' => 'qt_TQPtrCollection*', +'TQPtrCollection*' => 'qt_TQPtrCollection*', +'TQPtrDict*' => 'qt_TQPtrDict*', +'TQPtrDictIterator*' => 'qt_TQPtrDictIterator*', +'TQPtrList*' => 'qt_TQPtrList*', +'TQPtrListIterator*' => 'qt_TQPtrListIterator*', +'TQPtrQueue*' => 'qt_TQPtrQueue*', +'TQPtrStack*' => 'qt_TQPtrStack*', +'TQPtrVector*' => 'qt_TQPtrVector*', +'TQPushButton*' => 'qt_TQPushButton*', +'TQQueue*' => 'qt_TQQueue*', +'TQRESULT' => 'long', +'TQRadioButton*' => 'qt_TQRadioButton*', +'TQRangeControl*' => 'qt_TQRangeControl*', +'TQRect&' => 'qt_TQRect*', +'TQRect' => 'qt_TQRect*', +'TQRect*' => 'qt_TQRect*', +'TQRegExp&' => 'qt_TQRegExp*', +'TQRegExp*' => 'qt_TQRegExp*', +'TQRegExpValidator*' => 'qt_TQRegExpValidator*', +'TQRegion&' => 'qt_TQRegion *', +'TQRegion' => 'qt_TQRegion *', +'TQRegion*' => 'qt_TQRegion*', +'TQRegionData*' => 'qt_TQRegionData*', +'TQRemoteFactory*' => 'qt_TQRemoteFactory*', +'TQRemotePlugin*' => 'qt_TQRemotePlugin*', +'TQResizeEvent*' => 'qt_TQResizeEvent*' , +'TQRgb' => 'unsigned int', +'TQRgb*' => 'int *', +'TQRichText&' => 'qt_TQRichText*' , +'TQSGIStyle*' => 'qt_TQSGIStyle*', +'TQScrollBar&' => 'qt_TQScrollBar*' , +'TQScrollBar*' => 'qt_TQScrollBar*' , +'TQScrollView*' => 'qt_TQScrollView*', +'TQSemaphore*' => 'qt_TQSemaphore*', +'TQSemiModal*' => 'qt_TQSemiModal*', +'TQSenderObject*' => 'qt_TQSenderObject*', +'TQServerSocket*' => 'qt_TQServerSocket*', +'TQSessionManager&' => 'qt_TQSessionManager*' , +'TQSessionManager*' => 'qt_TQSessionManager*', +'TQSettings*' => 'qt_TQSettings*', +'TQShared*' => 'qt_TQShared*', +'TQShowEvent*' => 'qt_TQShowEvent*' , +'TQSignal*' => 'qt_TQSignal *', +'TQSignalDict&' => 'qt_TQSignalDict*' , +'TQSignalDict*' => 'qt_TQSignalDict*', +'TQSignalDictIt&' => 'qt_TQSignalDictIt*' , +'TQSignalDictIt*' => 'qt_TQSignalDictIt*', +'TQSignalMapper*' => 'qt_TQSignalMapper*', +'TQSignalVec&' => 'qt_TQSignalVec*', +'TQSignalVec*' => 'qt_TQSignalVec*', +'TQSimpleRichText*' => 'qt_TQSimpleRichText*', +'TQSize&' => 'qt_TQSize *', +'TQSize' => 'qt_TQSize *', +'TQSize*' => 'qt_TQSize*' , +'TQSizeGrip*' => 'qt_TQSizeGrip*', +'TQSizePolicy&' => 'qt_TQSizePolicy*' , +'TQSizePolicy' => 'qt_TQSizePolicy*' , +'TQSizePolicy*' => 'qt_TQSizePolicy*', +'TQSizePolicy::ExpandData' => 'int' , +'TQSizePolicy::SizeTypehData::Minimum' => 'int' , +'TQSizePolicy::SizeTypevData::Minimum' => 'int' , +'TQSjisCodec*' => 'qt_TQSjisCodec*', +'TQSlider*' => 'qt_TQSlider*', +'TQSmartPtr&' => 'qt_TQSmartPtr*' , +'TQSmartPtr*' => 'qt_TQSmartPtr*', +'TQSmartPtrPrivate*' => 'qt_TQSmartPtrPrivate*', +'TQSocket*' => 'qt_TQSocket*', +'TQSocketDevice*' => 'qt_TQSocketDevice*' , +'TQSocketNotifier*' => 'qt_TQSocketNotifier*', +'TQSocketNotifier::Type' => 'int', +'TQSortedList*' => 'qt_TQSortedList*', +'TQSound*' => 'qt_TQSound*', +'TQSpacerItem*' => 'qt_TQSpacerItem*' , +'TQSpinBox*' => 'qt_TQSpinBox*', +'TQSpinWidget*' => 'qt_TQSpinWidget*', +'TQSplitter*' => 'qt_TQSplitter*', +'TQSql*' => 'qt_TQSql*', +'TQSql::Confirm' => 'int', +'TQSql::Op' => 'int', +'TQSqlCursor&' => 'qt_TQSqlCursor*', +'TQSqlCursor' => 'qt_TQSqlCursor*', +'TQSqlCursor*' => 'qt_TQSqlCursor*', +'TQSqlDatabase*' => 'qt_TQSqlDatabase*', +'TQSqlDriver*' => 'qt_TQSqlDriver*', +'TQSqlDriverCreator*' => 'qt_TQSqlDriverCreator*', +'TQSqlDriverCreatorBase*' => 'qt_TQSqlDriverCreatorBase*', +'TQSqlDriverFactoryInterface*' => 'qt_TQSqlDriverFactoryInterface*', +'TQSqlDriverPlugin*' => 'qt_TQSqlDriverPlugin*', +'TQSqlEditorFactory*' => 'qt_TQSqlEditorFactory*', +'TQSqlError&' => 'qt_TQSqlError*', +'TQSqlError' => 'qt_TQSqlError*', +'TQSqlError*' => 'qt_TQSqlError*', +'TQSqlField&' => 'qt_TQSqlField*', +'TQSqlField' => 'qt_TQSqlField*', +'TQSqlField*' => 'qt_TQSqlField*', +'TQSqlFieldInfo&' => 'qt_TQSqlFieldInfo*', +'TQSqlFieldInfo*' => 'qt_TQSqlFieldInfo*', +'TQSqlForm' => 'qt_TQSqlForm*', +'TQSqlForm*' => 'qt_TQSqlForm*', +'TQSqlIndex&' => 'qt_TQSqlIndex*', +'TQSqlIndex' => 'qt_TQSqlIndex*', +'TQSqlIndex*' => 'qt_TQSqlIndex*', +'TQSqlPropertyMap*' => 'qt_TQSqlPropertyMap*', +'TQSqlQuery&' => 'qt_TQSqlQuery*', +'TQSqlQuery' => 'qt_TQSqlQuery*', +'TQSqlQuery*' => 'qt_TQSqlQuery*', +'TQSqlRecord&' => 'qt_TQSqlRecord*', +'TQSqlRecord' => 'qt_TQSqlRecord*', +'TQSqlRecord*' => 'qt_TQSqlRecord*', +'TQSqlRecordInfo&' => 'qt_TQSqlRecordInfo*', +'TQSqlRecordInfo' => 'qt_TQSqlRecordInfo*', +'TQSqlRecordInfo*' => 'qt_TQSqlRecordInfo*', +'TQSqlRecordPrivate*' => 'qt_TQSqlRecordPrivate*', +'TQSqlRecordShared*' => 'qt_TQSqlRecordShared*', +'TQSqlResult' => 'qt_TQSqlResult*', +'TQSqlResult*' => 'qt_TQSqlResult*', +'TQSqlResultShared*' => 'qt_TQSqlResultShared*', +'TQStack*' => 'qt_TQStack*', +'TQStatusBar*' => 'qt_TQStatusBar*' , +'TQStoredDrag*' => 'qt_TQStoredDrag*', +'TQStrIList' => 'kde_TQStrIList', +'TQStrIList*' => 'qt_TQStrIList*', +'TQStrIVec*' => 'qt_TQStrIVec*', +'TQStrList&' => 'qt_TQStrList *', +'TQStrList' => 'qt_TQStrList *', +'TQStrList*' => 'qt_TQStrList *', +'TQStrListIterator*' => 'qt_TQStrListIterator*', +'TQStrVec*' => 'qt_TQStrVec*', +'TQString&' => 'qt_TQString *', +'TQString&::null' => 'qt_TQString*' , +'TQString&button0Text::null' => 'qt_TQString*' , +'TQString&button1Text::null' => 'qt_TQString*' , +'TQString&button2Text::null' => 'qt_TQString*' , +'TQString&buttonText::null' => 'qt_TQString*' , +'TQString&caption::null' => 'qt_TQString*' , +'TQString&charSet::null' => 'qt_TQString*' , +'TQString&context::null' => 'qt_TQString*' , +'TQString&defValue::null' => 'qt_TQString*' , +'TQString&dir::null' => 'qt_TQString*' , +'TQString&directory::null' => 'qt_TQString*' , +'TQString&filter::null' => 'qt_TQString*' , +'TQString&initially::null' => 'qt_TQString*' , +'TQString&location::null' => 'qt_TQString*' , +'TQString&n::null' => 'qt_TQString*' , +'TQString&nameFilter::null' => 'qt_TQString*' , +'TQString&noButtonText::null' => 'qt_TQString*' , +'TQString&search_delimiters::null' => 'qt_TQString*' , +'TQString&style::null' => 'qt_TQString*' , +'TQString&suffix::null' => 'qt_TQString*' , +'TQString&text::null' => 'qt_TQString*' , +'TQString&text_::null' => 'qt_TQString*' , +'TQString&translation::null' => 'qt_TQString*' , +'TQString&yesButtonText::null' => 'qt_TQString*' , +'TQString' => 'qt_TQString *', +'TQString*' => 'qt_TQString*' , +'TQString::null' => 'qt_TQString_null()' , +'TQStringBucket*' => 'qt_TQStringBucket*', +'TQStringData*' => 'qt_TQStringData*', +'TQStringList&' => 'qt_TQStringList*' , +'TQStringList' => 'qt_TQStringList*' , +'TQStringList*' => 'qt_TQStringList*' , +'TQStringcharSetName::null' => 'qt_TQStringcharSetName*' , +'TQStyle&' => 'qt_TQStyle*' , +'TQStyle*' => 'qt_TQStyle*' , +'TQStyle::ScrollControl' => 'int' , +'TQStyle::StylePixmap' => 'int', +'TQStyle::SubControl' => 'int', +'TQStyle::SubRect' => 'int', +'TQStyleFactory*' => 'qt_TQStyleFactory*', +'TQStyleFactoryInterface*' => 'qt_TQStyleFactoryInterface*', +'TQStyleHintReturn*' => 'qt_TQStyleHintReturn*', +'TQStyleOption&' => 'int', +'TQStyleOption' => 'int', +'TQStyleOption*' => 'int*', +'TQStylePlugin*' => 'qt_TQStylePlugin*', +'TQStyleSheet*' => 'qt_TQStyleSheet*' , +'TQStyleSheetItem&' => 'qt_TQStyleSheetItem*' , +'TQStyleSheetItem*' => 'qt_TQStyleSheetItem*' , +'TQStyleSheetItem::DisplayMode*' => 'int', +'TQStyleSheetItem::ListStyle*' => 'int', +'TQStyleSheetItem::WhiteSpaceMode' => 'int', +'TQTSCIICodec*' => 'qt_TQTSCIICodec*', +'TQTSMFI' => 'int' , +'TQTab*' => 'qt_TQTab*', +'TQTabBar*' => 'qt_TQTabBar*' , +'TQTabBar::Shape' => 'int' , +'TQTabDialog*' => 'qt_TQTabDialog*', +'TQTabWidget*' => 'qt_TQTabWidget*', +'TQTable*' => 'qt_TQTable*' , +'TQTableHeader*' => 'qt_TQTableHeader*', +'TQTableItem*' => 'qt_TQTableItem*' , +'TQTableSelection&' => 'qt_TQTableSelection*' , +'TQTableSelection' => 'qt_TQTableSelection*' , +'TQTableSelection*' => 'qt_TQTableSelection*', +'TQTableView*' => 'qt_TQTableView*', +'TQTabletEvent*' => 'qt_TQTabletEvent*', +'TQTextBrowser*' => 'qt_TQTextBrowser*', +'TQTextCodec*' => 'qt_TQTextCodec*' , +'TQTextCodecFactory*' => 'qt_TQTextCodecFactory*', +'TQTextCodecFactoryInterface*' => 'qt_TQTextCodecFactoryInterface*', +'TQTextCodecPlugin*' => 'qt_TQTextCodecPlugin*', +'TQTextCursor*' => 'qt_TQTextCursor*', +'TQTextDecoder*' => 'qt_TQTextDecoder*' , +'TQTextDocument*' => 'qt_TQTextDocument*', +'TQTextDrag*' => 'qt_TQTextDrag*', +'TQTextEdit*' => 'qt_TQTextEdit*', +'TQTextEncoder*' => 'qt_TQTextEncoder*' , +'TQTextFormat*' => 'qt_TQTextFormat*', +'TQTextIStream*' => 'qt_TQTextIStream*', +'TQTextOStream&' => 'qt_TQTextOStream*' , +'TQTextOStream*' => 'qt_TQTextOStream*', +'TQTextOStreamIterator*' => 'qt_TQTextOStreamIterator*', +'TQTextParag**' => 'qt_TQTextParag**', +'TQTextStream&' => 'qt_TQTextStream*' , +'TQTextStream*' => 'qt_TQTextStream*' , +'TQTextView*' => 'qt_TQTextView*', +'TQThread*' => 'qt_TQThread*', +'TQThreadData*' => 'qt_TQThreadData*', +'TQThreadEvent*' => 'qt_TQThreadEvent*', +'TQTime&' => 'qt_TQTime *', +'TQTime' => 'qt_TQTime *', +'TQTime*' => 'qt_TQTime*', +'TQTimeEdit*' => 'qt_TQTimeEdit*', +'TQTimeWatch*' => 'qt_TQTimeWatch*', +'TQTimer*' => 'qt_TQTimer*', +'TQTimerEvent*' => 'qt_TQTimerEvent*' , +'TQToolBar*' => 'qt_TQToolBar*' , +'TQToolButton*' => 'qt_TQToolButton*' , +'TQToolTip*' => 'qt_TQToolTip*', +'TQToolTipGroup*' => 'qt_TQToolTipGroup *', +'TQTranslator*' => 'qt_TQTranslator*' , +'TQTranslatorMessage&' => 'qt_TQTranslatorMessage*' , +'TQTranslatorMessage' => 'qt_TQTranslatorMessage*' , +'TQTranslatorMessage*' => 'qt_TQTranslatorMessage*', +'TQTsciiCodec*' => 'qt_TQTsciiCodec*', +'TQUObject*' => 'qt_TQUObject*', +'TQUnknownInterface*' => 'qt_TQUnknownInterface*', +'TQUnknownInterface**' => 'qt_TQUnknownInterface**', +'TQUriDrag*' => 'qt_TQUriDrag*', +'TQUrl&' => 'qt_TQUrl*' , +'TQUrl' => 'qt_TQUrl*' , +'TQUrl*' => 'qt_TQUrl*', +'TQUrlInfo&' => 'qt_TQUrlInfo*' , +'TQUrlInfo' => 'qt_TQUrlInfo*' , +'TQUrlInfo*' => 'qt_TQUrlInfo*', +'TQUrlOperator&' => 'qt_TQUrlOperator*' , +'TQUrlOperator*' => 'qt_TQUrlOperator*' , +'TQUtf16Codec*' => 'qt_TQUtf16Codec*', +'TQUtf8Codec*' => 'qt_TQUtf8Codec*', +'TQUuid&' => 'qt_TQUuid*', +'TQUuid*' => 'qt_TQUuid*', +'TQVBox*' => 'qt_TQVBox*' , +'TQVBoxLayout*' => 'qt_TQVBoxLayout*', +'TQVButtonGroup*' => 'qt_TQVButtonGroup*', +'TQVFbHeader*' => 'qt_TQVFbHeader*', +'TQVFbKeyData*' => 'qt_TQVFbKeyData*', +'TQVGroupBox*' => 'qt_TQVGroupBox*', +'TQValidator*' => 'qt_TQValidator *', +'TQValidator::State' => 'int', +'TQValueList*' => 'qt_TQValueList*', +'TQValueListConstIterator*' => 'qt_TQValueListConstIterator*', +'TQValueListIterator*' => 'qt_TQValueListIterator*', +'TQValueListNode*' => 'qt_TQValueListNode*', +'TQValueListPrivate*' => 'qt_TQValueListPrivate*', +'TQValueStack*' => 'qt_TQValueStack*', +'TQValueVector*' => 'qt_TQValueVector*', +'TQValueVectorPrivate*' => 'qt_TQValueVectorPrivate*', +'TQVariant&' => 'qt_TQVariant *', +'TQVariant' => 'qt_TQVariant *', +'TQVariant*' => 'qt_TQVariant*', +'TQVariant::Type' => 'int' , +'TQVariantPrivate*' => 'qt_TQVariantPrivate*' , +'TQVector*' => 'qt_TQVector*', +'TQWMatrix&' => 'qt_TQWMatrix *', +'TQWMatrix' => 'qt_TQWMatrix *', +'TQWMatrix*' => 'qt_TQWMatrix*', +'TQWSDecoration&' => 'qt_TQWSDecoration*' , +'TQWSDecoration*' => 'qt_TQWSDecoration*' , +'TQWSDisplay*' => 'qt_TQWSDisplay*' , +'TQWSEvent*' => 'qt_TQWSEvent*' , +'TQWaitCondition*' => 'qt_TQWaitCondition*', +'TQWhatsThis*' => 'qt_TQWhatsThis*', +'TQWheelEvent*' => 'qt_TQWheelEvent*' , +'TQWidget *' => 'qt_TQWidget *', +'TQWidget' => 'qt_TQWidget *', +'TQWidget*' => 'qt_TQWidget *', +'TQWidgetFactory*' => 'qt_TQWidgetFactory*', +'TQWidgetIntDict&' => 'qt_TQWidgetIntDict*' , +'TQWidgetIntDict*' => 'qt_TQWidgetIntDict*', +'TQWidgetIntDictIt&' => 'qt_TQWidgetIntDictIt*' , +'TQWidgetIntDictIt*' => 'qt_TQWidgetIntDictIt*', +'TQWidgetItem*' => 'qt_TQWidgetItem*', +'TQWidgetList&' => 'qt_TQWidgetList *' , +'TQWidgetList&' => 'qt_TQWidgetList*' , +'TQWidgetList' => 'qt_TQWidgetList *' , +'TQWidgetList' => 'qt_TQWidgetList*' , +'TQWidgetList*' => 'qt_TQWidgetList *', +'TQWidgetList*' => 'qt_TQWidgetList*', +'TQWidgetListIt&' => 'qt_TQWidgetListIt*' , +'TQWidgetListIt*' => 'qt_TQWidgetListIt*', +'TQWidgetMapper*' => 'qt_TQWidgetMapper*', +'TQWidgetPlugin*' => 'qt_TQWidgetPlugin*', +'TQWidgetStack*' => 'qt_TQWidgetStack*', +'TQWindowsMime*' => 'qt_TQWindowsMime*' , +'TQWindowsStyle*' => 'qt_TQWindowsStyle*', +'TQWizard*' => 'qt_TQWizard*', +'TQWorkspace*' => 'qt_TQWorkspace*', +'TQXEmbed*' => 'qt_TQXEmbed*' , +'TQXmlAttributes&' => 'qt_TQXmlAttributes*' , +'TQXmlAttributes*' => 'qt_TQXmlAttributes*', +'TQXmlContentHandler*' => 'qt_TQXmlContentHandler*' , +'TQXmlDTDHandler*' => 'qt_TQXmlDTDHandler*' , +'TQXmlDeclHandler*' => 'qt_TQXmlDeclHandler*' , +'TQXmlDefaultHandler*' => 'qt_TQXmlDefaultHandler*', +'TQXmlEntityResolver*' => 'qt_TQXmlEntityResolver*' , +'TQXmlErrorHandler*' => 'qt_TQXmlErrorHandler*' , +'TQXmlInputSource&' => 'qt_TQXmlInputSource*' , +'TQXmlInputSource*&' => 'qt_TQXmlInputSource*', +'TQXmlInputSource*' => 'qt_TQXmlInputSource*' , +'TQXmlLexicalHandler*' => 'qt_TQXmlLexicalHandler*' , +'TQXmlLocator*' => 'qt_TQXmlLocator*' , +'TQXmlNamespaceSupport*' => 'qt_TQXmlNamespaceSupport*', +'TQXmlParseException&' => 'qt_TQXmlParseException*' , +'TQXmlParseException*' => 'qt_TQXmlParseException*', +'TQXmlReader*' => 'qt_TQXmlReader*', +'TQXmlSimpleReader*' => 'qt_TQXmlSimpleReader*' , +'TQXtApplication*' => 'qt_TQXtApplication*', +'TQXtWidget*' => 'qt_TQXtWidget*', +'TTQ_INT16&' => 'short', +'TTQ_INT16' => 'short', +'TTQ_INT32&' => 'int', +'TTQ_INT32' => 'int', +'TTQ_INT8&' => 'char', +'TTQ_INT8' => 'char', +'TTQ_LONG&' => 'long', +'TTQ_LONG' => 'long', +'TTQ_PACKED*' => 'void*', +'TTQ_UINT16&' => 'unsigned short', +'TTQ_UINT16' => 'unsigned short', +'TTQ_UINT32&' => 'unsigned int', +'TTQ_UINT32' => 'unsigned int', +'TTQ_UINT8&' => 'unsigned char', +'TTQ_UINT8' => 'unsigned char', +'TTQ_UINT8*' => 'unsigned char*' , +'TTQ_ULONG&' => 'long', +'TTQ_ULONG' => 'long', +'TQt*' => 'qt_TQt*' , +'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' , +'TQtMultiLineEdit*' => 'qt_TQtMultiLineEdit*', +'TQtMultiLineEditRow*' => 'qt_TQtMultiLineEditRow*', +'TQtTableView*' => 'qt_TQtTableView*', 'QwAbsSpriteFieldView*' => 'qt_QwAbsSpriteFieldView*' , 'QwClusterizer*' => 'qt_QwClusterizer*' , 'QwEllipse*' => 'qt_QwEllipse*', @@ -2459,7 +2459,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*', @@ -2550,12 +2550,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*', @@ -2718,7 +2718,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', @@ -2833,21 +2833,21 @@ 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<KAction>&' => 'kde_KActionPtrList*', -'QPtrList<KSSLCertificate>&' => 'kde_KSSLCertificatePtrList*', -'QPtrList<KXMLGUIClient>*' => 'kde_KXMLGUIClientPtrList*', -'QPtrList<QDockWindow>*' => 'qt_QDockWindowPtrList*', -'QPtrList<QPixmap>' => 'qt_QPixmapPtrList*', -'QPtrList<QPoint>' => 'qt_QPointPtrList*', +'TQValueList<int>' => 'qt_TQIntValueList*', +'TQValueList<int>&' => 'qt_TQIntValueList*', +'TQValueList<TQIconDragItem>' => 'qt_TQIconDragItemValueList*', +'TQValueList<TQIconDragItem>&' => 'qt_TQIconDragItemValueList*', +'TQValueList<TQPixmap>' => 'qt_TQPixmapValueList*', +'TQValueList<TQString>&' => 'qt_TQStringValueList*', +'TQValueList<TQVariant>&' => 'qt_TQVariantValueList*', +'TQValueList<TQUrlInfo>*' => 'qt_TQUrlInfoValueList*', +'TQValueList<KDataToolInfo>&' => 'kde_KDataToolInfoValueList*', +'TQPtrList<KAction>&' => 'kde_KActionPtrList*', +'TQPtrList<KSSLCertificate>&' => 'kde_KSSLCertificatePtrList*', +'TQPtrList<KXMLGUIClient>*' => 'kde_KXMLGUIClientPtrList*', +'TQPtrList<TQDockWindow>*' => 'qt_TQDockWindowPtrList*', +'TQPtrList<TQPixmap>' => 'qt_TQPixmapPtrList*', +'TQPtrList<TQPoint>' => 'qt_TQPointPtrList*', 'KService::Ptr&' => 'kde_KServicePtr*', 'ClassContext*' => 'kde_ClassContext*', 'ClassStoreIface*' => 'kde_ClassStoreIface*', @@ -2867,8 +2867,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*', @@ -3007,7 +3007,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/kdocLib.pm b/kalyptus/kdocLib.pm index 6eac4df..3c0b727 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/kdecore/"> <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/kdocUtil.pm b/kalyptus/kdocUtil.pm index 629147a..e045a67 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 diff --git a/puic/LICENSE.GPL b/puic/LICENSE.GPL index c7aea18..2c14883 100644 --- a/puic/LICENSE.GPL +++ b/puic/LICENSE.GPL @@ -263,14 +263,14 @@ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + 12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER diff --git a/puic/Makefile.am b/puic/Makefile.am index d429dc7..b0d7d8b 100644 --- a/puic/Makefile.am +++ b/puic/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DUIC -DQT_INTERNAL_XML +AM_CPPFLAGS = -DUIC -DTQT_INTERNAL_XML AM_CXXFLAGS= $(KDE_CXXFLAGS) bin_PROGRAMS = puic @@ -14,8 +14,8 @@ EXTRA_DIST = domtool.cpp domtool.h embed.cpp form.cpp globaldefs.h main.cpp obje # kde_bindir Where executables should go to. Use bin_PROGRAMS or bin_SCRIPTS. # kde_libdir Where shared libraries should go to. Use lib_LTLIBRARIES. # kde_moduledir Where modules (e.g. parts) should go to. Use kde_module_LTLIBRARIES. -# kde_styledir Where Qt/KDE widget styles should go to (new in KDE 3). -# kde_designerdir Where Qt Designer plugins should go to (new in KDE 3). +# kde_styledir Where TQt/KDE widget styles should go to (new in KDE 3). +# kde_designerdir Where TQt Designer plugins should go to (new in KDE 3). # set the include path for X, qt and KDE INCLUDES= $(all_includes) diff --git a/puic/Makefile.in b/puic/Makefile.in index 5caff94..25a3e00 100644 --- a/puic/Makefile.in +++ b/puic/Makefile.in @@ -104,14 +104,14 @@ LIBUCB = @LIBUCB@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ +LIB_TQPE = @LIB_TQPE@ LIB_QT = @LIB_QT@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MOC = @MOC@ +TQMOC = @TQMOC@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -122,9 +122,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ +TQTE_NORTTI = @TQTE_NORTTI@ +TQT_INCLUDES = @TQT_INCLUDES@ +TQT_LDFLAGS = @TQT_LDFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ x_includes = @x_includes@ x_libraries = @x_libraries@ -AM_CPPFLAGS = -DUIC -DQT_INTERNAL_XML +AM_CPPFLAGS = -DUIC -DTQT_INTERNAL_XML AM_CXXFLAGS = $(KDE_CXXFLAGS) bin_PROGRAMS = puic @@ -209,8 +209,8 @@ EXTRA_DIST = domtool.cpp domtool.h embed.cpp form.cpp globaldefs.h main.cpp obje # kde_bindir Where executables should go to. Use bin_PROGRAMS or bin_SCRIPTS. # kde_libdir Where shared libraries should go to. Use lib_LTLIBRARIES. # kde_moduledir Where modules (e.g. parts) should go to. Use kde_module_LTLIBRARIES. -# kde_styledir Where Qt/KDE widget styles should go to (new in KDE 3). -# kde_designerdir Where Qt Designer plugins should go to (new in KDE 3). +# kde_styledir Where TQt/KDE widget styles should go to (new in KDE 3). +# kde_designerdir Where TQt Designer plugins should go to (new in KDE 3). # set the include path for X, qt and KDE INCLUDES = $(all_includes) @@ -296,7 +296,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>+ 3 cd $(top_srcdir) && \ $(AUTOMAKE) --gnu puic/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/puic/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/puic/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -645,7 +645,7 @@ docs-am: force-reedit: cd $(top_srcdir) && \ $(AUTOMAKE) --gnu puic/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/puic/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/puic/Makefile.in #>+ 9 @@ -1,7 +1,7 @@ - PNGs embedded in ui files and B&W pictures in external MimeSourceFactory remain untested (and thus probably wrong) -- PerlQt does not handle subclassing yet, so don't use the -subimpl option +- PerlTQt does not handle subclassing yet, so don't use the -subimpl option - database code needs more testing - ... diff --git a/puic/domtool.cpp b/puic/domtool.cpp index 492ce88..3448d41 100644 --- a/puic/domtool.cpp +++ b/puic/domtool.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -51,9 +51,9 @@ \sa hasProperty() */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -68,9 +68,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const /*! \overload */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readProperty( e, name, defValue, comment ); } @@ -79,9 +79,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const \sa readProperty() */ -bool DomTool::hasProperty( const QDomElement& e, const QString& name ) +bool DomTool::hasProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -92,13 +92,13 @@ bool DomTool::hasProperty( const QDomElement& e, const QString& name ) return FALSE; } -QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type ) +TQStringList DomTool::propertiesOfType( const TQDomElement& e, const TQString& type ) { - QStringList result; - QDomElement n; + TQStringList result; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == type ) result += n.attribute( "name" ); } @@ -107,20 +107,20 @@ QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type } -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue ) { - QString dummy; + TQString dummy; return elementToVariant( e, defValue, dummy ); } /*! Interprets element \a e as variant and returns the result of the interpretation. */ -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ) { - QVariant v; + TQVariant v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -133,9 +133,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QRect( x, y, w, h ) ); + v = TQVariant( TQRect( x, y, w, h ) ); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -144,9 +144,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QPoint( x, y ) ); + v = TQVariant( TQPoint( x, y ) ); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -155,12 +155,12 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QSize( w, h ) ); + v = TQVariant( TQSize( w, h ) ); } else if ( e.tagName() == "color" ) { - v = QVariant( readColor( e ) ); + v = TQVariant( readColor( e ) ); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QFont f( defValue.toFont() ); + TQDomElement n3 = e.firstChild().toElement(); + TQFont f( defValue.toFont() ); while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) f.setFamily( n3.firstChild().toText().data() ); @@ -176,58 +176,58 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal f.setStrikeOut( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( f ); + v = TQVariant( f ); } else if ( e.tagName() == "string" ) { - v = QVariant( e.firstChild().toText().data() ); - QDomElement n = e; + v = TQVariant( e.firstChild().toText().data() ); + TQDomElement n = e; n = n.nextSibling().toElement(); if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = QVariant( QCString( e.firstChild().toText().data() ) ); + v = TQVariant( TQCString( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "number" ) { bool ok = TRUE; - v = QVariant( e.firstChild().toText().data().toInt( &ok ) ); + v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); if ( !ok ) - v = QVariant( e.firstChild().toText().data().toDouble() ); + v = TQVariant( e.firstChild().toText().data().toDouble() ); } else if ( e.tagName() == "bool" ) { - QString t = e.firstChild().toText().data(); - v = QVariant( t == "true" || t == "1", 0 ); + TQString t = e.firstChild().toText().data(); + v = TQVariant( t == "true" || t == "1", 0 ); } else if ( e.tagName() == "pixmap" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "iconset" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "image" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "enum" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "set" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) sp.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) sp.setVerStretch( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( sp ); + v = TQVariant( sp ); } else if ( e.tagName() == "cursor" ) { - v = QVariant( QCursor( e.firstChild().toText().data().toInt() ) ); + v = TQVariant( TQCursor( e.firstChild().toText().data().toInt() ) ); } else if ( e.tagName() == "stringlist" ) { - QStringList lst; - QDomElement n; + TQStringList lst; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) lst << n.firstChild().toText().data(); - v = QVariant( lst ); + v = TQVariant( lst ); } else if ( e.tagName() == "date" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int y, m, d; y = m = d = 0; while ( !n3.isNull() ) { @@ -239,9 +239,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDate( y, m, d ) ); + v = TQVariant( TQDate( y, m, d ) ); } else if ( e.tagName() == "time" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, m, s; h = m = s = 0; while ( !n3.isNull() ) { @@ -253,9 +253,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal s = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QTime( h, m, s ) ); + v = TQVariant( TQTime( h, m, s ) ); } else if ( e.tagName() == "datetime" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, mi, s, y, mo, d ; h = mi = s = y = mo = d = 0; while ( !n3.isNull() ) { @@ -273,7 +273,7 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDateTime( QDate( y, mo, d ), QTime( h, mi, s ) ) ); + v = TQVariant( TQDateTime( TQDate( y, mo, d ), TQTime( h, mi, s ) ) ); } return v; } @@ -282,9 +282,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal /*! Returns the color which is returned in the dom element \a e. */ -QColor DomTool::readColor( const QDomElement &e ) +TQColor DomTool::readColor( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int r= 0, g = 0, b = 0; while ( !n.isNull() ) { if ( n.tagName() == "red" ) @@ -296,7 +296,7 @@ QColor DomTool::readColor( const QDomElement &e ) n = n.nextSibling().toElement(); } - return QColor( r, g, b ); + return TQColor( r, g, b ); } /*! @@ -306,9 +306,9 @@ QColor DomTool::readColor( const QDomElement &e ) \sa hasAttribute() */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -322,9 +322,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons /*! \overload */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readAttribute( e, name, defValue, comment ); } @@ -333,9 +333,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons \sa readAttribute() */ -bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) +bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -346,19 +346,19 @@ bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) return FALSE; } -static bool toBool( const QString& s ) +static bool toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } /*! - Convert Qt 2.x format to Qt 3.0 format if necessary + Convert TQt 2.x format to TQt 3.0 format if necessary */ -void DomTool::fixDocument( QDomDocument& doc ) +void DomTool::fixDocument( TQDomDocument& doc ) { - QDomElement e; - QDomNode n; - QDomNodeList nl; + TQDomElement e; + TQDomNode n; + TQDomNodeList nl; int i = 0; e = doc.firstChild().toElement(); @@ -374,8 +374,8 @@ void DomTool::fixDocument( QDomDocument& doc ) // in 3.0, we need to fix a spelling error if ( e.hasAttribute("version") && e.attribute("version").toDouble() == 3.0 ) { for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement el = nl.item(i).toElement(); - QString s = el.attribute( "name" ); + TQDomElement el = nl.item(i).toElement(); + TQString s = el.attribute( "name" ); if ( s == "resizeable" ) { el.removeAttribute( "name" ); el.setAttribute( "name", "resizable" ); @@ -391,8 +391,8 @@ void DomTool::fixDocument( QDomDocument& doc ) e.setAttribute("stdsetdef", 1 ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); if ( name == "resizeable" ) @@ -416,8 +416,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "attribute" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -428,8 +428,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -440,8 +440,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "class" ) { name = n2.firstChild().toText().data(); e.setAttribute( "class", name ); diff --git a/puic/domtool.h b/puic/domtool.h index 61b4269..4619552 100644 --- a/puic/domtool.h +++ b/puic/domtool.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -30,23 +30,23 @@ #include <qvariant.h> #include <qnamespace.h> -class QDomElement; -class QDomDocument; +class TQDomElement; +class TQDomDocument; -class DomTool : public Qt +class DomTool : public TQt { public: - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasProperty( const QDomElement& e, const QString& name ); - static QStringList propertiesOfType( const QDomElement& e, const QString& type ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasAttribute( const QDomElement& e, const QString& name ); - static QColor readColor( const QDomElement &e ); - static void fixDocument( QDomDocument& ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasProperty( const TQDomElement& e, const TQString& name ); + static TQStringList propertiesOfType( const TQDomElement& e, const TQString& type ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasAttribute( const TQDomElement& e, const TQString& name ); + static TQColor readColor( const TQDomElement &e ); + static void fixDocument( TQDomDocument& ); }; diff --git a/puic/embed.cpp b/puic/embed.cpp index aac9633..148aa61 100644 --- a/puic/embed.cpp +++ b/puic/embed.cpp @@ -4,7 +4,7 @@ ** Copyright (c) 2002 Riverbank Computing Limited <info@riverbankcomputing.co.uk> ** Copyright (c) 2002 Germain Garand <germain@ebooksfrance.com> ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -21,9 +21,9 @@ ** **********************************************************************/ /* -** 06/2002 : Initial release of puic, the PerlQt User Interface Compiler, -** a work derivated from uic (the Qt User Interface Compiler) -** and pyuic (the PyQt User Interface Compiler). +** 06/2002 : Initial release of puic, the PerlTQt User Interface Compiler, +** a work derivated from uic (the TQt User Interface Compiler) +** and pyuic (the PyTQt User Interface Compiler). ** ** G.Garand ** @@ -46,15 +46,15 @@ struct EmbedImage { int width, height, depth; int numColors; - QRgb* colorTable; - QString name; - QString cname; + TQRgb* colorTable; + TQString name; + TQString cname; bool alpha; }; -static QString convertToCIdentifier( const char *s ) +static TQString convertToCIdentifier( const char *s ) { - QString r = s; + TQString r = s; int len = r.length(); if ( len > 0 && !isalpha( (char)r[0].latin1() ) ) r[0] = '_'; @@ -66,10 +66,10 @@ static QString convertToCIdentifier( const char *s ) } -static void embedData( QTextStream& out, const uchar* input, int nbytes ) +static void embedData( TQTextStream& out, const uchar* input, int nbytes ) { static const char hexdigits[] = "0123456789abcdef"; - QString s; + TQString s; for ( int i=0; i<nbytes; i++ ) { if ( (i%14) == 0 ) @@ -91,10 +91,10 @@ static void embedData( QTextStream& out, const uchar* input, int nbytes ) out << (const char*)s; } -static void embedData( QTextStream& out, const QRgb* input, int n ) +static void embedData( TQTextStream& out, const TQRgb* input, int n ) { out << hex; - const QRgb *v = input; + const TQRgb *v = input; for ( int i=0; i<n; i++ ) { if ( (i%6) == 0 ) out << endl << " "; @@ -108,20 +108,20 @@ static void embedData( QTextStream& out, const QRgb* input, int n ) out << dec; // back to decimal mode } -void Uic::embed( QTextStream& out, const char* project, const QStringList& images ) +void Uic::embed( TQTextStream& out, const char* project, const TQStringList& images ) { - QString cProject = convertToCIdentifier( project ); + TQString cProject = convertToCIdentifier( project ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; out << "# Image collection for project '" << project << "'." << endl; out << "#" << endl; out << "# Generated from reading image files: " << endl; for ( it = images.begin(); it != images.end(); ++it ) out << "# " << *it << endl; out << "#" << endl; - out << "# Created: " << QDateTime::currentDateTime().toString() << endl; - out << "# by: The PerlQt User Interface Compiler (puic)" << endl; + out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; + out << "# by: The PerlTQt User Interface Compiler (puic)" << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; out << endl; @@ -130,14 +130,14 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << endl; out << indent << "package DesignerMimeSourceFactory_" << cProject << ";" << endl; - out << indent << "use Qt;" << endl; - out << indent << "use Qt::isa qw(Qt::MimeSourceFactory);" << endl; + out << indent << "use TQt;" << endl; + out << indent << "use TQt::isa qw(TQt::MimeSourceFactory);" << endl; out << endl; - QPtrList<EmbedImage> list_image; + TQPtrList<EmbedImage> list_image; int image_count = 0; for ( it = images.begin(); it != images.end(); ++it ) { - QImage img; + TQImage img; if ( !img.load( *it ) ) { fprintf( stderr, "puic: cannot load image file %s\n", (*it).latin1() ); continue; @@ -147,28 +147,28 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image e->height = img.height(); e->depth = img.depth(); e->numColors = img.numColors(); - e->colorTable = new QRgb[e->numColors]; + e->colorTable = new TQRgb[e->numColors]; e->alpha = img.hasAlphaBuffer(); - memcpy(e->colorTable, img.colorTable(), e->numColors*sizeof(QRgb)); - QFileInfo fi( *it ); + memcpy(e->colorTable, img.colorTable(), e->numColors*sizeof(TQRgb)); + TQFileInfo fi( *it ); e->name = fi.fileName(); - e->cname = QString("$image_%1").arg( image_count++); + e->cname = TQString("$image_%1").arg( image_count++); list_image.append( e ); out << "# " << *it << endl; - QString s; - QString imgname = (const char *)e->cname; + TQString s; + TQString imgname = (const char *)e->cname; -//my $i0 = Qt::Image($image_0_data, 22, 22, 32, undef, &Qt::Image::BigEndian); +//my $i0 = TQt::Image($image_0_data, 22, 22, 32, undef, &TQt::Image::BigEndian); //$i0->setAlphaBuffer(1); -//my $image0 = Qt::Pixmap($i0); +//my $image0 = TQt::Pixmap($i0); if ( e->depth == 32 ) { out << indent << "my " << imgname << "_data = pack 'L*'," << endl; - embedData( out, (QRgb*)img.bits(), e->width*e->height ); + embedData( out, (TQRgb*)img.bits(), e->width*e->height ); } else { if ( e->depth == 1 ) - img = img.convertBitOrder(QImage::BigEndian); + img = img.convertBitOrder(TQImage::BigEndian); out << indent << "my " << imgname << "_data = pack 'C*'," << endl; embedData( out, img.bits(), img.numBytes() ); } @@ -190,7 +190,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image { out << indent << "\"" << e->name << "\"" << " => [" << e->cname << "_data, " << e->width << ", " << e->height << ", " << e->depth << ", " - << (e->numColors ? e->cname + "_ctable" : QString::fromLatin1("undef") ) << ", " + << (e->numColors ? e->cname + "_ctable" : TQString::fromLatin1("undef") ) << ", " << (e->alpha ? "1" : "0") << "]," << endl; e = list_image.next(); } @@ -206,9 +206,9 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image ++indent; out << indent << "my $name = shift;" << endl; out << indent << "return $images{$name} if exists $images{$name};" << endl; - out << indent << "return Qt::Image() unless exists $embed_images{$name};" << endl; + out << indent << "return TQt::Image() unless exists $embed_images{$name};" << endl; out << indent << endl; - out << indent << "my $img = Qt::Image(@{$embed_images{$name}}[0..4], &Qt::Image::BigEndian);" << endl; + out << indent << "my $img = TQt::Image(@{$embed_images{$name}}[0..4], &TQt::Image::BigEndian);" << endl; out << indent << "${$embed_images{$name}}[5] && $img->setAlphaBuffer(1);" << endl; out << indent << "$images{$name} = $img;" << endl; out << indent << "return $img;" << endl; @@ -223,14 +223,14 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << indent << "if($img->isNull())" << endl; out << indent << "{" << endl; ++indent; - out << indent << "Qt::MimeSourceFactory::removeFactory(this);" << endl; - out << indent << "my $s = Qt::MimeSourceFactory::defaultFactory()->data($abs_name);" << endl; - out << indent << "Qt::MimeSourceFactory::addFactory(this);" << endl; + out << indent << "TQt::MimeSourceFactory::removeFactory(this);" << endl; + out << indent << "my $s = TQt::MimeSourceFactory::defaultFactory()->data($abs_name);" << endl; + out << indent << "TQt::MimeSourceFactory::addFactory(this);" << endl; out << indent << "return $s;" << endl; --indent; out << indent << "}" << endl; - out << indent << "Qt::MimeSourceFactory::defaultFactory()->setImage($abs_name, $img);" << endl; - out << indent << "return Qt::MimeSourceFactory::defaultFactory()->data($abs_name);" << endl; + out << indent << "TQt::MimeSourceFactory::defaultFactory()->setImage($abs_name, $img);" << endl; + out << indent << "return TQt::MimeSourceFactory::defaultFactory()->data($abs_name);" << endl; --indent; out << indent << "}" << endl; @@ -238,12 +238,12 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << endl; out << indent << "package staticImages;" << endl; - out << indent << "use Qt;" << endl; + out << indent << "use TQt;" << endl; out << indent << "use DesignerMimeSourceFactory_" << cProject << ";" << endl; out << indent << "our %factories;" << endl; out << indent << endl; out << indent << "my $factory = DesignerMimeSourceFactory_" << cProject << ";" << endl; - out << indent << "Qt::MimeSourceFactory::defaultFactory()->addFactory($factory);" << endl; + out << indent << "TQt::MimeSourceFactory::defaultFactory()->addFactory($factory);" << endl; out << indent << "$factories{'DesignerMimeSourceFactory_" << cProject << "'} = $factory;" << endl; out << endl; out << indent << "END" << endl; @@ -252,7 +252,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << indent << "for( values %factories )" << endl; out << indent << "{" << endl; ++indent; - out << indent << "Qt::MimeSourceFactory::defaultFactory()->removeFactory($_);" << endl; + out << indent << "TQt::MimeSourceFactory::defaultFactory()->removeFactory($_);" << endl; --indent; out << indent << "}" << endl; out << indent << "%factories = ();" << endl; diff --git a/puic/form.cpp b/puic/form.cpp index 56f44c2..55ee7a7 100644 --- a/puic/form.cpp +++ b/puic/form.cpp @@ -2,7 +2,7 @@ ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** Copyright (c) 2002 Germain Garand <germain@ebooksfrance.com> ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -19,9 +19,9 @@ ** **********************************************************************/ /* -** 06/2002 : Initial release of puic, the PerlQt User Interface Compiler, -** a work derivated from uic (the Qt User Interface Compiler) -** and pyuic (the PyQt User Interface Compiler). +** 06/2002 : Initial release of puic, the PerlTQt User Interface Compiler, +** a work derivated from uic (the TQt User Interface Compiler) +** and pyuic (the PyTQt User Interface Compiler). ** ** G.Garand ** @@ -40,27 +40,27 @@ #include <qregexp.h> #define NO_STATIC_COLORS #include <globaldefs.h> -#if( QT_VERSION < 0x030101 ) +#if( TQT_VERSION < 0x030101 ) # include <zlib.h> -static QByteArray qUncompress( const uchar* data, int nbytes ) +static TQByteArray qUncompress( const uchar* data, int nbytes ) { if ( !data ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "qUncompress: data is NULL." ); #endif - return QByteArray(); + return TQByteArray(); } if ( nbytes <= 4 ) { -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( nbytes < 4 || ( data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0 ) ) qWarning( "qUncompress: Input data is corrupted." ); #endif - return QByteArray(); + return TQByteArray(); } ulong expectedSize = ( data[0] << 24 ) | ( data[1] << 16 ) | ( data[2] << 8 ) | data[3]; - ulong len = QMAX( expectedSize, 1 ); - QByteArray baunzip; + ulong len = TQMAX( expectedSize, 1 ); + TQByteArray baunzip; int res; do { baunzip.resize( len ); @@ -73,7 +73,7 @@ static QByteArray qUncompress( const uchar* data, int nbytes ) baunzip.resize( len ); break; case Z_MEM_ERROR: -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." ); #endif break; @@ -81,7 +81,7 @@ static QByteArray qUncompress( const uchar* data, int nbytes ) len *= 2; break; case Z_DATA_ERROR: -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) qWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." ); #endif break; @@ -89,15 +89,15 @@ static QByteArray qUncompress( const uchar* data, int nbytes ) } while ( res == Z_BUF_ERROR ); if ( res != Z_OK ) - baunzip = QByteArray(); + baunzip = TQByteArray(); return baunzip; } -#endif // QT_VERSION < 0x030101 +#endif // TQT_VERSION < 0x030101 using namespace std; -static QByteArray unzipXPM( QString data, ulong& length ) +static TQByteArray unzipXPM( TQString data, ulong& length ) { const int lengthOffset = 4; int baSize = data.length() / 2 + lengthOffset; @@ -123,27 +123,27 @@ static QByteArray unzipXPM( QString data, ulong& length ) ba[1] = ( length & 0x00ff0000 ) >> 16; ba[2] = ( length & 0x0000ff00 ) >> 8; ba[3] = ( length & 0x000000ff ); - QByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = qUncompress( ba, baSize ); delete[] ba; return baunzip; } #if 0 //- kept for diffs -#if QT_VERSION >= 0x030900 -#error Add this functionality to QDir (relativePathTo() maybe?) and \ +#if TQT_VERSION >= 0x030900 +#error Add this functionality to TQDir (relativePathTo() maybe?) and \ remove it from here and from moc #endif -QCString combinePath( const char *infile, const char *outfile ) +TQCString combinePath( const char *infile, const char *outfile ) { - QFileInfo inFileInfo( QDir::current(), QFile::decodeName(infile) ); - QFileInfo outFileInfo( QDir::current(), QFile::decodeName(outfile) ); + TQFileInfo inFileInfo( TQDir::current(), TQFile::decodeName(infile) ); + TQFileInfo outFileInfo( TQDir::current(), TQFile::decodeName(outfile) ); int numCommonComponents = 0; - QStringList inSplitted = - QStringList::split( '/', inFileInfo.dir().canonicalPath(), TRUE ); - QStringList outSplitted = - QStringList::split( '/', outFileInfo.dir().canonicalPath(), TRUE ); + TQStringList inSplitted = + TQStringList::split( '/', inFileInfo.dir().canonicalPath(), TRUE ); + TQStringList outSplitted = + TQStringList::split( '/', outFileInfo.dir().canonicalPath(), TRUE ); while ( !inSplitted.isEmpty() && !outSplitted.isEmpty() && inSplitted.first() == outSplitted.first() ) { @@ -157,7 +157,7 @@ QCString combinePath( const char *infile, const char *outfile ) The paths don't have the same drive, or they don't have the same root directory. Use an absolute path. */ - return QFile::encodeName( inFileInfo.absFilePath() ); + return TQFile::encodeName( inFileInfo.absFilePath() ); } else { /* The paths have something in common. Use a path relative to @@ -168,7 +168,7 @@ QCString combinePath( const char *infile, const char *outfile ) inSplitted.prepend( ".." ); } inSplitted.append( inFileInfo.fileName() ); - return QFile::encodeName( inSplitted.join("/") ); + return TQFile::encodeName( inSplitted.join("/") ); } } #endif @@ -178,30 +178,30 @@ QCString combinePath( const char *infile, const char *outfile ) \sa createFormDecl(), createObjectImpl() */ -void Uic::createFormImpl( const QDomElement &e ) +void Uic::createFormImpl( const TQDomElement &e ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); out << indent << "package " << nameOfClass << ";" << endl; - out << indent << "use Qt;" << endl; + out << indent << "use TQt;" << endl; // generate local and local includes required - QStringList globalIncludes, localIncludes, useIncludes; - QStringList::Iterator it; - QStringList sqlClasses; + TQStringList globalIncludes, localIncludes, useIncludes; + TQStringList::Iterator it; + TQStringList sqlClasses; - QMap<QString, CustomInclude> customWidgetIncludes; - QMap<QString, QString> functionImpls; - QString uiPmInclude; + TQMap<TQString, CustomInclude> customWidgetIncludes; + TQMap<TQString, TQString> functionImpls; + TQString uiPmInclude; // find additional slots - QStringList extraSlots; - QStringList extraSlotTyp; + TQStringList extraSlots; + TQStringList extraSlotTyp; nl = e.parentNode().toElement().elementsByTagName( "slot" ); for ( i = 0; i < (int) nl.length(); i++ ) { @@ -209,10 +209,10 @@ void Uic::createFormImpl( const QDomElement &e ) if ( n.parentNode().toElement().tagName() != "slots" && n.parentNode().toElement().tagName() != "connections" ) continue; - QString l = n.attribute( "language", "C++" ); + TQString l = n.attribute( "language", "C++" ); if ( l != "C++" && l != "Perl" ) //- mmh continue; - QString slotName = n.firstChild().toText().data().stripWhiteSpace(); + TQString slotName = n.firstChild().toText().data().stripWhiteSpace(); if ( slotName.endsWith( ";" ) ) slotName = slotName.left( slotName.length() - 1 ); @@ -221,18 +221,18 @@ void Uic::createFormImpl( const QDomElement &e ) } // find additional functions - QStringList extraFuncts; - QStringList extraFunctTyp; + TQStringList extraFuncts; + TQStringList extraFunctTyp; nl = e.parentNode().toElement().elementsByTagName( "function" ); for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); if ( n.parentNode().toElement().tagName() != "functions" ) continue; - QString l = n.attribute( "language", "C++" ); + TQString l = n.attribute( "language", "C++" ); if ( l != "C++" && l != "Perl" ) //- mmh continue; - QString functionName = n.firstChild().toText().data().stripWhiteSpace(); + TQString functionName = n.firstChild().toText().data().stripWhiteSpace(); if ( functionName.endsWith( ";" ) ) functionName = functionName.left( functionName.length() - 1 ); extraFuncts += Parser::cleanArgs(functionName); @@ -240,17 +240,17 @@ void Uic::createFormImpl( const QDomElement &e ) } // find signals - QStringList extraSignals; + TQStringList extraSignals; nl = e.parentNode().toElement().elementsByTagName( "signal" ); for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); if ( n.parentNode().toElement().tagName() != "signals" && n.parentNode().toElement().tagName() != "connections" ) continue; - QString l = n.attribute( "language", "C++" ); + TQString l = n.attribute( "language", "C++" ); if ( l != "C++" && l != "Perl" ) //- mmh continue; - QString sigName = n.firstChild().toText().data().stripWhiteSpace(); + TQString sigName = n.firstChild().toText().data().stripWhiteSpace(); if ( sigName.endsWith( ";" ) ) sigName = sigName.left( sigName.length() - 1 ); extraSignals += sigName; @@ -258,7 +258,7 @@ void Uic::createFormImpl( const QDomElement &e ) #if 0 //- kept for diffs - QStringList customImages; + TQStringList customImages; for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "customwidgets" ) { nl = n.elementsByTagName( "pixmap" ); @@ -269,11 +269,11 @@ void Uic::createFormImpl( const QDomElement &e ) #endif for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "customwidgets" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "customwidget" ) { - QDomElement n3 = n2.firstChild().toElement(); - QString cl, header; + TQDomElement n3 = n2.firstChild().toElement(); + TQString cl, header; WidgetDatabaseRecord *r = new WidgetDatabaseRecord; while ( !n3.isNull() ) { if ( n3.tagName() == "class" ) { @@ -310,11 +310,11 @@ void Uic::createFormImpl( const QDomElement &e ) } } - out << indent << "use Qt::isa qw(" << objClass << ");" << endl; + out << indent << "use TQt::isa qw(" << objClass << ");" << endl; - // PerlQt sig/slot declaration + // PerlTQt sig/slot declaration if ( !extraSlots.isEmpty() ) { - out << indent << "use Qt::slots" << endl; + out << indent << "use TQt::slots" << endl; ++indent; for ( it = extraSlots.begin(); it != extraSlots.end(); ++it ) { @@ -326,7 +326,7 @@ void Uic::createFormImpl( const QDomElement &e ) // create signals if ( !extraSignals.isEmpty() ) { - out << indent << "use Qt::signals" << endl; + out << indent << "use TQt::signals" << endl; ++indent; for ( it = extraSignals.begin(); it != extraSignals.end(); ++it ) { @@ -336,8 +336,8 @@ void Uic::createFormImpl( const QDomElement &e ) --indent; } - // PerlQt attributes - out << indent << "use Qt::attributes qw("<< endl; + // PerlTQt attributes + out << indent << "use TQt::attributes qw("<< endl; ++indent; // children @@ -352,7 +352,7 @@ void Uic::createFormImpl( const QDomElement &e ) objectNames.clear(); // additional attributes (from Designer) - QStringList publicVars, protectedVars, privateVars; + TQStringList publicVars, protectedVars, privateVars; nl = e.parentNode().toElement().elementsByTagName( "variable" ); for ( i = 0; i < (int)nl.length(); i++ ) { n = nl.item( i ).toElement(); @@ -360,8 +360,8 @@ void Uic::createFormImpl( const QDomElement &e ) // Someday it should be uncommented. //if ( n.parentNode().toElement().tagName() != "variables" ) // continue; - QString access = n.attribute( "access", "protected" ); - QString var = n.firstChild().toText().data().stripWhiteSpace(); + TQString access = n.attribute( "access", "protected" ); + TQString var = n.firstChild().toText().data().stripWhiteSpace(); if ( var.endsWith( ";" ) ) var.truncate(var.length() - 1); if ( access == "public" ) @@ -393,12 +393,12 @@ void Uic::createFormImpl( const QDomElement &e ) { if ( n.tagName() == "actions" ) { - for ( QDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) + for ( TQDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) createActionDecl( a ); } else if ( n.tagName() == "toolbars" ) { - for ( QDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) + for ( TQDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) { if ( a.tagName() == "toolbar" ) out << indent << getObjectName( a ) << endl; @@ -408,7 +408,7 @@ void Uic::createFormImpl( const QDomElement &e ) else if ( n.tagName() == "menubar" ) { out << indent << getObjectName( n ) << endl; - for ( QDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) + for ( TQDomElement a = n.firstChild().toElement(); !a.isNull(); a = a.nextSibling().toElement() ) { if ( a.tagName() == "item" ) out << indent << a.attribute( "name" ) << endl; @@ -434,10 +434,10 @@ void Uic::createFormImpl( const QDomElement &e ) // additional includes (local or global ) and forward declaractions nl = e.parentNode().toElement().elementsByTagName( "include" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQDomElement n2 = nl.item(i).toElement(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) != "local" ) { - if ( (s.right( 5 ) == ".ui.h" || s.right( 6 ) == ".ui.pm") && !QFile::exists( s ) ) + if ( (s.right( 5 ) == ".ui.h" || s.right( 6 ) == ".ui.pm") && !TQFile::exists( s ) ) continue; if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" ) continue; @@ -447,10 +447,10 @@ void Uic::createFormImpl( const QDomElement &e ) // do the local includes afterwards, since global includes have priority on clashes for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQDomElement n2 = nl.item(i).toElement(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { - if ( (s.right( 5 ) == ".ui.h" || s.right( 6 ) == ".ui.pm") && !QFile::exists( s ) ) + if ( (s.right( 5 ) == ".ui.h" || s.right( 6 ) == ".ui.pm") && !TQFile::exists( s ) ) continue; if ( n2.attribute( "impldecl", "in declaration" ) == "in declaration" ) { @@ -466,8 +466,8 @@ void Uic::createFormImpl( const QDomElement &e ) // additional custom widget headers nl = e.parentNode().toElement().elementsByTagName( "header" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQDomElement n2 = nl.item(i).toElement(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) != "local" ) globalIncludes += s; else @@ -476,21 +476,21 @@ void Uic::createFormImpl( const QDomElement &e ) // Output the "use" clauses for extra stuff in "Includes (In Declaration)" // => in the perleditor plugin, this is content of the "Use clauses" list - for(QStringList::Iterator it = useIncludes.begin(); it != useIncludes.end(); ++it) + for(TQStringList::Iterator it = useIncludes.begin(); it != useIncludes.end(); ++it) out << indent << (*it) << endl; // grab slots/funcs defined in ui.h files / ui.pm files - for(QStringList::Iterator it = localIncludes.begin(); it != localIncludes.end(); ++it) + for(TQStringList::Iterator it = localIncludes.begin(); it != localIncludes.end(); ++it) { if((*it).right( 5 ) == ".ui.h") { - QFile f((*it)); + TQFile f((*it)); if( f.open( IO_ReadOnly ) ) { - QRegExp re("^.*([a-zA-Z0-9_]+\\s*\\(.*\\))\\s*$"); - QRegExp re2("^\\}.*"); - QTextStream t( &f ); - QString s, s2, s3; + TQRegExp re("^.*([a-zA-Z0-9_]+\\s*\\(.*\\))\\s*$"); + TQRegExp re2("^\\}.*"); + TQTextStream t( &f ); + TQString s, s2, s3; while ( !t.eof() ) { s = t.readLine(); @@ -499,7 +499,7 @@ void Uic::createFormImpl( const QDomElement &e ) continue; s2 = re.cap(1); s2 = Parser::cleanArgs(s2); - s3 = QString::null; + s3 = TQString::null; while( !t.eof() ) { s = t.readLine(); @@ -515,14 +515,14 @@ void Uic::createFormImpl( const QDomElement &e ) } else if((*it).right( 6 ) == ".ui.pm") { - //QFileInfo fname( fileName ); //- FIXME: .ui files seem to require being in CWD? - //QString path = fname.absFilePath(); + //TQFileInfo fname( fileName ); //- FIXME: .ui files seem to require being in CWD? + //TQString path = fname.absFilePath(); //path = path.left( path.length() - fname.fileName().length() ); - QFile f(*it); + TQFile f(*it); if( f.open( IO_ReadOnly ) ) { - QTextStream t( &f ); - QString s; + TQTextStream t( &f ); + TQString s; bool skip = true; int count = 0; while ( !t.eof() ) @@ -538,7 +538,7 @@ void Uic::createFormImpl( const QDomElement &e ) else { skip = false; - uiPmInclude += "# line " + QString::number( count+1 ) + " \"" + *it + "\"\n"; + uiPmInclude += "# line " + TQString::number( count+1 ) + " \"" + *it + "\"\n"; } } uiPmInclude += s + "\n"; @@ -553,7 +553,7 @@ void Uic::createFormImpl( const QDomElement &e ) for ( it = tags.begin(); it != tags.end(); ++it ) { nl = e.parentNode().toElement().elementsByTagName( *it ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget - QString name = getClassName( nl.item(i).toElement() ); + TQString name = getClassName( nl.item(i).toElement() ); if ( name == "Spacer" ) { globalIncludes += "qlayout.h"; globalIncludes += "qapplication.h"; @@ -562,8 +562,8 @@ void Uic::createFormImpl( const QDomElement &e ) if ( name.mid( 4 ) == "ListView" ) globalIncludes += "qheader.h"; if ( name != objClass ) { - int wid = WidgetDatabase::idFromClassName( name.replace( QRegExp("^Qt::"), "Q" ) ); - QMap<QString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); + int wid = WidgetDatabase::idFromClassName( name.replace( TQRegExp("^TQt::"), "Q" ) ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); if ( it == customWidgetIncludes.end() ) globalIncludes += WidgetDatabase::includeFile( wid ); } @@ -572,9 +572,9 @@ void Uic::createFormImpl( const QDomElement &e ) dbConnections = unique( dbConnections ); if ( dbConnections.count() ) - sqlClasses += "Qt::SqlDatabase"; + sqlClasses += "TQt::SqlDatabase"; if ( dbCursors.count() ) - sqlClasses += "Qt::SqlCursor"; + sqlClasses += "TQt::SqlCursor"; bool dbForm = FALSE; if ( dbForms[ "(default)" ].count() ) dbForm = TRUE; @@ -588,28 +588,28 @@ void Uic::createFormImpl( const QDomElement &e ) } } if ( dbForm || subDbForms ) { - sqlClasses += "Qt::SqlForm"; - sqlClasses += "Qt::SqlRecord"; + sqlClasses += "TQt::SqlForm"; + sqlClasses += "TQt::SqlRecord"; } if (globalIncludes.findIndex("qdatatable.h") >= 0) - sqlClasses += "Qt::DataTable"; + sqlClasses += "TQt::DataTable"; if (globalIncludes.findIndex("qtableview.h") >= 0) - sqlClasses += "Qt::TableView"; + sqlClasses += "TQt::TableView"; if (globalIncludes.findIndex("qdatabrowser.h") >= 0) - sqlClasses += "Qt::DataBrowser"; + sqlClasses += "TQt::DataBrowser"; out << endl; // find out what images are required - QStringList requiredImages; + TQStringList requiredImages; static const char *imgTags[] = { "pixmap", "iconset", 0 }; for ( i = 0; imgTags[i] != 0; i++ ) { nl = e.parentNode().toElement().elementsByTagName( imgTags[i] ); for ( int j = 0; j < (int) nl.length(); j++ ) { - QDomNode nn = nl.item(j); + TQDomNode nn = nl.item(j); while ( nn.parentNode() != e.parentNode() ) nn = nn.parentNode(); if ( nn.nodeName() != "customwidgets" ) @@ -620,8 +620,8 @@ void Uic::createFormImpl( const QDomElement &e ) // register the object and unify its name objName = registerObject( objName ); - QStringList images; - QStringList xpmImages; + TQStringList images; + TQStringList xpmImages; if ( pixmapLoaderFunction.isEmpty() && !externPixmaps ) { // create images @@ -632,20 +632,20 @@ void Uic::createFormImpl( const QDomElement &e ) nl = n.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString img = registerObject( nl.item(i).toElement().attribute( "name" ) ); + TQString img = registerObject( nl.item(i).toElement().attribute( "name" ) ); if ( !requiredImages.contains( img ) ) continue; - QDomElement tmp = nl.item(i).firstChild().toElement(); + TQDomElement tmp = nl.item(i).firstChild().toElement(); if ( tmp.tagName() != "data" ) continue; - QString format = tmp.attribute("format", "PNG" ); - QString data = tmp.firstChild().toText().data(); + TQString format = tmp.attribute("format", "PNG" ); + TQString data = tmp.firstChild().toText().data(); out << indent << "our $" << img << ";" << endl; if ( format == "XPM.GZ" ) { xpmImages += img; ulong length = tmp.attribute("length").toULong(); - QByteArray baunzip = unzipXPM( data, length ); + TQByteArray baunzip = unzipXPM( data, length ); length = baunzip.size(); // shouldn't we test the initial `length' against the // resulting `length' to catch corrupt UIC files? @@ -673,13 +673,13 @@ void Uic::createFormImpl( const QDomElement &e ) ++indent; int a ; for ( a = 0; a < (int) (data.length()/2)-1; a++ ) { - out << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << ","; + out << "0x" << TQString(data[2*a]) << TQString(data[2*a+1]) << ","; if ( a % 12 == 11 ) out << endl << " "; else out << " "; } - out << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << ";" << endl; + out << "0x" << TQString(data[2*a]) << TQString(data[2*a+1]) << ";" << endl; --indent; out << endl; } @@ -690,7 +690,7 @@ void Uic::createFormImpl( const QDomElement &e ) } else if ( externPixmaps ) { - pixmapLoaderFunction = "Qt::Pixmap::fromMimeSource"; + pixmapLoaderFunction = "TQt::Pixmap::fromMimeSource"; } @@ -698,11 +698,11 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "sub NEW" << endl; out << indent << "{" << endl; ++indent; - if ( objClass == "Qt::Dialog" || objClass == "Qt::Wizard" ) { + if ( objClass == "TQt::Dialog" || objClass == "TQt::Wizard" ) { out << indent << "shift->SUPER::NEW(@_[0..3]);" << endl; - } else if ( objClass == "Qt::Widget") { + } else if ( objClass == "TQt::Widget") { out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl; - } else if ( objClass == "Qt::MainWindow" ) { + } else if ( objClass == "TQt::MainWindow" ) { out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl; out << indent << "statusBar();" << endl; isMainWindow = TRUE; @@ -714,9 +714,9 @@ void Uic::createFormImpl( const QDomElement &e ) // create pixmaps for all images if ( !images.isEmpty() ) { - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = images.begin(); it != images.end(); ++it ) { - out << indent << "$" << (*it) << " = Qt::Pixmap();" << endl; + out << indent << "$" << (*it) << " = TQt::Pixmap();" << endl; out << indent << "$" << (*it) << "->loadFromData($" << (*it) << "_data, length ($" << (*it) << "_data), \"PNG\");" << endl; } out << endl; @@ -724,28 +724,28 @@ void Uic::createFormImpl( const QDomElement &e ) // create pixmaps for all images if ( !xpmImages.isEmpty() ) { for ( it = xpmImages.begin(); it != xpmImages.end(); ++it ) { - out << indent << "$" << (*it) << " = Qt::Pixmap($" << (*it) << "_data);" << endl; + out << indent << "$" << (*it) << " = TQt::Pixmap($" << (*it) << "_data);" << endl; } out << endl; } // set the properties - QSize geometry( 0, 0 ); + TQSize geometry( 0, 0 ); for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute("name"); - QDomElement n2 = n.firstChild().toElement(); - QString value = setObjectProperty( objClass, QString::null, prop, n2, stdset ); + TQString prop = n.attribute("name"); + TQDomElement n2 = n.firstChild().toElement(); + TQString value = setObjectProperty( objClass, TQString::null, prop, n2, stdset ); if ( value.isEmpty() ) continue; if ( prop == "geometry" && n2.tagName() == "rect" ) { - QDomElement n3 = n2.firstChild().toElement(); + TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) geometry.setWidth( n3.firstChild().toText().data().toInt() ); @@ -754,11 +754,11 @@ void Uic::createFormImpl( const QDomElement &e ) n3 = n3.nextSibling().toElement(); } } else { - QString call; + TQString call; if ( stdset ) call = mkStdSet( prop ) + "(" + value; else - call = "setProperty(\"" + prop + "\", Qt::Variant(" + value + ")"; + call = "setProperty(\"" + prop + "\", TQt::Variant(" + value + ")"; call += " );"; if ( n2.tagName() == "string" ) { trout << indent << call << endl; @@ -780,18 +780,18 @@ void Uic::createFormImpl( const QDomElement &e ) // create all children, some forms have special requirements - if ( objClass == "Qt::Wizard" ) + if ( objClass == "TQt::Wizard" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, "this" ); - QString comment; - QString label = DomTool::readAttribute( n, "title", "", comment ).toString(); + TQString page = createObjectImpl( n, objClass, "this" ); + TQString comment; + TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); out << indent << "addPage( " << page << ", \"\" );" << endl; trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " );" << endl; - QVariant def( FALSE, 0 ); + TQVariant def( FALSE, 0 ); if ( DomTool::hasAttribute( n, "backEnabled" ) ) out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl; if ( DomTool::hasAttribute( n, "nextEnabled" ) ) @@ -820,20 +820,20 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; for ( it = dbConnections.begin(); it != dbConnections.end(); ++it ) { if ( !(*it).isEmpty() && (*it) != "(default)") { - out << indent << (*it) << "Connection = Qt::SqlDatabase::database(\"" <<(*it) << "\");" << endl; + out << indent << (*it) << "Connection = TQt::SqlDatabase::database(\"" <<(*it) << "\");" << endl; } } nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget n = nl.item(i).toElement(); - QString s = getClassName( n ); - if ( (dbForm || subDbForms) && ( s == "Qt::DataBrowser" || s == "Qt::DataView" ) ) { - QString objName = getObjectName( n ); - QString tab = getDatabaseInfo( n, "table" ); - QString con = getDatabaseInfo( n, "connection" ); - out << indent << "my $" << objName << "Form = Qt::SqlForm(this, \"" << objName << "Form\");" << endl; - QDomElement n2; + TQString s = getClassName( n ); + if ( (dbForm || subDbForms) && ( s == "TQt::DataBrowser" || s == "TQt::DataView" ) ) { + TQString objName = getObjectName( n ); + TQString tab = getDatabaseInfo( n, "table" ); + TQString con = getDatabaseInfo( n, "connection" ); + out << indent << "my $" << objName << "Form = TQt::SqlForm(this, \"" << objName << "Form\");" << endl; + TQDomElement n2; for ( n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) createFormImpl( n2, objName, con, tab ); out << indent << objName << "->setForm($" << objName << "Form);" << endl; @@ -879,11 +879,11 @@ void Uic::createFormImpl( const QDomElement &e ) // take minimumSizeHint() into account, for height-for-width widgets if ( !geometry.isNull() ) { - out << indent << "my $resize = Qt::Size(" << geometry.width() << ", " + out << indent << "my $resize = TQt::Size(" << geometry.width() << ", " << geometry.height() << ");" << endl; out << indent << "$resize = $resize->expandedTo(minimumSizeHint());" << endl; out << indent << "resize( $resize );" << endl; - out << indent << "clearWState( &Qt::WState_Polished );" << endl; + out << indent << "clearWState( &TQt::WState_Polished );" << endl; } for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { @@ -892,8 +892,8 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; nl = n.elementsByTagName( "connection" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString sender, receiver, signal, slot; - for ( QDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + TQString sender, receiver, signal, slot; + for ( TQDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "sender" ) sender = n2.firstChild().toText().data(); else if ( n2.tagName() == "receiver" ) @@ -921,17 +921,17 @@ void Uic::createFormImpl( const QDomElement &e ) if ( receiver == objName ) receiver = "this"; - out << indent << "Qt::Object::connect(" << sender - << ", SIGNAL \"" << signal << "\", "<< receiver << ", SLOT \"" << slot << "\");" << endl; + out << indent << "TQt::Object::connect(" << sender + << ", TQT_SIGNAL \"" << signal << "\", "<< receiver << ", TQT_SLOT \"" << slot << "\");" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order out << endl; - QString lastName; - QDomElement n2 = n.firstChild().toElement(); + TQString lastName; + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "tabstop" ) { - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); name = registeredName( name ); if ( !lastName.isEmpty() ) out << indent << "setTabOrder(" << lastName << ", " << name << ");" << endl; @@ -944,7 +944,7 @@ void Uic::createFormImpl( const QDomElement &e ) // buddies bool firstBuddy = TRUE; - for ( QValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { + for ( TQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { if ( isObjectRegistered( (*buddy).buddy ) ) { if ( firstBuddy ) { out << endl; @@ -984,20 +984,20 @@ void Uic::createFormImpl( const QDomElement &e ) for ( i = 0; i < (int) nl.length(); i++ ) { if ( !DomTool::propertiesOfType( nl.item(i).toElement() , "font" ).isEmpty() ) needFontEventHandler = TRUE; - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "Qt::DataTable" || s == "Qt::DataBrowser" ) { + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQt::DataTable" || s == "TQt::DataBrowser" ) { if ( !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) continue; - if ( s == "Qt::DataTable" ) + if ( s == "TQt::DataTable" ) needSqlTableEventHandler = TRUE; - if ( s == "Qt::DataBrowser" ) + if ( s == "TQt::DataBrowser" ) needSqlDataBrowserEventHandler = TRUE; } if ( needFontEventHandler && needSqlTableEventHandler && needSqlDataBrowserEventHandler ) break; } -// PerlQt - TODO: is this needed ? +// PerlTQt - TODO: is this needed ? // Seems not.. let's ifzero for now... if ( 0 && needFontEventHandler ) { @@ -1012,10 +1012,10 @@ void Uic::createFormImpl( const QDomElement &e ) out << " my $ret = SUPER->event( $ev ); " << endl; if ( needFontEventHandler ) { ++indent; - out << " if ( $ev->type() == &Qt::Event::ApplicationFontChange ) {" << endl; + out << " if ( $ev->type() == &TQt::Event::ApplicationFontChange ) {" << endl; for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); - QStringList list = DomTool::propertiesOfType( n, "font" ); + TQStringList list = DomTool::propertiesOfType( n, "font" ); for ( it = list.begin(); it != list.end(); ++it ) createExclusiveProperty( n, *it ); } @@ -1038,12 +1038,12 @@ void Uic::createFormImpl( const QDomElement &e ) ++indent; if ( needSqlTableEventHandler ) { for ( i = 0; i < (int) nl.length(); i++ ) { - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "Qt::DataTable" ) { + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQt::DataTable" ) { n = nl.item(i).toElement(); - QString c = getObjectName( n ); - QString conn = getDatabaseInfo( n, "connection" ); - QString tab = getDatabaseInfo( n, "table" ); + TQString c = getObjectName( n ); + TQString conn = getDatabaseInfo( n, "connection" ); + TQString tab = getDatabaseInfo( n, "table" ); if ( !( conn.isEmpty() || tab.isEmpty() || !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) ) { out << indent << "if(" << c << ")" << endl; out << indent << "{" << endl; @@ -1054,13 +1054,13 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "{" << endl; ++indent; if ( conn == "(default)" ) - out << indent << "$cursor = Qt::SqlCursor(\"" << tab << "\");" << endl; + out << indent << "$cursor = TQt::SqlCursor(\"" << tab << "\");" << endl; else - out << indent << "$cursor = Qt::SqlCursor(\"" << tab << "\", 1, " << conn << "Connection);" << endl; + out << indent << "$cursor = TQt::SqlCursor(\"" << tab << "\", 1, " << conn << "Connection);" << endl; out << indent << "if ( " << c << "->isReadOnly() ) " << endl; out << indent << "{" << endl; ++indent; - out << indent << "$cursor->setMode( &Qt::SqlCursor::ReadOnly )" << endl; + out << indent << "$cursor->setMode( &TQt::SqlCursor::ReadOnly )" << endl; --indent; out << indent << "}" << endl; out << indent << c << "->setSqlCursor($cursor, 0, 1);" << endl; @@ -1070,7 +1070,7 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "if(!$cursor->isActive())" << endl; out << indent << "{" << endl; ++indent; - out << indent << c << "->refresh( &Qt::DataTable::RefreshAll );" << endl; + out << indent << c << "->refresh( &TQt::DataTable::RefreshAll );" << endl; --indent; out << indent << "}" << endl; --indent; @@ -1082,12 +1082,12 @@ void Uic::createFormImpl( const QDomElement &e ) if ( needSqlDataBrowserEventHandler ) { nl = e.elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "Qt::DataBrowser" ) { - QString obj = getObjectName( nl.item(i).toElement() ); - QString tab = getDatabaseInfo( nl.item(i).toElement(), + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQt::DataBrowser" ) { + TQString obj = getObjectName( nl.item(i).toElement() ); + TQString tab = getDatabaseInfo( nl.item(i).toElement(), "table" ); - QString conn = getDatabaseInfo( nl.item(i).toElement(), + TQString conn = getDatabaseInfo( nl.item(i).toElement(), "connection" ); if ( !(tab).isEmpty() || !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) { out << indent << "if(" << obj << ")" << endl; @@ -1097,9 +1097,9 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "{" << endl; ++indent; if ( conn == "(default)" ) - out << indent << "my $cursor = Qt::SqlCursor(\"" << tab << "\");" << endl; + out << indent << "my $cursor = TQt::SqlCursor(\"" << tab << "\");" << endl; else - out << indent << "my $cursor = Qt::SqlCursor(\"" << tab << "\", 1, " << conn << "Connection);" << endl; + out << indent << "my $cursor = TQt::SqlCursor(\"" << tab << "\", 1, " << conn << "Connection);" << endl; out << indent << obj << "->setSqlCursor($cursor, 1);" << endl; out << indent << obj << "->refresh();" << endl; out << indent << obj << "->first();" << endl; @@ -1140,11 +1140,11 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "sub " << (*it).left(astart)<< endl; out << indent << "{" << endl; bool createWarning = TRUE; - QString fname = Parser::cleanArgs( *it ); - QMap<QString, QString>::Iterator fit = functionImpls.find( fname ); + TQString fname = Parser::cleanArgs( *it ); + TQMap<TQString, TQString>::Iterator fit = functionImpls.find( fname ); if ( fit != functionImpls.end() ) { int begin = (*fit).find( "{" ); - QString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 ); + TQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 ); createWarning = body.simplifyWhiteSpace().isEmpty(); if ( !createWarning ) out << body << endl; @@ -1166,7 +1166,7 @@ void Uic::createFormImpl( const QDomElement &e ) if ( *it == "init()" || *it == "destroy()" ) continue; int astart = (*it).find('('); - QRegExp r( "(\\nsub\\s+" + (*it).left(astart) + "(?:\\s*#\\s*SLOT:[^\\n]+|[ \t]+)?\\n\\{)(\\s*)(\\}\\n)" ); + TQRegExp r( "(\\nsub\\s+" + (*it).left(astart) + "(?:\\s*#\\s*SLOT:[^\\n]+|[ \t]+)?\\n\\{)(\\s*)(\\}\\n)" ); r.setMinimal( true ); uiPmInclude.replace( r, "\\1\n" + indent + "print \"" + nameOfClass + "->" + (*it) + @@ -1190,34 +1190,34 @@ void Uic::createFormImpl( const QDomElement &e ) Traverses recursively over all children. */ -void Uic::createFormImpl( const QDomElement& e, const QString& form, const QString& connection, const QString& table ) +void Uic::createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table ) { if ( e.tagName() == "widget" && - e.attribute( "class" ) != "Qt::DataTable" ) { - QString field = getDatabaseInfo( e, "field" ); + e.attribute( "class" ) != "TQt::DataTable" ) { + TQString field = getDatabaseInfo( e, "field" ); if ( !field.isEmpty() ) { if ( isWidgetInTable( e, connection, table ) ) out << indent << "$" << form << "Form->insert(" << getObjectName( e ) << ", " << fixString( field ) << ");" << endl; } } - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { createFormImpl( n, form, connection, table ); } } -// Generate a PerlQt signal/slot definition. +// Generate a PerlTQt signal/slot definition. -void Uic::perlSlot(QStringList::Iterator &it) +void Uic::perlSlot(TQStringList::Iterator &it) { int astart = (*it).find('('); out << indent << (*it).left(astart) << " => "; - QString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); + TQString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); out << "["; if (!args.isEmpty()) { - QStringList arglist = QStringList::split( QRegExp(","), args ); + TQStringList arglist = TQStringList::split( TQRegExp(","), args ); out << "'" << arglist.join( "', '") << "'"; } out << "]"; diff --git a/puic/globaldefs.h b/puic/globaldefs.h index cc6ed40..a3e141f 100644 --- a/puic/globaldefs.h +++ b/puic/globaldefs.h @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,17 +27,17 @@ #define BOXLAYOUT_DEFAULT_SPACING 6 #ifndef NO_STATIC_COLORS -static QColor *backColor1 = 0; -static QColor *backColor2 = 0; -static QColor *selectedBack = 0; +static TQColor *backColor1 = 0; +static TQColor *backColor2 = 0; +static TQColor *selectedBack = 0; static void init_colors() { if ( backColor1 ) return; - backColor1 = new QColor( 236, 245, 255 ); - backColor2 = new QColor( 250, 250, 250 ); - selectedBack = new QColor( 221, 221, 221 ); + backColor1 = new TQColor( 236, 245, 255 ); + backColor2 = new TQColor( 250, 250, 250 ); + selectedBack = new TQColor( 221, 221, 221 ); } #endif diff --git a/puic/main.cpp b/puic/main.cpp index 869702c..c56c75e 100644 --- a/puic/main.cpp +++ b/puic/main.cpp @@ -3,7 +3,7 @@ ** Copyright (c) 2001 Phil Thompson <phil@river-bank.demon.co.uk> ** Copyright (c) 2002 Germain Garand <germain@ebooksfrance.com> ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -20,9 +20,9 @@ ** **********************************************************************/ /* -** 06/2002 : Initial release of puic, the PerlQt User Interface Compiler, -** a work derivated from uic (the Qt User Interface Compiler) -** and pyuic (the PyQt User Interface Compiler). +** 06/2002 : Initial release of puic, the PerlTQt User Interface Compiler, +** a work derivated from uic (the TQt User Interface Compiler) +** and pyuic (the PyTQt User Interface Compiler). ** ** G.Garand ** @@ -41,7 +41,7 @@ #include <stdlib.h> #define PUIC_VERSION "0.70" -void getDBConnections( Uic& uic, QString& s); +void getDBConnections( Uic& uic, TQString& s); int main( int argc, char * argv[] ) { @@ -50,24 +50,24 @@ int main( int argc, char * argv[] ) bool subcl = FALSE; bool imagecollection = FALSE; bool imagecollection_tmpfile = FALSE; - QStringList images; + TQStringList images; const char *error = 0; const char* fileName = 0; const char* className = 0; - QCString outputFile; - QCString image_tmpfile; + TQCString outputFile; + TQCString image_tmpfile; const char* projectName = 0; const char* trmacro = 0; bool nofwd = FALSE; bool fix = FALSE; - QApplication app(argc, argv, FALSE); - QString uicClass; + TQApplication app(argc, argv, FALSE); + TQString uicClass; for ( int n = 1; n < argc && error == 0; n++ ) { - QCString arg = argv[n]; + TQCString arg = argv[n]; if ( arg[0] == '-' ) { // option - QCString opt = &arg[1]; + TQCString opt = &arg[1]; if ( opt[0] == 'o' ) { // output redirection if ( opt[1] == '\0' ) { if ( !(n < argc-2) ) { @@ -114,8 +114,8 @@ int main( int argc, char * argv[] ) } } else if ( opt == "version" ) { fprintf( stderr, - "PerlQt User Interface Compiler v%s for Qt version %s\n", PUIC_VERSION, - QT_VERSION_STR ); + "PerlTQt User Interface Compiler v%s for TQt version %s\n", PUIC_VERSION, + TQT_VERSION_STR ); exit( 1 ); } else if ( opt == "help" ) { break; @@ -130,7 +130,7 @@ int main( int argc, char * argv[] ) error = "Missing indent"; break; } - tabstop = QCString(argv[++n]).toUInt(&ok); + tabstop = TQCString(argv[++n]).toUInt(&ok); } else tabstop = opt.mid(1).toUInt(&ok); @@ -141,7 +141,7 @@ int main( int argc, char * argv[] ) } else if ( opt == "x" ) { execCode = TRUE; } else { - error = QString( "Unrecognized option " + opt ).latin1(); + error = TQString( "Unrecognized option " + opt ).latin1(); } } else { if ( imagecollection && !imagecollection_tmpfile ) @@ -154,7 +154,7 @@ int main( int argc, char * argv[] ) } if ( argc < 2 || error || (!fileName && !imagecollection ) ) { - fprintf( stderr, "PerlQt user interface compiler.\n" ); + fprintf( stderr, "PerlTQt user interface compiler.\n" ); if ( error ) fprintf( stderr, "puic: %s\n", error ); @@ -185,20 +185,20 @@ int main( int argc, char * argv[] ) } if ( imagecollection_tmpfile ) { - QFile ifile( image_tmpfile ); + TQFile ifile( image_tmpfile ); if ( ifile.open( IO_ReadOnly ) ) { - QTextStream ts( &ifile ); - QString s = ts.read(); + TQTextStream ts( &ifile ); + TQString s = ts.read(); s = s.simplifyWhiteSpace(); - images = QStringList::split( ' ', s ); - for ( QStringList::Iterator it = images.begin(); it != images.end(); ++it ) + images = TQStringList::split( ' ', s ); + for ( TQStringList::Iterator it = images.begin(); it != images.end(); ++it ) *it = (*it).simplifyWhiteSpace(); } } Uic::setIndent(indent); - QFile fileOut; + TQFile fileOut; if ( !outputFile.isEmpty() ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) { @@ -208,34 +208,34 @@ int main( int argc, char * argv[] ) } else { fileOut.open( IO_WriteOnly, stdout ); } - QTextStream out( &fileOut ); + TQTextStream out( &fileOut ); if ( imagecollection ) { - out.setEncoding( QTextStream::Latin1 ); + out.setEncoding( TQTextStream::Latin1 ); Uic::embed( out, projectName, images ); return 0; } - out.setEncoding( QTextStream::UnicodeUTF8 ); + out.setEncoding( TQTextStream::UnicodeUTF8 ); - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { qWarning( "puic: Could not open file '%s' ", fileName ); return 1; } - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) { - qWarning( QString("puic: Failed to parse %s: ") + errMsg + QString (" in line %d\n"), fileName, errLine ); + qWarning( TQString("puic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); return 1; } - QDomElement e = doc.firstChild().toElement(); + TQDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.2 ) { - qWarning( QString("puic: File generated with too recent version of Qt Designer (%s). Recent extensions won't be handled."), + qWarning( TQString("puic: File generated with too recent version of TQt Designer (%s). Recent extensions won't be handled."), e.attribute("version").latin1() ); return 1; } @@ -250,8 +250,8 @@ int main( int argc, char * argv[] ) if ( !subcl ) { out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl; out << "#" << endl; - out << "# Created: " << QDateTime::currentDateTime().toString() << endl; - out << "# by: The PerlQt User Interface Compiler (puic)" << endl; + out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; + out << "# by: The PerlTQt User Interface Compiler (puic)" << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; out << endl; @@ -269,14 +269,14 @@ int main( int argc, char * argv[] ) out << endl; out << indent << "package main;" << endl; out << endl; - out << "use Qt;" << endl; - out << "use " << (subcl ? QString::fromLatin1(className) : uicClass) << ";" << endl; + out << "use TQt;" << endl; + out << "use " << (subcl ? TQString::fromLatin1(className) : uicClass) << ";" << endl; out << endl; - out << indent << "my $a = Qt::Application(\\@ARGV);" << endl; - QString s; + out << indent << "my $a = TQt::Application(\\@ARGV);" << endl; + TQString s; getDBConnections( uic, s); out << s; - out << indent << "my $w = " << (subcl? QString::fromLatin1(className) : uicClass) << ";" << endl; + out << indent << "my $w = " << (subcl? TQString::fromLatin1(className) : uicClass) << ";" << endl; out << indent << "$a->setMainWidget($w);" << endl; out << indent << "$w->show;" << endl; out << indent << "exit $a->exec;" << endl; @@ -289,20 +289,20 @@ int main( int argc, char * argv[] ) return 0; } -void getDBConnections( Uic& uic, QString& s) +void getDBConnections( Uic& uic, TQString& s) { int num = 0; - for ( QStringList::Iterator it = uic.dbConnections.begin(); it != uic.dbConnections.end(); ++it ) { + for ( TQStringList::Iterator it = uic.dbConnections.begin(); it != uic.dbConnections.end(); ++it ) { if ( !(*it).isEmpty()) { - QString inc = (num ? QString::number(num+1) : QString::null); + TQString inc = (num ? TQString::number(num+1) : TQString::null); s += "\n# Connection to database " + (*it) + "\n\n"; - s += "my $DRIVER" + inc + " =\t\t'QMYSQL3';" + (inc?"":" # appropriate driver") + "\n"; + s += "my $DRIVER" + inc + " =\t\t'TQMYSQL3';" + (inc?"":" # appropriate driver") + "\n"; s += "my $DATABASE" + inc + " =\t\t'foo';" + (inc?"":" # name of your database") + "\n"; s += "my $USER" + inc + "=\t\t'john';" + (inc?"":" # username") + "\n"; s += "my $PASSWORD" + inc + "=\t\t'ZxjGG34s';" + (inc?"":" # password for USER") + "\n"; s += "my $HOST" + inc + "=\t\t'localhost';" + (inc?"":" # host on which the database is running") + "\n"; s += "\n"; - s += "my $db" + inc + " = Qt::SqlDatabase::addDatabase( $DRIVER" + inc; + s += "my $db" + inc + " = TQt::SqlDatabase::addDatabase( $DRIVER" + inc; if (inc) s+= ", '" + (*it) + "'"; s += " );\n"; @@ -313,7 +313,7 @@ void getDBConnections( Uic& uic, QString& s) s += "\n"; s += "if( !$db" + inc + "->open() )\n"; s += "{\n"; - s += " Qt::MessageBox::information( undef, 'Unable to open database',\n"; + s += " TQt::MessageBox::information( undef, 'Unable to open database',\n"; s += " $db" + inc + "->lastError()->databaseText() . \"\\n\");\n"; s += " exit 1;\n"; s += "}\n"; diff --git a/puic/object.cpp b/puic/object.cpp index a7eb0c4..ec2f717 100644 --- a/puic/object.cpp +++ b/puic/object.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -36,19 +36,19 @@ \sa createObjectImpl() */ -void Uic::createObjectDecl( const QDomElement& e ) +void Uic::createObjectDecl( const TQDomElement& e ) { if ( e.tagName() == "vbox" || e.tagName() == "hbox" || e.tagName() == "grid" ) { out << indent << registerObject(getLayoutName(e) ) << endl; } else { - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); if ( objName.isEmpty() ) return; - // ignore QLayoutWidgets - if ( objClass == "Qt::LayoutWidget" ) + // ignore TQLayoutWidgets + if ( objClass == "TQt::LayoutWidget" ) return; // register the object and unify its name @@ -58,29 +58,29 @@ void Uic::createObjectDecl( const QDomElement& e ) } /*! - Creates a PerlQt attribute declaration for the object given in \a e. + Creates a PerlTQt attribute declaration for the object given in \a e. Children are not traversed recursively. */ -void Uic::createAttrDecl( const QDomElement& e ) +void Uic::createAttrDecl( const TQDomElement& e ) { if ( e.tagName() == "vbox" || e.tagName() == "hbox" || e.tagName() == "grid" ) { out << indent << registerObject(getLayoutName(e) ) << endl; } else { - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); if ( objName.isEmpty() ) return; - // ignore QLayoutWidgets - if ( objClass == "Qt::LayoutWidget" ) + // ignore TQLayoutWidgets + if ( objClass == "TQt::LayoutWidget" ) return; // register the object and unify its name objName = registerObject( objName ); out << indent << objName << endl; - QDomElement n = getObjectProperty( e, "font"); + TQDomElement n = getObjectProperty( e, "font"); if ( !n.isNull() ) out << indent << objName + "_font" << endl; } @@ -99,17 +99,17 @@ void Uic::createAttrDecl( const QDomElement& e ) static bool createdCentralWidget = FALSE; -QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& par, const QString& layout ) +TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& layout ) { - QString parent( par ); + TQString parent( par ); if ( parent == "this" && isMainWindow ) { if ( !createdCentralWidget ) - out << indent << "setCentralWidget(Qt::Widget(this, \"qt_central_widget\"));" << endl; + out << indent << "setCentralWidget(TQt::Widget(this, \"qt_central_widget\"));" << endl; createdCentralWidget = TRUE; parent = "centralWidget()"; } - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; int numItems = 0; int numColumns = 0; int numRows = 0; @@ -122,8 +122,8 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, return objName; objName = getObjectName( e ); - QString definedName = objName; - bool isTmpObject = objName.isEmpty() || objClass == "Qt::LayoutWidget"; + TQString definedName = objName; + bool isTmpObject = objName.isEmpty() || objClass == "TQt::LayoutWidget"; if ( isTmpObject ) { if ( objClass[0] == 'Q' ) objName = "$" + objClass.mid( 4 ); @@ -133,17 +133,17 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, bool isLine = objClass == "Line"; if ( isLine ) - objClass = "Qt::Frame"; + objClass = "TQt::Frame"; out << endl; - if ( objClass == "Qt::LayoutWidget" ) { + if ( objClass == "TQt::LayoutWidget" ) { if ( layout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << indent << (isTmpObject ? QString::fromLatin1("my ") : QString::null) << objName << " = Qt::Widget(" << parent << ", '" << objName << "');" << endl; + out << indent << (isTmpObject ? TQString::fromLatin1("my ") : TQString::null) << objName << " = TQt::Widget(" << parent << ", '" << objName << "');" << endl; } else { // the layout widget is not necessary, hide it by creating its child in the parent - QString result; + TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) result = createObjectImpl( n, parentClass, parent, layout ); @@ -151,17 +151,17 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, return result; } - } else if ( objClass != "Qt::ToolBar" && objClass != "Qt::MenuBar" ) { + } else if ( objClass != "TQt::ToolBar" && objClass != "TQt::MenuBar" ) { // register the object and unify its name objName = registerObject( objName ); // Temporary objects don't go into the class instance dictionary. - out << indent << (isTmpObject ? QString("my ") : QString::null) << objName << " = " << createObjectInstance( objClass, parent, objName ) << ";" << endl; + out << indent << (isTmpObject ? TQString("my ") : TQString::null) << objName << " = " << createObjectInstance( objClass, parent, objName ) << ";" << endl; } - if ( objClass == "Qt::AxWidget" ) { - QString controlId; + if ( objClass == "TQt::AxWidget" ) { + TQString controlId; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" && n.attribute( "name" ) == "control" ) { controlId = n.firstChild().toElement().text(); @@ -178,10 +178,10 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute( "name" ); + TQString prop = n.attribute( "name" ); if ( prop == "database" ) continue; - QString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; if ( prop == "name" ) @@ -195,35 +195,35 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( isLine && prop == "orientation" ) { prop = "frameShape"; if ( value.right(10) == "Horizontal" ) - value = "&Qt::Frame::HLine"; + value = "&TQt::Frame::HLine"; else - value = "&Qt::Frame::VLine"; + value = "&TQt::Frame::VLine"; if ( !hadFrameShadow ) { prop = "frameStyle"; - value += " | &Qt::Frame::Sunken"; + value += " | &TQt::Frame::Sunken"; } } if ( prop == "buttonGroupId" ) { - if ( parentClass == "Qt::ButtonGroup" ) + if ( parentClass == "TQt::ButtonGroup" ) out << indent << parent << "->insert( " << objName << "," << value << ");" << endl; continue; } if ( prop == "frameworkCode" ) continue; - if ( objClass == "Qt::MultiLineEdit" && - QRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) ) + if ( objClass == "TQt::MultiLineEdit" && + TQRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) ) continue; - QString call = objName + "->"; + TQString call = objName + "->"; bool needClose = false; if ( stdset ) { call += mkStdSet( prop ) + "( "; } else { - call += "setProperty( \"" + prop + "\", Qt::Variant(" ; + call += "setProperty( \"" + prop + "\", TQt::Variant(" ; needClose = true; } if ( prop == "accel" ) - call += "Qt::KeySequence( " + value + " )"+ (needClose ? " )": "") + " );"; + call += "TQt::KeySequence( " + value + " )"+ (needClose ? " )": "") + " );"; else call += value + (needClose ? " )": "") + " );"; @@ -234,8 +234,8 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, out << indent << call << endl; } } else if ( n.tagName() == "item" ) { - QString call; - QString value; + TQString call; + TQString value; if ( objClass.mid( 4 ) == "ListBox" ) { call = createListBoxItemImpl( n, objName ); @@ -259,7 +259,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, trout << indent << call << endl; } } else if ( objClass.mid( 4 ) == "ListView" ) { - call = createListViewItemImpl( n, objName, QString::null ); + call = createListViewItemImpl( n, objName, TQString::null ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; @@ -269,8 +269,8 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( !call.isEmpty() ) numItems++; } else if ( n.tagName() == "column" || n.tagName() == "row" ) { - QString call; - QString value; + TQString call; + TQString value; if ( objClass.mid( 4 ) == "ListView" ) { call = createListViewColumnImpl( n, objName, &value ); @@ -279,7 +279,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, trout << indent << objName << "->header()->setLabel( " << numColumns++ << ", " << value << " );\n"; } - } else if ( objClass == "Qt::Table" || objClass == "Qt::DataTable" ) { + } else if ( objClass == "TQt::Table" || objClass == "TQt::DataTable" ) { bool isCols = ( n.tagName() == "column" ); call = createTableRowColumnImpl( n, objName, &value ); if ( !call.isEmpty() ) { @@ -296,52 +296,52 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, // create all children, some widgets have special requirements - if ( objClass == "Qt::TabWidget" ) { + if ( objClass == "TQt::TabWidget" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, objName ); - QString comment; - QString label = DomTool::readAttribute( n, "title", "", comment ).toString(); + TQString page = createObjectImpl( n, objClass, objName ); + TQString comment; + TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); out << indent << objName << "->insertTab( " << page << ", \"\" );" << endl; trout << indent << objName << "->changeTab( " << page << ", " << trcall( label, comment ) << " );" << endl; } } - } else if ( objClass == "Qt::WidgetStack" ) { + } else if ( objClass == "TQt::WidgetStack" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, objName ); + TQString page = createObjectImpl( n, objClass, objName ); int id = DomTool::readAttribute( n, "id", "" ).toInt(); out << indent << objName << "->addWidget( " << page << ", " << id << " );" << endl; } } - } else if ( objClass == "Qt::ToolBox" ) { + } else if ( objClass == "TQt::ToolBox" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, objName ); - QString label = DomTool::readAttribute( n, "label", "" ).toString(); + TQString page = createObjectImpl( n, objClass, objName ); + TQString label = DomTool::readAttribute( n, "label", "" ).toString(); out << indent << objName << "->addItem( " << page << ", \"" << label << "\" );" << endl; } } - } else if ( objClass != "Qt::ToolBar" && objClass != "Qt::MenuBar" ) { // standard widgets + } else if ( objClass != "TQt::ToolBar" && objClass != "TQt::MenuBar" ) { // standard widgets WidgetInterface *iface = 0; - QString QtObjClass = objClass; - QtObjClass.replace( QRegExp("^Qt::"), "Q" ); - QtObjClass.replace( QRegExp("^KDE::"), "K" ); - widgetManager()->queryInterface( QtObjClass, &iface ); -#ifdef QT_CONTAINER_CUSTOM_WIDGETS - int id = WidgetDatabase::idFromClassName( QtObjClass ); + TQString TQtObjClass = objClass; + TQtObjClass.replace( TQRegExp("^TQt::"), "Q" ); + TQtObjClass.replace( TQRegExp("^KDE::"), "K" ); + widgetManager()->queryInterface( TQtObjClass, &iface ); +#ifdef TQT_CONTAINER_CUSTOM_WIDGETS + int id = WidgetDatabase::idFromClassName( TQtObjClass ); if ( WidgetDatabase::isContainer( id ) && WidgetDatabase::isCustomPluginWidget( id ) && iface ) { - QWidgetContainerInterfacePrivate *iface2 = 0; - iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 ); + TQWidgetContainerInterfacePrivate *iface2 = 0; + iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 ); if ( iface2 ) { - bool supportsPages = iface2->supportsPages( QtObjClass ); + bool supportsPages = iface2->supportsPages( TQtObjClass ); for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { if ( supportsPages ) { - QString page = createObjectImpl( n, objClass, objName ); - QString comment; - QString label = DomTool::readAttribute( n, "label", "", comment ).toString(); + TQString page = createObjectImpl( n, objClass, objName ); + TQString comment; + TQString label = DomTool::readAttribute( n, "label", "", comment ).toString(); out << indent << iface2->createCode( objClass, objName, page, label ) << endl; } else { createObjectImpl( n, objClass, objName ); @@ -357,7 +357,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objClass, objName ); } -#ifdef QT_CONTAINER_CUSTOM_WIDGETS +#ifdef TQT_CONTAINER_CUSTOM_WIDGETS } #endif } @@ -377,13 +377,13 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, application font or palette change handlers in createFormImpl(). */ -void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ) +void Uic::createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ) { - QDomElement n; - QString objClass = getClassName( e ); + TQDomElement n; + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); #if 0 // it's not clear whether this check should be here or not if ( objName.isEmpty() ) return; @@ -393,15 +393,15 @@ void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusi bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute( "name" ); + TQString prop = n.attribute( "name" ); if ( prop != exclusiveProp ) continue; - QString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; // we assume the property isn't of type 'string' ++indent; - out << indent << objName << "->setProperty(\"" << prop << "\", Qt::Variant(" << value << "));" << endl; + out << indent << objName << "->setProperty(\"" << prop << "\", TQt::Variant(" << value << "));" << endl; --indent; } } @@ -412,11 +412,11 @@ void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusi Resource::saveProperty() and DomTool::elementToVariant. If you change one, change all. */ -QString Uic::setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ) +TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ) { - QString v; + TQString v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -429,11 +429,11 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Rect(%1, %2, %3, %4)"; + v = "TQt::Rect(%1, %2, %3, %4)"; v = v.arg(x).arg(y).arg(w).arg(h); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -442,10 +442,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Point(%1, %2)"; + v = "TQt::Point(%1, %2)"; v = v.arg(x).arg(y); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -454,10 +454,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Size(%1, %2)"; + v = "TQt::Size(%1, %2)"; v = v.arg(w).arg(h); } else if ( e.tagName() == "color" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int r = 0, g = 0, b = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "red" ) @@ -468,18 +468,18 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con b = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Color(%1, %2, %3)"; + v = "TQt::Color(%1, %2, %3)"; v = v.arg(r).arg(g).arg(b); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QString attrname = e.parentNode().toElement().attribute( "name", "font" ); - QString fontname; + TQDomElement n3 = e.firstChild().toElement(); + TQString attrname = e.parentNode().toElement().attribute( "name", "font" ); + TQString fontname; if ( !obj.isEmpty() ) { fontname = registerObject( "$" + obj + "_" + attrname ); - out << indent << "my " << fontname << " = Qt::Font(" << obj << "->font);" << endl; + out << indent << "my " << fontname << " = TQt::Font(" << obj << "->font);" << endl; } else { fontname = "$" + registerObject( "font" ); - out << indent << "my " << fontname << " = Qt::Font(this->font);" << endl; + out << indent << "my " << fontname << " = TQt::Font(this->font);" << endl; } while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) @@ -506,22 +506,22 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = fontname; } } else if ( e.tagName() == "string" ) { - QString txt = e.firstChild().toText().data(); - QString com = getComment( e.parentNode() ); + TQString txt = e.firstChild().toText().data(); + TQString com = getComment( e.parentNode() ); - if ( prop == "toolTip" && objClass != "Qt::Action" && objClass != "Qt::ActionGroup" ) { + if ( prop == "toolTip" && objClass != "TQt::Action" && objClass != "TQt::ActionGroup" ) { if ( !obj.isEmpty() ) - trout << indent << "Qt::ToolTip::add(" << obj << ", " + trout << indent << "TQt::ToolTip::add(" << obj << ", " << trcall( txt, com ) << ");" << endl; else - out << indent << "Qt::ToolTip::add( this, " + out << indent << "TQt::ToolTip::add( this, " << trcall( txt, com ) << ");" << endl; - } else if ( prop == "whatsThis" && objClass != "Qt::Action" && objClass != "Qt::ActionGroup" ) { + } else if ( prop == "whatsThis" && objClass != "TQt::Action" && objClass != "TQt::ActionGroup" ) { if ( !obj.isEmpty() ) - trout << indent << "Qt::WhatsThis::add(" << obj << ", " + trout << indent << "TQt::WhatsThis::add(" << obj << ", " << trcall( txt, com ) << ");" << endl; else - trout << indent << "Qt::WhatsThis::add( this," + trout << indent << "TQt::WhatsThis::add( this," << trcall( txt, com ) << ");" << endl; } else { v = trcall( txt, com ); @@ -536,24 +536,24 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con if ( stdset ) v = "%1"; else - v = "Qt::Variant(%1, 0)"; + v = "TQt::Variant(%1, 0)"; v = v.arg( mkBool( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "pixmap" ) { v = e.firstChild().toText().data(); if( !externPixmaps ) v.prepend( '$' ); if ( !pixmapLoaderFunction.isEmpty() ) { - v.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - v.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + v.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + v.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } else if ( e.tagName() == "iconset" ) { - v = "Qt::IconSet(%1)"; - QString s = e.firstChild().toText().data(); + v = "TQt::IconSet(%1)"; + TQString s = e.firstChild().toText().data(); if( !externPixmaps ) s.prepend( '$' ); if ( !pixmapLoaderFunction.isEmpty() ) { - s.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - s.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + s.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + s.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } v = v.arg( s ); } else if ( e.tagName() == "image" ) { @@ -563,19 +563,19 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = "&%1::%2()"; else v = "\"%1\""; - QString oc = objClass; - QString ev = e.firstChild().toText().data(); - if ( oc == "Qt::ListView" && ev == "Manual" ) // #### workaround, rename QListView::Manual in 4.0 - oc = "Qt::ScrollView"; + TQString oc = objClass; + TQString ev = e.firstChild().toText().data(); + if ( oc == "TQt::ListView" && ev == "Manual" ) // #### workaround, rename TQListView::Manual in 4.0 + oc = "TQt::ScrollView"; if ( stdset ) v = v.arg( oc ).arg( ev ); else v = v.arg( ev ); } else if ( e.tagName() == "set" ) { - QString keys( e.firstChild().toText().data() ); - QStringList lst = QStringList::split( '|', keys ); + TQString keys( e.firstChild().toText().data() ); + TQStringList lst = TQStringList::split( '|', keys ); v = "int(&"; - QStringList::Iterator it = lst.begin(); + TQStringList::Iterator it = lst.begin(); while ( it != lst.end() ) { v += objClass + "::" + *it; if ( it != lst.fromLast() ) @@ -584,30 +584,30 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con } v += ")"; } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) sp.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) sp.setVerStretch( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - QString tmp = (obj.isEmpty() ? QString::fromLatin1("this") : obj) + "->"; - v = "Qt::SizePolicy(%1, %2, %3, %4, " + tmp + "sizePolicy()->hasHeightForWidth())"; + TQString tmp = (obj.isEmpty() ? TQString::fromLatin1("this") : obj) + "->"; + v = "TQt::SizePolicy(%1, %2, %3, %4, " + tmp + "sizePolicy()->hasHeightForWidth())"; v = v.arg( (int)sp.horData() ).arg( (int)sp.verData() ).arg( sp.horStretch() ).arg( sp.verStretch() ); } else if ( e.tagName() == "palette" ) { - QPalette pal; + TQPalette pal; bool no_pixmaps = e.elementsByTagName( "pixmap" ).count() == 0; - QDomElement n; + TQDomElement n; if ( no_pixmaps ) { n = e.firstChild().toElement(); while ( !n.isNull() ) { - QColorGroup cg; + TQColorGroup cg; if ( n.tagName() == "active" ) { cg = loadColorGroup( n ); pal.setActive( cg ); @@ -621,19 +621,19 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con n = n.nextSibling().toElement(); } } - if ( no_pixmaps && pal == QPalette( pal.active().button(), pal.active().background() ) ) { - v = "Qt::Palette(Qt::Color(%1,%2,%3), Qt::Color(%1,%2,%3))"; + if ( no_pixmaps && pal == TQPalette( pal.active().button(), pal.active().background() ) ) { + v = "TQt::Palette(TQt::Color(%1,%2,%3), TQt::Color(%1,%2,%3))"; v = v.arg( pal.active().button().red() ).arg( pal.active().button().green() ).arg( pal.active().button().blue() ); v = v.arg( pal.active().background().red() ).arg( pal.active().background().green() ).arg( pal.active().background().blue() ); } else { - QString palette = "pal"; + TQString palette = "pal"; if ( !pal_used ) { - out << indent << palette << " = Qt::Palette();" << endl; + out << indent << palette << " = TQt::Palette();" << endl; pal_used = TRUE; } - QString cg = "cg"; + TQString cg = "cg"; if ( !cg_used ) { - out << indent << cg << " = Qt::ColorGroup();" << endl; + out << indent << cg << " = TQt::ColorGroup();" << endl; cg_used = TRUE; } n = e.firstChild().toElement(); @@ -656,10 +656,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = palette; } } else if ( e.tagName() == "cursor" ) { - v = "Qt::Cursor(%1)"; + v = "TQt::Cursor(%1)"; v = v.arg( e.firstChild().toText().data() ); } else if ( e.tagName() == "date" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int y, m, d; y = m = d = 0; while ( !n3.isNull() ) { @@ -671,10 +671,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Date(%1,%2,%3)"; + v = "TQt::Date(%1,%2,%3)"; v = v.arg(y).arg(m).arg(d); } else if ( e.tagName() == "time" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, m, s; h = m = s = 0; while ( !n3.isNull() ) { @@ -686,10 +686,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con s = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::Time(%1, %2, %3)"; + v = "TQt::Time(%1, %2, %3)"; v = v.arg(h).arg(m).arg(s); } else if ( e.tagName() == "datetime" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, mi, s, y, mo, d; h = mi = s = y = mo = d = 0; while ( !n3.isNull() ) { @@ -707,12 +707,12 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "Qt::DateTime(Qt::Date(%1, %2, %3), Qt::Time(%4, %5, %6))"; + v = "TQt::DateTime(TQt::Date(%1, %2, %3), TQt::Time(%4, %5, %6))"; v = v.arg(y).arg(mo).arg(d).arg(h).arg(mi).arg(s); } else if ( e.tagName() == "stringlist" ) { - QStringList l; - QDomElement n3 = e.firstChild().toElement(); - QString listname; + TQStringList l; + TQDomElement n3 = e.firstChild().toElement(); + TQString listname; if ( !obj.isEmpty() ) { listname = obj + "->{_strlist"; listname = registerObject( listname ); @@ -754,9 +754,9 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con /*! Extracts a named object property from \a e. */ -QDomElement Uic::getObjectProperty( const QDomElement& e, const QString& name ) +TQDomElement Uic::getObjectProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { diff --git a/puic/parser.cpp b/puic/parser.cpp index 4fc13c5..a4def26 100644 --- a/puic/parser.cpp +++ b/puic/parser.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -22,25 +22,25 @@ #include <qobject.h> #include <qstringlist.h> -class NormalizeObject : public QObject +class NormalizeObject : public TQObject { public: - NormalizeObject() : QObject() {} - static QCString normalizeSignalSlot( const char *signalSlot ) { return QObject::normalizeSignalSlot( signalSlot ); } + NormalizeObject() : TQObject() {} + static TQCString normalizeSignalSlot( const char *signalSlot ) { return TQObject::normalizeSignalSlot( signalSlot ); } }; -QString Parser::cleanArgs( const QString &func ) +TQString Parser::cleanArgs( const TQString &func ) { - QString slot( func ); + TQString slot( func ); int begin = slot.find( "(" ) + 1; - QString args = slot.mid( begin ); + TQString args = slot.mid( begin ); args = args.left( args.find( ")" ) ); - QStringList lst = QStringList::split( ',', args ); - QString res = slot.left( begin ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst = TQStringList::split( ',', args ); + TQString res = slot.left( begin ); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( it != lst.begin() ) res += ","; - QString arg = *it; + TQString arg = *it; int pos = 0; if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); @@ -50,7 +50,7 @@ QString Parser::cleanArgs( const QString &func ) arg = arg.simplifyWhiteSpace(); if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); - QStringList l = QStringList::split( ' ', arg ); + TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { if ( l[ 0 ] != "const" && l[ 0 ] != "unsigned" && l[ 0 ] != "var" ) arg = l[ 0 ]; @@ -62,5 +62,5 @@ QString Parser::cleanArgs( const QString &func ) } res += ")"; - return QString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/puic/parser.h b/puic/parser.h index 5a5671a..db07ea2 100644 --- a/puic/parser.h +++ b/puic/parser.h @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -26,7 +26,7 @@ class Parser { public: - static QString cleanArgs( const QString &func ); + static TQString cleanArgs( const TQString &func ); }; diff --git a/puic/puic.1 b/puic/puic.1 index a125a8d..2341fe3 100644 --- a/puic/puic.1 +++ b/puic/puic.1 @@ -26,12 +26,12 @@ This manual page documents briefly the command. .PP \fBpuic\fP is a program you can use to compile .ui and .ui.h -files (from Qt Designer) into perl (actually, PerlQt) code. This -enables you to draw your application using Qt Designer, compile +files (from TQt Designer) into perl (actually, PerlTQt) code. This +enables you to draw your application using TQt Designer, compile and then run it. -PerlQt is an API for Perl to the Qt toolkit from Trolltech. With -PerlQt, you can use Qt widgets in perl code, thus giving a GUI to +PerlTQt is an API for Perl to the TQt toolkit from Trolltech. With +PerlTQt, you can use TQt widgets in perl code, thus giving a GUI to your perl programs. .SH "OPTIONS" \fBGenerate implementation:\fR diff --git a/puic/puic.pro b/puic/puic.pro index 157ae59..62916e2 100644 --- a/puic/puic.pro +++ b/puic/puic.pro @@ -4,11 +4,11 @@ INCLUDEPATH += . CONFIG += qt warn_on -exists( $(QTDIR)/lib/libqt-mt* ) { +exists( $(TQTDIR)/lib/libqt-mt* ) { CONFIG += thread } -DEFINES += UIC QT_INTERNAL_XML +DEFINES += UIC TQT_INTERNAL_XML # Input HEADERS += domtool.h \ diff --git a/puic/subclassing.cpp b/puic/subclassing.cpp index 51a5e55..f49dd27 100644 --- a/puic/subclassing.cpp +++ b/puic/subclassing.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -38,19 +38,19 @@ \sa createSubDecl() */ -void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) +void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; out << indent << "package " << subClass << ";" << endl; - out << indent << "use Qt;" << endl; + out << indent << "use TQt;" << endl; out << indent << "use " << nameOfClass << ";" << endl; - out << indent << "use Qt::isa qw("<< nameOfClass << ");" << endl; + out << indent << "use TQt::isa qw("<< nameOfClass << ");" << endl; out << endl; @@ -58,11 +58,11 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) out << indent << "sub NEW" << endl; out << indent << "{" << endl; ++indent; - if ( objClass == "Qt::Dialog" || objClass == "Qt::Wizard" ) { + if ( objClass == "TQt::Dialog" || objClass == "TQt::Wizard" ) { out << indent << "shift->SUPER::NEW(@_[0..3]);" << endl; - } else if ( objClass == "Qt::Widget") { + } else if ( objClass == "TQt::Widget") { out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl; - } else if ( objClass == "Qt::MainWindow" ) { + } else if ( objClass == "TQt::MainWindow" ) { out << indent << "shift->SUPER::NEW(@_[0..2]);" << endl; out << indent << "statusBar();" << endl; isMainWindow = TRUE; @@ -74,12 +74,12 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) out << endl; // find additional functions - QStringList publicSlots, protectedSlots, privateSlots; - QStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; - QStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; - QStringList publicFuncts, protectedFuncts, privateFuncts; - QStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp; - QStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec; + TQStringList publicSlots, protectedSlots, privateSlots; + TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; + TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; + TQStringList publicFuncts, protectedFuncts, privateFuncts; + TQStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp; + TQStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec; nl = e.parentNode().toElement().elementsByTagName( "slot" ); @@ -88,15 +88,15 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) if ( n.parentNode().toElement().tagName() != "slots" && n.parentNode().toElement().tagName() != "connections" ) continue; - QString l = n.attribute( "language", "C++" ); + TQString l = n.attribute( "language", "C++" ); if ( l != "C++" && l != "Perl" ) //- mmh continue; - QString returnType = n.attribute( "returnType", "void" ); - QString functionName = n.firstChild().toText().data().stripWhiteSpace(); + TQString returnType = n.attribute( "returnType", "void" ); + TQString functionName = n.firstChild().toText().data().stripWhiteSpace(); if ( functionName.endsWith( ";" ) ) functionName = functionName.left( functionName.length() - 1 ); - QString specifier = n.attribute( "specifier" ); - QString access = n.attribute( "access" ); + TQString specifier = n.attribute( "specifier" ); + TQString access = n.attribute( "access" ); if ( access == "protected" ) { protectedSlots += functionName; protectedSlotTypes += returnType; @@ -115,19 +115,19 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) nl = e.parentNode().toElement().elementsByTagName( "function" ); for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); - QString fname = n.attribute( "name" ); + TQString fname = n.attribute( "name" ); fname = Parser::cleanArgs( fname ); if ( n.parentNode().toElement().tagName() != "functions" ) continue; - QString l = n.attribute( "language", "C++" ); + TQString l = n.attribute( "language", "C++" ); if ( l != "C++" && l != "Perl" ) //- mmh continue; - QString returnType = n.attribute( "returnType", "void" ); - QString functionName = n.firstChild().toText().data().stripWhiteSpace(); + TQString returnType = n.attribute( "returnType", "void" ); + TQString functionName = n.firstChild().toText().data().stripWhiteSpace(); if ( functionName.endsWith( ";" ) ) functionName = functionName.left( functionName.length() - 1 ); - QString specifier = n.attribute( "specifier" ); - QString access = n.attribute( "access" ); + TQString specifier = n.attribute( "specifier" ); + TQString access = n.attribute( "access" ); if ( access == "protected" ) { protectedFuncts += functionName; protectedFunctRetTyp += returnType; @@ -143,7 +143,7 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) } } - // FIXME PerlQt: distinguishing public/protected/private slots does not make any sense in the forseable future + // FIXME PerlTQt: distinguishing public/protected/private slots does not make any sense in the forseable future // but nevermind, never forget somewhere far beyond the sky, Ashley Winters is furbishing *Plan 42* ! :) if ( !publicFuncts.isEmpty() ) @@ -167,13 +167,13 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) out << "1;" << endl; } -void Uic::writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst, - const QString &subClass, const QString &descr ) +void Uic::writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList &typLst, const TQStringList &specLst, + const TQString &subClass, const TQString &descr ) { - QValueListConstIterator<QString> it, it2, it3; + TQValueListConstIterator<TQString> it, it2, it3; for ( it = fuLst.begin(), it2 = typLst.begin(), it3 = specLst.begin(); it != fuLst.end(); ++it, ++it2, ++it3 ) { - QString type = *it2; + TQString type = *it2; if ( type.isEmpty() ) type = "void"; if ( *it3 == "non virtual" ) diff --git a/puic/uic.cpp b/puic/uic.cpp index 5d87918..25ba919 100644 --- a/puic/uic.cpp +++ b/puic/uic.cpp @@ -3,7 +3,7 @@ ** Copyright (c) 2001 Phil Thompson <phil@river-bank.demon.co.uk> ** Copyright (c) 2002 Germain Garand <germain@ebooksfrance.com> ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -20,9 +20,9 @@ ** **********************************************************************/ /* -** 06/2002 : Initial release of puic, the PerlQt User Interface Compiler, -** a work derivated from uic (the Qt User Interface Compiler) -** and pyuic (the PyQt User Interface Compiler). +** 06/2002 : Initial release of puic, the PerlTQt User Interface Compiler, +** a work derivated from uic (the TQt User Interface Compiler) +** and pyuic (the PyTQt User Interface Compiler). ** ** G.Garand ** @@ -60,55 +60,55 @@ void PyIndent::calc() } -QString Uic::getComment( const QDomNode& n ) +TQString Uic::getComment( const TQDomNode& n ) { - QDomNode child = n.firstChild(); + TQDomNode child = n.firstChild(); while ( !child.isNull() ) { if ( child.toElement().tagName() == "comment" ) return child.toElement().firstChild().toText().data(); child = child.nextSibling(); } - return QString::null; + return TQString::null; } -QString Uic::mkBool( bool b ) +TQString Uic::mkBool( bool b ) { return b? "1" : "0"; } -QString Uic::mkBool( const QString& s ) +TQString Uic::mkBool( const TQString& s ) { return mkBool( s == "true" || s == "1" ); } -bool Uic::toBool( const QString& s ) +bool Uic::toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } -QString Uic::fixString( const QString &str, bool encode ) +TQString Uic::fixString( const TQString &str, bool encode ) { - QString s; + TQString s; if ( !encode ) { s = str; - // PerlQt: we don't want to use replace( QString, QString ) because we support Qt 3.0 - s.replace( QRegExp("\\\\"), "\\\\" ); - s.replace( QRegExp("\""), "\\\"" ); - s.replace( QRegExp("\\r?\\n"), "\\n\" .\n" + indent + "\"" ); + // PerlTQt: we don't want to use replace( TQString, TQString ) because we support TQt 3.0 + s.replace( TQRegExp("\\\\"), "\\\\" ); + s.replace( TQRegExp("\""), "\\\"" ); + s.replace( TQRegExp("\\r?\\n"), "\\n\" .\n" + indent + "\"" ); } else { - QCString utf8 = str.utf8(); + TQCString utf8 = str.utf8(); const int l = utf8.length(); for ( int i = 0; i < l; ++i ) - s += "\\x" + QString::number( (uchar)utf8[i], 16 ); + s += "\\x" + TQString::number( (uchar)utf8[i], 16 ); } return "\"" + s + "\""; } -QString Uic::trcall( const QString& sourceText, const QString& comment ) +TQString Uic::trcall( const TQString& sourceText, const TQString& comment ) { if ( sourceText.isEmpty() && comment.isEmpty() ) return "\"\""; - QString t = trmacro; + TQString t = trmacro; bool encode = FALSE; if ( t.isNull() ) { t = "tr"; @@ -126,9 +126,9 @@ QString Uic::trcall( const QString& sourceText, const QString& comment ) return trmacro + "(" + fixString( sourceText, encode ) + "," + fixString( comment, encode ) + ")"; } -QString Uic::mkStdSet( const QString& prop ) +TQString Uic::mkStdSet( const TQString& prop ) { - return QString( "set" ) + prop[0].upper() + prop.mid(1); + return TQString( "set" ) + prop[0].upper() + prop.mid(1); } /*! @@ -137,9 +137,9 @@ QString Uic::mkStdSet( const QString& prop ) The class Uic encapsulates the user interface compiler (uic). */ -Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, - QDomDocument doc, bool subcl, const QString &trm, - const QString& subClass, bool omitForwardDecls, QString &uicClass ) +Uic::Uic( const TQString &fn, const char *outputFn, TQTextStream &outStream, + TQDomDocument doc, bool subcl, const TQString &trm, + const TQString& subClass, bool omitForwardDecls, TQString &uicClass ) : out( outStream ), trout( &languageChangeBody ), outputFileName( outputFn ), trmacro( trm ), nofwd( omitForwardDecls ) { @@ -162,8 +162,8 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, if ( doc.firstChild().isNull() || doc.firstChild().firstChild().isNull() ) return; - QDomElement e = doc.firstChild().firstChild().toElement(); - QDomElement widget; + TQDomElement e = doc.firstChild().firstChild().toElement(); + TQDomElement widget; while ( !e.isNull() ) { if ( e.tagName() == "widget" ) { widget = e; @@ -177,13 +177,13 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, bool ok; defSpacing.toInt( &ok ); if ( !ok ) { - QString buf = defSpacing.toString(); + TQString buf = defSpacing.toString(); defSpacing = buf.append( "()" ); } defMargin = e.attribute( "margin", defMargin.toString() ); defMargin.toInt( &ok ); if ( !ok ) { - QString buf = defMargin.toString(); + TQString buf = defMargin.toString(); defMargin = buf.append( "()" ); } } @@ -193,7 +193,7 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, if ( nameOfClass.isEmpty() ) nameOfClass = getObjectName( e ); - namespaces = QStringList::split( "::", nameOfClass ); + namespaces = TQStringList::split( "::", nameOfClass ); bareNameOfClass = namespaces.last(); namespaces.remove( namespaces.fromLast() ); @@ -208,26 +208,26 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, /*! Extracts a pixmap loader function from \a e */ -QString Uic::getPixmapLoaderFunction( const QDomElement& e ) +TQString Uic::getPixmapLoaderFunction( const TQDomElement& e ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "pixmapfunction" ) return n.firstChild().toText().data(); } - return QString::null; + return TQString::null; } /*! Extracts the forms class name from \a e */ -QString Uic::getFormClassName( const QDomElement& e ) +TQString Uic::getFormClassName( const TQDomElement& e ) { - QDomElement n; - QString cn; + TQDomElement n; + TQString cn; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "class" ) { - QString s = n.firstChild().toText().data(); + TQString s = n.firstChild().toText().data(); int i; while ( ( i = s.find(' ' )) != -1 ) s[i] = '_'; @@ -239,20 +239,20 @@ QString Uic::getFormClassName( const QDomElement& e ) /*! Extracts a Perl class name from \a e. */ -QString Uic::getClassName( const QDomElement& e ) +TQString Uic::getClassName( const TQDomElement& e ) { - QString s = e.attribute( "class" ); + TQString s = e.attribute( "class" ); if ( s.isEmpty() && e.tagName() == "toolbar" ) - s = "Qt::ToolBar"; + s = "TQt::ToolBar"; else if ( s.isEmpty() && e.tagName() == "menubar" ) - s = "Qt::MenuBar"; + s = "TQt::MenuBar"; else if( WidgetDatabase::idFromClassName( s ) == -1) return s; else { - QRegExp r("^([QK])(\\S+)"); + TQRegExp r("^([QK])(\\S+)"); if( r.search( s ) != -1 ) - s = (r.cap(1) == 'K'?"KDE::":"Qt::") + r.cap(2); + s = (r.cap(1) == 'K'?"KDE::":"TQt::") + r.cap(2); } return s; } @@ -262,11 +262,11 @@ QString Uic::getClassName( const QDomElement& e ) /*! Returns TRUE if database framework code is generated, else FALSE. */ -bool Uic::isFrameworkCodeGenerated( const QDomElement& e ) +bool Uic::isFrameworkCodeGenerated( const TQDomElement& e ) { - QDomElement n = getObjectProperty( e, "frameworkCode" ); + TQDomElement n = getObjectProperty( e, "frameworkCode" ); if ( n.attribute("name") == "frameworkCode" && - !DomTool::elementToVariant( n.firstChild().toElement(), QVariant( TRUE, 0 ) ).toBool() ) + !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( TRUE, 0 ) ).toBool() ) return FALSE; return TRUE; } @@ -274,38 +274,38 @@ bool Uic::isFrameworkCodeGenerated( const QDomElement& e ) /*! Extracts an object name from \a e. It's stored in the 'name' property. */ -QString Uic::getObjectName( const QDomElement& e ) +TQString Uic::getObjectName( const TQDomElement& e ) { - QDomElement n = getObjectProperty( e, "name" ); + TQDomElement n = getObjectProperty( e, "name" ); if ( n.firstChild().toElement().tagName() == "cstring" ) return n.firstChild().toElement().firstChild().toText().data(); - return QString::null; + return TQString::null; } /*! Extracts an layout name from \a e. It's stored in the 'name' - property of the preceeding sibling (the first child of a QLayoutWidget). + property of the preceeding sibling (the first child of a TQLayoutWidget). */ -QString Uic::getLayoutName( const QDomElement& e ) +TQString Uic::getLayoutName( const TQDomElement& e ) { - QDomElement p = e.parentNode().toElement(); - QString name; + TQDomElement p = e.parentNode().toElement(); + TQString name; - if ( getClassName(p) != "Qt::LayoutWidget" ) + if ( getClassName(p) != "TQt::LayoutWidget" ) name = "Layout"; - QDomElement n = getObjectProperty( p, "name" ); + TQDomElement n = getObjectProperty( p, "name" ); if ( n.firstChild().toElement().tagName() == "cstring" ) { name.prepend( n.firstChild().toElement().firstChild().toText().data() ); - return QStringList::split( "::", name ).last(); + return TQStringList::split( "::", name ).last(); } return e.tagName(); } -QString Uic::getDatabaseInfo( const QDomElement& e, const QString& tag ) +TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) { - QDomElement n; - QDomElement n1; + TQDomElement n; + TQDomElement n1; int child = 0; // database info is a stringlist stored in this order if ( tag == "connection" ) @@ -315,27 +315,27 @@ QString Uic::getDatabaseInfo( const QDomElement& e, const QString& tag ) else if ( tag == "field" ) child = 2; else - return QString::null; + return TQString::null; n = getObjectProperty( e, "database" ); if ( n.firstChild().toElement().tagName() == "stringlist" ) { // find correct stringlist entry - QDomElement n1 = n.firstChild().firstChild().toElement(); + TQDomElement n1 = n.firstChild().firstChild().toElement(); for ( int i = 0; i < child && !n1.isNull(); ++i ) n1 = n1.nextSibling().toElement(); if ( n1.isNull() ) - return QString::null; + return TQString::null; return n1.firstChild().toText().data(); } - return QString::null; + return TQString::null; } -void Uic::registerLayouts( const QDomElement &e ) +void Uic::registerLayouts( const TQDomElement &e ) { if ( layouts.contains(e.tagName()) ) createObjectDecl(e); - QDomNodeList nl = e.childNodes(); + TQDomNodeList nl = e.childNodes(); for ( int i = 0; i < (int) nl.length(); ++i ) registerLayouts( nl.item(i).toElement() ); } @@ -344,60 +344,60 @@ void Uic::registerLayouts( const QDomElement &e ) /*! Returns include file for class \a className or a null string. */ -QString Uic::getInclude( const QString& className ) +TQString Uic::getInclude( const TQString& className ) { int wid = WidgetDatabase::idFromClassName( className ); if ( wid != -1 ) return WidgetDatabase::includeFile( wid ); - return QString::null; + return TQString::null; } -void Uic::createActionDecl( const QDomElement& e ) +void Uic::createActionDecl( const TQDomElement& e ) { - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); if ( objName.isEmpty() ) return; out << indent << objName << endl; if ( e.tagName() == "actiongroup" ) { - for ( QDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { + for ( TQDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup" ) createActionDecl( n ); } } } -void Uic::createActionImpl( const QDomElement &n, const QString &parent ) +void Uic::createActionImpl( const TQDomElement &n, const TQString &parent ) { - for ( QDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { - QString objName = registerObject( getObjectName( ae ) ); + for ( TQDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { + TQString objName = registerObject( getObjectName( ae ) ); if ( ae.tagName() == "action" ) - out << indent << objName << "= Qt::Action(" << parent << ", \"" << objName << "\");" << endl; + out << indent << objName << "= TQt::Action(" << parent << ", \"" << objName << "\");" << endl; else if ( ae.tagName() == "actiongroup" ) - out << indent << objName << "= Qt::ActionGroup(" << parent << ", \"" << objName << "\");" << endl; + out << indent << objName << "= TQt::ActionGroup(" << parent << ", \"" << objName << "\");" << endl; else continue; bool subActionsDone = FALSE; - for ( QDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "property" ) { bool stdset = stdsetdef; if ( n2.hasAttribute( "stdset" ) ) stdset = toBool( n2.attribute( "stdset" ) ); - QString prop = n2.attribute("name"); + TQString prop = n2.attribute("name"); if ( prop == "name" ) continue; - QString value = setObjectProperty( "Qt::Action", objName, prop, n2.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( "TQt::Action", objName, prop, n2.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; - QString call = objName + "->"; + TQString call = objName + "->"; bool needClose = false; if ( stdset ) { call += mkStdSet( prop ) + "( "; } else { - call += "setProperty( \"" + prop + "\", Qt::Variant(" ; + call += "setProperty( \"" + prop + "\", TQt::Variant(" ; needClose = true; } if ( prop == "accel" ) - call += "Qt::KeySequence( " + value + " )"+ (needClose ? " )": "") + " );"; + call += "TQt::KeySequence( " + value + " )"+ (needClose ? " )": "") + " );"; else call += value + (needClose ? " )": "") + " );"; @@ -414,7 +414,7 @@ void Uic::createActionImpl( const QDomElement &n, const QString &parent ) } } -QString get_dock( const QString &d ) +TQString get_dock( const TQString &d ) { if ( d == "0" ) return "&DockUnmanaged"; @@ -433,27 +433,27 @@ QString get_dock( const QString &d ) return ""; } -void Uic::createToolbarImpl( const QDomElement &n, const QString &parentClass, const QString &parent ) +void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { - QDomNodeList nl = n.elementsByTagName( "toolbar" ); + TQDomNodeList nl = n.elementsByTagName( "toolbar" ); for ( int i = 0; i < (int) nl.length(); i++ ) { - QDomElement ae = nl.item( i ).toElement(); - QString dock = get_dock( ae.attribute( "dock" ) ); - QString objName = getObjectName( ae ); - out << indent << objName << " = Qt::ToolBar(\"\", this, " << dock << ");" << endl; + TQDomElement ae = nl.item( i ).toElement(); + TQString dock = get_dock( ae.attribute( "dock" ) ); + TQString objName = getObjectName( ae ); + out << indent << objName << " = TQt::ToolBar(\"\", this, " << dock << ");" << endl; createObjectImpl( ae, parentClass, parent ); - for ( QDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "action" ) { out << indent << n2.attribute( "name" ) << "->addTo(" << objName << ");" << endl; } else if ( n2.tagName() == "separator" ) { out << indent << objName << "->addSeparator;" << endl; } else if ( n2.tagName() == "widget" ) { if ( n2.attribute( "class" ) != "Spacer" ) { - createObjectImpl( n2, "Qt::ToolBar", objName ); + createObjectImpl( n2, "TQt::ToolBar", objName ); } else { - QString child = createSpacerImpl( n, parentClass, parent, objName ); - out << indent << "Qt::Application->sendPostedEvents( $" << objName - << ", &Qt::Event::ChildInserted);" << endl; + TQString child = createSpacerImpl( n, parentClass, parent, objName ); + out << indent << "TQt::Application->sendPostedEvents( $" << objName + << ", &TQt::Event::ChildInserted);" << endl; out << indent << "$" << objName << "->boxLayout()->addItem(" << child << ");" << endl; } } @@ -461,20 +461,20 @@ void Uic::createToolbarImpl( const QDomElement &n, const QString &parentClass, c } } -void Uic::createMenuBarImpl( const QDomElement &n, const QString &parentClass, const QString &parent ) +void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { - QString objName = getObjectName( n ); - out << indent << objName << "= Qt::MenuBar( this, \"" << objName << "\");" << endl; + TQString objName = getObjectName( n ); + out << indent << objName << "= TQt::MenuBar( this, \"" << objName << "\");" << endl; createObjectImpl( n, parentClass, parent ); - QDomNodeList nl = n.elementsByTagName( "item" ); + TQDomNodeList nl = n.elementsByTagName( "item" ); int i = 0; - QDomElement c = n.firstChild().toElement(); + TQDomElement c = n.firstChild().toElement(); while ( !c.isNull() ) { if ( c.tagName() == "item" ) { - QString itemName = c.attribute( "name" ); + TQString itemName = c.attribute( "name" ); out << endl; - out << indent << itemName << " = Qt::PopupMenu( this );" << endl; + out << indent << itemName << " = TQt::PopupMenu( this );" << endl; createPopupMenuImpl( c, parentClass, itemName ); out << indent << objName << "->insertItem( \"\", " << itemName << ", " << i << " );" << endl; trout << indent << objName << "->findItem( " << i << " )->setText( " << trcall( c.attribute( "text" ) ) << " );" << endl; @@ -487,15 +487,15 @@ void Uic::createMenuBarImpl( const QDomElement &n, const QString &parentClass, c } } -void Uic::createPopupMenuImpl( const QDomElement &e, const QString &parentClass, const QString &parent ) +void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ) { - for ( QDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { + for ( TQDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "action" ) { - QDomElement n2 = n.nextSibling().toElement(); + TQDomElement n2 = n.nextSibling().toElement(); if ( n2.tagName() == "item" ) { // the action has a sub menu - QString itemName = n2.attribute( "name" ); - QString itemText = n2.attribute( "text" ); - out << indent << itemName << " = Qt::PopupMenu( this );" << endl; + TQString itemName = n2.attribute( "name" ); + TQString itemText = n2.attribute( "text" ); + out << indent << itemName << " = TQt::PopupMenu( this );" << endl; out << indent << parent << "->setAccel( tr( \"" << n2.attribute( "accel" ) << "\" ), " << endl; ++indent; out << indent << parent << "->insertItem( " << n.attribute( "name" ) << "->iconSet(),"; @@ -516,18 +516,18 @@ void Uic::createPopupMenuImpl( const QDomElement &e, const QString &parentClass, Creates implementation of an listbox item tag. */ -QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent, - QString *value ) +TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &parent, + TQString *value ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -536,8 +536,8 @@ QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent, if( !pix.isEmpty() && !externPixmaps ) pix.prepend( '$' ); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { - pix.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } @@ -559,16 +559,16 @@ QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent, Creates implementation of an iconview item tag. */ -QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent ) +TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &parent ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -577,8 +577,8 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent if( !pix.isEmpty() && !externPixmaps ) pix.prepend( '$' ); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { - pix.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } @@ -586,24 +586,24 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent } if ( pix.isEmpty() ) - return "Qt::IconViewItem(" + parent + ", " + trcall( txt, com ) + ");"; + return "TQt::IconViewItem(" + parent + ", " + trcall( txt, com ) + ");"; else - return "Qt::IconViewItem(" + parent + ", " + trcall( txt, com ) + ", " + pix + ");"; + return "TQt::IconViewItem(" + parent + ", " + trcall( txt, com ) + ", " + pix + ");"; } /*! Creates implementation of an listview item tag. */ -QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ) +TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ) { - QString s; + TQString s; - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); bool hasChildren = e.elementsByTagName( "item" ).count() > 0; - QString item; + TQString item; if ( hasChildren ) { item = "$" + registerObject( "item" ); @@ -618,25 +618,25 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent } if ( !parentItem.isEmpty() ) - s += "Qt::ListViewItem(" + parentItem + ", " + lastItem + ");\n"; + s += "TQt::ListViewItem(" + parentItem + ", " + lastItem + ");\n"; else - s += "Qt::ListViewItem(" + parent + ", " + lastItem + ");\n"; + s += "TQt::ListViewItem(" + parent + ", " + lastItem + ");\n"; - QStringList texts; - QStringList pixmaps; + TQStringList texts; + TQStringList pixmaps; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) texts << v.toString(); else if ( attrib == "pixmap" ) { - QString pix = v.toString(); + TQString pix = v.toString(); if( !pix.isEmpty() && !externPixmaps ) pix.prepend( '$' ); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { - pix.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } pixmaps << pix; } @@ -649,9 +649,9 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent for ( int i = 0; i < (int)texts.count(); ++i ) { if ( !texts[ i ].isEmpty() ) - s += indent + item + "->setText(" + QString::number( i ) + ", " + trcall( texts[ i ] ) + ");\n"; + s += indent + item + "->setText(" + TQString::number( i ) + ", " + trcall( texts[ i ] ) + ");\n"; if ( !pixmaps[ i ].isEmpty() ) - s += indent + item + "->setPixmap(" + QString::number( i ) + ", " + pixmaps[ i ] + ");\n"; + s += indent + item + "->setPixmap(" + TQString::number( i ) + ", " + pixmaps[ i ] + ");\n"; } lastItem = item; @@ -662,18 +662,18 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent Creates implementation of an listview column tag. */ -QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &parent, - QString *value ) +TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &parent, + TQString *value ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; bool clickable = FALSE, resizable = FALSE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -682,8 +682,8 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare if( !pix.isEmpty() && !externPixmaps ) pix.prepend( '$' ); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { - pix.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } else if ( attrib == "clickable" ) clickable = v.toBool(); @@ -696,7 +696,7 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare if ( value ) *value = trcall( txt, com ); - QString s; + TQString s; s = indent + parent + "->addColumn(" + trcall( txt, com ) + ");\n"; if ( !pix.isEmpty() ) s += indent + parent + "->header()->setLabel(" + parent + "->header()->count() - 1," + pix + ", " + trcall( txt, com ) + ");\n"; @@ -708,20 +708,20 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare return s; } -QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &parent, - QString *value ) +TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, + TQString *value ) { - QString objClass = getClassName( e.parentNode().toElement() ); - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; - QString field; + TQString objClass = getClassName( e.parentNode().toElement() ); + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; + TQString field; bool isRow = e.tagName() == "row"; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -730,8 +730,8 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare if( !pix.isEmpty() && !externPixmaps ) pix.prepend( '$' ); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { - pix.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } else if ( attrib == "field" ) field = v.toString(); @@ -744,32 +744,32 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare // ### This generated code sucks! We have to set the number of // rows/cols before and then only do setLabel/() - // ### careful, though, since QDataTable has an API which makes this code pretty good + // ### careful, though, since TQDataTable has an API which makes this code pretty good - QString s; + TQString s; if ( isRow ) { s = indent + parent + "->setNumRows(" + parent + "->numRows() + 1 );\n"; if ( pix.isEmpty() ) s += indent + parent + "->verticalHeader()->setLabel(" + parent + "->numRows() - 1, " + trcall( txt, com ) + ");\n"; else - s += indent + parent + "->verticalHeader()->setLabel(" + parent + "->numRows() - 1, Qt::IconSet(" + s += indent + parent + "->verticalHeader()->setLabel(" + parent + "->numRows() - 1, TQt::IconSet(" + pix + " ), " + trcall( txt, com ) + ");\n"; } else { - if ( objClass == "Qt::Table" ) { + if ( objClass == "TQt::Table" ) { s = indent + parent + "->setNumCols(" + parent + "->numCols() + 1);\n"; if ( pix.isEmpty() ) s += indent + parent + "->horizontalHeader()->setLabel(" + parent + "->numCols() - 1, " + trcall( txt, com ) + ");\n"; else - s += indent + parent + "->horizontalHeader()->setLabel(" + parent + "->numCols() - 1, Qt::IconSet(" + s += indent + parent + "->horizontalHeader()->setLabel(" + parent + "->numCols() - 1, TQt::IconSet(" + pix + " ), " + trcall( txt, com ) + ");\n"; - } else if ( objClass == "Qt::DataTable" ) { + } else if ( objClass == "TQt::DataTable" ) { if ( !txt.isEmpty() && !field.isEmpty() ) { if ( pix.isEmpty() ) out << indent << parent << "->addColumn(" << fixString( field ) << ", " << trcall( txt, com ) << ");" << endl; else - out << indent << parent << "->addColumn(" << fixString( field ) << ", " << trcall( txt, com ) << ", Qt::IconSet(" << pix << "));" << endl; + out << indent << parent << "->addColumn(" << fixString( field ) << ", " << trcall( txt, com ) << ", TQt::IconSet(" << pix << "));" << endl; } } } @@ -779,29 +779,29 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare /*! Creates the implementation of a layout tag. Called from createObjectImpl(). */ -QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout ) +TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout ) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); - QString qlayout = "Qt::VBoxLayout"; + TQString qlayout = "TQt::VBoxLayout"; if ( objClass == "hbox" ) - qlayout = "Qt::HBoxLayout"; + qlayout = "TQt::HBoxLayout"; else if ( objClass == "grid" ) - qlayout = "Qt::GridLayout"; + qlayout = "TQt::GridLayout"; bool isGrid = e.tagName() == "grid" ; objName = registerObject( "$" + getLayoutName( e ) ); layoutObjects += objName; - QString margin = DomTool::readProperty( e, "margin", defMargin ).toString(); - QString spacing = DomTool::readProperty( e, "spacing", defSpacing ).toString(); - QString resizeMode = DomTool::readProperty( e, "resizeMode", QString::null ).toString(); + TQString margin = DomTool::readProperty( e, "margin", defMargin ).toString(); + TQString spacing = DomTool::readProperty( e, "spacing", defSpacing ).toString(); + TQString resizeMode = DomTool::readProperty( e, "resizeMode", TQString::null ).toString(); - QString optcells; + TQString optcells; if ( isGrid ) optcells = "1, 1, "; - if ( (parentClass == "Qt::GroupBox" || parentClass == "Qt::ButtonGroup") && layout.isEmpty() ) { + if ( (parentClass == "TQt::GroupBox" || parentClass == "TQt::ButtonGroup") && layout.isEmpty() ) { // special case for group box out << indent << parent << "->setColumnLayout( 0, &Vertical );" << endl; out << indent << parent << "->layout()->setSpacing(" << spacing << ");" << endl; @@ -820,15 +820,15 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, out << ", " << optcells << margin << ", " << spacing << ", '" << objName << "');" << endl; } if ( !resizeMode.isEmpty() ) - out << indent << objName << "->setResizeMode( &Qt::Layout::" << resizeMode << " );" << endl; + out << indent << objName << "->setResizeMode( &TQt::Layout::" << resizeMode << " );" << endl; if ( !isGrid ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); out << indent << objName << "->addItem(" << child << ");" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); if ( isLayout( child ) ) out << indent << objName << "->addLayout(" << child << ");" << endl; else @@ -837,7 +837,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, } } else { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - QDomElement ae = n; + TQDomElement ae = n; int row = ae.attribute( "row" ).toInt(); int col = ae.attribute( "column" ).toInt(); int rowspan = ae.attribute( "rowspan" ).toInt(); @@ -847,7 +847,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, if ( colspan < 1 ) colspan = 1; if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); if ( rowspan * colspan != 1 ) out << indent << objName << "->addMultiCell(" << child << ", " << row << ", " << ( row + rowspan - 1 ) << ", " << col << ", " << col + colspan - 1 << ");" << endl; @@ -855,9 +855,9 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, out << indent << objName << "->addItem(" << child << ", " << row << ", " << col << ");" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); out << endl; - QString o = "Widget"; + TQString o = "Widget"; if ( isLayout( child ) ) o = "Layout"; if ( rowspan * colspan != 1 ) @@ -875,31 +875,31 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, -QString Uic::createSpacerImpl( const QDomElement &e, const QString& /*parentClass*/, const QString& /*parent*/, const QString& /*layout*/) +TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*parent*/, const TQString& /*layout*/) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); objName = registerObject( "$spacer" ); - QSize size = DomTool::readProperty( e, "sizeHint", QSize( 0, 0 ) ).toSize(); - QString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); + TQSize size = DomTool::readProperty( e, "sizeHint", TQSize( 0, 0 ) ).toSize(); + TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; if ( sizeType != "Expanding" && sizeType != "MinimumExpanding" && - DomTool::hasProperty( e, "geometry" ) ) { // compatibility Qt 2.2 - QRect geom = DomTool::readProperty( e, "geometry", QRect(0,0,0,0) ).toRect(); + DomTool::hasProperty( e, "geometry" ) ) { // compatibility TQt 2.2 + TQRect geom = DomTool::readProperty( e, "geometry", TQRect(0,0,0,0) ).toRect(); size = geom.size(); } if ( isVspacer ) - out << indent << "my " << objName << " = Qt::SpacerItem(" + out << indent << "my " << objName << " = TQt::SpacerItem(" << size.width() << ", " << size.height() - << ", &Qt::SizePolicy::Minimum, &Qt::SizePolicy::" << sizeType << ");" << endl; + << ", &TQt::SizePolicy::Minimum, &TQt::SizePolicy::" << sizeType << ");" << endl; else - out << indent << "my " << objName << " = Qt::SpacerItem(" + out << indent << "my " << objName << " = TQt::SpacerItem(" << size.width() << ", " << size.height() - << ", &Qt::SizePolicy::" << sizeType << ", &Qt::SizePolicy::Minimum);" << endl; + << ", &TQt::SizePolicy::" << sizeType << ", &TQt::SizePolicy::Minimum);" << endl; return objName; } @@ -914,35 +914,35 @@ static const char* const ColorRole[] = { /*! Creates a colorgroup with name \a name from the color group \a cg */ -void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) +void Uic::createColorGroupImpl( const TQString& name, const TQDomElement& e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QString color; + TQDomElement n = e.firstChild().toElement(); + TQString color; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - QColor col = DomTool::readColor( n ); - color = "Qt::Color(%1,%2,%3)"; + TQColor col = DomTool::readColor( n ); + color = "TQt::Color(%1,%2,%3)"; color = color.arg( col.red() ).arg( col.green() ).arg( col.blue() ); if ( col == white ) color = "&white"; else if ( col == black ) color = "&black"; if ( n.nextSibling().toElement().tagName() != "pixmap" ) { - out << indent << name << "->setColor(&Qt::ColorGroup::" << ColorRole[r] << ", " << color << ");" << endl; + out << indent << name << "->setColor(&TQt::ColorGroup::" << ColorRole[r] << ", " << color << ");" << endl; } } else if ( n.tagName() == "pixmap" ) { - QString pixmap = n.firstChild().toText().data(); + TQString pixmap = n.firstChild().toText().data(); if( !pixmap.isEmpty() && !externPixmaps ) pixmap.prepend( '$' ); if ( !pixmapLoaderFunction.isEmpty() ) { - pixmap.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - pixmap.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pixmap.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + pixmap.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } - out << indent << name << "->setBrush(&Qt::ColorGroup::" - << ColorRole[r] << ", Qt::Brush(" << color << ", " << pixmap << "));" << endl; + out << indent << name << "->setBrush(&TQt::ColorGroup::" + << ColorRole[r] << ", TQt::Brush(" << color << ", " << pixmap << "));" << endl; } n = n.nextSibling().toElement(); } @@ -952,16 +952,16 @@ void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) Auxiliary function to load a color group. The colorgroup must not contain pixmaps. */ -QColorGroup Uic::loadColorGroup( const QDomElement &e ) +TQColorGroup Uic::loadColorGroup( const TQDomElement &e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QColor col; + TQDomElement n = e.firstChild().toElement(); + TQColor col; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - cg.setColor( (QColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); + cg.setColor( (TQColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); } n = n.nextSibling().toElement(); } @@ -972,10 +972,10 @@ QColorGroup Uic::loadColorGroup( const QDomElement &e ) the database \a connection and \a table. */ -bool Uic::isWidgetInTable( const QDomElement& e, const QString& connection, const QString& table ) +bool Uic::isWidgetInTable( const TQDomElement& e, const TQString& connection, const TQString& table ) { - QString conn = getDatabaseInfo( e, "connection" ); - QString tab = getDatabaseInfo( e, "table" ); + TQString conn = getDatabaseInfo( e, "connection" ); + TQString tab = getDatabaseInfo( e, "table" ); if ( conn == connection && tab == table ) return TRUE; return FALSE; @@ -985,17 +985,17 @@ bool Uic::isWidgetInTable( const QDomElement& e, const QString& connection, cons Registers all database connections, cursors and forms. */ -void Uic::registerDatabases( const QDomElement& e ) +void Uic::registerDatabases( const TQDomElement& e ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); ++i ) { n = nl.item(i).toElement(); - QString conn = getDatabaseInfo( n, "connection" ); - QString tab = getDatabaseInfo( n, "table" ); - QString fld = getDatabaseInfo( n, "field" ); + TQString conn = getDatabaseInfo( n, "connection" ); + TQString tab = getDatabaseInfo( n, "table" ); + TQString fld = getDatabaseInfo( n, "field" ); if ( !conn.isNull() ) { dbConnections += conn; if ( !tab.isNull() ) { @@ -1015,7 +1015,7 @@ void Uic::registerDatabases( const QDomElement& e ) \sa registeredName(), isObjectRegistered() */ -QString Uic::registerObject( const QString& name ) +TQString Uic::registerObject( const TQString& name ) { if ( objectNames.isEmpty() ) { // some temporary variables we need @@ -1025,7 +1025,7 @@ QString Uic::registerObject( const QString& name ) objectNames += "pal"; } - QString result = name; + TQString result = name; int i; while ( ( i = result.find(' ' )) != -1 ) { result[i] = '_'; @@ -1033,10 +1033,10 @@ QString Uic::registerObject( const QString& name ) if ( objectNames.contains( result ) ) { int i = 2; - while ( objectNames.contains( result + "_" + QString::number(i) ) ) + while ( objectNames.contains( result + "_" + TQString::number(i) ) ) i++; result += "_"; - result += QString::number(i); + result += TQString::number(i); } objectNames += result; objectMapper.insert( name, result ); @@ -1049,7 +1049,7 @@ QString Uic::registerObject( const QString& name ) \sa registerObject(), isObjectRegistered() */ -QString Uic::registeredName( const QString& name ) +TQString Uic::registeredName( const TQString& name ) { if ( !objectMapper.contains( name ) ) return name; @@ -1059,22 +1059,22 @@ QString Uic::registeredName( const QString& name ) /*! Returns whether the object \a name was registered yet or not. */ -bool Uic::isObjectRegistered( const QString& name ) +bool Uic::isObjectRegistered( const TQString& name ) { return objectMapper.contains( name ); } /*! - Unifies the entries in stringlist \a list. Should really be a QStringList feature. + Unifies the entries in stringlist \a list. Should really be a TQStringList feature. */ -QStringList Uic::unique( const QStringList& list ) +TQStringList Uic::unique( const TQStringList& list ) { if ( list.isEmpty() ) return list; - QStringList result; - for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { + TQStringList result; + for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { if ( !result.contains(*it) ) result += *it; } @@ -1086,7 +1086,7 @@ QStringList Uic::unique( const QStringList& list ) /*! Creates an instance of class \a objClass, with parent \a parent and name \a objName */ -QString Uic::createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ) +TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ) { if ( objClass.mid( 4 ) == "ComboBox" ) { @@ -1095,7 +1095,7 @@ QString Uic::createObjectInstance( const QString& objClass, const QString& paren return objClass + "(" + parent + ", \"" + objName + "\")"; } -bool Uic::isLayout( const QString& name ) const +bool Uic::isLayout( const TQString& name ) const { return layoutObjects.contains( name ); } @@ -2,7 +2,7 @@ ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** Copyright (c) 2001 Phil Thompson <phil@river-bank.demon.co.uk> ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -29,16 +29,16 @@ #include <qpalette.h> #include <qvariant.h> -#ifndef Q_DUMMY_COMPARISON_OPERATOR -# warning "Defining Q_DUMMY_COMPARISON_OPERATOR" -# ifdef Q_FULL_TEMPLATE_INSTANTIATION -# define Q_DUMMY_COMPARISON_OPERATOR(C) \ +#ifndef TTQ_DUMMY_COMPARISON_OPERATOR +# warning "Defining TTQ_DUMMY_COMPARISON_OPERATOR" +# ifdef TTQ_FULL_TEMPLATE_INSTANTIATION +# define TTQ_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ qWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } # else -# define Q_DUMMY_COMPARISON_OPERATOR(C) +# define TTQ_DUMMY_COMPARISON_OPERATOR(C) # endif #endif @@ -50,110 +50,110 @@ public: void setTabStop(uint n) {tabStop = n; calc();} void operator++() {++current; calc();} void operator--() {--current; calc();} - operator QString() {return indstr;} + operator TQString() {return indstr;} private: uint tabStop; uint current; - QString indstr; + TQString indstr; void calc(); }; -class Uic : public Qt +class Uic : public TQt { public: - Uic( const QString &fn, const char *outputFn, QTextStream& outStream, - QDomDocument doc, bool subcl, const QString &trm, - const QString& subClass, bool omitForwardDecls, QString &uicClass ); + Uic( const TQString &fn, const char *outputFn, TQTextStream& outStream, + TQDomDocument doc, bool subcl, const TQString &trm, + const TQString& subClass, bool omitForwardDecls, TQString &uicClass ); static void setIndent(const PyIndent &pyind) {indent = pyind;} - void createFormImpl( const QDomElement &e ); - - void createSubImpl( const QDomElement &e, const QString& subclname ); - - void createObjectDecl( const QDomElement& e ); - void createAttrDecl( const QDomElement& e ); - void createActionDecl( const QDomElement& e ); - void createActionImpl( const QDomElement& e, const QString &parent ); - void createToolbarImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - void createMenuBarImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - void createPopupMenuImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - QString createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ); - QString createSpacerImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - void createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ); - QString createListBoxItemImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createIconViewItemImpl( const QDomElement &e, const QString &parent ); - QString createListViewColumnImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createTableRowColumnImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ); - void createColorGroupImpl( const QString& cg, const QDomElement& e ); - QColorGroup loadColorGroup( const QDomElement &e ); - - QDomElement getObjectProperty( const QDomElement& e, const QString& name ); - QString getPixmapLoaderFunction( const QDomElement& e ); - QString getFormClassName( const QDomElement& e ); - QString getClassName( const QDomElement& e ); - QString getObjectName( const QDomElement& e ); - QString getLayoutName( const QDomElement& e ); - QString getInclude( const QString& className ); - - QString setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ); - - QString registerObject( const QString& name ); - QString registeredName( const QString& name ); - bool isObjectRegistered( const QString& name ); - QStringList unique( const QStringList& ); - - QString trcall( const QString& sourceText, const QString& comment = "" ); - - static void embed( QTextStream& out, const char* project, const QStringList& images ); - - friend void getDBConnections(Uic& uic, QString& s); + void createFormImpl( const TQDomElement &e ); + + void createSubImpl( const TQDomElement &e, const TQString& subclname ); + + void createObjectDecl( const TQDomElement& e ); + void createAttrDecl( const TQDomElement& e ); + void createActionDecl( const TQDomElement& e ); + void createActionImpl( const TQDomElement& e, const TQString &parent ); + void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ); + TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ); + TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ); + void createColorGroupImpl( const TQString& cg, const TQDomElement& e ); + TQColorGroup loadColorGroup( const TQDomElement &e ); + + TQDomElement getObjectProperty( const TQDomElement& e, const TQString& name ); + TQString getPixmapLoaderFunction( const TQDomElement& e ); + TQString getFormClassName( const TQDomElement& e ); + TQString getClassName( const TQDomElement& e ); + TQString getObjectName( const TQDomElement& e ); + TQString getLayoutName( const TQDomElement& e ); + TQString getInclude( const TQString& className ); + + TQString setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ); + + TQString registerObject( const TQString& name ); + TQString registeredName( const TQString& name ); + bool isObjectRegistered( const TQString& name ); + TQStringList unique( const TQStringList& ); + + TQString trcall( const TQString& sourceText, const TQString& comment = "" ); + + static void embed( TQTextStream& out, const char* project, const TQStringList& images ); + + friend void getDBConnections(Uic& uic, TQString& s); private: - void registerLayouts ( const QDomElement& e ); - - QTextStream& out; - QTextOStream trout; - QString languageChangeBody; - QCString outputFileName; - QStringList objectNames; - QMap<QString,QString> objectMapper; - QStringList tags; - QStringList layouts; - QString formName; - QString lastItem; - QString trmacro; + void registerLayouts ( const TQDomElement& e ); + + TQTextStream& out; + TQTextOStream trout; + TQString languageChangeBody; + TQCString outputFileName; + TQStringList objectNames; + TQMap<TQString,TQString> objectMapper; + TQStringList tags; + TQStringList layouts; + TQString formName; + TQString lastItem; + TQString trmacro; bool nofwd; static PyIndent indent; struct Buddy { - Buddy( const QString& k, const QString& b ) + Buddy( const TQString& k, const TQString& b ) : key( k ), buddy( b ) {} Buddy(){} // for valuelist - QString key; - QString buddy; + TQString key; + TQString buddy; bool operator==( const Buddy& other ) const { return (key == other.key); } }; struct CustomInclude { - QString header; - QString location; - Q_DUMMY_COMPARISON_OPERATOR(CustomInclude) + TQString header; + TQString location; + TTQ_DUMMY_COMPARISON_OPERATOR(CustomInclude) }; - QValueList<Buddy> buddies; + TQValueList<Buddy> buddies; - QStringList layoutObjects; - bool isLayout( const QString& name ) const; + TQStringList layoutObjects; + bool isLayout( const TQString& name ) const; uint item_used : 1; uint cg_used : 1; @@ -161,35 +161,35 @@ private: uint stdsetdef : 1; uint externPixmaps : 1; - QString nameOfClass; - QStringList namespaces; - QString bareNameOfClass; - QString pixmapLoaderFunction; - - void registerDatabases( const QDomElement& e ); - bool isWidgetInTable( const QDomElement& e, const QString& connection, const QString& table ); - bool isFrameworkCodeGenerated( const QDomElement& e ); - QString getDatabaseInfo( const QDomElement& e, const QString& tag ); - void createFormImpl( const QDomElement& e, const QString& form, const QString& connection, const QString& table ); - void writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst, - const QString &subClass, const QString &descr ); - QStringList dbConnections; - QMap< QString, QStringList > dbCursors; - QMap< QString, QStringList > dbForms; + TQString nameOfClass; + TQStringList namespaces; + TQString bareNameOfClass; + TQString pixmapLoaderFunction; + + void registerDatabases( const TQDomElement& e ); + bool isWidgetInTable( const TQDomElement& e, const TQString& connection, const TQString& table ); + bool isFrameworkCodeGenerated( const TQDomElement& e ); + TQString getDatabaseInfo( const TQDomElement& e, const TQString& tag ); + void createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table ); + void writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList &typLst, const TQStringList &specLst, + const TQString &subClass, const TQString &descr ); + TQStringList dbConnections; + TQMap< TQString, TQStringList > dbCursors; + TQMap< TQString, TQStringList > dbForms; static bool isMainWindow; - static QString mkBool( bool b ); - static QString mkBool( const QString& s ); - bool toBool( const QString& s ); - static QString fixString( const QString &str, bool encode = FALSE ); + static TQString mkBool( bool b ); + static TQString mkBool( const TQString& s ); + bool toBool( const TQString& s ); + static TQString fixString( const TQString &str, bool encode = FALSE ); static bool onlyAscii; - static QString mkStdSet( const QString& prop ); - static QString getComment( const QDomNode& n ); - QVariant defSpacing, defMargin; - QString fileName; + static TQString mkStdSet( const TQString& prop ); + static TQString getComment( const TQDomNode& n ); + TQVariant defSpacing, defMargin; + TQString fileName; bool writeFunctImpl; - void perlSlot(QStringList::Iterator &it); + void perlSlot(TQStringList::Iterator &it); }; #endif diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp index 6c447d5..99b59d6 100644 --- a/puic/widgetdatabase.cpp +++ b/puic/widgetdatabase.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -43,17 +43,17 @@ const int dbsize = 300; const int dbcustom = 200; const int dbdictsize = 211; static WidgetDatabaseRecord* db[ dbsize ]; -static QDict<int> *className2Id = 0; +static TQDict<int> *className2Id = 0; static int dbcount = 0; static int dbcustomcount = 200; -static QStrList *wGroups; -static QStrList *invisibleGroups; +static TQStrList *wGroups; +static TQStrList *invisibleGroups; static bool whatsThisLoaded = FALSE; -static QPluginManager<WidgetInterface> *widgetPluginManager = 0; +static TQPluginManager<WidgetInterface> *widgetPluginManager = 0; static bool plugins_set_up = FALSE; static bool was_in_setup = FALSE; -QCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager; +TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager; WidgetDatabaseRecord::WidgetDatabaseRecord() { @@ -103,7 +103,7 @@ void WidgetDatabase::setupDataBase( int id ) { was_in_setup = TRUE; #ifndef UIC - Q_UNUSED( id ) + TTQ_UNUSED( id ) if ( dbcount ) return; #else @@ -117,18 +117,18 @@ void WidgetDatabase::setupDataBase( int id ) return; #endif - wGroups = new QStrList; - invisibleGroups = new QStrList; + wGroups = new TQStrList; + invisibleGroups = new TQStrList; invisibleGroups->append( "Forms" ); invisibleGroups->append( "Temp" ); - className2Id = new QDict<int>( dbdictsize ); + className2Id = new TQDict<int>( dbdictsize ); className2Id->setAutoDelete( TRUE ); WidgetDatabaseRecord *r = 0; r = new WidgetDatabaseRecord; r->iconSet = "designer_pushbutton.png"; - r->name = "QPushButton"; + r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; r->isCommon = TRUE; @@ -137,7 +137,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbutton.png"; - r->name = "QToolButton"; + r->name = "TQToolButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -145,7 +145,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_radiobutton.png"; - r->name = "QRadioButton"; + r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; r->isCommon = TRUE; @@ -154,7 +154,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_checkbox.png"; - r->name = "QCheckBox"; + r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; r->isCommon = TRUE; @@ -163,7 +163,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_groupbox.png"; - r->name = "QGroupBox"; + r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -172,7 +172,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_buttongroup.png"; - r->name = "QButtonGroup"; + r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -182,7 +182,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_frame.png"; - r->name = "QFrame"; + r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -191,7 +191,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QTabWidget"; + r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -200,7 +200,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_widgetstack.png"; - r->name = "QWidgetStack"; + r->name = "TQWidgetStack"; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; r->isContainer = TRUE; @@ -209,7 +209,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbox.png"; - r->name = "QToolBox"; + r->name = "TQToolBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; r->isContainer = TRUE; @@ -218,7 +218,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listbox.png"; - r->name = "QListBox"; + r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; r->isCommon = TRUE; @@ -227,37 +227,37 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listview.png"; - r->name = "QListView"; + r->name = "TQListView"; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; append( r ); -#if !defined(QT_NO_ICONVIEW) || defined(UIC) +#if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "designer_iconview.png"; - r->name = "QIconView"; + r->name = "TQIconView"; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; append( r ); #endif -#if !defined(QT_NO_TABLE) +#if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "designer_table.png"; - r->name = "QTable"; + r->name = "TQTable"; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; append( r ); #endif -#if !defined(QT_NO_SQL) +#if !defined(TQT_NO_SQL) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; r->includeFile = "qdatatable.h"; - r->name = "QDataTable"; + r->name = "TQDataTable"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lineedit.png"; - r->name = "QLineEdit"; + r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; r->isCommon = TRUE; @@ -275,7 +275,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_spinbox.png"; - r->name = "QSpinBox"; + r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; r->isCommon = TRUE; @@ -284,7 +284,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dateedit.png"; - r->name = "QDateEdit"; + r->name = "TQDateEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date Edit"; r->includeFile = "qdatetimeedit.h"; @@ -293,7 +293,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_timeedit.png"; - r->name = "QTimeEdit"; + r->name = "TQTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Time Edit"; r->includeFile = "qdatetimeedit.h"; @@ -302,7 +302,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_datetimeedit.png"; - r->name = "QDateTimeEdit"; + r->name = "TQDateTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date-Time Edit"; r->includeFile = "qdatetimeedit.h"; @@ -311,7 +311,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_multilineedit.png"; - r->name = "QMultiLineEdit"; + r->name = "TQMultiLineEdit"; r->group = widgetGroup( "Temp" ); r->toolTip = "Multi Line Edit"; @@ -319,7 +319,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_richtextedit.png"; - r->name = "QTextEdit"; + r->name = "TQTextEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; r->isCommon = TRUE; @@ -328,7 +328,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_combobox.png"; - r->name = "QComboBox"; + r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; r->isCommon = TRUE; @@ -337,7 +337,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_slider.png"; - r->name = "QSlider"; + r->name = "TQSlider"; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -345,7 +345,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_scrollbar.png"; - r->name = "QScrollBar"; + r->name = "TQScrollBar"; r->group = widgetGroup( "Input" ); r->toolTip = "Scrollbar"; @@ -353,7 +353,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dial.png"; - r->name = "QDial"; + r->name = "TQDial"; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -361,7 +361,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_label.png"; - r->name = "QLabel"; + r->name = "TQLabel"; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -388,7 +388,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lcdnumber.png"; - r->name = "QLCDNumber"; + r->name = "TQLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -406,7 +406,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_progress.png"; - r->name = "QProgressBar"; + r->name = "TQProgressBar"; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -414,7 +414,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textview.png"; - r->name = "QTextView"; + r->name = "TQTextView"; r->group = widgetGroup( "Temp" ); r->toolTip = "Text View"; @@ -422,7 +422,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textbrowser.png"; - r->name = "QTextBrowser"; + r->name = "TQTextBrowser"; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -438,35 +438,35 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QWidget"; + r->name = "TQWidget"; r->isForm = TRUE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = "QDialog"; + r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); r->isForm = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QWizard"; + r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QDesignerWizard"; + r->name = "TQDesignerWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QLayoutWidget"; + r->name = "TQLayoutWidget"; r->group = widgetGroup( "Temp" ); r->includeFile = ""; r->isContainer = TRUE; @@ -474,7 +474,7 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QSplitter"; + r->name = "TQSplitter"; r->group = widgetGroup( "Temp" ); r->includeFile = "qsplitter.h"; r->isContainer = TRUE; @@ -483,7 +483,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerTabWidget"; + r->name = "TQDesignerTabWidget"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -491,7 +491,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerWidget"; + r->name = "TQDesignerWidget"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -499,7 +499,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerDialog"; + r->name = "TQDesignerDialog"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -507,7 +507,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QMainWindow"; + r->name = "TQMainWindow"; r->includeFile = "qmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -516,7 +516,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDesignerAction"; + r->name = "TQDesignerAction"; r->includeFile = "qaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -525,7 +525,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDesignerActionGroup"; + r->name = "TQDesignerActionGroup"; r->includeFile = "qaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -534,17 +534,17 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QScrollView"; + r->name = "TQScrollView"; r->includeFile = "qscrollview.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; append( r ); -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataBrowser"; + r->name = "TQDataBrowser"; r->includeFile = "qdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; @@ -555,7 +555,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataView"; + r->name = "TQDataView"; r->includeFile = "qdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; @@ -575,8 +575,8 @@ void WidgetDatabase::setupPlugins() if ( plugins_set_up ) return; plugins_set_up = TRUE; - QStringList widgets = widgetManager()->featureList(); - for ( QStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { + TQStringList widgets = widgetManager()->featureList(); + for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { if ( hasWidget( *it ) ) continue; WidgetDatabaseRecord *r = new WidgetDatabaseRecord; @@ -586,11 +586,11 @@ void WidgetDatabase::setupPlugins() continue; #ifndef UIC - QIconSet icon = iface->iconSet( *it ); + TQIconSet icon = iface->iconSet( *it ); if ( !icon.pixmap().isNull() ) - r->icon = new QIconSet( icon ); + r->icon = new TQIconSet( icon ); #endif - QString grp = iface->group( *it ); + TQString grp = iface->group( *it ); if ( grp.isEmpty() ) grp = "3rd party widgets"; r->group = widgetGroup( grp ); @@ -629,24 +629,24 @@ int WidgetDatabase::startCustom() Returns the iconset which represents the class registered as \a id. */ -QIconSet WidgetDatabase::iconSet( int id ) +TQIconSet WidgetDatabase::iconSet( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QIconSet(); + return TQIconSet(); #if !defined(UIC) && !defined(RESOURCE) if ( !r->icon ) { if ( r->iconSet.isEmpty() ) - return QIconSet(); - QPixmap pix = QPixmap::fromMimeSource( r->iconSet ); + return TQIconSet(); + TQPixmap pix = TQPixmap::fromMimeSource( r->iconSet ); if ( pix.isNull() ) - pix = QPixmap( r->iconSet ); - r->icon = new QIconSet( pix ); + pix = TQPixmap( r->iconSet ); + r->icon = new TQIconSet( pix ); } return *r->icon; #else - return QIconSet(); + return TQIconSet(); #endif } @@ -654,12 +654,12 @@ QIconSet WidgetDatabase::iconSet( int id ) Returns the classname of the widget which is registered as \a id. */ -QString WidgetDatabase::className( int id ) +TQString WidgetDatabase::className( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->name; } @@ -667,12 +667,12 @@ QString WidgetDatabase::className( int id ) Returns the group the widget registered as \a id belongs to. */ -QString WidgetDatabase::group( int id ) +TQString WidgetDatabase::group( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->group; } @@ -680,12 +680,12 @@ QString WidgetDatabase::group( int id ) Returns the tooltip text of the widget which is registered as \a id. */ -QString WidgetDatabase::toolTip( int id ) +TQString WidgetDatabase::toolTip( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->toolTip; } @@ -693,12 +693,12 @@ QString WidgetDatabase::toolTip( int id ) Returns the what's this? text of the widget which is registered as \a id. */ -QString WidgetDatabase::whatsThis( int id ) +TQString WidgetDatabase::whatsThis( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->whatsThis; } @@ -706,12 +706,12 @@ QString WidgetDatabase::whatsThis( int id ) Returns the include file if the widget which is registered as \a id. */ -QString WidgetDatabase::includeFile( int id ) +TQString WidgetDatabase::includeFile( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; if ( r->includeFile.isNull() ) return r->name.lower() + ".h"; return r->includeFile; @@ -749,11 +749,11 @@ bool WidgetDatabase::isCommon( int id ) return r->isCommon; } -QString WidgetDatabase::createWidgetName( int id ) +TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); - QString n = className( id ); - if ( n == "QLayoutWidget" ) + TQString n = className( id ); + if ( n == "TQLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); @@ -764,14 +764,14 @@ QString WidgetDatabase::createWidgetName( int id ) WidgetDatabaseRecord *r = at( id ); if ( !r ) return n; - n += QString::number( ++r->nameCounter ); + n += TQString::number( ++r->nameCounter ); n[0] = n[0].lower(); return n; } /*! Returns the id for \a name or -1 if \a name is unknown. */ -int WidgetDatabase::idFromClassName( const QString &name ) +int WidgetDatabase::idFromClassName( const TQString &name ) { setupDataBase( -1 ); if ( name.isEmpty() ) @@ -780,7 +780,7 @@ int WidgetDatabase::idFromClassName( const QString &name ) if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( "QLayoutWidget" ); + return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); i = className2Id->find( name ); @@ -790,7 +790,7 @@ int WidgetDatabase::idFromClassName( const QString &name ) return -1; } -bool WidgetDatabase::hasWidget( const QString &name ) +bool WidgetDatabase::hasWidget( const TQString &name ) { return className2Id->find( name ) != 0; } @@ -813,7 +813,7 @@ void WidgetDatabase::insert( int index, WidgetDatabaseRecord *r ) db[ index ] = r; className2Id->insert( r->name, new int( index ) ); if ( index < dbcustom ) - dbcount = QMAX( dbcount, index ); + dbcount = TQMAX( dbcount, index ); } void WidgetDatabase::append( WidgetDatabaseRecord *r ) @@ -823,14 +823,14 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) insert( dbcount++, r ); } -QString WidgetDatabase::widgetGroup( const QString &g ) +TQString WidgetDatabase::widgetGroup( const TQString &g ) { if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } -bool WidgetDatabase::isGroupEmpty( const QString &grp ) +bool WidgetDatabase::isGroupEmpty( const TQString &grp ) { WidgetDatabaseRecord *r = 0; for ( int i = 0; i < dbcount; ++i ) { @@ -842,12 +842,12 @@ bool WidgetDatabase::isGroupEmpty( const QString &grp ) return TRUE; } -QString WidgetDatabase::widgetGroup( int i ) +TQString WidgetDatabase::widgetGroup( int i ) { setupDataBase( -1 ); if ( i >= 0 && i < (int)wGroups->count() ) return wGroups->at( i ); - return QString::null; + return TQString::null; } int WidgetDatabase::numWidgetGroups() @@ -856,7 +856,7 @@ int WidgetDatabase::numWidgetGroups() return wGroups->count(); } -bool WidgetDatabase::isGroupVisible( const QString &g ) +bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); return invisibleGroups->find( g ) == -1; @@ -868,8 +868,8 @@ int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) return dbcustomcount - 1; } -void WidgetDatabase::customWidgetClassNameChanged( const QString &oldName, - const QString &newName ) +void WidgetDatabase::customWidgetClassNameChanged( const TQString &oldName, + const TQString &newName ) { int id = idFromClassName( oldName ); if ( id == -1 ) @@ -901,16 +901,16 @@ bool WidgetDatabase::isWhatsThisLoaded() return whatsThisLoaded; } -void WidgetDatabase::loadWhatsThis( const QString &docPath ) +void WidgetDatabase::loadWhatsThis( const TQString &docPath ) { - QString whatsthisFile = docPath + "/whatsthis"; - QFile f( whatsthisFile ); + TQString whatsthisFile = docPath + "/whatsthis"; + TQFile f( whatsthisFile ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); while ( !ts.atEnd() ) { - QString s = ts.readLine(); - QStringList l = QStringList::split( " | ", s ); + TQString s = ts.readLine(); + TQStringList l = TQStringList::split( " | ", s ); int id = idFromClassName( l[ 1 ] ); WidgetDatabaseRecord *r = at( id ); if ( r ) @@ -920,30 +920,30 @@ void WidgetDatabase::loadWhatsThis( const QString &docPath ) } -// ### Qt 3.1: make these publically accessible via QWidgetDatabase API +// ### TQt 3.1: make these publically accessible via TQWidgetDatabase API #if defined(UIC) bool dbnounload = FALSE; -QStringList *dbpaths = 0; +TQStringList *dbpaths = 0; #else -extern QString *qwf_plugin_dir; +extern TQString *qwf_plugin_dir; #endif -QPluginManager<WidgetInterface> *widgetManager() +TQPluginManager<WidgetInterface> *widgetManager() { if ( !widgetPluginManager ) { - QString pluginDir = "/designer"; + TQString pluginDir = "/designer"; #if !defined(UIC) if ( qwf_plugin_dir ) pluginDir = *qwf_plugin_dir; #endif - widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, QApplication::libraryPaths(), pluginDir ); + widgetPluginManager = new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir ); cleanup_manager.add( &widgetPluginManager ); #if defined(UIC) if ( dbnounload ) widgetPluginManager->setAutoUnload( FALSE ); if ( dbpaths ) { - QStringList::ConstIterator it = dbpaths->begin(); + TQStringList::ConstIterator it = dbpaths->begin(); for ( ; it != dbpaths->end(); ++it ) widgetPluginManager->addLibraryPath( *it ); } diff --git a/puic/widgetdatabase.h b/puic/widgetdatabase.h index dee809d..37baa6d 100644 --- a/puic/widgetdatabase.h +++ b/puic/widgetdatabase.h @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,22 +27,22 @@ #include <private/qpluginmanager_p.h> -extern QPluginManager<WidgetInterface> *widgetManager(); +extern TQPluginManager<WidgetInterface> *widgetManager(); struct WidgetDatabaseRecord { WidgetDatabaseRecord(); ~WidgetDatabaseRecord(); - QString iconSet, name, group, toolTip, whatsThis, includeFile; + TQString iconSet, name, group, toolTip, whatsThis, includeFile; uint isContainer : 1; uint isForm : 1; uint isCommon : 1; uint isPlugin : 1; - QIconSet *icon; + TQIconSet *icon; int nameCounter; }; -class WidgetDatabase : public Qt +class WidgetDatabase : public TQt { public: WidgetDatabase(); @@ -52,38 +52,38 @@ public: static int count(); static int startCustom(); - static QIconSet iconSet( int id ); - static QString className( int id ); - static QString group( int id ); - static QString toolTip( int id ); - static QString whatsThis( int id ); - static QString includeFile( int id ); + static TQIconSet iconSet( int id ); + static TQString className( int id ); + static TQString group( int id ); + static TQString toolTip( int id ); + static TQString whatsThis( int id ); + static TQString includeFile( int id ); static bool isForm( int id ); static bool isContainer( int id ); static bool isCommon( int id ); - static int idFromClassName( const QString &name ); - static QString createWidgetName( int id ); + static int idFromClassName( const TQString &name ); + static TQString createWidgetName( int id ); static WidgetDatabaseRecord *at( int index ); static void insert( int index, WidgetDatabaseRecord *r ); static void append( WidgetDatabaseRecord *r ); - static QString widgetGroup( const QString &g ); - static QString widgetGroup( int i ); + static TQString widgetGroup( const TQString &g ); + static TQString widgetGroup( int i ); static int numWidgetGroups(); - static bool isGroupVisible( const QString &g ); - static bool isGroupEmpty( const QString &grp ); + static bool isGroupVisible( const TQString &g ); + static bool isGroupEmpty( const TQString &grp ); static int addCustomWidget( WidgetDatabaseRecord *r ); static bool isCustomWidget( int id ); static bool isCustomPluginWidget( int id ); static bool isWhatsThisLoaded(); - static void loadWhatsThis( const QString &docPath ); + static void loadWhatsThis( const TQString &docPath ); - static bool hasWidget( const QString &name ); - static void customWidgetClassNameChanged( const QString &oldName, const QString &newName ); + static bool hasWidget( const TQString &name ); + static void customWidgetClassNameChanged( const TQString &oldName, const TQString &newName ); }; diff --git a/puic/widgetinterface.h b/puic/widgetinterface.h index bf6bcd5..530d812 100644 --- a/puic/widgetinterface.h +++ b/puic/widgetinterface.h @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000-2001 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -23,7 +23,7 @@ #include <private/qwidgetinterface_p.h> -#define WidgetInterface QWidgetFactoryInterface -#define IID_Widget IID_QWidgetFactory +#define WidgetInterface TQWidgetFactoryInterface +#define IID_Widget IID_TQWidgetFactory #endif diff --git a/smoke/Makefile.in b/smoke/Makefile.in index 957c292..dfb559b 100644 --- a/smoke/Makefile.in +++ b/smoke/Makefile.in @@ -104,14 +104,14 @@ LIBUCB = @LIBUCB@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ +LIB_TQPE = @LIB_TQPE@ LIB_QT = @LIB_QT@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MOC = @MOC@ +TQMOC = @TQMOC@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -122,9 +122,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ +TQTE_NORTTI = @TQTE_NORTTI@ +TQT_INCLUDES = @TQT_INCLUDES@ +TQT_LDFLAGS = @TQT_LDFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -236,7 +236,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>+ 3 cd $(top_srcdir) && \ $(AUTOMAKE) --gnu smoke/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/smoke/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) @@ -539,7 +539,7 @@ docs-am: force-reedit: cd $(top_srcdir) && \ $(AUTOMAKE) --gnu smoke/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/smoke/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/Makefile.in #>+ 5 diff --git a/smoke/qt/Makefile.in b/smoke/qt/Makefile.in index 8fdbc30..6a98cac 100644 --- a/smoke/qt/Makefile.in +++ b/smoke/qt/Makefile.in @@ -104,14 +104,14 @@ LIBUCB = @LIBUCB@ LIBUTIL = @LIBUTIL@ LIBZ = @LIBZ@ LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ +LIB_TQPE = @LIB_TQPE@ LIB_QT = @LIB_QT@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MOC = @MOC@ +TQMOC = @TQMOC@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ OBJEXT = @OBJEXT@ @@ -122,9 +122,9 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ +TQTE_NORTTI = @TQTE_NORTTI@ +TQT_INCLUDES = @TQT_INCLUDES@ +TQT_LDFLAGS = @TQT_LDFLAGS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -304,7 +304,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>+ 3 cd $(top_srcdir) && \ $(AUTOMAKE) --gnu smoke/qt/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/smoke/qt/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/qt/Makefile.in Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) qtguess.pl: $(top_builddir)/config.status qtguess.pl.in @@ -630,7 +630,7 @@ docs-am: force-reedit: cd $(top_srcdir) && \ $(AUTOMAKE) --gnu smoke/qt/Makefile - cd $(top_srcdir) && perl admin/am_edit PerlQt-3.008/smoke/qt/Makefile.in + cd $(top_srcdir) && perl admin/am_edit PerlTQt-3.008/smoke/qt/Makefile.in #>+ 9 diff --git a/smoke/qt/generate.pl.in b/smoke/qt/generate.pl.in index 5f4a669..4fa8cd4 100644 --- a/smoke/qt/generate.pl.in +++ b/smoke/qt/generate.pl.in @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -## Run this first, to generate the x_*.cpp files from the Qt headers +## Run this first, to generate the x_*.cpp files from the TQt headers ## using kalyptus my $kalyptusdir = "../../kalyptus"; @@ -25,7 +25,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; } mkdir $finaloutdir unless (-d $finaloutdir); -# Load the QT_NO_* macros found in "qtdefines". They'll be passed to kalyptus +# Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus my $macros=""; if ( -e $definespath ){ print "Found '$defines'. Reading preprocessor symbols from there...\n"; @@ -39,9 +39,9 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change # We don't want all of them - e.g. not template-based stuff my %excludes = ( 'qaccessible.h' => 1, # Accessibility support is not compiled by defaut - 'qassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1) + 'qassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1) 'qmotif.h' => 1, # - 'qmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1) + 'qmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1) 'qmotifdialog.h' => 1, # 'qxt.h' => 1, # Xt 'qxtwidget.h' => 1, # Xt @@ -49,11 +49,11 @@ my %excludes = ( 'qgl.h' => 1, # OpenGL 'qglcolormap.h' => 1, # OpenGL 'qnp.h' => 1, # NSPlugin - 'qttableview.h' => 1, # Not in Qt anymore... - 'qtmultilineedit.h' => 1, # Not in Qt anymore... + 'qttableview.h' => 1, # Not in TQt anymore... + 'qtmultilineedit.h' => 1, # Not in TQt anymore... 'qwidgetfactory.h' => 1, # Just an interface - 'qsharedmemory.h' => 1, # "not part of the Qt API" they say - 'qwindowsstyle.h' => 1, # Qt windowsstyle, plugin + 'qsharedmemory.h' => 1, # "not part of the TQt API" they say + 'qwindowsstyle.h' => 1, # TQt windowsstyle, plugin 'qmotifstyle.h' => 1, 'qcompactstyle.h' => 1, 'qinterlacestyle.h' => 1, @@ -64,7 +64,7 @@ my %excludes = ( 'qwindowsxpstyle.h' => 1 # play on the safe side ); -# Some systems have a QTDIR = KDEDIR = PREFIX +# Some systems have a TQTDIR = KDEDIR = PREFIX # We need a complete list my %includes; @@ -78,18 +78,18 @@ if("@KDE_HAVE_GL@" eq "yes") open(DEFS, $definespath); my @defs = <DEFS>; close DEFS; - if(!grep(/QT_NO_OPENGL/, @defs)) + if(!grep(/TQT_NO_OPENGL/, @defs)) { $excludes{'qgl.h'} = undef; $excludes{'qglcolormap.h'} = undef; } else { - print STDERR "Qt was not compiled with OpenGL support...\n Skipping QGL Classes.\n"; + print STDERR "TQt was not compiled with OpenGL support...\n Skipping TQGL Classes.\n"; } } -# List Qt headers, and exclude the ones listed above +# List TQt headers, and exclude the ones listed above my @headers = (); $qtinc= '@qt_includes@'; diff --git a/smoke/qt/qt_smoke.h b/smoke/qt/qt_smoke.h index 22d8d23..3ca29df 100644 --- a/smoke/qt/qt_smoke.h +++ b/smoke/qt/qt_smoke.h @@ -1,9 +1,9 @@ -#ifndef QT_SMOKE_H -#define QT_SMOKE_H +#ifndef TQT_SMOKE_H +#define TQT_SMOKE_H // Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files extern Smoke* qt_Smoke; -class QGlobalSpace { }; +class TQGlobalSpace { }; #endif diff --git a/smoke/qt/qtguess.pl.in b/smoke/qt/qtguess.pl.in index a5fc6b2..c23530e 100644 --- a/smoke/qt/qtguess.pl.in +++ b/smoke/qt/qtguess.pl.in @@ -1,6 +1,6 @@ #!/usr/bin/perl -# qtguess.pl : check how Qt was compiled. Issue a list of all defined QT_NO_* macros, one per line. +# qtguess.pl : check how TQt was compiled. Issue a list of all defined TQT_NO_* macros, one per line. # # author: germain Garand <germain@ebooksfrance.com> # licence: GPL v.2 @@ -17,9 +17,9 @@ use vars qw/$opt_f $opt_o $opt_p/; getopts('qo:f:t:'); # Threshold : -# 0 - test basic Qt types/classes +# 0 - test basic TQt types/classes # 5 - test higher level, non-gui classes -# 8 - test options of the above (ex: QT_NO_IMAGE_SMOOTHSCALE) +# 8 - test options of the above (ex: TQT_NO_IMAGE_SMOOTHSCALE) # 10 - test basic widgets # 12 - test composite widgets # 13 - test widgets inheriting composite widgets @@ -52,21 +52,21 @@ $x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g; $qtflags =~ s/\$\((.*?)\)/$x{$1}/g; - -e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n"; + -e "$qtinc/qglobal.h" or die "Invalid TQt directory.\n"; my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags"; my $threshold = defined($opt_t)?$opt_t : $default_threshold; $threshold >= 0 or die "invalid testing threshold: $threshold\n"; -print "Checking how Qt was built... \n"; +print "Checking how TQt was built... \n"; print "Threshold is set to $threshold\n" unless $opt_q; my($count, $used, $total); map{ $tests{$_}->[2]>=$threshold ? ($used++, $total++):$total++ } keys %tests; print "Number of defines to be tested : $used/$total\n\n" unless $opt_q; -open( QTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n"; +open( TQTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n"; grab_qglobal_symbols(); preliminary_test(); @@ -74,7 +74,7 @@ perform_all_tests(); print +scalar(keys %qtdefs) . " defines found.\n"; -print QTDEFS join("\n", keys %qtdefs), "\n"; +print TQTDEFS join("\n", keys %qtdefs), "\n"; close; #--------------------------------------------------------------# @@ -100,14 +100,14 @@ sub grab_qglobal_symbols { if( check_exit_status($?) ) { - while( $symbols =~/^#\s*define\s*(QT_\S+)/gm ) + while( $symbols =~/^#\s*define\s*(TQT_\S+)/gm ) { $qtdefs{$1} = 1; } print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs)); - while( $symbols =~/^#\s*define\s*QT_MODULE_(\S+)/gm ) + while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)/gm ) { - $qtundefs{"QT_NO_$1"} = 1; + $qtundefs{"TQT_NO_$1"} = 1; } print "Found ". scalar( keys %qtundefs )." undefined symbol".((scalar( keys %qtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtundefs)); last; @@ -133,7 +133,7 @@ sub preliminary_test #include <qapplication.h> int main( int argc, char **argv ) { - QApplication foo( argc, argv ); + TQApplication foo( argc, argv ); return 0; } £; @@ -248,254 +248,254 @@ BEGIN { # "DEFINE" => ["header-1.h,... header-n.h", "main() code", priority, "Definitions (if needed)"] our %tests = ( - "QT_NO_ACCEL" => ["qaccel.h", "QAccel foo( (QWidget*)NULL );", 5], - "QT_NO_ACTION" => ["qaction.h", "QAction foo( (QObject*)NULL );", 5], - "QT_NO_ASYNC_IO" => ["qasyncio.h", "QAsyncIO foo();", 5], - "QT_NO_ASYNC_IMAGE_IO"=> ["qasyncimageio.h", "QImageDecoder foo( (QImageConsumer*) NULL );", 5], - "QT_NO_BIG_CODECS" => ["qbig5codec.h", "QBig5Codec foo();", 5], - "QT_NO_BUTTON" => ["qbutton.h", "QButton foo( (QWidget*)NULL );", 10], - "QT_NO_BUTTONGROUP" => ["qbuttongroup.h", "QButtonGroup foo( (QWidget*)NULL );", 12], - "QT_NO_CANVAS" => ["qcanvas.h", "QCanvas foo( (QObject*)NULL );", 10], - "QT_NO_CHECKBOX" => ["qcheckbox.h", "QCheckBox( (QWidget*)NULL );", 10], - "QT_NO_CLIPBOARD" => ["qapplication.h, qclipboard.h", q£ - QApplication foo( argc, argv ); - QClipboard *baz= foo.clipboard(); + "TQT_NO_ACCEL" => ["qaccel.h", "TQAccel foo( (TQWidget*)NULL );", 5], + "TQT_NO_ACTION" => ["qaction.h", "TQAction foo( (TQObject*)NULL );", 5], + "TQT_NO_ASYNC_IO" => ["qasyncio.h", "TQAsyncIO foo();", 5], + "TQT_NO_ASYNC_IMAGE_IO"=> ["qasyncimageio.h", "TQImageDecoder foo( (TQImageConsumer*) NULL );", 5], + "TQT_NO_BIG_CODECS" => ["qbig5codec.h", "TQBig5Codec foo();", 5], + "TQT_NO_BUTTON" => ["qbutton.h", "TQButton foo( (TQWidget*)NULL );", 10], + "TQT_NO_BUTTONGROUP" => ["qbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12], + "TQT_NO_CANVAS" => ["qcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10], + "TQT_NO_CHECKBOX" => ["qcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10], + "TQT_NO_CLIPBOARD" => ["qapplication.h, qclipboard.h", q£ + TQApplication foo( argc, argv ); + TQClipboard *baz= foo.clipboard(); £, 5], - "QT_NO_COLORDIALOG" => ["qcolordialog.h", "QColorDialog::customCount();", 12], - "QT_NO_COMBOBOX" => ["qcombobox.h", "QComboBox( (QWidget*)NULL );", 10], - "QT_NO_COMPAT" => ["qfontmetrics.h", q£ - QFontMetrics *foo= new QFontMetrics( QFont() ); + "TQT_NO_COLORDIALOG" => ["qcolordialog.h", "TQColorDialog::customCount();", 12], + "TQT_NO_COMBOBOX" => ["qcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10], + "TQT_NO_COMPAT" => ["qfontmetrics.h", q£ + TQFontMetrics *foo= new TQFontMetrics( TQFont() ); int bar = foo->width( 'c' ); £, 0], - "QT_NO_COMPONENT" => ["qapplication.h", q£ - QApplication foo( argc, argv ); - foo.addLibraryPath( QString::null ); + "TQT_NO_COMPONENT" => ["qapplication.h", q£ + TQApplication foo( argc, argv ); + foo.addLibraryPath( TQString::null ); £, 5], - "QT_NO_CURSOR" => ["qcursor.h", "QCursor foo;", 5], - "QT_NO_DATASTREAM" => ["qdatastream.h", "QDataStream foo;", 5], - "QT_NO_DATETIMEEDIT" => ["qdatetimeedit.h", "QTimeEdit foo;", 12], - "QT_NO_DIAL" => ["qdial.h", "QDial foo;", 10], - "QT_NO_DIALOG" => ["qdialog.h", "QDialog foo;", 12], - "QT_NO_DIR" => ["qdir.h", "QDir foo;", 5], - "QT_NO_DNS" => ["qdns.h", "QDns foo;", 5], - "QT_NO_DOM" => ["qdom.h", "QDomDocumentType foo;", 5], - "QT_NO_DRAGANDDROP" => ["qevent.h", "QDropEvent foo( QPoint(1,1) );", 5], - "QT_NO_DRAWUTIL" => ["qdrawutil.h, qcolor.h", "qDrawPlainRect( (QPainter *) NULL, 0, 0, 0, 0, QColor() );", 10], - "QT_NO_ERRORMESSAGE" => ["qerrormessage.h", "QErrorMessage foo( (QWidget*) NULL );", 13], - "QT_NO_FILEDIALOG" => ["qfiledialog.h", "QFileIconProvider foo;", 13], - - "QT_NO_FONTDATABASE" => ["qfontdatabase.h", "QFontDatabase foo;", 5], - "QT_NO_FONTDIALOG" => ["qfontdialog.h", "QFontDialog::getFont( (bool *)NULL );", 12], - "QT_NO_FRAME" => ["qframe.h", "QFrame foo;", 10], - "QT_NO_GRID" => ["qgrid.h", "QGrid foo(5);", 12], - "QT_NO_GRIDVIEW" => ["qgridview.h", "QFoo foo;", 13, q£ - class QFoo: public QGridView + "TQT_NO_CURSOR" => ["qcursor.h", "TQCursor foo;", 5], + "TQT_NO_DATASTREAM" => ["qdatastream.h", "TQDataStream foo;", 5], + "TQT_NO_DATETIMEEDIT" => ["qdatetimeedit.h", "TQTimeEdit foo;", 12], + "TQT_NO_DIAL" => ["qdial.h", "TQDial foo;", 10], + "TQT_NO_DIALOG" => ["qdialog.h", "TQDialog foo;", 12], + "TQT_NO_DIR" => ["qdir.h", "TQDir foo;", 5], + "TQT_NO_DNS" => ["qdns.h", "TQDns foo;", 5], + "TQT_NO_DOM" => ["qdom.h", "TQDomDocumentType foo;", 5], + "TQT_NO_DRAGANDDROP" => ["qevent.h", "TQDropEvent foo( TQPoint(1,1) );", 5], + "TQT_NO_DRAWUTIL" => ["qdrawutil.h, qcolor.h", "qDrawPlainRect( (TQPainter *) NULL, 0, 0, 0, 0, TQColor() );", 10], + "TQT_NO_ERRORMESSAGE" => ["qerrormessage.h", "TQErrorMessage foo( (TQWidget*) NULL );", 13], + "TQT_NO_FILEDIALOG" => ["qfiledialog.h", "TQFileIconProvider foo;", 13], + + "TQT_NO_FONTDATABASE" => ["qfontdatabase.h", "TQFontDatabase foo;", 5], + "TQT_NO_FONTDIALOG" => ["qfontdialog.h", "TQFontDialog::getFont( (bool *)NULL );", 12], + "TQT_NO_FRAME" => ["qframe.h", "TQFrame foo;", 10], + "TQT_NO_GRID" => ["qgrid.h", "TQGrid foo(5);", 12], + "TQT_NO_GRIDVIEW" => ["qgridview.h", "TQFoo foo;", 13, q£ + class TQFoo: public TQGridView { public: - QFoo(){}; - ~QFoo(){}; - void paintCell(QPainter *, int, int){}; + TQFoo(){}; + ~TQFoo(){}; + void paintCell(TQPainter *, int, int){}; }; £], - "QT_NO_GROUPBOX" => ["qgroupbox.h", "QGroupBox foo;", 12], - "QT_NO_HBOX" => ["qhbox.h", "QHBox foo;", 12], - "QT_NO_HBUTTONGROUP" => ["qhbuttongroup.h", "QHButtonGroup foo;", 13], - "QT_NO_HEADER" => ["qheader.h", "QHeader foo;", 10], - "QT_NO_HGROUPBOX" => ["qhgroupbox.h", "QHGroupBox foo;", 13], - "QT_NO_ICONSET" => ["qiconset.h", "QIconSet foo;", 8], + "TQT_NO_GROUPBOX" => ["qgroupbox.h", "TQGroupBox foo;", 12], + "TQT_NO_HBOX" => ["qhbox.h", "TQHBox foo;", 12], + "TQT_NO_HBUTTONGROUP" => ["qhbuttongroup.h", "TQHButtonGroup foo;", 13], + "TQT_NO_HEADER" => ["qheader.h", "TQHeader foo;", 10], + "TQT_NO_HGROUPBOX" => ["qhgroupbox.h", "TQHGroupBox foo;", 13], + "TQT_NO_ICONSET" => ["qiconset.h", "TQIconSet foo;", 8], - "QT_NO_ICONVIEW" => ["qiconview.h", "QIconView foo;", 13], - "QT_NO_IMAGEFORMATPLUGIN" => ["qimageformatplugin.h, qstringlist.h", "QFoo foo;", 5, q£ + "TQT_NO_ICONVIEW" => ["qiconview.h", "TQIconView foo;", 13], + "TQT_NO_IMAGEFORMATPLUGIN" => ["qimageformatplugin.h, qstringlist.h", "TQFoo foo;", 5, q£ - class QFoo: public QImageFormatPlugin + class TQFoo: public TQImageFormatPlugin { public: - QFoo() {}; - ~QFoo() {}; - QStringList keys() const { return QStringList(); }; - bool installIOHandler( const QString &format ) { return true; }; + TQFoo() {}; + ~TQFoo() {}; + TQStringList keys() const { return TQStringList(); }; + bool installIOHandler( const TQString &format ) { return true; }; }; - Q_EXPORT_PLUGIN( QFoo ) + TTQ_EXPORT_PLUGIN( TQFoo ) £], - "QT_NO_IMAGE_DITHER_TO_1" => ["qimage.h", q£ - QImage *foo = new QImage; + "TQT_NO_IMAGE_DITHER_TO_1" => ["qimage.h", q£ + TQImage *foo = new TQImage; foo->createAlphaMask(); £, 8], - "QT_NO_IMAGE_HEURISTIC_MASK" => ["qimage.h", q£ - QImage *foo = new QImage; + "TQT_NO_IMAGE_HEURISTIC_MASK" => ["qimage.h", q£ + TQImage *foo = new TQImage; foo->createHeuristicMask(); £, 8], - "QT_NO_IMAGE_MIRROR" => ["qimage.h", q£ - QImage *foo = new QImage; + "TQT_NO_IMAGE_MIRROR" => ["qimage.h", q£ + TQImage *foo = new TQImage; foo->mirror(); £, 8], - "QT_NO_IMAGE_SMOOTHSCALE" => ["qimage.h", q£ - QImage *foo = new QImage; + "TQT_NO_IMAGE_SMOOTHSCALE" => ["qimage.h", q£ + TQImage *foo = new TQImage; foo->smoothScale( 10, 10); £, 8], - "QT_NO_IMAGE_TEXT" => ["qimage.h", "QImageTextKeyLang foo;", 8], - "QT_NO_IMAGE_TRANSFORMATION" => ["qimage.h", q£ - QImage *foo = new QImage; + "TQT_NO_IMAGE_TEXT" => ["qimage.h", "TQImageTextKeyLang foo;", 8], + "TQT_NO_IMAGE_TRANSFORMATION" => ["qimage.h", q£ + TQImage *foo = new TQImage; foo->scale( 10, 10); £, 8], - "QT_NO_IMAGE_TRUECOLOR" => ["qimage.h", q£ - QImage *foo = new QImage; - foo->convertDepthWithPalette( 1, (QRgb*) NULL, 1 ); + "TQT_NO_IMAGE_TRUECOLOR" => ["qimage.h", q£ + TQImage *foo = new TQImage; + foo->convertDepthWithPalette( 1, (TQRgb*) NULL, 1 ); £, 8], - "QT_NO_INPUTDIALOG" => ["qinputdialog.h, qstring.h", q£QInputDialog::getText( QString::null, QString::null);£, 13], - "QT_NO_IMAGEIO" => ["qbitmap.h, qstring.h", q£ - QBitmap foo( QString::fromLatin1("foobar") ); + "TQT_NO_INPUTDIALOG" => ["qinputdialog.h, qstring.h", q£TQInputDialog::getText( TQString::null, TQString::null);£, 13], + "TQT_NO_IMAGEIO" => ["qbitmap.h, qstring.h", q£ + TQBitmap foo( TQString::fromLatin1("foobar") ); £, 5], - "QT_NO_IMAGEIO_JPEG" => ["qjpegio.h", "qInitJpegIO();", 8], - "QT_NO_IMAGEIO_MNG" => ["qmngio.h", "qInitMngIO();", 8], - "QT_NO_IMAGEIO_PNG" => ["qpngio.h", "qInitPngIO();", 8], - "QT_NO_LABEL" => ["qlabel.h", "QLabel foo( (QWidget*) NULL );", 10], - "QT_NO_LAYOUT" => ["qlayout.h", "QFoo foo;", 10, q£ + "TQT_NO_IMAGEIO_JPEG" => ["qjpegio.h", "qInitJpegIO();", 8], + "TQT_NO_IMAGEIO_MNG" => ["qmngio.h", "qInitMngIO();", 8], + "TQT_NO_IMAGEIO_PNG" => ["qpngio.h", "qInitPngIO();", 8], + "TQT_NO_LABEL" => ["qlabel.h", "TQLabel foo( (TQWidget*) NULL );", 10], + "TQT_NO_LAYOUT" => ["qlayout.h", "TQFoo foo;", 10, q£ - class QFoo: public QLayout + class TQFoo: public TQLayout { public: - QFoo() {}; - ~QFoo() {}; - void addItem( QLayoutItem * ) { }; - QSize sizeHint() const { return QSize(); } - QLayoutIterator iterator() { return QLayoutIterator( (QGLayoutIterator *) NULL ); }; - void setGeometry( const QRect & ) { }; + TQFoo() {}; + ~TQFoo() {}; + void addItem( TQLayoutItem * ) { }; + TQSize sizeHint() const { return TQSize(); } + TQLayoutIterator iterator() { return TQLayoutIterator( (TQGLayoutIterator *) NULL ); }; + void setGeometry( const TQRect & ) { }; }; £], - "QT_NO_LCDNUMBER" => ["qlcdnumber.h", "QLCDNumber foo;", 12], - "QT_NO_LINEEDIT" => ["qlineedit.h", "QLineEdit foo( (QWidget *) NULL );", 12], - "QT_NO_LISTBOX" => ["qlistbox.h", "QListBox foo;", 13], - "QT_NO_LISTVIEW" => ["qlistview.h", "QListView foo;", 13], - "QT_NO_MAINWINDOW" => ["qmainwindow.h", "QMainWindow foo;", 13], - "QT_NO_MENUBAR" => ["qmenubar.h", "QMenuBar foo;", 13], - "QT_NO_MOVIE" => ["qmovie.h", "QMovie foo;", 5], - "QT_NO_MENUDATA" => ["qmenudata.h", "QMenuData foo;", 9], - "QT_NO_MESSAGEBOX" => ["qmessagebox.h", "QMessageBox foo;", 13], - "QT_NO_MIME" => ["qmime.h", "QMimeSourceFactory foo;", 5], - "QT_NO_MIMECLIPBOARD" => ["qapplication.h, qclipboard.h", q£ - QApplication foo( argc, argv ); - QClipboard *baz= foo.clipboard(); + "TQT_NO_LCDNUMBER" => ["qlcdnumber.h", "TQLCDNumber foo;", 12], + "TQT_NO_LINEEDIT" => ["qlineedit.h", "TQLineEdit foo( (TQWidget *) NULL );", 12], + "TQT_NO_LISTBOX" => ["qlistbox.h", "TQListBox foo;", 13], + "TQT_NO_LISTVIEW" => ["qlistview.h", "TQListView foo;", 13], + "TQT_NO_MAINWINDOW" => ["qmainwindow.h", "TQMainWindow foo;", 13], + "TQT_NO_MENUBAR" => ["qmenubar.h", "TQMenuBar foo;", 13], + "TQT_NO_MOVIE" => ["qmovie.h", "TQMovie foo;", 5], + "TQT_NO_MENUDATA" => ["qmenudata.h", "TQMenuData foo;", 9], + "TQT_NO_MESSAGEBOX" => ["qmessagebox.h", "TQMessageBox foo;", 13], + "TQT_NO_MIME" => ["qmime.h", "TQMimeSourceFactory foo;", 5], + "TQT_NO_MIMECLIPBOARD" => ["qapplication.h, qclipboard.h", q£ + TQApplication foo( argc, argv ); + TQClipboard *baz= foo.clipboard(); baz->data(); £, 8], - "QT_NO_MULTILINEEDIT" => ["qmultilineedit.h", "QMultiLineEdit foo;", 14], - "QT_NO_NETWORK" => ["qnetwork.h", "qInitNetworkProtocols();", 5], - "QT_NO_NETWORKPROTOCOL" => ["qnetworkprotocol.h", "QNetworkProtocol foo;", 8], - "QT_NO_NETWORKPROTOCOL_FTP" => ["qftp.h", "QFtp foo;", 9], - "QT_NO_PALETTE" => ["qpalette.h", "QColorGroup foo;", 5], - "QT_NO_PICTURE" => ["qpicture.h", "QPicture foo;", 5], - "QT_NO_PIXMAP_TRANSFORMATION" =>["qbitmap.h, qwmatrix.h", q£ - QBitmap *foo= new QBitmap(); - QWMatrix bar; + "TQT_NO_MULTILINEEDIT" => ["qmultilineedit.h", "TQMultiLineEdit foo;", 14], + "TQT_NO_NETWORK" => ["qnetwork.h", "qInitNetworkProtocols();", 5], + "TQT_NO_NETWORKPROTOCOL" => ["qnetworkprotocol.h", "TQNetworkProtocol foo;", 8], + "TQT_NO_NETWORKPROTOCOL_FTP" => ["qftp.h", "TQFtp foo;", 9], + "TQT_NO_PALETTE" => ["qpalette.h", "TQColorGroup foo;", 5], + "TQT_NO_PICTURE" => ["qpicture.h", "TQPicture foo;", 5], + "TQT_NO_PIXMAP_TRANSFORMATION" =>["qbitmap.h, qwmatrix.h", q£ + TQBitmap *foo= new TQBitmap(); + TQWMatrix bar; foo->xForm( bar ); £, 5], - "QT_NO_POPUPMENU" => ["qpopupmenu.h", "QPopupMenu foo;", 12], - "QT_NO_PRINTER" => ["qprinter.h", "QPrinter foo;", 5], - "QT_NO_PRINTDIALOG" => ["qprintdialog.h", "QPrintDialog foo( (QPrinter*) NULL );", 13], - "QT_NO_PROCESS" => ["qprocess.h", "QProcess foo;", 5], - "QT_NO_PROGRESSBAR" => ["qprogressbar.h", "QProgressBar foo;", 12], - "QT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "QProgressDialog foo;", 13], - "QT_NO_PUSHBUTTON" => ["qpushbutton.h", "QPushButton foo( (QWidget *) NULL );", 12], - "QT_NO_PROPERTIES" => ["qmetaobject.h", "QMetaProperty foo;", 0], -# "QT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "QT_NO_QTTABLEVIEW" => ["qttableview.h", "QFoo foo;", 16, q£ -# class QFoo: public QtTableView + "TQT_NO_POPUPMENU" => ["qpopupmenu.h", "TQPopupMenu foo;", 12], + "TQT_NO_PRINTER" => ["qprinter.h", "TQPrinter foo;", 5], + "TQT_NO_PRINTDIALOG" => ["qprintdialog.h", "TQPrintDialog foo( (TQPrinter*) NULL );", 13], + "TQT_NO_PROCESS" => ["qprocess.h", "TQProcess foo;", 5], + "TQT_NO_PROGRESSBAR" => ["qprogressbar.h", "TQProgressBar foo;", 12], + "TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13], + "TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12], + "TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0], +# "TQT_NO_TQTMULTILINEEDIT" => ["qtmultilineedit.h", "TQtMultiLineEdit foo;", 15], +# "TQT_NO_TQTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ +# class TQFoo: public TQtTableView # { # public: -# QFoo() {}; -# ~QFoo() {}; -# void paintCell( QPainter *, int, int) {}; +# TQFoo() {}; +# ~TQFoo() {}; +# void paintCell( TQPainter *, int, int) {}; # }; # £], - "QT_NO_QUUID_STRING" => ["quuid.h", "QUuid foo( QString::null );", 8], - "QT_NO_RANGECONTROL" => ["qrangecontrol.h", "QRangeControl foo;", 10], - "QT_NO_REGEXP" => ["qregexp.h", "QRegExp foo;", 5], - "QT_NO_REGEXP_WILDCARD" => ["qregexp.h", q£ - QRegExp foo; + "TQT_NO_TQUUID_STRING" => ["quuid.h", "TQUuid foo( TQString::null );", 8], + "TQT_NO_RANGECONTROL" => ["qrangecontrol.h", "TQRangeControl foo;", 10], + "TQT_NO_REGEXP" => ["qregexp.h", "TQRegExp foo;", 5], + "TQT_NO_REGEXP_WILDCARD" => ["qregexp.h", q£ + TQRegExp foo; foo.wildcard(); £, 8], - "QT_NO_REMOTE" => ["qapplication.h", q£ - QApplication foo( argc, argv ); + "TQT_NO_REMOTE" => ["qapplication.h", q£ + TQApplication foo( argc, argv ); foo.remoteControlEnabled(); £, 15], - "QT_NO_RADIOBUTTON" => ["qradiobutton.h", "QRadioButton foo( (QWidget *) NULL );", 12], - "QT_NO_RICHTEXT" => ["qsimplerichtext.h, qstring.h, qfont.h", "QSimpleRichText foo( QString::null, QFont() );", 10], - "QT_NO_SCROLLBAR" => ["qscrollbar.h", "QScrollBar foo( (QWidget *) NULL );", 12], - "QT_NO_SCROLLVIEW" => ["qscrollview.h", "QScrollView foo;", 12], - "QT_NO_SEMIMODAL" => ["qsemimodal.h", "QSemiModal foo;", 10], - "QT_NO_SESSIONMANAGER" => ["qapplication.h", q£ - QApplication foo( argc, argv ); + "TQT_NO_RADIOBUTTON" => ["qradiobutton.h", "TQRadioButton foo( (TQWidget *) NULL );", 12], + "TQT_NO_RICHTEXT" => ["qsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10], + "TQT_NO_SCROLLBAR" => ["qscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12], + "TQT_NO_SCROLLVIEW" => ["qscrollview.h", "TQScrollView foo;", 12], + "TQT_NO_SEMIMODAL" => ["qsemimodal.h", "TQSemiModal foo;", 10], + "TQT_NO_SESSIONMANAGER" => ["qapplication.h", q£ + TQApplication foo( argc, argv ); foo.sessionId(); £, 15], - "QT_NO_SETTINGS" => ["qsettings.h", "QSettings foo;", 5], - "QT_NO_SIGNALMAPPER" => ["qsignalmapper.h", "QSignalMapper foo( (QObject *) NULL );", 0], - "QT_NO_SIZEGRIP" => ["qsizegrip.h", "QSizeGrip foo( (QWidget *) NULL );", 10], - "QT_NO_SLIDER" => ["qslider.h", "QSlider foo( (QWidget *) NULL );", 12], - "QT_NO_SOUND" => ["qsound.h", "QSound foo( QString::null );", 5], + "TQT_NO_SETTINGS" => ["qsettings.h", "TQSettings foo;", 5], + "TQT_NO_SIGNALMAPPER" => ["qsignalmapper.h", "TQSignalMapper foo( (TQObject *) NULL );", 0], + "TQT_NO_SIZEGRIP" => ["qsizegrip.h", "TQSizeGrip foo( (TQWidget *) NULL );", 10], + "TQT_NO_SLIDER" => ["qslider.h", "TQSlider foo( (TQWidget *) NULL );", 12], + "TQT_NO_SOUND" => ["qsound.h", "TQSound foo( TQString::null );", 5], - "QT_NO_SPINWIDGET" => ["qrangecontrol.h", "QSpinWidget foo;", 10], - "QT_NO_SPRINTF" => ["qcolor.h", q£ - QColor foo; + "TQT_NO_SPINWIDGET" => ["qrangecontrol.h", "TQSpinWidget foo;", 10], + "TQT_NO_SPRINTF" => ["qcolor.h", q£ + TQColor foo; foo.name(); £, 0], - "QT_NO_SQL" => ["qsqlcursor.h", "QSqlCursor foo;", 5], - "QT_NO_STRINGLIST" => ["qstringlist.h", "QStringList foo;", 0], - "QT_NO_STYLE" => ["qapplication.h", q£ - QApplication foo( argc, argv ); + "TQT_NO_SQL" => ["qsqlcursor.h", "TQSqlCursor foo;", 5], + "TQT_NO_STRINGLIST" => ["qstringlist.h", "TQStringList foo;", 0], + "TQT_NO_STYLE" => ["qapplication.h", q£ + TQApplication foo( argc, argv ); foo.style(); £, 15], -# "QT_NO_STYLE_CDE" => ["qcdestyle.h", "QCDEStyle foo;", 16], -# "QT_NO_STYLE_COMPACT" => ["qcompactstyle.h", "QCompactStyle foo;", 16], -# "QT_NO_STYLE_INTERLACE" => ["qinterlacestyle.h", "QInterlaceStyle foo;", 16], -# "QT_NO_STYLE_PLATINUM" => ["qplatinumstyle.h", "QPlatinumStyle foo;", 16], -# "QT_NO_STYLE_MOTIF" => ["qmotifstyle.h", "QMotifStyle foo;", 16], -# "QT_NO_STYLE_MOTIFPLUS" => ["qmotifplusstyle.h", "QMotifPlusStyle foo;", 16], -# "QT_NO_STYLE_SGI" => ["qsgistyle.h", "QSGIStyle foo;", 16], -# "QT_NO_STYLE_WINDOWS" => ["qwindowsstyle.h", "QWindowsStyle foo;", 16], - "QT_NO_TABBAR" => ["qtabbar.h", "QTabBar foo;", 10], - "QT_NO_TABDIALOG" => ["qtabdialog.h", "QTabDialog foo;", 12], - "QT_NO_TABLE" => ["qtable.h", "QTable foo;", 10], - "QT_NO_TABWIDGET" => ["qtabwidget.h", "QTabWidget foo;", 10], - "QT_NO_TEXTBROWSER" => ["qtextbrowser.h", "QTextBrowser foo;", 14], - "QT_NO_TEXTCODEC" => ["qtextcodec.h", "QTextCodec::codecForIndex(1);", 5], - "QT_NO_TEXTCODECPLUGIN" => ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "QFoo foo;", 6, q£ +# "TQT_NO_STYLE_CDE" => ["qcdestyle.h", "TQCDEStyle foo;", 16], +# "TQT_NO_STYLE_COMPACT" => ["qcompactstyle.h", "TQCompactStyle foo;", 16], +# "TQT_NO_STYLE_INTERLACE" => ["qinterlacestyle.h", "TQInterlaceStyle foo;", 16], +# "TQT_NO_STYLE_PLATINUM" => ["qplatinumstyle.h", "TQPlatinumStyle foo;", 16], +# "TQT_NO_STYLE_MOTIF" => ["qmotifstyle.h", "TQMotifStyle foo;", 16], +# "TQT_NO_STYLE_MOTIFPLUS" => ["qmotifplusstyle.h", "TQMotifPlusStyle foo;", 16], +# "TQT_NO_STYLE_SGI" => ["qsgistyle.h", "TQSGIStyle foo;", 16], +# "TQT_NO_STYLE_WINDOWS" => ["qwindowsstyle.h", "TQWindowsStyle foo;", 16], + "TQT_NO_TABBAR" => ["qtabbar.h", "TQTabBar foo;", 10], + "TQT_NO_TABDIALOG" => ["qtabdialog.h", "TQTabDialog foo;", 12], + "TQT_NO_TABLE" => ["qtable.h", "TQTable foo;", 10], + "TQT_NO_TABWIDGET" => ["qtabwidget.h", "TQTabWidget foo;", 10], + "TQT_NO_TEXTBROWSER" => ["qtextbrowser.h", "TQTextBrowser foo;", 14], + "TQT_NO_TEXTCODEC" => ["qtextcodec.h", "TQTextCodec::codecForIndex(1);", 5], + "TQT_NO_TEXTCODECPLUGIN" => ["qtextcodecplugin.h, qstringlist.h, qvaluelist.h, qtextcodec.h", "TQFoo foo;", 6, q£ - class QFoo: public QTextCodecPlugin + class TQFoo: public TQTextCodecPlugin { public: - QFoo() {}; - ~QFoo() {}; - QStringList names() const {return QStringList();} - QValueList<int>mibEnums() const {return QValueList<int>();} - QTextCodec *createForName( const QString & name ) {return (QTextCodec *)NULL;} - QTextCodec *createForMib( int mib ) {return (QTextCodec *)NULL;} + TQFoo() {}; + ~TQFoo() {}; + TQStringList names() const {return TQStringList();} + TQValueList<int>mibEnums() const {return TQValueList<int>();} + TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;} + TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;} }; - Q_EXPORT_PLUGIN( QFoo ) + TTQ_EXPORT_PLUGIN( TQFoo ) £], - "QT_NO_TEXTEDIT" => ["qtextedit.h", "QTextEdit foo;", 13], - "QT_NO_TEXTSTREAM" => ["qtextstream.h", "QTextStream foo;", 5], - "QT_NO_TEXTVIEW" => ["qtextview.h", "QTextView foo;", 14], #Obsolete - "QT_NO_TOOLBAR" => ["qtoolbar.h", "QToolBar foo;", 10], - "QT_NO_TOOLBUTTON" => ["qtoolbutton.h", "QToolButton foo((QWidget *) NULL );", 12], - "QT_NO_TOOLTIP" => ["qtooltip.h", "QToolTip::hide();", 10], + "TQT_NO_TEXTEDIT" => ["qtextedit.h", "TQTextEdit foo;", 13], + "TQT_NO_TEXTSTREAM" => ["qtextstream.h", "TQTextStream foo;", 5], + "TQT_NO_TEXTVIEW" => ["qtextview.h", "TQTextView foo;", 14], #Obsolete + "TQT_NO_TOOLBAR" => ["qtoolbar.h", "TQToolBar foo;", 10], + "TQT_NO_TOOLBUTTON" => ["qtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12], + "TQT_NO_TOOLTIP" => ["qtooltip.h", "TQToolTip::hide();", 10], - "QT_NO_TRANSFORMATIONS" => ["qpainter.h", q£ - QPainter *foo= new QPainter(); + "TQT_NO_TRANSFORMATIONS" => ["qpainter.h", q£ + TQPainter *foo= new TQPainter(); foo->setViewXForm( true );£, 5], - "QT_NO_VARIANT" => ["qvariant.h", "QVariant foo;", 0], - "QT_NO_WHATSTHIS" => ["qwhatsthis.h", "QWhatsThis::inWhatsThisMode();", 10], - "QT_NO_WHEELEVENT" => ["qevent.h", "QWheelEvent foo( QPoint(1,1), 1, 1 );", 5], - "QT_NO_WIDGET_TOPEXTRA" => ["qwidget.h", "QWidget foo; foo.caption();", 9], - "QT_NO_WIDGETSTACK" => ["qwidgetstack.h", "QWidgetStack foo;", 13], - "QT_NO_WIZARD" => ["qwizard.h", "QWizard foo;", 13], - "QT_NO_WMATRIX" => ["qwmatrix.h", "QWMatrix foo;", 0], - "QT_NO_XML" => ["qxml.h", "QXmlNamespaceSupport foo;", 5], + "TQT_NO_VARIANT" => ["qvariant.h", "TQVariant foo;", 0], + "TQT_NO_WHATSTHIS" => ["qwhatsthis.h", "TQWhatsThis::inWhatsThisMode();", 10], + "TQT_NO_WHEELEVENT" => ["qevent.h", "TQWheelEvent foo( TQPoint(1,1), 1, 1 );", 5], + "TQT_NO_WIDGET_TOPEXTRA" => ["qwidget.h", "TQWidget foo; foo.caption();", 9], + "TQT_NO_WIDGETSTACK" => ["qwidgetstack.h", "TQWidgetStack foo;", 13], + "TQT_NO_WIZARD" => ["qwizard.h", "TQWizard foo;", 13], + "TQT_NO_WMATRIX" => ["qwmatrix.h", "TQWMatrix foo;", 0], + "TQT_NO_XML" => ["qxml.h", "TQXmlNamespaceSupport foo;", 5], ); } diff --git a/smoke/smoke.h b/smoke/smoke.h index 91acea8..d0943af 100644 --- a/smoke/smoke.h +++ b/smoke/smoke.h @@ -72,7 +72,7 @@ public: * # is an object * ? is a non-scalar (reference to array or hash, undef) * - * e.g. QApplication(int &, char **) becomes QApplication$? + * e.g. TQApplication(int &, char **) becomes TQApplication$? */ struct MethodMap { Index classId; // Index into classes @@ -1,4 +1,4 @@ smoke -PerlQt +PerlTQt puic @@ -1,4 +1,4 @@ -BEGIN{ chdir("PerlQt/t") or die "couldn't chdir to PerlQt: $!\n" } +BEGIN{ chdir("PerlTQt/t") or die "couldn't chdir to PerlTQt: $!\n" } END{ chdir("../..") or die "couldn't chdir to ../..\n" } use blib; |
