From edb9650a0deee1426f9fade5db5d0e0fd6a0e06e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 6 Oct 2018 22:06:01 +0900 Subject: [PATCH 1/4] Moved to /usr folder instead of /opt/trinity. This relates to bug 266. Signed-off-by: Michele Calgaro --- dcopperl/Makefile.PL | 4 ++-- kalyptus/kalyptus.spec.in | 2 +- kjsembed/docs/examples/imageinfo/imagescale.js | 2 +- qtruby/INSTALL | 2 +- tdejava/koala.kdevprj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL index af1a3d14..807c6f49 100644 --- a/dcopperl/Makefile.PL +++ b/dcopperl/Makefile.PL @@ -4,8 +4,8 @@ use Config; # the contents of the Makefile that is written. print "Trying to find some configuration information...\n"; -my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity'; -my $qt_dir = $ENV{TQTDIR} || '/opt/trinity/lib'; +my $tde_dirs = $ENV{TDEDIRS} || '/usr'; +my $qt_dir = $ENV{TQTDIR} || '/usr/lib'; my $tde_inc = "$tde_dirs/include"; my $tde_lib = "$tde_dirs/lib"; my $qt_inc = "$qt_dir/include"; diff --git a/kalyptus/kalyptus.spec.in b/kalyptus/kalyptus.spec.in index 6fdf86fb..4260a625 100644 --- a/kalyptus/kalyptus.spec.in +++ b/kalyptus/kalyptus.spec.in @@ -1,6 +1,6 @@ # You might want to change the next 2 lines, the rest should be ok %define qtdir /usr/lib/qt-3.0.0 -Prefix: /opt/trinity +Prefix: /usr Name: kalyptus Icon: kde-icon.xpm diff --git a/kjsembed/docs/examples/imageinfo/imagescale.js b/kjsembed/docs/examples/imageinfo/imagescale.js index d0921cd9..996144f1 100644 --- a/kjsembed/docs/examples/imageinfo/imagescale.js +++ b/kjsembed/docs/examples/imageinfo/imagescale.js @@ -1,4 +1,4 @@ -#!/opt/trinity/bin/kjscmd +#!/usr/bin/kjscmd // // Load an image, scale it, and save it in the specified format. diff --git a/qtruby/INSTALL b/qtruby/INSTALL index 94fc7787..c4165afb 100644 --- a/qtruby/INSTALL +++ b/qtruby/INSTALL @@ -28,7 +28,7 @@ To build the Qt.so extension, provide 'extconf.rb' with the directories where the Qt and Smoke libraries are installed: $ cd qtruby/rubylib/qtruby -$ ruby extconf.rb --with-smoke-dir=/opt/trinity \ +$ ruby extconf.rb --with-smoke-dir=/usr \ --with-qt-dir=/home/duke/src/kde/HEAD/qt-copy $ make $ make install diff --git a/tdejava/koala.kdevprj b/tdejava/koala.kdevprj index 1dbf6985..d07cf954 100644 --- a/tdejava/koala.kdevprj +++ b/tdejava/koala.kdevprj @@ -80,7 +80,7 @@ install_location= type=DATA [Workspace_1] -browser_file=file:/opt/trinity/share/doc/tde/HTML/default/tdevelop/about/intro.html +browser_file=file:/usr/share/doc/tde/HTML/default/tdevelop/about/intro.html cpp_file=/local/src/kde/tdebindings/tdejava/koala/tdejava/KKeyChooser.cpp header_file=Untitled.h openfiles=Untitled.h,Untitled.cpp,/local/src/kde/tdebindings/tdejava/koala/main.cpp,/local/src/kde/tdebindings/tdejava/koala/tdejava/TDEIO.cpp,/local/src/kde/tdebindings/tdejava/koala/tdejava/KKeyChooser.cpp -- 2.20.1 From b0768b8783ed42c8fa77468d08d7b7843ac5ebb2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 7 Oct 2018 20:39:00 +0900 Subject: [PATCH 2/4] qtruby -> tqtruby renaming. This relates to bug 266. Signed-off-by: Michele Calgaro --- ChangeLog | 2 +- Makefile.am.in | 6 +- README | 4 +- korundum/AUTHORS | 2 +- korundum/ChangeLog | 12 +- korundum/README | 2 +- korundum/bin/Makefile.am | 6 +- korundum/rubylib/korundum/Korundum.cpp | 8 +- korundum/rubylib/korundum/Makefile.am | 4 +- korundum/rubylib/korundum/tdehandlers.cpp | 2 +- qtruby/bin/Makefile.am | 9 - qtruby/rubylib/Makefile.am | 1 - qtruby/rubylib/designer/uilib/extconf.rb | 6 - qtruby/rubylib/qtruby/Makefile.am | 15 - qtruby/rubylib/qtruby/lib/Makefile.am | 4 - qtruby/rubylib/qtruby/lib/Qt.rb | 1 - qtruby/rubylib/qtruby/lib/Qt/Makefile.am | 2 - {qtruby => tqtruby}/AUTHORS | 4 +- {qtruby => tqtruby}/COPYING | 4 +- {qtruby => tqtruby}/ChangeLog | 172 +++---- {qtruby => tqtruby}/INSTALL | 56 +-- {qtruby => tqtruby}/Makefile.am | 0 {qtruby => tqtruby}/README | 50 +- {qtruby => tqtruby}/README.1st | 0 {qtruby => tqtruby}/TODO | 6 +- tqtruby/bin/Makefile.am | 9 + qtruby/bin/rbqtapi => tqtruby/bin/rbtqtapi | 14 +- qtruby/bin/rbqtsh => tqtruby/bin/rbtqtsh | 26 +- .../bin/tqtrubyinit.cpp | 0 tqtruby/rubylib/Makefile.am | 1 + .../rubylib/designer/Makefile.am | 0 .../designer/examples/colortool/Makefile | 0 .../designer/examples/colortool/README | 2 +- .../examples/colortool/colornameform.ui | 0 .../examples/colortool/colornameform.ui.rb | 0 .../designer/examples/colortool/findform.ui | 0 .../examples/colortool/findform.ui.rb | 0 .../examples/colortool/images/editcopy | Bin .../examples/colortool/images/editcopy.png | Bin .../examples/colortool/images/editcut | Bin .../examples/colortool/images/editcut.png | Bin .../examples/colortool/images/editraise.png | Bin .../examples/colortool/images/filenew | Bin .../examples/colortool/images/filenew.png | Bin .../examples/colortool/images/fileopen | Bin .../examples/colortool/images/fileopen.png | Bin .../examples/colortool/images/filesave | Bin .../examples/colortool/images/filesave.png | Bin .../examples/colortool/images/iconview.png | Bin .../colortool/images/richtextedit.png | Bin .../examples/colortool/images/searchfind | Bin .../examples/colortool/images/searchfind.png | Bin .../examples/colortool/images/table.png | Bin .../examples/colortool/images/tabwidget.png | Bin .../examples/colortool/images/widgetstack.png | Bin .../designer/examples/colortool/main.rb | 2 +- .../designer/examples/colortool/mainform.ui | 0 .../examples/colortool/mainform.ui.rb | 2 +- .../examples/colortool/optionsform.ui | 0 .../rubylib/designer/rbuic/LICENSE.GPL | 0 .../rubylib/designer/rbuic/Makefile.am | 0 .../rubylib/designer/rbuic/TODO | 0 .../rubylib/designer/rbuic/domtool.cpp | 10 +- .../rubylib/designer/rbuic/domtool.h | 10 +- .../rubylib/designer/rbuic/embed.cpp | 16 +- .../rubylib/designer/rbuic/form.cpp | 18 +- .../rubylib/designer/rbuic/globaldefs.h | 2 +- .../rubylib/designer/rbuic/main.cpp | 18 +- .../rubylib/designer/rbuic/object.cpp | 12 +- .../rubylib/designer/rbuic/parser.cpp | 6 +- .../rubylib/designer/rbuic/parser.h | 2 +- .../rubylib/designer/rbuic/rbuic.pro | 2 +- .../rubylib/designer/rbuic/subclassing.cpp | 4 +- .../rubylib/designer/rbuic/uic.cpp | 14 +- .../rubylib/designer/rbuic/uic.h | 4 +- .../rubylib/designer/rbuic/widgetdatabase.cpp | 2 +- .../rubylib/designer/rbuic/widgetdatabase.h | 4 +- .../rubylib/designer/rbuic/widgetinterface.h | 2 +- .../rubylib/designer/uilib/Makefile.am | 4 +- tqtruby/rubylib/designer/uilib/extconf.rb | 6 + .../rubylib/designer/uilib/test/test.rb | 2 +- .../rubylib/designer/uilib/tqui.cpp | 12 +- .../rubylib/examples/base/kicons.rb | 2 +- .../rubylib/examples/base/rui.rb | 8 +- .../rubylib/examples/canvastest/canvastest.rb | 2 +- .../examples/killerfilter/killerfilter.rb | 4 +- .../network/clientserver/client/client.rb | 2 +- .../network/clientserver/server/server.rb | 2 +- .../examples/passivepopup/passivepopup.rb | 2 +- .../rubylib/examples/ruboids/Manifest | 0 .../rubylib/examples/ruboids/README | 4 +- .../rubylib/examples/ruboids/TODO | 0 .../rubylib/examples/ruboids/boids.properties | 0 .../examples/ruboids/generateManifest.rb | 0 .../rubylib/examples/ruboids/index.html | 4 +- .../rubylib/examples/ruboids/release.rb | 0 .../rubylib/examples/ruboids/ruboids/Boid.rb | 0 .../examples/ruboids/ruboids/BoidView.rb | 0 .../examples/ruboids/ruboids/Camera.rb | 0 .../examples/ruboids/ruboids/CameraDialog.rb | 2 +- .../examples/ruboids/ruboids/Canvas.rb | 2 +- .../rubylib/examples/ruboids/ruboids/Cloud.rb | 0 .../examples/ruboids/ruboids/CloudView.rb | 2 +- .../rubylib/examples/ruboids/ruboids/Flock.rb | 0 .../examples/ruboids/ruboids/Graphics.rb | 0 .../examples/ruboids/ruboids/Params.rb | 0 .../rubylib/examples/ruboids/ruboids/Point.rb | 0 .../rubylib/examples/ruboids/ruboids/Thing.rb | 0 .../examples/ruboids/ruboids/Triangle.rb | 0 .../rubylib/examples/ruboids/ruboids/View.rb | 0 .../rubylib/examples/ruboids/ruboids/World.rb | 2 +- .../examples/ruboids/ruboids/WorldWindow.rb | 2 +- .../rubylib/examples/ruboids/ruboids/info.rb | 0 .../examples/ruboids/ruboids/ruboids.rb | 2 +- .../rubylib/examples/testcases/bugs.rb | 2 +- .../examples/testcases/error_reporting.rb | 2 +- .../examples/testcases/opoverloading.rb | 2 +- .../rubylib/examples/textedit/textedit.rb | 2 +- .../examples/tqt-examples}/aclock/aclock.rb | 2 +- .../examples/tqt-examples}/aclock/main.rb | 4 +- .../examples/tqt-examples}/chart/README | 2 +- .../tqt-examples}/chart/canvastext.rb | 0 .../tqt-examples}/chart/canvasview.rb | 0 .../examples/tqt-examples}/chart/chartform.rb | 10 +- .../tqt-examples}/chart/chartform_canvas.rb | 2 +- .../tqt-examples}/chart/chartform_files.rb | 0 .../examples/tqt-examples}/chart/element.rb | 0 .../tqt-examples}/chart/images/chart-forms.sk | 0 .../tqt-examples}/chart/images/file_new.xpm | 0 .../tqt-examples}/chart/images/file_open.xpm | 0 .../tqt-examples}/chart/images/file_print.xpm | 0 .../tqt-examples}/chart/images/file_save.xpm | 0 .../chart/images/file_saveaspostscript.xpm | 0 .../images/options_horizontalbarchart.xpm | 0 .../chart/images/options_piechart.xpm | 0 .../chart/images/options_setdata.xpm | 0 .../chart/images/options_setfont.xpm | 0 .../chart/images/options_setoptions.xpm | 0 .../chart/images/options_verticalbarchart.xpm | 0 .../tqt-examples}/chart/images/pattern01.xpm | 0 .../tqt-examples}/chart/images/pattern02.xpm | 0 .../tqt-examples}/chart/images/pattern03.xpm | 0 .../tqt-examples}/chart/images/pattern04.xpm | 0 .../tqt-examples}/chart/images/pattern05.xpm | 0 .../tqt-examples}/chart/images/pattern06.xpm | 0 .../tqt-examples}/chart/images/pattern07.xpm | 0 .../tqt-examples}/chart/images/pattern08.xpm | 0 .../tqt-examples}/chart/images/pattern09.xpm | 0 .../tqt-examples}/chart/images/pattern10.xpm | 0 .../tqt-examples}/chart/images/pattern11.xpm | 0 .../tqt-examples}/chart/images/pattern12.xpm | 0 .../tqt-examples}/chart/images/pattern13.xpm | 0 .../tqt-examples}/chart/images/pattern14.xpm | 0 .../examples/tqt-examples}/chart/main.rb | 2 +- .../tqt-examples}/chart/optionsform.rb | 0 .../tqt-examples}/chart/setdataform.rb | 0 .../tqt-examples}/checklists/checklists.rb | 2 +- .../examples/tqt-examples}/checklists/main.rb | 4 +- .../examples/tqt-examples}/dclock/dclock.rb | 2 +- .../examples/tqt-examples}/dclock/main.rb | 4 +- .../fonts/simple-qfont-demo/main.rb | 4 +- .../fonts/simple-qfont-demo/viewer.rb | 0 .../examples/tqt-examples}/forever/forever.rb | 6 +- .../examples/tqt-examples}/hello/hello.rb | 2 +- .../examples/tqt-examples}/hello/main.rb | 4 +- .../tqt-examples}/progress/progress.rb | 2 +- .../examples/tqt-examples}/tictac/main.rb | 4 +- .../examples/tqt-examples}/tictac/tictac.rb | 2 +- .../examples/tqt-examples}/tooltip/main.rb | 4 +- .../examples/tqt-examples}/tooltip/tooltip.rb | 2 +- .../rubylib/examples/tqtscribble}/scribble.rb | 14 +- tqtruby/rubylib/tqtruby/Makefile.am | 15 + .../Qt.cpp => tqtruby/rubylib/tqtruby/TQt.cpp | 466 +++++++++--------- .../rubylib/tqtruby}/configure.in.in | 2 +- .../rubylib/tqtruby}/extconf.rb | 4 +- .../rubylib/tqtruby}/handlers.cpp | 52 +- tqtruby/rubylib/tqtruby/lib/Makefile.am | 4 + tqtruby/rubylib/tqtruby/lib/TQt.rb | 1 + tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am | 2 + .../rubylib/tqtruby/lib/TQt/tqtruby.rb | 44 +- .../rubylib/tqtruby}/marshall.h | 0 .../rubylib/tqtruby}/smokeruby.h | 2 +- .../rubylib/tqtruby/tqtruby.h | 20 +- {qtruby => tqtruby}/rubylib/tutorial/t1/t1.rb | 2 +- .../rubylib/tutorial/t10/cannon.rb | 2 +- .../rubylib/tutorial/t10/lcdrange.rb | 2 +- .../rubylib/tutorial/t10/t10.rb | 2 +- .../rubylib/tutorial/t11/cannon.rb | 2 +- .../rubylib/tutorial/t11/lcdrange.rb | 2 +- .../rubylib/tutorial/t11/t11.rb | 2 +- .../rubylib/tutorial/t12/cannon.rb | 2 +- .../rubylib/tutorial/t12/lcdrange.rb | 2 +- .../rubylib/tutorial/t12/t12.rb | 2 +- .../rubylib/tutorial/t13/cannon.rb | 2 +- .../rubylib/tutorial/t13/gamebrd.rb | 2 +- .../rubylib/tutorial/t13/lcdrange.rb | 2 +- .../rubylib/tutorial/t13/t13.rb | 2 +- .../rubylib/tutorial/t14/cannon.rb | 2 +- .../rubylib/tutorial/t14/gamebrd.rb | 0 .../rubylib/tutorial/t14/lcdrange.rb | 2 +- .../rubylib/tutorial/t14/t14.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t2/t2.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t3/t3.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t4/t4.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t5/t5.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t6/t6.rb | 2 +- .../rubylib/tutorial/t7/lcdrange.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t7/t7.rb | 2 +- .../rubylib/tutorial/t8/cannon.rb | 2 +- .../rubylib/tutorial/t8/lcdrange.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t8/t8.rb | 4 +- .../rubylib/tutorial/t9/cannon.rb | 2 +- .../rubylib/tutorial/t9/lcdrange.rb | 2 +- {qtruby => tqtruby}/rubylib/tutorial/t9/t9.rb | 2 +- 214 files changed, 693 insertions(+), 693 deletions(-) delete mode 100644 qtruby/bin/Makefile.am delete mode 100644 qtruby/rubylib/Makefile.am delete mode 100644 qtruby/rubylib/designer/uilib/extconf.rb delete mode 100644 qtruby/rubylib/qtruby/Makefile.am delete mode 100644 qtruby/rubylib/qtruby/lib/Makefile.am delete mode 100644 qtruby/rubylib/qtruby/lib/Qt.rb delete mode 100644 qtruby/rubylib/qtruby/lib/Qt/Makefile.am rename {qtruby => tqtruby}/AUTHORS (92%) rename {qtruby => tqtruby}/COPYING (99%) rename {qtruby => tqtruby}/ChangeLog (91%) rename {qtruby => tqtruby}/INSTALL (68%) rename {qtruby => tqtruby}/Makefile.am (100%) rename {qtruby => tqtruby}/README (86%) rename {qtruby => tqtruby}/README.1st (100%) rename {qtruby => tqtruby}/TODO (59%) create mode 100644 tqtruby/bin/Makefile.am rename qtruby/bin/rbqtapi => tqtruby/bin/rbtqtapi (89%) rename qtruby/bin/rbqtsh => tqtruby/bin/rbtqtsh (97%) rename qtruby/bin/qtrubyinit.cpp => tqtruby/bin/tqtrubyinit.cpp (100%) create mode 100644 tqtruby/rubylib/Makefile.am rename {qtruby => tqtruby}/rubylib/designer/Makefile.am (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/Makefile (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/README (75%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/colornameform.ui (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/colornameform.ui.rb (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/findform.ui (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/findform.ui.rb (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/editcopy (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/editcopy.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/editcut (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/editcut.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/editraise.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/filenew (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/filenew.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/fileopen (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/fileopen.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/filesave (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/filesave.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/iconview.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/richtextedit.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/searchfind (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/searchfind.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/table.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/tabwidget.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/images/widgetstack.png (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/main.rb (89%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/mainform.ui (100%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/mainform.ui.rb (99%) rename {qtruby => tqtruby}/rubylib/designer/examples/colortool/optionsform.ui (100%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/LICENSE.GPL (100%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/Makefile.am (100%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/TODO (100%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/domtool.cpp (97%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/domtool.h (88%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/embed.cpp (95%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/form.cpp (98%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/globaldefs.h (97%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/main.cpp (93%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/object.cpp (98%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/parser.cpp (93%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/parser.h (96%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/rbuic.pro (89%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/subclassing.cpp (98%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/uic.cpp (98%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/uic.h (99%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/widgetdatabase.cpp (99%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/widgetdatabase.h (97%) rename {qtruby => tqtruby}/rubylib/designer/rbuic/widgetinterface.h (96%) rename {qtruby => tqtruby}/rubylib/designer/uilib/Makefile.am (51%) create mode 100644 tqtruby/rubylib/designer/uilib/extconf.rb rename {qtruby => tqtruby}/rubylib/designer/uilib/test/test.rb (92%) rename {qtruby => tqtruby}/rubylib/designer/uilib/tqui.cpp (94%) rename {qtruby => tqtruby}/rubylib/examples/base/kicons.rb (96%) rename {qtruby => tqtruby}/rubylib/examples/base/rui.rb (64%) rename {qtruby => tqtruby}/rubylib/examples/canvastest/canvastest.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/killerfilter/killerfilter.rb (97%) rename {qtruby => tqtruby}/rubylib/examples/network/clientserver/client/client.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/network/clientserver/server/server.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/passivepopup/passivepopup.rb (98%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/Manifest (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/README (94%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/TODO (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/boids.properties (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/generateManifest.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/index.html (97%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/release.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Boid.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/BoidView.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Camera.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/CameraDialog.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Canvas.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Cloud.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/CloudView.rb (98%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Flock.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Graphics.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Params.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Point.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Thing.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/Triangle.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/View.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/World.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/WorldWindow.rb (98%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/info.rb (100%) rename {qtruby => tqtruby}/rubylib/examples/ruboids/ruboids/ruboids.rb (97%) rename {qtruby => tqtruby}/rubylib/examples/testcases/bugs.rb (98%) rename {qtruby => tqtruby}/rubylib/examples/testcases/error_reporting.rb (99%) rename {qtruby => tqtruby}/rubylib/examples/testcases/opoverloading.rb (98%) rename {qtruby => tqtruby}/rubylib/examples/textedit/textedit.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/aclock/aclock.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/aclock/main.rb (77%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/README (80%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/canvastext.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/canvasview.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/chartform.rb (98%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/chartform_canvas.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/chartform_files.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/element.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/chart-forms.sk (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/file_new.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/file_open.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/file_print.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/file_save.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/file_saveaspostscript.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_horizontalbarchart.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_piechart.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_setdata.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_setfont.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_setoptions.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/options_verticalbarchart.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern01.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern02.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern03.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern04.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern05.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern06.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern07.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern08.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern09.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern10.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern11.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern12.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern13.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/images/pattern14.xpm (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/main.rb (96%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/optionsform.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/chart/setdataform.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/checklists/checklists.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/checklists/main.rb (73%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/dclock/dclock.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/dclock/main.rb (70%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/fonts/simple-qfont-demo/main.rb (67%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/fonts/simple-qfont-demo/viewer.rb (100%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/forever/forever.rb (91%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/hello/hello.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/hello/main.rb (88%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/progress/progress.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/tictac/main.rb (74%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/tictac/tictac.rb (99%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/tooltip/main.rb (64%) rename {qtruby/rubylib/examples/qt-examples => tqtruby/rubylib/examples/tqt-examples}/tooltip/tooltip.rb (98%) rename {qtruby/rubylib/examples/qtscribble => tqtruby/rubylib/examples/tqtscribble}/scribble.rb (95%) create mode 100644 tqtruby/rubylib/tqtruby/Makefile.am rename qtruby/rubylib/qtruby/Qt.cpp => tqtruby/rubylib/tqtruby/TQt.cpp (82%) rename {qtruby/rubylib/qtruby => tqtruby/rubylib/tqtruby}/configure.in.in (98%) rename {qtruby/rubylib/qtruby => tqtruby/rubylib/tqtruby}/extconf.rb (64%) rename {qtruby/rubylib/qtruby => tqtruby/rubylib/tqtruby}/handlers.cpp (95%) create mode 100644 tqtruby/rubylib/tqtruby/lib/Makefile.am create mode 100644 tqtruby/rubylib/tqtruby/lib/TQt.rb create mode 100644 tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am rename qtruby/rubylib/qtruby/lib/Qt/qtruby.rb => tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb (97%) rename {qtruby/rubylib/qtruby => tqtruby/rubylib/tqtruby}/marshall.h (100%) rename {qtruby/rubylib/qtruby => tqtruby/rubylib/tqtruby}/smokeruby.h (99%) rename qtruby/rubylib/qtruby/qtruby.h => tqtruby/rubylib/tqtruby/tqtruby.h (82%) rename {qtruby => tqtruby}/rubylib/tutorial/t1/t1.rb (93%) rename {qtruby => tqtruby}/rubylib/tutorial/t10/cannon.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t10/lcdrange.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t10/t10.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t11/cannon.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t11/lcdrange.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t11/t11.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t12/cannon.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t12/lcdrange.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t12/t12.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t13/cannon.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t13/gamebrd.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t13/lcdrange.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t13/t13.rb (95%) rename {qtruby => tqtruby}/rubylib/tutorial/t14/cannon.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t14/gamebrd.rb (100%) rename {qtruby => tqtruby}/rubylib/tutorial/t14/lcdrange.rb (99%) rename {qtruby => tqtruby}/rubylib/tutorial/t14/t14.rb (95%) rename {qtruby => tqtruby}/rubylib/tutorial/t2/t2.rb (95%) rename {qtruby => tqtruby}/rubylib/tutorial/t3/t3.rb (96%) rename {qtruby => tqtruby}/rubylib/tutorial/t4/t4.rb (97%) rename {qtruby => tqtruby}/rubylib/tutorial/t5/t5.rb (97%) rename {qtruby => tqtruby}/rubylib/tutorial/t6/t6.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t7/lcdrange.rb (97%) rename {qtruby => tqtruby}/rubylib/tutorial/t7/t7.rb (97%) rename {qtruby => tqtruby}/rubylib/tutorial/t8/cannon.rb (97%) rename {qtruby => tqtruby}/rubylib/tutorial/t8/lcdrange.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t8/t8.rb (94%) rename {qtruby => tqtruby}/rubylib/tutorial/t9/cannon.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t9/lcdrange.rb (98%) rename {qtruby => tqtruby}/rubylib/tutorial/t9/t9.rb (98%) diff --git a/ChangeLog b/ChangeLog index c665804d..5631d0d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2004-06-27 Richard Dale - * The qtruby and korundum ruby bindings are built by default + * The tqtruby and korundum ruby bindings are built by default * Both Qt only and Qt/KDE versions of the Smoke library are built 2002-11-05 Marcus Urban diff --git a/Makefile.am.in b/Makefile.am.in index 5e441278..291530b4 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -5,9 +5,9 @@ COMPILE_BEFORE_tdejava = qtjava COMPILE_BEFORE_kdec = qtc COMPILE_BEFORE_xparts = dcopc -# below if for proper korundum / qtruby build order -COMPILE_BEFORE_qtruby = smoke -COMPILE_BEFORE_korundum = qtruby +# below if for proper korundum / tqtruby build order +COMPILE_BEFORE_tqtruby = smoke +COMPILE_BEFORE_korundum = tqtruby # the below is for proper referencing of dcopperl into SUBDIRS COMPILE_BEFORE_dcopc = dcopperl diff --git a/README b/README index 3e5fadbb..06a2a708 100644 --- a/README +++ b/README @@ -19,8 +19,8 @@ This package contains: * korundum: TDE bindings for ruby * python: a copy of SIP/pyQt/pyTDE bindings from riverbankcomputing.co.uk * qtjava: Qt bindings for Java JNI to use Qt/TDE classes with Java - * qtruby: Qt bindings for Ruby - * smoke: Language independent library for Qt and TDE bindings. Used by QtRuby + * tqtruby: TQt bindings for Ruby + * smoke: Language independent library for Qt and TDE bindings. Used by TQtRuby and PerlQt. * kalyptus: a header parser and bindings generator for Qt/TDE. Used for Smoke, Java, C# and KSVG bindings generation at present. diff --git a/korundum/AUTHORS b/korundum/AUTHORS index 0756dc66..10ace0fa 100644 --- a/korundum/AUTHORS +++ b/korundum/AUTHORS @@ -14,7 +14,7 @@ Chief Wreck On The Highway Bug fixes, enhancements, sample code Alex Kellett -QtRuby is a ruby version of the PerlQt/Smoke project, written by: +TQtRuby is a ruby version of the PerlQt/Smoke project, written by: Ashley Winters Germain Garand David Faure diff --git a/korundum/ChangeLog b/korundum/ChangeLog index ef9115c0..530a1a08 100644 --- a/korundum/ChangeLog +++ b/korundum/ChangeLog @@ -1,6 +1,6 @@ 2007-03-05 Richard Dale - * Added a marshaller for TQValueList& as requested by volty on #qtruby + * Added a marshaller for TQValueList& as requested by volty on #tqtruby 2007-07-06 Richard Dale @@ -41,7 +41,7 @@ 2006-08-18 Richard Dale * Added a TDEActionPtrList marshaller. Fixes problem reported by - eskatos on the #qtruby irc channel. + eskatos on the #tqtruby irc channel. 2006-06-05 Richard Dale @@ -91,7 +91,7 @@ Han Holl. * KDE::CmdLineArgs and KDE::AboutData instances are no longer - deleted by qtruby on garbage collection. Fixes another problem + deleted by tqtruby on garbage collection. Fixes another problem reported by Han Holl. 2005-12-08 Richard Dale @@ -190,7 +190,7 @@ * The DCOPObject inspect method was crashing if the instance hadn't been fully constructed * The kde_resolve_classname function's arg types were changed to match the new - ones in the resolve_classname() function of QtRuby/handlers.cpp. + ones in the resolve_classname() function of TQtRuby/handlers.cpp. 2004-12-11 Richard Dale @@ -223,7 +223,7 @@ 2004-10-11 Richard Dale * Set global flag 'application_terminated' when KDE::Application or KDE::UniqueApplication - has returned from exec(). Once this is set the QtRuby runtime will no longer delete any + has returned from exec(). Once this is set the TQtRuby runtime will no longer delete any C++ instances. This will hopefully fix crash on application exit problems reported by Thibauld Favre. @@ -265,7 +265,7 @@ CCMAIL: kde-bindings@kde.org 2004-09-30 Richard Dale - * The resolve_classname() function in qtruby handlers.cpp uses the various Qt rtti mechanisms to + * The resolve_classname() function in tqtruby handlers.cpp uses the various Qt rtti mechanisms to get a more accurate classname to instantiate as a ruby instance. It has now been extended with a callback to the Korundum library to do the same for KDE classes. diff --git a/korundum/README b/korundum/README index 2ddb3911..28f77963 100644 --- a/korundum/README +++ b/korundum/README @@ -1,4 +1,4 @@ -Please see tdebindings/qtruby/README +Please see tdebindings/tqtruby/README KDE Specific Infomation: diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am index 508f7731..3faeee35 100644 --- a/korundum/bin/Makefile.am +++ b/korundum/bin/Makefile.am @@ -4,10 +4,10 @@ bin_PROGRAMS = krubyinit krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tde/ -L$(RUBY_LIBDIR) -ltdemdi -ltdenewstuff krubyinit_METASOURCES = AUTO krubyinit_SOURCES = krubyinit.cpp -krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libtqtrubyinternal.la +krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/tqtruby/rubylib/tqtruby/libtqtrubyinternal.la install-exec-local: @-rm -f $(DESTDIR)$(bindir)/rbtdeapi - @$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbtdeapi + @$(LN_S) rbtqtapi $(DESTDIR)$(bindir)/rbtdeapi @-rm -f $(DESTDIR)$(bindir)/rbtdesh - @$(LN_S) rbqtsh $(DESTDIR)$(bindir)/rbtdesh + @$(LN_S) rbtqtsh $(DESTDIR)$(bindir)/rbtdesh diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index b7325d75..459c09c7 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include @@ -905,7 +905,7 @@ public: }; extern "C" { -extern void Init_qtruby(); +extern void Init_tqtruby(); extern void set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)); extern void set_tdeconfigskeletonitem_immutable(VALUE (*tdeconfigskeletonitem_immutable) (VALUE)); extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *)); @@ -1163,9 +1163,9 @@ Init_korundum() // The Qt extension is linked against libsmoketqt.so, but Korundum links against // libsmoketde.so only. Specifying both a 'require Qt' and a 'require Korundum', // would give a link error (see the rb_fatal() error above). - // So call the Init_qtruby() initialization function explicitely, not via 'require Qt' + // So call the Init_tqtruby() initialization function explicitely, not via 'require Qt' // (Qt.o is linked into libtqtruby.so, as well as the Qt.so extension). - Init_qtruby(); + Init_tqtruby(); install_handlers(KDE_handlers); kde_internal_module = rb_define_module_under(kde_module, "Internal"); diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index 840b6ab6..775f501f 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -1,10 +1,10 @@ -INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) +INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/tqtruby/rubylib/tqtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) rubylib_LTLIBRARIES = korundum.la korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 korundum_la_METASOURCES = AUTO korundum_la_SOURCES = Korundum.cpp tdehandlers.cpp -korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libtqtrubyinternal.la $(RUBY_LIBRUBYARG) +korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/tqtruby/rubylib/tqtruby/libtqtrubyinternal.la $(RUBY_LIBRUBYARG) SUBDIRS = lib diff --git a/korundum/rubylib/korundum/tdehandlers.cpp b/korundum/rubylib/korundum/tdehandlers.cpp index f4707824..6cf5bbbc 100644 --- a/korundum/rubylib/korundum/tdehandlers.cpp +++ b/korundum/rubylib/korundum/tdehandlers.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include #include diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am deleted file mode 100644 index a1005f0b..00000000 --- a/qtruby/bin/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - -bin_PROGRAMS = qtrubyinit -qtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tqt/ -L$(RUBY_LIBDIR) -qtrubyinit_METASOURCES = AUTO -qtrubyinit_SOURCES = qtrubyinit.cpp -qtrubyinit_LDADD = $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libtqtrubyinternal.la - -bin_SCRIPTS = rbqtapi rbqtsh diff --git a/qtruby/rubylib/Makefile.am b/qtruby/rubylib/Makefile.am deleted file mode 100644 index 1c60934e..00000000 --- a/qtruby/rubylib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = qtruby designer diff --git a/qtruby/rubylib/designer/uilib/extconf.rb b/qtruby/rubylib/designer/uilib/extconf.rb deleted file mode 100644 index ac5410a6..00000000 --- a/qtruby/rubylib/designer/uilib/extconf.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'mkmf' -dir_config('smoke') -dir_config('qt') -$CPPFLAGS += " -I../../../../smoke -I../../qtruby " -$LOCAL_LIBS += '-bundle_loader ../../qtruby/qtruby.bundle -lsmoketqt -ltqui -ltqt-mt -lstdc++' -create_makefile("tqui") diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am deleted file mode 100644 index 7083719c..00000000 --- a/qtruby/rubylib/qtruby/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - -noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb - -noinst_LTLIBRARIES = libtqtrubyinternal.la -libtqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp -libtqtrubyinternal_la_METASOURCES = AUTO - -rubylibdir = $(RUBY_ARCHDIR) -rubylib_LTLIBRARIES = qtruby.la -qtruby_la_SOURCES = -qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -qtruby_la_LIBADD = libtqtrubyinternal.la $(LIB_TQT) $(top_builddir)/smoke/tqt/libsmoketqt.la $(LIB_TDECORE) $(RUBY_LIBRUBYARG) -lstdc++ - -SUBDIRS = lib diff --git a/qtruby/rubylib/qtruby/lib/Makefile.am b/qtruby/rubylib/qtruby/lib/Makefile.am deleted file mode 100644 index b8298cb7..00000000 --- a/qtruby/rubylib/qtruby/lib/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = Qt - -rubylibdir = $(RUBY_RUBYLIBDIR) -rubylib_DATA = Qt.rb diff --git a/qtruby/rubylib/qtruby/lib/Qt.rb b/qtruby/rubylib/qtruby/lib/Qt.rb deleted file mode 100644 index 70e9c776..00000000 --- a/qtruby/rubylib/qtruby/lib/Qt.rb +++ /dev/null @@ -1 +0,0 @@ -require 'qtruby' diff --git a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am deleted file mode 100644 index b20eb92e..00000000 --- a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt -qtrubylib_DATA = qtruby.rb diff --git a/qtruby/AUTHORS b/tqtruby/AUTHORS similarity index 92% rename from qtruby/AUTHORS rename to tqtruby/AUTHORS index 3b98da28..c70a5616 100644 --- a/qtruby/AUTHORS +++ b/tqtruby/AUTHORS @@ -38,7 +38,7 @@ Other contributions (from the ChangeLog), bug reports, fixes etc: Daniel Morris Ryutaro Amano -QtRuby is a ruby version of the PerlQt/Smoke project, written by: +TQtRuby is a ruby version of the PerlTQt/Smoke project, written by: Ashley Winters Germain Garand David Faure @@ -47,7 +47,7 @@ Equipment 800 Mhz iBook with Yellow Dog 3.0, Macally Micro 3 button mouse Books - 'Programming with Qt' by Mathias Kalle Dalheimer + 'Programming with TQt' by Mathias Kalle Dalheimer 'Programming Ruby' by David Thomas and Andrew Hunt 'The Ruby Way' by Hal Fulton 'Ruby In a Nutshell' by Yukihiro Matsumoto diff --git a/qtruby/COPYING b/tqtruby/COPYING similarity index 99% rename from qtruby/COPYING rename to tqtruby/COPYING index 89d419a1..2503152c 100644 --- a/qtruby/COPYING +++ b/tqtruby/COPYING @@ -1,8 +1,8 @@ Trademarks ---------- -"[QtRuby": "[Qt]" name usage by permission of Trolltech AS, owner of the -Qt(TM) trademark +"[TQtRuby": "[TQt]" name usage by permission of Trolltech AS, owner of the +TQt(TM) trademark License diff --git a/qtruby/ChangeLog b/tqtruby/ChangeLog similarity index 91% rename from qtruby/ChangeLog rename to tqtruby/ChangeLog index cd9455da..96e5f9b8 100644 --- a/qtruby/ChangeLog +++ b/tqtruby/ChangeLog @@ -7,7 +7,7 @@ 2006-12-05 Richard Dale - * Backported some improvements to TQt::Variants from Qt4 QtRuby + * Backported some improvements to TQt::Variants from Qt4 TQtRuby * When marhalling TQMap types with TQVariant values, if the Ruby value isn't a TQt::Variant then one is created * TQt::Variants can now be constructed with Hash's of String/TQt::Variant @@ -25,7 +25,7 @@ * Made TQt::ListView, TQt::ListViewItem, TQt::BoxLayout, TQt::HBoxLayout, TQt::VBoxLayout and TQt::GridLayout Enumerable with implementations - of each() so they don't need to use the Qt External iterators like + of each() so they don't need to use the TQt External iterators like TQt::LayoutIterator anymore. For instance: lv = TQt::ListView.new do @@ -44,7 +44,7 @@ 2006-09-19 Richard Dale - * Upped the QtRuby version to 1.0.13 for the KDE 3.5.5 release + * Upped the TQtRuby version to 1.0.13 for the KDE 3.5.5 release * Fixed a crash when a slot was inherited by a subclass, and the subclass had no slots or signals of its own @@ -63,7 +63,7 @@ The block is called in the context of where the connect call was made, and 'self' needn't be a TQt::Object. It is similar to the signal_connect() method in - ruby-gnome. This was suggested by rickdangerous on the #qtruby irc channel. + ruby-gnome. This was suggested by rickdangerous on the #tqtruby irc channel. 2006-09-13 Richard Dale @@ -97,7 +97,7 @@ 2006-08-29 Richard Dale - * Backported some memory leak fixes from Qt4 QtRuby + * Backported some memory leak fixes from Qt4 TQtRuby 2006-08-10 Richard Dale @@ -160,12 +160,12 @@ 2006-05-07 Richard Dale - * An an type of TQ_UINT16 wasn't working with QtRuby. Fixes problem + * An an type of TQ_UINT16 wasn't working with TQtRuby. Fixes problem reported by maelclerambault. 2006-05-03 Richard Dale - * The tqt_emit() and tqt_invoke() methods are overriden by the QtRuby + * The tqt_emit() and tqt_invoke() methods are overriden by the TQtRuby runtime. When they are called the runtime looks for a Ruby slot or signal matching the call, and invokes it if found. If a Ruby version wasn't found for a signal however, the tqt_invoke() method was being @@ -181,7 +181,7 @@ 2006-03-29 Richard Dale * Don't special case open() in virtual method callbacks, because all - the Qt classes with open methods now have explicit open() method + the TQt classes with open methods now have explicit open() method calls. So it isn't possible that Kernel.open() will be called wrongly anymore. @@ -197,7 +197,7 @@ etc. Otherwise, the corresponding methods in the Smoke library were not being invoked correctly. * Removed a virtual destructor compile warning - * Removed obsolete qtruby-only.patch and tdevelop project file + * Removed obsolete tqtruby-only.patch and tdevelop project file 2006-03-14 Richard Dale @@ -208,7 +208,7 @@ * The Kernel#select method was being redefined as it clashed with TQt::SqlCursor#select and TQt::SqlSelectCursor#select methods. This - caused a problem when QtRuby was used with Rails ActiveRecord which + caused a problem when TQtRuby was used with Rails ActiveRecord which also has a select method. So the methods are now defined in the Sql classes, and use method_missing() to explictly invoke the methods in the Smoke library. Fixes problem reported by Imo Sosa. @@ -233,7 +233,7 @@ 2005-12-08 Richard Dale * The ruby display() method was clashing with a display() method in some - QtRuby classes, and so it was aliased to _display(). However, this caused + TQtRuby classes, and so it was aliased to _display(). However, this caused problems with the ruby RMagick extension. The display methods are now special cased in TQt::LCDNumber, TQt::WhatsThis and TQt::TimeEdit. Fixes problem reported by David Corbin. @@ -243,9 +243,9 @@ 2005-12-06 Richard Dale - * QtRuby didn't work with versions of ruby > 1.8.3, as it didn't call + * TQtRuby didn't work with versions of ruby > 1.8.3, as it didn't call initialize methods correctly. It used the rb_respond_to() method - to check it a newly created qt instance responded to :initialize. + to check it a newly created tqt instance responded to :initialize. However, in newer versions of ruby rb_responds_to() ignores private methods such as initialize(). The solution was to just remove the test, as it was redundant anyway. @@ -285,7 +285,7 @@ 2005-09-26 Richard Dale - * Added some fixes from the Qt4 version of QtRuby + * Added some fixes from the Qt4 version of TQtRuby * There was a clash between operator methods in Kernel for '>', '>=', '<' and '<=' and the ones in the Smoke lib. * Fixed a TQt::ByteArray marshalling problem @@ -307,7 +307,7 @@ 2005-08-09 Richard Dale * Caleb Tennis wrote: - One nice feature would be to allow TQt::Object::inherits() to use the QtRuby + One nice feature would be to allow TQt::Object::inherits() to use the TQtRuby naming scheme for valid lookups. For example, right now: irb(main):001:0> w = TQt::Widget.new(nil) @@ -324,8 +324,8 @@ 2005-08-04 Richard Dale - * Added a file called 'COPYING' to the qtruby project, with a note that - the 'Qt' trademark in the QtRuby name is used with Trolltech's permission, + * Added a file called 'COPYING' to the tqtruby project, with a note that + the 'TQt' trademark in the TQtRuby name is used with Trolltech's permission, followed by the text of the GPL v2 license. 2005-07-30 Richard Dale @@ -344,7 +344,7 @@ 2005-07-14 Richard Dale * Added example programs for client/server programming with TQt::Socket - and associated classes. client.rb illustrates current bugs in QtRuby + and associated classes. client.rb illustrates current bugs in TQtRuby * TQt::Socket.canReadLine() always returns true * TQt::readLine() seg faults when called a second time * A memory leak and seg faulting problems like the above were reported @@ -352,7 +352,7 @@ 2005-07-09 Richard Dale - * When a Qt method returned a TQString value type, such as: + * When a TQt method returned a TQString value type, such as: TQString TQSocket::readLine() A temporary TQString was being created that wasn't deleted and caused a memory leak. Fixes problem reported by Caleb Tennis. @@ -417,7 +417,7 @@ 2005-05-21 Richard Dale - * Improved the format of enums displayed by rbqtapi and rbkdeapi + * Improved the format of enums displayed by rbtqtapi and rbkdeapi 2005-05-20 Richard Dale @@ -444,7 +444,7 @@ 2005-04-09 Richard Dale - * Fixed regressions in the rbqtapi and rbkdeapi utilities caused by the TQt::Internal namespace + * Fixed regressions in the rbtqtapi and rbkdeapi utilities caused by the TQt::Internal namespace tidy up * TQt::version and TQt::ruby_version had wrongly been moved to the TQt::Internal module @@ -454,13 +454,13 @@ 2005-03-30 Richard Dale - * An 'include Qt' statement in qtruby.rb where a couple of methods were being added to - class Module was causing all the Qt methods to be added to Module. Oops, this a really - serious bug. Various methods in qtruby.rb are now module methods in the TQt::Internal + * An 'include TQt' statement in tqtruby.rb where a couple of methods were being added to + class Module was causing all the TQt methods to be added to Module. Oops, this a really + serious bug. Various methods in tqtruby.rb are now module methods in the TQt::Internal module. Big thanks to Eric Veensta and Samir Patel for pointing out this can of worms. * It also fixes a problem reported by David Crosby where a "require 'time'" statement was - incompatible with a "require 'Qt'" statement. As the cause was unknown, a hacky workround + incompatible with a "require 'TQt'" statement. As the cause was unknown, a hacky workround had to be added, which is no longer needed. 2005-03-24 Richard Dale @@ -474,7 +474,7 @@ 2005-03-21 Richard Dale - * Moved Qt.rb from qtruby/lib/Qt to qtruby/lib. Fixes problem building qtruby on Mac OS X + * Moved TQt.rb from tqtruby/lib/TQt to tqtruby/lib. Fixes problem building tqtruby on Mac OS X with extconf.rb reported by Michael Doppler * Rename 'README.build' as INSTALL @@ -540,7 +540,7 @@ * Fixed an interesting bug reported by Stephan Oehlert. Kernel has a method called open() which takes a String as the first argument. But when a call is made to an open() - method in the Qt classes, it messes up the method_missing() logic to divert it to the + method in the TQt classes, it messes up the method_missing() logic to divert it to the Smoke library. Instead it attempts to call the Kernel method with the wrong arg types. * The problem is fixed by calling the appropriate method based on the @@ -560,7 +560,7 @@ 2004-12-21 Richard Dale - * The qtruby runtime needs to be able to run the code for an initialize() method up + * The tqtruby runtime needs to be able to run the code for an initialize() method up to the point where the C++ instance has been constructed and wrapped, and then jump out. It then re-runs initialize() with the wrapped instance. Before a callcc() call had been used for the jumping which worked fine. However, it made the frame stack @@ -569,7 +569,7 @@ 2004-12-20 Richard Dale - * Added a work round for a bug caused by an incompatibility between QtRuby + * Added a work round for a bug caused by an incompatibility between TQtRuby the 'require time' statement, reported by David Crosby CCMAIL: dcrosby42@gmail.com @@ -616,7 +616,7 @@ 2004-12-10 Richard Dale * Added inspect() and pretty_print() methods for TQt::SizePolicy - * Greatly improved the TQt::Object Qt property based inspect() and pretty_print() + * Greatly improved the TQt::Object TQt property based inspect() and pretty_print() methods. Property types such as TQt::Point, TQt::Font and TQt::Rect can be viewed as expandable items in the KDevelop debugger variable tree. @@ -633,12 +633,12 @@ 2004-11-29 Richard Dale - * Upped the QtRuby version to 1.0.5 for the KDE 3.3.2 release + * Upped the TQtRuby version to 1.0.5 for the KDE 3.3.2 release 2004-10-30 Richard Dale - * qError(), tqWarning() and tqFatal() are now Object instance methods, rather than Qt module - methods. This means they don't need to be referenced with an ugly 'Qt.' module scope anymore. + * qError(), tqWarning() and tqFatal() are now Object instance methods, rather than TQt module + methods. This means they don't need to be referenced with an ugly 'TQt.' module scope anymore. 2004-10-21 Richard Dale @@ -653,7 +653,7 @@ 2004-10-16 Richard Dale - * Until super has been called in an initialize() method, Qt methods can't be called on + * Until super has been called in an initialize() method, TQt methods can't be called on it. An exception is now thrown 'Instance not initialized', instead of it causing a seg fault. * For instance: @@ -701,16 +701,16 @@ * Added greater than and less than operators to TQt::Enum, so that enums can be compared with Integers - * Added the chart example for Qt Tutorial #2 + * Added the chart example for TQt Tutorial #2 2004-10-12 Richard Dale - * Added TQt::Application.ARGV. It returns the original ruby ARGV array with Qt command line + * Added TQt::Application.ARGV. It returns the original ruby ARGV array with TQt command line options removed. 2004-10-11 Richard Dale - * Added a global flag 'application_terminated'. Once this is set the QtRuby runtime will no longer + * Added a global flag 'application_terminated'. Once this is set the TQtRuby runtime will no longer delete any C++ instances. This will hopefully fix crash on application exit problems reported by Thibauld Favre. @@ -753,7 +753,7 @@ 2004-10-07 Richard Dale - * Added Qt Designer Tutorial 'Creating Dialogs' translated into QtRuby. It + * Added TQt Designer Tutorial 'Creating Dialogs' translated into TQtRuby. It shows how you can combine ruby code generated from .ui files with the rbuic tool, with your own code. @@ -778,12 +778,12 @@ 2004-10-05 Richard Dale - * Given a C++ instance and an approximate classname, the QtRuby runtime uses the - various Qt rtti mechanisms such as TQObject::className() to improve the resolution + * Given a C++ instance and an approximate classname, the TQtRuby runtime uses the + various TQt rtti mechanisms such as TQObject::className() to improve the resolution of the name. However, the numeric classId into the array of classnames in the Smoke runtime was not being updated in line with the more accurate name. * This caused problems with method argument matching which uses the numeric classId - rather than the ruby object's classname, and so QtRuby wrongly assumed that a an + rather than the ruby object's classname, and so TQtRuby wrongly assumed that a an instance of a TQt::Widget was a TQt::Object. * Fixes problem reported by Han Holl @@ -812,10 +812,10 @@ 2004-10-03 Richard Dale - * Han Holl's report about a when you pass an incorrect arg type to a QtRuby + * Han Holl's report about a when you pass an incorrect arg type to a TQtRuby method, it caused a crash has opened a 'can of worms'. This was because there was no arg type checking if there was only one candidate method in the - Smoke runtime. Now that arg type checking is applied to all QtRuby method calls, not + Smoke runtime. Now that arg type checking is applied to all TQtRuby method calls, not not just those that after lookup in Smoke map onto a single method, the overloaded method resolution via the arg types has had to be greatly improved. This has been done, and so the arg type matching is now extremely fussy. @@ -843,7 +843,7 @@ 2004-10-03 Richard Dale * A common programming error is to accidently leave off the 'new' method call when - creating an instance. The QtRuby runtime wasn't correctly trapping an attempt to + creating an instance. The TQtRuby runtime wasn't correctly trapping an attempt to call an instance method on a class object, and was seg faulting rather than throwing an exception. @@ -868,7 +868,7 @@ 2004-09-30 Richard Dale - * The resolve_classname() function in handlers.cpp uses the various Qt rtti mechanisms to + * The resolve_classname() function in handlers.cpp uses the various TQt rtti mechanisms to get a more accurate classname to instantiate as a ruby instance. It has now been extended with a callback to the Korundum library to do the same for KDE classes. @@ -885,10 +885,10 @@ 2004-09-12 Richard Dale - * Added a 'tqui' extension for reading in .ui Qt Designer files at runtime + * Added a 'tqui' extension for reading in .ui TQt Designer files at runtime * For example: - require 'Qt' + require 'TQt' require 'tqui' a = TQt::Application.new(ARGV) @@ -924,7 +924,7 @@ * Brought the rbuic code to uncompress zip files in line with the current uic code * Added a qmake project file for building the rbuic tool on Mac OS X, and some - notes on how to build QtRuby on a Mac. + notes on how to build TQtRuby on a Mac. 2004-08-29 Richard Dale @@ -947,7 +947,7 @@ 2004-08-04 Richard Dale - * Upped the QtRuby version to 1.0.0 - it must work now then.. + * Upped the TQtRuby version to 1.0.0 - it must work now then.. 2004-08-02 Richard Dale @@ -976,7 +976,7 @@ had virtual method callbacks, this meant that the ruby instance couldn't be found, and the callback couldn't be made. - * Hence, the TQt::ToolTip callback in examples/qt-examples/tooltip didn't + * Hence, the TQt::ToolTip callback in examples/tqt-examples/tooltip didn't work, as that class doesn't have a virtual destructor. * Added an 'isEnum()' function to use when matching args in overloaded @@ -1100,12 +1100,12 @@ 2004-07-11 Richard Dale - * Qt eucJP and Shift-JIS codecs used to support ruby $KCODE values of 's' + * TQt eucJP and Shift-JIS codecs used to support ruby $KCODE values of 's' for SJIS and 'e' for EUC 2004-07-08 Richard Dale - * Added support for strings in QtRuby programs being written in UTF-8. + * Added support for strings in TQtRuby programs being written in UTF-8. Use the '-Ku' command line option or '$KCODE=u' in the program. * Removed recently added TQChar marshalling as it wasn't very i18n friendly @@ -1188,7 +1188,7 @@ * The marshalling TypeHandler function pointers are now looked up in a TQAsciiDict, rather than a ruby Hash. * Some unused functions removed - * QtRuby version upped to 0.9.8 + * TQtRuby version upped to 0.9.8 2004-06-09 Richard Dale @@ -1206,7 +1206,7 @@ 2004-05-03 Richard Dale * Added a '-kde' option to the rbuic tool to generate require 'Korundum' - instead of require 'Qt' statements, and use KDE widgets. + instead of require 'TQt' statements, and use KDE widgets. 2004-04-30 Richard Dale @@ -1254,7 +1254,7 @@ corresponding ruby arg VALUE after the call. - A pointer to a locally allocated TQString was being returned, giving memory corruption problems. - * The default debug level in qtruby.rb is DebugLevel::OFF, otherwise + * The default debug level in tqtruby.rb is DebugLevel::OFF, otherwise very verbose error messages are produced. 2004-01-28 Richard Dale @@ -1267,13 +1267,13 @@ * Added DOM:: namespace for the DOM:: classes in the Smoke library. * The scope operator in nested classnames is now '::' rather - than '__', so changed the qtruby runtime to expect that. + than '__', so changed the tqtruby runtime to expect that. 2003-11-13 Richard Dale * Added the KillerFilter event filtering example from chapter 16 - of 'Programming with Qt' - * Improved classname resolution via the Qt rtti mechanisms in + of 'Programming with TQt' + * Improved classname resolution via the TQt rtti mechanisms in TQObject, TQEvent and TQCanvasItem. This fixed a problem in the KillerFilter example when a TQMouseEvent was passed to the ruby event handler, it was being instantiated as a ruby TQt::Event, @@ -1282,7 +1282,7 @@ 2003-11-11 Richard Dale * Improved nil argument matching, and nil can match any type now - not just classes. Translated the code from the Qt.pm in PerlQt, + not just classes. Translated the code from the TQt.pm in PerlTQt, after discussion on the kde-perl list. * Fixed bug in rbuic where a C++ 'TQString::null' was "" in ruby, and should have been a nil. @@ -1296,7 +1296,7 @@ * Put some C++ code inside blocks to ensure that the destructor clean up code was called, when the current f'n longjmp's up the stack rather than returns normally. - * QtRuby looking good, raised the version to 0.9.6 to celebrate + * TQtRuby looking good, raised the version to 0.9.6 to celebrate 2003-11-07 Richard Dale @@ -1309,9 +1309,9 @@ 2003-11-03 Richard Dale * When marshalling a const ref type to a ruby VALUE, it is now copied - * Applied some fixes for construct_copy() from the PerlQt version of + * Applied some fixes for construct_copy() from the PerlTQt version of handlers.cpp - * Fixed some minor bugs in the progress.rb Qt example + * Fixed some minor bugs in the progress.rb TQt example 2003-11-03 Richard Dale @@ -1375,18 +1375,18 @@ 2003-10-08 Richard Dale * Korundum KDE ruby extension - - made various changes so it can be linked against the QtRuby code + - made various changes so it can be linked against the TQtRuby code 2003-09-18 Richard Dale * Removed leading 'K' from class names of when adding to KDE:: namespace. As per Germain Garand's suggestion on the kde-bindings list: - ..actually, I used the same scheme as for Qt when possible, that is: + ..actually, I used the same scheme as for TQt when possible, that is: $class =~ s/^Q/TQt::/ or $class =~ s/^K/KDE::/ or $class = "KDE::" . $class - unless $class eq "Qt"; + unless $class eq "TQt"; 2003-09-18 Richard Dale @@ -1435,8 +1435,8 @@ 2003-09-10 Richard Dale * Improved garbage collection with various 'ad hoc' rules from the - QtJava bindings about when it's ok/not ok to destruct an instance. - Not always just a 'parent() != 0' check in Qt. + TQtJava bindings about when it's ok/not ok to destruct an instance. + Not always just a 'parent() != 0' check in TQt. 2003-09-10 Richard Dale @@ -1469,13 +1469,13 @@ * smokeruby_free() and smokeruby_mark() have been implemented * The C++ instance for a ruby object is deleted in smokeruby_free(), so watch out for extra crashes! - * Improved README with more details about QtRuby + * Improved README with more details about TQtRuby 2003-09-07 Richard Dale * Improved error message handling, changed rb_error() calls to rb_raise() * Decided changing method calls like foobar? to isFoobar() not a good idea, - as the Qt property could just as also be hasFoobar() or foobar() + as the TQt property could just as also be hasFoobar() or foobar() 2003-09-06 Richard Dale @@ -1484,7 +1484,7 @@ 2003-08-31 Richard Dale - * rbuic code generation brought up to date wrt Qt 3.2 uic + * rbuic code generation brought up to date wrt TQt 3.2 uic Main change is that a 'languageChanged()' method is generated 2003-08-30 Richard Dale @@ -1493,7 +1493,7 @@ 2003-08-30 Richard Dale - * Added 'Run Selection' menu option to the QtRuby shell + * Added 'Run Selection' menu option to the TQtRuby shell 2003-08-30 Richard Dale @@ -1510,17 +1510,17 @@ 2003-08-27 Richard Dale - * Changed the operator overloading implementation to be more like PerlQt + * Changed the operator overloading implementation to be more like PerlTQt 2003-08-27 Richard Dale - * Translated the rbqtsh filePrint() method from perl + * Translated the rbtqtsh filePrint() method from perl 2003-08-26 Richard Dale * Added 'changed' attribute to the MetaInfo class, so that the C++ metaObject is reconstructed if the slots or signals are changed. - * Changed window title on rbqtsh to 'QtRuby'. The example slot now works + * Changed window title on rbtqtsh to 'TQtRuby'. The example slot now works correctly. Only just tried this utility - Wow Alex!! 2003-08-26 Richard Dale @@ -1538,16 +1538,16 @@ * Removed obsolete rb_enable_super() calls * Removed test for _current_object in class_method_missing() * Fixed missing index in signalInfo() method - * Added Qt scribble example - TODO add TQt::PaintDevice.bitBlt() calls to SMOKE runtime + * Added TQt scribble example - TODO add TQt::PaintDevice.bitBlt() calls to SMOKE runtime 2003-08-23 Richard Dale - * Added rbuic tool for ruby Qt Designer support + * Added rbuic tool for ruby TQt Designer support 2003-08-12 Alexander Kellett * Add debug level setting via TQt::debug_level - * When calling .new on a Qt object with a incorrect prototype + * When calling .new on a TQt object with a incorrect prototype the list of appropriate constructors is printed * Fix a number of cases in which imperfect code would cause a crash @@ -1562,7 +1562,7 @@ 2003-08-07 Alexander Kellett - * Added rbqtapi and rbqt tools (port of the PerlQt tools of the same name) + * Added rbtqtapi and rbtqt tools (port of the PerlTQt tools of the same name) 2003-08-06 Richard Dale @@ -1575,8 +1575,8 @@ 2003-08-12 Alexander Kellett * Add several new marshalling types - TQCanvasItemList for example, - unfortuantely due to several improvements in Qt 3.2 these - improvements will not be seen when compiling against Qt 3.1.2 + unfortuantely due to several improvements in TQt 3.2 these + improvements will not be seen when compiling against TQt 3.1.2 2003-08-05 Richard Dale @@ -1584,7 +1584,7 @@ 2003-08-05 Richard Dale - * Removed redundant 'rb_eval_string("include Qt")' call from extension initialization. + * Removed redundant 'rb_eval_string("include TQt")' call from extension initialization. 2003-08-05 Richard Dale @@ -1611,8 +1611,8 @@ 2003-08-01 Alexander Kellett - * Slightly improve ease of debugging of qtruby programs - which subclass Qt base classes by print out some useful + * Slightly improve ease of debugging of tqtruby programs + which subclass TQt base classes by print out some useful debugging informationn when/if method_missing ever fails to find a matching function in the baseclass. @@ -1627,14 +1627,14 @@ 2003-07-31 Richard Dale - * Changed require in Qt.cpp to 'Qt/Qt.rb' instead of 'lib/Qt/Qt.rb' + * Changed require in TQt.cpp to 'TQt/TQt.rb' instead of 'lib/TQt/TQt.rb' 2003-07-31 Richard Dale - * Fixed problem with non-working installed version, lib/Qt.rb moved to lib/Qt/Qt.rb + * Fixed problem with non-working installed version, lib/TQt.rb moved to lib/TQt/TQt.rb 2003-07-30 Richard Dale - * QtRuby - a Ruby SMOKE adaptor for Qt, initial checkin + * TQtRuby - a Ruby SMOKE adaptor for TQt, initial checkin diff --git a/qtruby/INSTALL b/tqtruby/INSTALL similarity index 68% rename from qtruby/INSTALL rename to tqtruby/INSTALL index c4165afb..8fe9c07a 100644 --- a/qtruby/INSTALL +++ b/tqtruby/INSTALL @@ -3,7 +3,7 @@ Dependencies - ruby 1.8 or greater - automake 1.7 or greater -- Qt 3.1 or greater +- TQt 3.1 or greater - KDE 3.1 or greater (for korundum) CVS Snapshot @@ -17,19 +17,19 @@ Configure flags needed ---------------------- In order to build korundum: (this is the default in fact, so you can just use ./configure) - ./configure --with-smoke="qt kde" -in order to build just qtruby: - ./configure --with-smoke="qt" + ./configure --with-smoke="tqt kde" +in order to build just tqtruby: + ./configure --with-smoke="tqt" -Building the Qt extension without KDE build process +Building the TQt extension without KDE build process --------------------------------------------------- -To build the Qt.so extension, provide 'extconf.rb' with the directories where -the Qt and Smoke libraries are installed: +To build the TQt.so extension, provide 'extconf.rb' with the directories where +the TQt and Smoke libraries are installed: -$ cd qtruby/rubylib/qtruby +$ cd tqtruby/rubylib/tqtruby $ ruby extconf.rb --with-smoke-dir=/usr \ - --with-qt-dir=/home/duke/src/kde/HEAD/qt-copy + --with-tqt-dir=/home/duke/src/kde/HEAD/tqt-copy $ make $ make install @@ -37,16 +37,16 @@ Building on Mac OS X -------------------- Automake/autoconf don't work very well on Mac OS X, and so qmake and -exconf.rb must be used instead. You can use the native Aqua/Quartz Qt/Mac -version of Qt - QtRuby doesn't require X11. +exconf.rb must be used instead. You can use the native Aqua/Quartz TQt/Mac +version of TQt - TQtRuby doesn't require X11. -Build Qt/Mac and install in /Developer/qt. These configure flags work well: +Build TQt/Mac and install in /Developer/tqt. These configure flags work well: -./configure -system-zlib -qt-gif -plugin-imgfmt-mng -thread -no-stl +./configure -system-zlib -tqt-gif -plugin-imgfmt-mng -thread -no-stl -no-exceptions -fast -Configure QtRuby and build the Smoke library: -$ ./configure '--with-qt-dir=/Developer/qt' '--enable-mac' +Configure TQtRuby and build the Smoke library: +$ ./configure '--with-tqt-dir=/Developer/tqt' '--enable-mac' $ cd smoke/tqt # Generate the Smoke library sources: $ perl generate.pl @@ -56,27 +56,27 @@ $ qmake -makefile $ sudo make ... -# Build the 'Qt' extension: -$ cd qtruby/rubylib/qtruby -$ ruby extconf.rb --with-qt-dir=/Developer/qt --with-smoke-dir=/usr \ +# Build the 'TQt' extension: +$ cd tqtruby/rubylib/tqtruby +$ ruby extconf.rb --with-tqt-dir=/Developer/tqt --with-smoke-dir=/usr \ --with-smoke-include=../../../smoke $ make $ sudo make install ... # Build the rbuic tool and install into /usr/bin -$ cd qtruby/rubylib/designer/rbuic +$ cd tqtruby/rubylib/designer/rbuic $ qmake -makefile $ sudo make ... # Build the 'tqui' TQWidgetFactory extension -$ cd qtruby/rubylib/designer/uilib -$ ruby extconf.rb --with-qtruby-include=../../qtruby --with-qt-dir=/Developer/qt +$ cd tqtruby/rubylib/designer/uilib +$ ruby extconf.rb --with-tqtruby-include=../../tqtruby --with-tqt-dir=/Developer/tqt $ make $ sudo make install -To get Mac menus to appear, when a QtRuby program is run from the command line, +To get Mac menus to appear, when a TQtRuby program is run from the command line, link ruby against the carbon resource lib and call it 'rubyw', see: http://www.rubygarden.org/ruby?RubyTkOnOSX @@ -97,12 +97,12 @@ Ryutaro Amano wrote this about creating a double clickable bundle: "Thanks all, I have succeeded make rubyw. sample script is launched in foreground. -And I have known the following steps to launch qt-ruby script by double clicking +And I have known the following steps to launch tqt-ruby script by double clicking from Finder. -As an example, I take qtruby-1.0.11/qtruby/rubylib/tutorial/t14 +As an example, I take tqtruby-1.0.11/tqtruby/rubylib/tutorial/t14 -cd qtruby-1.0.11/qtruby/rubylib/tutorial/t14 +cd tqtruby-1.0.11/tqtruby/rubylib/tutorial/t14 chmod 755 t14.rb replace first line of t14.rb with "#!/usr/local/bin/rubyw" mkdir -p Shoot.app/Contents/MacOS @@ -119,7 +119,7 @@ Info.plist is CFBundleExecutable Shoot CFBundleIdentifier - jp.co.ryutaro.qtquit + jp.co.ryutaro.tqtquit CFBundlePackageType APPL CFBundleSignature @@ -129,7 +129,7 @@ Info.plist is echo -n "APPL????" > Shoot.app/Contents/PkgInfo -Double click Shoot.app, Qt-Window appears in foreground." +Double click Shoot.app, TQt-Window appears in foreground." TQScintilla text editing widget support -------------------------------------- @@ -139,6 +139,6 @@ number of languages including ruby. It can be downloaded from here: http://www.riverbankcomputing.co.uk/qscintilla/download.php -Use the '--enable-qscintilla=yes' configure option to build QtRuby with +Use the '--enable-qscintilla=yes' configure option to build TQtRuby with TQScintilla support. The classes in a 'Qext::' module, with names such as Qext::Scintilla. diff --git a/qtruby/Makefile.am b/tqtruby/Makefile.am similarity index 100% rename from qtruby/Makefile.am rename to tqtruby/Makefile.am diff --git a/qtruby/README b/tqtruby/README similarity index 86% rename from qtruby/README rename to tqtruby/README index ecf5f954..ea42d183 100644 --- a/qtruby/README +++ b/tqtruby/README @@ -8,7 +8,7 @@ * * ***************************************************************************/ -Here is a Ruby SMOKE adaptor for Qt +Here is a Ruby SMOKE adaptor for TQt Why ruby? From the rubytalk list @@ -31,11 +31,11 @@ On 8/28/03 8:56 PM, "Scott Thompson" wrote: So there you have it! :) -Here is 'Hello World' in QtRuby: +Here is 'Hello World' in TQtRuby: #!/usr/bin/ruby -w -require 'Qt' +require 'TQt' a = TQt::Application.new(ARGV) hello = TQt::PushButton.new("Hello World!", nil) @@ -46,12 +46,12 @@ a.exec() Ruby 1.8 is unfortunately implicitly required as with 1.6.x it is not possible to: - Make dynamic constants available (thus forcing syntax such as Qt.RichText rather than TQt::RichText)
+ Make dynamic constants available (thus forcing syntax such as TQt.RichText rather than TQt::RichText)
Call super in the initialize method thus making subclassing of non trivial classes impossible -QtRuby features a very complete coverage of the Qt api: +TQtRuby features a very complete coverage of the TQt api: - - You can call all Qt public and protected methods, and all friend methods + - You can call all TQt public and protected methods, and all friend methods such as bitBlt() etc - Virtual methods @@ -73,7 +73,7 @@ QtRuby features a very complete coverage of the Qt api: createStandardStatusBarAction() - Operator overloading - The full range of Qt operator methods is available, for example: + The full range of TQt operator methods is available, for example: p1 = TQt::Point.new(5,5) => (5, 5) p2 = TQt::Point.new(20,20) => (20, 20) @@ -85,7 +85,7 @@ QtRuby features a very complete coverage of the Qt api: slots 'setColor(TQColor)', 'slotLoad(const TQString&)'.. signals 'clicked()'.. - Currently C++ type signatures must be used, a future version of QtRuby + Currently C++ type signatures must be used, a future version of TQtRuby will allow ruby type signatures instead. Connect slots and signals like this: @@ -163,7 +163,7 @@ QtRuby features a very complete coverage of the Qt api: error, you can turn on debugging to trace the matching process: a = TQt::Application.new(ARGV) - Qt.debug_level = TQt::DebugLevel::High + TQt.debug_level = TQt::DebugLevel::High a.loadLibrary("foo") # Non existent method Will give the following output: @@ -181,21 +181,21 @@ QtRuby features a very complete coverage of the Qt api: Another debugging mechanism allows various trace 'channels' to be switched on. You can trace virtual method callbacks: - TQt::Internal::setDebug(TQt::QtDebugChannel::TQTDB_VIRTUAL) + TQt::Internal::setDebug(TQt::TQtDebugChannel::TQTDB_VIRTUAL) - Or trace QtRuby garbage collection: - TQt::Internal::setDebug(TQt::QtDebugChannel::TQTDB_GC) + Or trace TQtRuby garbage collection: + TQt::Internal::setDebug(TQt::TQtDebugChannel::TQTDB_GC) - String i18n - QtRuby supports $KCODE values of 'u', 'e' and - 's' or the corresponding '-K' options from the command line. Qt Designer + TQtRuby supports $KCODE values of 'u', 'e' and + 's' or the corresponding '-K' options from the command line. TQt Designer .ui files have UTF-8 strings so if you use any 8 bit UTF-8 characters, you will need to set $KCODE='u' or use the -Ku command line option. - - Qt Designer - A 'rbuic' tool is included in qtruby/rubylib/designer/rbuic to compile - .ui files into ruby code. As described above, Qt Designer uses UTF-8. + - TQt Designer + A 'rbuic' tool is included in tqtruby/rubylib/designer/rbuic to compile + .ui files into ruby code. As described above, TQt Designer uses UTF-8. In addition to the options in the original uic C++ utility an '-x' flag has been added. This will generate a top level stub in the code: @@ -216,10 +216,10 @@ QtRuby features a very complete coverage of the Qt api: $ ruby mainform.rb - Loading .ui files at runtime with TQWidgetFactory - You can load a Qt Designer .ui file at runtime with the tqui extension, + You can load a TQt Designer .ui file at runtime with the tqui extension, for example: - require 'Qt' + require 'TQt' require 'tqui' a = TQt::Application.new(ARGV) @@ -238,18 +238,18 @@ QtRuby features a very complete coverage of the Qt api: a.exec() end - - QtRuby shell - You can use the QtRuby shell in bin/rbqtsh to create widgets + - TQtRuby shell + You can use the TQtRuby shell in bin/rbtqtsh to create widgets interactively from the command line. - API reference - Use the bin/rbqtapi tool to discover which methods are available in - the QtRuby api. + Use the bin/rbtqtapi tool to discover which methods are available in + the TQtRuby api. - Example programs - The best way to start programming QtRuby is to look at some existing + The best way to start programming TQtRuby is to look at some existing code and start messing with it.. - The are various samples under qtruby/rubylib/examples. + The are various samples under tqtruby/rubylib/examples. - Optional TQScintilla text editing widget support Great for building your own ruby IDE.. diff --git a/qtruby/README.1st b/tqtruby/README.1st similarity index 100% rename from qtruby/README.1st rename to tqtruby/README.1st diff --git a/qtruby/TODO b/tqtruby/TODO similarity index 59% rename from qtruby/TODO rename to tqtruby/TODO index 6aef75b8..5188dd9e 100644 --- a/qtruby/TODO +++ b/tqtruby/TODO @@ -6,8 +6,8 @@ * See the separate TODO list for the rbuic tool - * Write a rubyeditor plugin for Qt Designer + * Write a rubyeditor plugin for TQt Designer - * Add an option to rbqtapi to show the api in ruby format, rather than C++ + * Add an option to rbtqtapi to show the api in ruby format, rather than C++ - * Write a graphic class browser based on rbqtapi + * Write a graphic class browser based on rbtqtapi diff --git a/tqtruby/bin/Makefile.am b/tqtruby/bin/Makefile.am new file mode 100644 index 00000000..ff1ea111 --- /dev/null +++ b/tqtruby/bin/Makefile.am @@ -0,0 +1,9 @@ +INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) + +bin_PROGRAMS = tqtrubyinit +tqtrubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tqt/ -L$(RUBY_LIBDIR) +tqtrubyinit_METASOURCES = AUTO +tqtrubyinit_SOURCES = tqtrubyinit.cpp +tqtrubyinit_LDADD = $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/tqtruby/rubylib/tqtruby/libtqtrubyinternal.la + +bin_SCRIPTS = rbtqtapi rbtqtsh diff --git a/qtruby/bin/rbqtapi b/tqtruby/bin/rbtqtapi similarity index 89% rename from qtruby/bin/rbqtapi rename to tqtruby/bin/rbtqtapi index 8914a38f..d94775fb 100755 --- a/qtruby/bin/rbqtapi +++ b/tqtruby/bin/rbtqtapi @@ -1,21 +1,21 @@ #!/usr/bin/env ruby -# Note: this program is part of qtruby and makes use of its internal functions. +# Note: this program is part of tqtruby and makes use of its internal functions. # You should not rely on those in your own programs. require 'getopts' getopts('r:hvimp') case File.basename $0 -when "rbqtapi" - require 'Qt' +when "rbtqtapi" + require 'TQt' when "rbtdeapi" require 'Korundum' end if $OPT_v # TODO add and use version number #{TQt::VERSION} - print "qtruby using Qt-#{TQt::version}\n" + print "tqtruby using TQt-#{TQt::version}\n" exit 0 elsif $OPT_h print $usage @@ -89,15 +89,15 @@ end BEGIN { $usage = < +rbtqtapi - a tqtruby introspection tool\t(c) Germain Garand 2003 -usage: rbqtapi [-r ] [] +usage: rbtqtapi [-r ] [] options: \t-r : find all functions matching regular expression/keyword \t-i : together with -r, performs a case insensitive search \t-p : display also inherited methods for . -\t-v : print qtruby and Qt versions +\t-v : print tqtruby and TQt versions \t-h : print this help message USAGE } diff --git a/qtruby/bin/rbqtsh b/tqtruby/bin/rbtqtsh similarity index 97% rename from qtruby/bin/rbqtsh rename to tqtruby/bin/rbtqtsh index 413a037f..79a3093c 100755 --- a/qtruby/bin/rbqtsh +++ b/tqtruby/bin/rbtqtsh @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -# rbqtsh : a graphical shell for qtruby. +# rbtqtsh : a graphical shell for tqtruby. # # author: Germain Garand # ruby port: Alexander Kellett @@ -10,13 +10,13 @@ require 'stringio' case File.basename $0 -when "rbqtsh" - require 'Qt' +when "rbtqtsh" + require 'TQt' when "rbtdesh" require 'Korundum' end -include Qt +include TQt $image0_data = ["22 22 7 1", @@ -224,7 +224,7 @@ $image3_data = "QtQt.d#r#s#s#t#p.T.T.T#u#u.z#e#e#v.o.kQtQtQt"] -class QtShellControl < TQt::MainWindow +class TQtShellControl < TQt::MainWindow attr_accessor :menubar, :fileMenu, :helpMenu, :toolBar, :fileName, :fileOpenAction attr_accessor :fileSaveAction, :fileSaveAsAction, :filePrintAction, :fileExitAction attr_accessor :helpExampleAction, :comboBox, :sessionLog, :executedLines, :printer @@ -248,7 +248,7 @@ class QtShellControl < TQt::MainWindow self.setCentralWidget(box) @comboBox.setFocus self.resize(500,300) - self.setCaption("QtRuby Shell") + self.setCaption("TQtRuby Shell") def trUtf8(k) return k end @@ -331,7 +331,7 @@ class QtShellControl < TQt::MainWindow def fileOpen fname = TQt::FileDialog::getOpenFileName( ".", - "Rbqtsh Session (*.rbqts)", + "Rbtqtsh Session (*.rbtqts)", self, "open session", "Choose a file to open") @@ -342,12 +342,12 @@ class QtShellControl < TQt::MainWindow def getFileName @fileName = TQt::FileDialog::getSaveFileName( ".", - "Rbqtsh Session (*.rbqts)", + "Rbtqtsh Session (*.rbtqts)", self, "save session", "Choose a filename" ) - unless @fileName =~ /\.rbqts$/ - @fileName << ".rbqts" + unless @fileName =~ /\.rbtqts$/ + @fileName << ".rbtqts" end @fileName end @@ -479,7 +479,7 @@ class QtShellControl < TQt::MainWindow end -class QtShell < TQt::MainWindow +class TQtShell < TQt::MainWindow slots 'evalInput()', 'evalFile(TQString)', 'evalSelection(TQString)' attr_accessor :shellWindow @@binding = binding @@ -490,7 +490,7 @@ end def initialize(*k) super(*k) - @shellWindow = QtShellControl.new(nil, "shellWindow") + @shellWindow = TQtShellControl.new(nil, "shellWindow") self.resize(350,350) self.move(Point.new(10,10)) @shellWindow.move(Point.new(300,200)) @@ -603,7 +603,7 @@ end end app = TQt::Application.new(ARGV) -w = QtShell.new(nil, "mainWindow") +w = TQtShell.new(nil, "mainWindow") app.setMainWidget(w.shellWindow) app.exec diff --git a/qtruby/bin/qtrubyinit.cpp b/tqtruby/bin/tqtrubyinit.cpp similarity index 100% rename from qtruby/bin/qtrubyinit.cpp rename to tqtruby/bin/tqtrubyinit.cpp diff --git a/tqtruby/rubylib/Makefile.am b/tqtruby/rubylib/Makefile.am new file mode 100644 index 00000000..b5fd7982 --- /dev/null +++ b/tqtruby/rubylib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = tqtruby designer diff --git a/qtruby/rubylib/designer/Makefile.am b/tqtruby/rubylib/designer/Makefile.am similarity index 100% rename from qtruby/rubylib/designer/Makefile.am rename to tqtruby/rubylib/designer/Makefile.am diff --git a/qtruby/rubylib/designer/examples/colortool/Makefile b/tqtruby/rubylib/designer/examples/colortool/Makefile similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/Makefile rename to tqtruby/rubylib/designer/examples/colortool/Makefile diff --git a/qtruby/rubylib/designer/examples/colortool/README b/tqtruby/rubylib/designer/examples/colortool/README similarity index 75% rename from qtruby/rubylib/designer/examples/colortool/README rename to tqtruby/rubylib/designer/examples/colortool/README index 99d2174b..574a943f 100644 --- a/qtruby/rubylib/designer/examples/colortool/README +++ b/tqtruby/rubylib/designer/examples/colortool/README @@ -1,4 +1,4 @@ -This is the Qt Designer Tutorial 'Creating Dialogs' translated into QtRuby. It +This is the TQt Designer Tutorial 'Creating Dialogs' translated into TQtRuby. It shows how you can combine ruby code generated from .ui files with the rbuic tool, with your own code. diff --git a/qtruby/rubylib/designer/examples/colortool/colornameform.ui b/tqtruby/rubylib/designer/examples/colortool/colornameform.ui similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/colornameform.ui rename to tqtruby/rubylib/designer/examples/colortool/colornameform.ui diff --git a/qtruby/rubylib/designer/examples/colortool/colornameform.ui.rb b/tqtruby/rubylib/designer/examples/colortool/colornameform.ui.rb similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/colornameform.ui.rb rename to tqtruby/rubylib/designer/examples/colortool/colornameform.ui.rb diff --git a/qtruby/rubylib/designer/examples/colortool/findform.ui b/tqtruby/rubylib/designer/examples/colortool/findform.ui similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/findform.ui rename to tqtruby/rubylib/designer/examples/colortool/findform.ui diff --git a/qtruby/rubylib/designer/examples/colortool/findform.ui.rb b/tqtruby/rubylib/designer/examples/colortool/findform.ui.rb similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/findform.ui.rb rename to tqtruby/rubylib/designer/examples/colortool/findform.ui.rb diff --git a/qtruby/rubylib/designer/examples/colortool/images/editcopy b/tqtruby/rubylib/designer/examples/colortool/images/editcopy similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/editcopy rename to tqtruby/rubylib/designer/examples/colortool/images/editcopy diff --git a/qtruby/rubylib/designer/examples/colortool/images/editcopy.png b/tqtruby/rubylib/designer/examples/colortool/images/editcopy.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/editcopy.png rename to tqtruby/rubylib/designer/examples/colortool/images/editcopy.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/editcut b/tqtruby/rubylib/designer/examples/colortool/images/editcut similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/editcut rename to tqtruby/rubylib/designer/examples/colortool/images/editcut diff --git a/qtruby/rubylib/designer/examples/colortool/images/editcut.png b/tqtruby/rubylib/designer/examples/colortool/images/editcut.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/editcut.png rename to tqtruby/rubylib/designer/examples/colortool/images/editcut.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/editraise.png b/tqtruby/rubylib/designer/examples/colortool/images/editraise.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/editraise.png rename to tqtruby/rubylib/designer/examples/colortool/images/editraise.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/filenew b/tqtruby/rubylib/designer/examples/colortool/images/filenew similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/filenew rename to tqtruby/rubylib/designer/examples/colortool/images/filenew diff --git a/qtruby/rubylib/designer/examples/colortool/images/filenew.png b/tqtruby/rubylib/designer/examples/colortool/images/filenew.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/filenew.png rename to tqtruby/rubylib/designer/examples/colortool/images/filenew.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/fileopen b/tqtruby/rubylib/designer/examples/colortool/images/fileopen similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/fileopen rename to tqtruby/rubylib/designer/examples/colortool/images/fileopen diff --git a/qtruby/rubylib/designer/examples/colortool/images/fileopen.png b/tqtruby/rubylib/designer/examples/colortool/images/fileopen.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/fileopen.png rename to tqtruby/rubylib/designer/examples/colortool/images/fileopen.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/filesave b/tqtruby/rubylib/designer/examples/colortool/images/filesave similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/filesave rename to tqtruby/rubylib/designer/examples/colortool/images/filesave diff --git a/qtruby/rubylib/designer/examples/colortool/images/filesave.png b/tqtruby/rubylib/designer/examples/colortool/images/filesave.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/filesave.png rename to tqtruby/rubylib/designer/examples/colortool/images/filesave.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/iconview.png b/tqtruby/rubylib/designer/examples/colortool/images/iconview.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/iconview.png rename to tqtruby/rubylib/designer/examples/colortool/images/iconview.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/richtextedit.png b/tqtruby/rubylib/designer/examples/colortool/images/richtextedit.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/richtextedit.png rename to tqtruby/rubylib/designer/examples/colortool/images/richtextedit.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/searchfind b/tqtruby/rubylib/designer/examples/colortool/images/searchfind similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/searchfind rename to tqtruby/rubylib/designer/examples/colortool/images/searchfind diff --git a/qtruby/rubylib/designer/examples/colortool/images/searchfind.png b/tqtruby/rubylib/designer/examples/colortool/images/searchfind.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/searchfind.png rename to tqtruby/rubylib/designer/examples/colortool/images/searchfind.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/table.png b/tqtruby/rubylib/designer/examples/colortool/images/table.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/table.png rename to tqtruby/rubylib/designer/examples/colortool/images/table.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/tabwidget.png b/tqtruby/rubylib/designer/examples/colortool/images/tabwidget.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/tabwidget.png rename to tqtruby/rubylib/designer/examples/colortool/images/tabwidget.png diff --git a/qtruby/rubylib/designer/examples/colortool/images/widgetstack.png b/tqtruby/rubylib/designer/examples/colortool/images/widgetstack.png similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/images/widgetstack.png rename to tqtruby/rubylib/designer/examples/colortool/images/widgetstack.png diff --git a/qtruby/rubylib/designer/examples/colortool/main.rb b/tqtruby/rubylib/designer/examples/colortool/main.rb similarity index 89% rename from qtruby/rubylib/designer/examples/colortool/main.rb rename to tqtruby/rubylib/designer/examples/colortool/main.rb index 5c6a64a1..ef0362da 100644 --- a/qtruby/rubylib/designer/examples/colortool/main.rb +++ b/tqtruby/rubylib/designer/examples/colortool/main.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' require 'mainform.rb' require 'mainform.ui.rb' diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui b/tqtruby/rubylib/designer/examples/colortool/mainform.ui similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/mainform.ui rename to tqtruby/rubylib/designer/examples/colortool/mainform.ui diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb b/tqtruby/rubylib/designer/examples/colortool/mainform.ui.rb similarity index 99% rename from qtruby/rubylib/designer/examples/colortool/mainform.ui.rb rename to tqtruby/rubylib/designer/examples/colortool/mainform.ui.rb index 3f4f5945..e7ed5d71 100644 --- a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb +++ b/tqtruby/rubylib/designer/examples/colortool/mainform.ui.rb @@ -6,7 +6,7 @@ class MainForm COL_NAME = 0 COL_HEX = 1 COL_WEB = 2 - WINDOWS_REGISTRY = "/QtExamples" + WINDOWS_REGISTRY = "/TQtExamples" APP_KEY = "/ColorTool/" def init() diff --git a/qtruby/rubylib/designer/examples/colortool/optionsform.ui b/tqtruby/rubylib/designer/examples/colortool/optionsform.ui similarity index 100% rename from qtruby/rubylib/designer/examples/colortool/optionsform.ui rename to tqtruby/rubylib/designer/examples/colortool/optionsform.ui diff --git a/qtruby/rubylib/designer/rbuic/LICENSE.GPL b/tqtruby/rubylib/designer/rbuic/LICENSE.GPL similarity index 100% rename from qtruby/rubylib/designer/rbuic/LICENSE.GPL rename to tqtruby/rubylib/designer/rbuic/LICENSE.GPL diff --git a/qtruby/rubylib/designer/rbuic/Makefile.am b/tqtruby/rubylib/designer/rbuic/Makefile.am similarity index 100% rename from qtruby/rubylib/designer/rbuic/Makefile.am rename to tqtruby/rubylib/designer/rbuic/Makefile.am diff --git a/qtruby/rubylib/designer/rbuic/TODO b/tqtruby/rubylib/designer/rbuic/TODO similarity index 100% rename from qtruby/rubylib/designer/rbuic/TODO rename to tqtruby/rubylib/designer/rbuic/TODO diff --git a/qtruby/rubylib/designer/rbuic/domtool.cpp b/tqtruby/rubylib/designer/rbuic/domtool.cpp similarity index 97% rename from qtruby/rubylib/designer/rbuic/domtool.cpp rename to tqtruby/rubylib/designer/rbuic/domtool.cpp index 65ea3a71..072f060a 100644 --- a/qtruby/rubylib/designer/rbuic/domtool.cpp +++ b/tqtruby/rubylib/designer/rbuic/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. @@ -352,7 +352,7 @@ static bool toBool( const TQString& s ) } /*! - Convert Qt 2.x format to Qt 3.0 format if necessary + Convert Qt 2.x format to TQt 3.0 format if necessary */ void DomTool::fixDocument( TQDomDocument& doc ) { diff --git a/qtruby/rubylib/designer/rbuic/domtool.h b/tqtruby/rubylib/designer/rbuic/domtool.h similarity index 88% rename from qtruby/rubylib/designer/rbuic/domtool.h rename to tqtruby/rubylib/designer/rbuic/domtool.h index 8f3aa67c..efa67f09 100644 --- a/qtruby/rubylib/designer/rbuic/domtool.h +++ b/tqtruby/rubylib/designer/rbuic/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. @@ -33,7 +33,7 @@ class TQDomElement; class TQDomDocument; -class DomTool : public Qt +class DomTool : public TQt { public: static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/tqtruby/rubylib/designer/rbuic/embed.cpp similarity index 95% rename from qtruby/rubylib/designer/rbuic/embed.cpp rename to tqtruby/rubylib/designer/rbuic/embed.cpp index 5b4a2fc3..f4ce2420 100644 --- a/qtruby/rubylib/designer/rbuic/embed.cpp +++ b/tqtruby/rubylib/designer/rbuic/embed.cpp @@ -4,7 +4,7 @@ ** Copyright (c) 2002 Riverbank Computing Limited ** Copyright (c) 2002 Germain Garand ** -** 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,14 +21,14 @@ ** **********************************************************************/ /* -** 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 ** -** 08/2003 : Initial release of rbuic, the QtRuby User Interface Compiler, -** a work derived from the PerlQt puic. +** 08/2003 : Initial release of rbuic, the TQtRuby User Interface Compiler, +** a work derived from the PerlTQt puic. ** ** Richard Dale ** @@ -133,14 +133,14 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << "# " << *it << endl; out << "#" << endl; out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; - out << "# by: The QtRuby User Interface Compiler (rbuic)" << endl; + out << "# by: The TQtRuby User Interface Compiler (rbuic)" << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; out << endl; if (hasKDEwidget) { out << "require 'Korundum'" << endl; } else { - out << "require 'Qt'" << endl; + out << "require 'TQt'" << endl; } out << endl; diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/tqtruby/rubylib/designer/rbuic/form.cpp similarity index 98% rename from qtruby/rubylib/designer/rbuic/form.cpp rename to tqtruby/rubylib/designer/rbuic/form.cpp index 937c32eb..650beeca 100644 --- a/qtruby/rubylib/designer/rbuic/form.cpp +++ b/tqtruby/rubylib/designer/rbuic/form.cpp @@ -2,7 +2,7 @@ ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** Copyright (c) 2002 Germain Garand ** -** 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 ** @@ -97,7 +97,7 @@ void Uic::createFormImpl( const TQDomElement &e ) if (hasKDEwidget) { out << indent << "require 'Korundum'" << endl << endl; } else { - out << indent << "require 'Qt'" << endl << endl; + out << indent << "require 'TQt'" << endl << endl; } // generate local and local includes required @@ -208,7 +208,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << "class " << nameOfClass << " < " << objClass << endl << endl; - // QtRuby sig/slot declaration + // TQtRuby sig/slot declaration ++indent; @@ -771,7 +771,7 @@ void Uic::createFormImpl( const TQDomElement &e ) } } -// QtRuby - FIXME: what the heck is this ? +// TQtRuby - FIXME: what the heck is this ? // buddies bool firstBuddy = true; for ( TQValueList::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { @@ -816,7 +816,7 @@ void Uic::createFormImpl( const TQDomElement &e ) break; } -// PerlQt - TODO: is this needed ? +// PerlTQt - TODO: is this needed ? // Seems not.. let's ifzero for now... if ( 0 && needFontEventHandler) { @@ -1009,7 +1009,7 @@ void Uic::createFormImpl( const TQDomElement& e, const TQString& form, const TQS } -// Generate a QtRuby signal/slot definition. +// Generate a TQtRuby signal/slot definition. void Uic::rubySlot(TQStringList::Iterator &it) { diff --git a/qtruby/rubylib/designer/rbuic/globaldefs.h b/tqtruby/rubylib/designer/rbuic/globaldefs.h similarity index 97% rename from qtruby/rubylib/designer/rbuic/globaldefs.h rename to tqtruby/rubylib/designer/rbuic/globaldefs.h index aebf63c3..45698cde 100644 --- a/qtruby/rubylib/designer/rbuic/globaldefs.h +++ b/tqtruby/rubylib/designer/rbuic/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 diff --git a/qtruby/rubylib/designer/rbuic/main.cpp b/tqtruby/rubylib/designer/rbuic/main.cpp similarity index 93% rename from qtruby/rubylib/designer/rbuic/main.cpp rename to tqtruby/rubylib/designer/rbuic/main.cpp index ed74aece..0cb21902 100644 --- a/qtruby/rubylib/designer/rbuic/main.cpp +++ b/tqtruby/rubylib/designer/rbuic/main.cpp @@ -3,7 +3,7 @@ ** Copyright (c) 2001 Phil Thompson ** Copyright (c) 2002 Germain Garand ** -** 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,14 +20,14 @@ ** **********************************************************************/ /* -** 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 ** -** 08/2003 : Initial release of rbuic, the QtRuby User Interface Compiler, -** a work derived from the PerlQt puic. +** 08/2003 : Initial release of rbuic, the TQtRuby User Interface Compiler, +** a work derived from the PerlTQt puic. ** ** Richard Dale ** @@ -116,7 +116,7 @@ int main( int argc, char * argv[] ) } } else if ( opt == "version" ) { fprintf( stderr, - "QtRuby User Interface Compiler v%s for Qt version %s\n", RBUIC_VERSION, + "TQtRuby User Interface Compiler v%s for TQt version %s\n", RBUIC_VERSION, TQT_VERSION_STR ); exit( 1 ); } else if ( opt == "help" ) { @@ -156,7 +156,7 @@ int main( int argc, char * argv[] ) } if ( argc < 2 || error || (!fileName && !imagecollection ) ) { - fprintf( stderr, "QtRuby user interface compiler.\n" ); + fprintf( stderr, "TQtRuby user interface compiler.\n" ); if ( error ) fprintf( stderr, "rbuic: %s\n", error ); @@ -224,7 +224,7 @@ int main( int argc, char * argv[] ) out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl; out << "#" << endl; out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; - out << "# by: The QtRuby User Interface Compiler (rbuic)" << endl; + out << "# by: The TQtRuby User Interface Compiler (rbuic)" << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; out << endl; diff --git a/qtruby/rubylib/designer/rbuic/object.cpp b/tqtruby/rubylib/designer/rbuic/object.cpp similarity index 98% rename from qtruby/rubylib/designer/rbuic/object.cpp rename to tqtruby/rubylib/designer/rbuic/object.cpp index 097ecab6..3711bcf7 100644 --- a/qtruby/rubylib/designer/rbuic/object.cpp +++ b/tqtruby/rubylib/designer/rbuic/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 @@ -16,8 +16,8 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** -** 08/2003 : Initial release of rbuic, the QtRuby User Interface Compiler, -** a work derived from the PerlQt puic. +** 08/2003 : Initial release of rbuic, the TQtRuby User Interface Compiler, +** a work derived from the PerlTQt puic. ** ** Richard Dale ** @@ -63,7 +63,7 @@ void Uic::createObjectDecl( const TQDomElement& e ) } /*! - Creates a QtRuby attribute declaration for the object given in \a e. + Creates a TQtRuby attribute declaration for the object given in \a e. Children are not traversed recursively. @@ -160,7 +160,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } // Layouts don't go into the class instance dictionary. - // FIXME PerlQt: fullObjName isn't used anymore => remove + // FIXME PerlTQt: fullObjName isn't used anymore => remove fullObjName = objName; } else if ( objClass != "TQt::ToolBar" && objClass != "TQt::MenuBar" ) { // register the object and unify its name @@ -511,7 +511,7 @@ TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, v = "\"%1\""; v = v.arg( e.firstChild().toText().data() ); } else if ( e.tagName() == "number" ) { - // FIXME: hack. QtRuby needs a TQKeySequence to build an accel + // FIXME: hack. TQtRuby needs a TQKeySequence to build an accel if( e.parentNode().toElement().attribute("name") == "accel" ) v = "TQt::KeySequence.new(%1)"; else diff --git a/qtruby/rubylib/designer/rbuic/parser.cpp b/tqtruby/rubylib/designer/rbuic/parser.cpp similarity index 93% rename from qtruby/rubylib/designer/rbuic/parser.cpp rename to tqtruby/rubylib/designer/rbuic/parser.cpp index 8c264a63..0c930dea 100644 --- a/qtruby/rubylib/designer/rbuic/parser.cpp +++ b/tqtruby/rubylib/designer/rbuic/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 @@ -16,8 +16,8 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** -** 08/2003 : Initial release of rbuic, the QtRuby User Interface Compiler, -** a work derived from the PerlQt puic. +** 08/2003 : Initial release of rbuic, the TQtRuby User Interface Compiler, +** a work derived from the PerlTQt puic. ** ** Richard Dale ** diff --git a/qtruby/rubylib/designer/rbuic/parser.h b/tqtruby/rubylib/designer/rbuic/parser.h similarity index 96% rename from qtruby/rubylib/designer/rbuic/parser.h rename to tqtruby/rubylib/designer/rbuic/parser.h index ace96d9e..5fdbdc2b 100644 --- a/qtruby/rubylib/designer/rbuic/parser.h +++ b/tqtruby/rubylib/designer/rbuic/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 diff --git a/qtruby/rubylib/designer/rbuic/rbuic.pro b/tqtruby/rubylib/designer/rbuic/rbuic.pro similarity index 89% rename from qtruby/rubylib/designer/rbuic/rbuic.pro rename to tqtruby/rubylib/designer/rbuic/rbuic.pro index a9869ab0..c9deff35 100644 --- a/qtruby/rubylib/designer/rbuic/rbuic.pro +++ b/tqtruby/rubylib/designer/rbuic/rbuic.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt console warn_on release professional +CONFIG += tqt console warn_on release professional HEADERS = uic.h \ widgetdatabase.h \ domtool.h \ diff --git a/qtruby/rubylib/designer/rbuic/subclassing.cpp b/tqtruby/rubylib/designer/rbuic/subclassing.cpp similarity index 98% rename from qtruby/rubylib/designer/rbuic/subclassing.cpp rename to tqtruby/rubylib/designer/rbuic/subclassing.cpp index 2246db73..e81b90ff 100644 --- a/qtruby/rubylib/designer/rbuic/subclassing.cpp +++ b/tqtruby/rubylib/designer/rbuic/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 @@ -52,7 +52,7 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) if (hasKDEwidget) { out << indent << "require 'Korundum'" << endl; } else { - out << indent << "require 'Qt'" << endl; + out << indent << "require 'TQt'" << endl; } out << endl; out << indent << "class " << subClass << " < " << nameOfClass << endl; diff --git a/qtruby/rubylib/designer/rbuic/uic.cpp b/tqtruby/rubylib/designer/rbuic/uic.cpp similarity index 98% rename from qtruby/rubylib/designer/rbuic/uic.cpp rename to tqtruby/rubylib/designer/rbuic/uic.cpp index 9343b4e6..e7155709 100644 --- a/qtruby/rubylib/designer/rbuic/uic.cpp +++ b/tqtruby/rubylib/designer/rbuic/uic.cpp @@ -3,7 +3,7 @@ ** Copyright (c) 2001 Phil Thompson ** Copyright (c) 2002 Germain Garand ** -** 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,14 +20,14 @@ ** **********************************************************************/ /* -** 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 ** -** 08/2003 : Initial release of rbuic, the QtRuby User Interface Compiler, -** a work derived from the PerlQt puic. +** 08/2003 : Initial release of rbuic, the TQtRuby User Interface Compiler, +** a work derived from the PerlTQt puic. ** ** Richard Dale ** @@ -127,7 +127,7 @@ bool Uic::isEmptyFunction( const TQString& fname ) TQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 ); return body.simplifyWhiteSpace().isEmpty(); } - // For now ruby functions are always empty, until a rubyeditor Qt Designer plugin exists.. + // For now ruby functions are always empty, until a rubyeditor TQt Designer plugin exists.. return true; } diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/tqtruby/rubylib/designer/rbuic/uic.h similarity index 99% rename from qtruby/rubylib/designer/rbuic/uic.h rename to tqtruby/rubylib/designer/rbuic/uic.h index ddfcc1be..f7c23483 100644 --- a/qtruby/rubylib/designer/rbuic/uic.h +++ b/tqtruby/rubylib/designer/rbuic/uic.h @@ -2,7 +2,7 @@ ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** Copyright (c) 2001 Phil Thompson ** -** 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 @@ -48,7 +48,7 @@ private: }; -class Uic : public Qt +class Uic : public TQt { public: Uic( const TQString &fn, TQTextStream& out, TQDomDocument doc, bool subcl, diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/tqtruby/rubylib/designer/rbuic/widgetdatabase.cpp similarity index 99% rename from qtruby/rubylib/designer/rbuic/widgetdatabase.cpp rename to tqtruby/rubylib/designer/rbuic/widgetdatabase.cpp index 816a6e74..242a89a9 100644 --- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp +++ b/tqtruby/rubylib/designer/rbuic/widgetdatabase.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 diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.h b/tqtruby/rubylib/designer/rbuic/widgetdatabase.h similarity index 97% rename from qtruby/rubylib/designer/rbuic/widgetdatabase.h rename to tqtruby/rubylib/designer/rbuic/widgetdatabase.h index 63ccd829..11fa0199 100644 --- a/qtruby/rubylib/designer/rbuic/widgetdatabase.h +++ b/tqtruby/rubylib/designer/rbuic/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 @@ -40,7 +40,7 @@ struct WidgetDatabaseRecord int nameCounter; }; -class WidgetDatabase : public Qt +class WidgetDatabase : public TQt { public: WidgetDatabase(); diff --git a/qtruby/rubylib/designer/rbuic/widgetinterface.h b/tqtruby/rubylib/designer/rbuic/widgetinterface.h similarity index 96% rename from qtruby/rubylib/designer/rbuic/widgetinterface.h rename to tqtruby/rubylib/designer/rbuic/widgetinterface.h index 1296f162..50f8e6d1 100644 --- a/qtruby/rubylib/designer/rbuic/widgetinterface.h +++ b/tqtruby/rubylib/designer/rbuic/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 diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/tqtruby/rubylib/designer/uilib/Makefile.am similarity index 51% rename from qtruby/rubylib/designer/uilib/Makefile.am rename to tqtruby/rubylib/designer/uilib/Makefile.am index 45876ed6..2873b9df 100644 --- a/qtruby/rubylib/designer/uilib/Makefile.am +++ b/tqtruby/rubylib/designer/uilib/Makefile.am @@ -1,7 +1,7 @@ -INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) +INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/tqtruby/rubylib/tqtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) rubylibdir = $(RUBY_ARCHDIR) rubylib_LTLIBRARIES = tqui.la tqui_la_SOURCES = tqui.cpp tqui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0 -tqui_la_LIBADD = -ltqui $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libtqtrubyinternal.la +tqui_la_LIBADD = -ltqui $(LIB_TQT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/tqtruby/rubylib/tqtruby/libtqtrubyinternal.la diff --git a/tqtruby/rubylib/designer/uilib/extconf.rb b/tqtruby/rubylib/designer/uilib/extconf.rb new file mode 100644 index 00000000..5968dcd2 --- /dev/null +++ b/tqtruby/rubylib/designer/uilib/extconf.rb @@ -0,0 +1,6 @@ +require 'mkmf' +dir_config('smoke') +dir_config('tqt') +$CPPFLAGS += " -I../../../../smoke -I../../tqtruby " +$LOCAL_LIBS += '-bundle_loader ../../tqtruby/tqtruby.bundle -lsmoketqt -ltqui -ltqt-mt -lstdc++' +create_makefile("tqui") diff --git a/qtruby/rubylib/designer/uilib/test/test.rb b/tqtruby/rubylib/designer/uilib/test/test.rb similarity index 92% rename from qtruby/rubylib/designer/uilib/test/test.rb rename to tqtruby/rubylib/designer/uilib/test/test.rb index ff3570cc..ccebd834 100644 --- a/qtruby/rubylib/designer/uilib/test/test.rb +++ b/tqtruby/rubylib/designer/uilib/test/test.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' require 'tqui' a = TQt::Application.new(ARGV) diff --git a/qtruby/rubylib/designer/uilib/tqui.cpp b/tqtruby/rubylib/designer/uilib/tqui.cpp similarity index 94% rename from qtruby/rubylib/designer/uilib/tqui.cpp rename to tqtruby/rubylib/designer/uilib/tqui.cpp index 834cba2c..8de2846f 100644 --- a/qtruby/rubylib/designer/uilib/tqui.cpp +++ b/tqtruby/rubylib/designer/uilib/tqui.cpp @@ -32,10 +32,10 @@ #endif #include -#include "qtruby.h" +#include "tqtruby.h" #include "smokeruby.h" -extern Smoke *qt_Smoke; +extern Smoke *tqt_Smoke; extern bool isDerivedFrom(Smoke *smoke, Smoke::Index classId, Smoke::Index baseId); extern "C" { @@ -93,7 +93,7 @@ create(int argc, VALUE * argv, VALUE /*klass*/) TQIODevice * dev = 0; smokeruby_object *o = value_obj_info(argv[0]); - if (o != 0 && o->ptr != 0 && o->classId == qt_Smoke->idClass("TQIODevice")) { + if (o != 0 && o->ptr != 0 && o->classId == tqt_Smoke->idClass("TQIODevice")) { dev = (TQIODevice *) o->ptr; } else { rb_raise(rb_eArgError, "invalid argument type\n"); @@ -106,12 +106,12 @@ create(int argc, VALUE * argv, VALUE /*klass*/) if (topLevelWidget != 0) { smokeruby_object * o = (smokeruby_object *) malloc(sizeof(smokeruby_object)); - o->smoke = qt_Smoke; - o->classId = qt_Smoke->idClass(topLevelWidget->className()); + o->smoke = tqt_Smoke; + o->classId = tqt_Smoke->idClass(topLevelWidget->className()); o->ptr = topLevelWidget; o->allocated = false; - const char * className = qt_Smoke->binding->className(o->classId); + const char * className = tqt_Smoke->binding->className(o->classId); result = set_obj_info(className, o); } diff --git a/qtruby/rubylib/examples/base/kicons.rb b/tqtruby/rubylib/examples/base/kicons.rb similarity index 96% rename from qtruby/rubylib/examples/base/kicons.rb rename to tqtruby/rubylib/examples/base/kicons.rb index 5d201c07..e9a6d6eb 100644 --- a/qtruby/rubylib/examples/base/kicons.rb +++ b/tqtruby/rubylib/examples/base/kicons.rb @@ -28,7 +28,7 @@ class TDEIconCollection icon_set.setPixmap(pixmap, TQt::IconSet.Small) icon_set end - def make_qt_action(parent, text_with_accel, icon_type) + def make_tqt_action(parent, text_with_accel, icon_type) act = TQt::Action.new(parent) act.setIconSet(get_icon_set(icon_type)) act.setMenuText(text_with_accel) diff --git a/qtruby/rubylib/examples/base/rui.rb b/tqtruby/rubylib/examples/base/rui.rb similarity index 64% rename from qtruby/rubylib/examples/base/rui.rb rename to tqtruby/rubylib/examples/base/rui.rb index ad14bc11..94d3637d 100644 --- a/qtruby/rubylib/examples/base/rui.rb +++ b/tqtruby/rubylib/examples/base/rui.rb @@ -10,12 +10,12 @@ def build_actions(actions) |to| a.id = to.insertSeparator() } else - qt_action = $kIcons.make_qt_action(self, a.text_with_accel, a.icon_type) - connect(qt_action, SIGNAL('activated()'), a.rec, a.slot) + tqt_action = $kIcons.make_tqt_action(self, a.text_with_accel, a.icon_type) + connect(tqt_action, SIGNAL('activated()'), a.rec, a.slot) a.included_in.each { - |to| qt_action.addTo(to) + |to| tqt_action.addTo(to) } - a.action = qt_action + a.action = tqt_action end } end diff --git a/qtruby/rubylib/examples/canvastest/canvastest.rb b/tqtruby/rubylib/examples/canvastest/canvastest.rb similarity index 99% rename from qtruby/rubylib/examples/canvastest/canvastest.rb rename to tqtruby/rubylib/examples/canvastest/canvastest.rb index b695505c..1e9a7307 100644 --- a/qtruby/rubylib/examples/canvastest/canvastest.rb +++ b/tqtruby/rubylib/examples/canvastest/canvastest.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -w -require 'Qt' +require 'TQt' require 'rexml/document' require '../base/kicons.rb' diff --git a/qtruby/rubylib/examples/killerfilter/killerfilter.rb b/tqtruby/rubylib/examples/killerfilter/killerfilter.rb similarity index 97% rename from qtruby/rubylib/examples/killerfilter/killerfilter.rb rename to tqtruby/rubylib/examples/killerfilter/killerfilter.rb index d7732ee1..10765116 100644 --- a/qtruby/rubylib/examples/killerfilter/killerfilter.rb +++ b/tqtruby/rubylib/examples/killerfilter/killerfilter.rb @@ -1,8 +1,8 @@ #!/usr/bin/env ruby -w -# This is the EventFilter example from Chapter 16 of 'Programming with Qt' +# This is the EventFilter example from Chapter 16 of 'Programming with TQt' -require 'Qt' +require 'TQt' class KillerFilter < TQt::Object diff --git a/qtruby/rubylib/examples/network/clientserver/client/client.rb b/tqtruby/rubylib/examples/network/clientserver/client/client.rb similarity index 99% rename from qtruby/rubylib/examples/network/clientserver/client/client.rb rename to tqtruby/rubylib/examples/network/clientserver/client/client.rb index 1272adf0..1c3dcec0 100644 --- a/qtruby/rubylib/examples/network/clientserver/client/client.rb +++ b/tqtruby/rubylib/examples/network/clientserver/client/client.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class Client < TQt::VBox diff --git a/qtruby/rubylib/examples/network/clientserver/server/server.rb b/tqtruby/rubylib/examples/network/clientserver/server/server.rb similarity index 99% rename from qtruby/rubylib/examples/network/clientserver/server/server.rb rename to tqtruby/rubylib/examples/network/clientserver/server/server.rb index 4a53fbf0..2dbe70e9 100644 --- a/qtruby/rubylib/examples/network/clientserver/server/server.rb +++ b/tqtruby/rubylib/examples/network/clientserver/server/server.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' =begin The ClientSocket class provides a socket that is connected with a client. diff --git a/qtruby/rubylib/examples/passivepopup/passivepopup.rb b/tqtruby/rubylib/examples/passivepopup/passivepopup.rb similarity index 98% rename from qtruby/rubylib/examples/passivepopup/passivepopup.rb rename to tqtruby/rubylib/examples/passivepopup/passivepopup.rb index 5cc2b4ea..9899f978 100644 --- a/qtruby/rubylib/examples/passivepopup/passivepopup.rb +++ b/tqtruby/rubylib/examples/passivepopup/passivepopup.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' class PassiveWindow < TQt::Frame MARGIN = 20 diff --git a/qtruby/rubylib/examples/ruboids/Manifest b/tqtruby/rubylib/examples/ruboids/Manifest similarity index 100% rename from qtruby/rubylib/examples/ruboids/Manifest rename to tqtruby/rubylib/examples/ruboids/Manifest diff --git a/qtruby/rubylib/examples/ruboids/README b/tqtruby/rubylib/examples/ruboids/README similarity index 94% rename from qtruby/rubylib/examples/ruboids/README rename to tqtruby/rubylib/examples/ruboids/README index 5417037a..4b961639 100644 --- a/qtruby/rubylib/examples/ruboids/README +++ b/tqtruby/rubylib/examples/ruboids/README @@ -1,7 +1,7 @@ INTRODUCTION ============ -RuBoids is a Boids simulation written in Ruby and using OpenGL and Qt. For +RuBoids is a Boids simulation written in Ruby and using OpenGL and TQt. For information on Boids, see http://www.red3d.com/cwr/boids/. Ruby is an object-oriented scripting language by Yukihiro Matsumoto. The @@ -30,7 +30,7 @@ directory: DEPENDENCIES ============ -RuBoids requires the OpenGL and Qt packages, which can be found on the Ruby +RuBoids requires the OpenGL and TQt packages, which can be found on the Ruby Application Archive. COPYING diff --git a/qtruby/rubylib/examples/ruboids/TODO b/tqtruby/rubylib/examples/ruboids/TODO similarity index 100% rename from qtruby/rubylib/examples/ruboids/TODO rename to tqtruby/rubylib/examples/ruboids/TODO diff --git a/qtruby/rubylib/examples/ruboids/boids.properties b/tqtruby/rubylib/examples/ruboids/boids.properties similarity index 100% rename from qtruby/rubylib/examples/ruboids/boids.properties rename to tqtruby/rubylib/examples/ruboids/boids.properties diff --git a/qtruby/rubylib/examples/ruboids/generateManifest.rb b/tqtruby/rubylib/examples/ruboids/generateManifest.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/generateManifest.rb rename to tqtruby/rubylib/examples/ruboids/generateManifest.rb diff --git a/qtruby/rubylib/examples/ruboids/index.html b/tqtruby/rubylib/examples/ruboids/index.html similarity index 97% rename from qtruby/rubylib/examples/ruboids/index.html rename to tqtruby/rubylib/examples/ruboids/index.html index 787038f8..024719da 100644 --- a/qtruby/rubylib/examples/ruboids/index.html +++ b/tqtruby/rubylib/examples/ruboids/index.html @@ -56,7 +56,7 @@ RuBoids

Introduction

-RuBoids is a Boids simulation written in Ruby and using OpenGL and Qt. For +RuBoids is a Boids simulation written in Ruby and using OpenGL and TQt. For information on Boids, see http://www.red3d.com/cwr/boids/.

@@ -82,7 +82,7 @@ where the latest release may be found.

Dependencies

-RuBoids requires the OpenGL and Qt packages, which can be found on the Ruby Application Archive.

diff --git a/qtruby/rubylib/examples/ruboids/release.rb b/tqtruby/rubylib/examples/ruboids/release.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/release.rb rename to tqtruby/rubylib/examples/ruboids/release.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Boid.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Boid.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Boid.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Boid.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb b/tqtruby/rubylib/examples/ruboids/ruboids/BoidView.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/BoidView.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/BoidView.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Camera.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Camera.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Camera.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Camera.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb b/tqtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb similarity index 99% rename from qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb index 623abe4b..2ad2a1bc 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb @@ -5,7 +5,7 @@ # http://www.ruby-lang.org/en/LICENSE.txt. # -require 'Qt' +require 'TQt' require 'World' require 'Camera' diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Canvas.rb similarity index 99% rename from qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Canvas.rb index d0fddeff..ad3e5029 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/Canvas.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/Canvas.rb @@ -5,7 +5,7 @@ # http://www.ruby-lang.org/en/LICENSE.txt. # -require 'Qt' +require 'TQt' require 'opengl' require 'World' require 'Cloud' diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Cloud.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Cloud.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Cloud.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb b/tqtruby/rubylib/examples/ruboids/ruboids/CloudView.rb similarity index 98% rename from qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/CloudView.rb index 75c62177..1f56cd30 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/CloudView.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/CloudView.rb @@ -5,7 +5,7 @@ # http://www.ruby-lang.org/en/LICENSE.txt. # -require 'Qt' +require 'TQt' require 'View' require 'Cloud' require 'Params' diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Flock.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Flock.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Flock.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Flock.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Graphics.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Graphics.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Graphics.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Params.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Params.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Params.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Params.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Point.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Point.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Point.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Point.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Thing.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Thing.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Thing.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Thing.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb b/tqtruby/rubylib/examples/ruboids/ruboids/Triangle.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/Triangle.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/Triangle.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/View.rb b/tqtruby/rubylib/examples/ruboids/ruboids/View.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/View.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/View.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/World.rb b/tqtruby/rubylib/examples/ruboids/ruboids/World.rb similarity index 99% rename from qtruby/rubylib/examples/ruboids/ruboids/World.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/World.rb index 4bd56d88..7642e5f2 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/World.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/World.rb @@ -6,7 +6,7 @@ # require 'singleton' -require 'Qt' +require 'TQt' require 'Params' require 'Cloud' require 'Flock' diff --git a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb b/tqtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb similarity index 98% rename from qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb index 56459729..95288ef8 100644 --- a/qtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb @@ -5,7 +5,7 @@ # http://www.ruby-lang.org/en/LICENSE.txt. # -require 'Qt' +require 'TQt' require 'Canvas' require 'CameraDialog' diff --git a/qtruby/rubylib/examples/ruboids/ruboids/info.rb b/tqtruby/rubylib/examples/ruboids/ruboids/info.rb similarity index 100% rename from qtruby/rubylib/examples/ruboids/ruboids/info.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/info.rb diff --git a/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb b/tqtruby/rubylib/examples/ruboids/ruboids/ruboids.rb similarity index 97% rename from qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb rename to tqtruby/rubylib/examples/ruboids/ruboids/ruboids.rb index 8040ab74..97787f70 100755 --- a/qtruby/rubylib/examples/ruboids/ruboids/ruboids.rb +++ b/tqtruby/rubylib/examples/ruboids/ruboids/ruboids.rb @@ -6,7 +6,7 @@ # http://www.ruby-lang.org/en/LICENSE.txt. # -require 'Qt' +require 'TQt' require 'World' require 'WorldWindow' require 'Canvas' diff --git a/qtruby/rubylib/examples/testcases/bugs.rb b/tqtruby/rubylib/examples/testcases/bugs.rb similarity index 98% rename from qtruby/rubylib/examples/testcases/bugs.rb rename to tqtruby/rubylib/examples/testcases/bugs.rb index 92bb8e80..f2fe3319 100644 --- a/qtruby/rubylib/examples/testcases/bugs.rb +++ b/tqtruby/rubylib/examples/testcases/bugs.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' #### TODO ### diff --git a/qtruby/rubylib/examples/testcases/error_reporting.rb b/tqtruby/rubylib/examples/testcases/error_reporting.rb similarity index 99% rename from qtruby/rubylib/examples/testcases/error_reporting.rb rename to tqtruby/rubylib/examples/testcases/error_reporting.rb index 3bc88abe..989c32ea 100644 --- a/qtruby/rubylib/examples/testcases/error_reporting.rb +++ b/tqtruby/rubylib/examples/testcases/error_reporting.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' #### CRASH ### # param mismatch? diff --git a/qtruby/rubylib/examples/testcases/opoverloading.rb b/tqtruby/rubylib/examples/testcases/opoverloading.rb similarity index 98% rename from qtruby/rubylib/examples/testcases/opoverloading.rb rename to tqtruby/rubylib/examples/testcases/opoverloading.rb index c7bfb775..897b68d2 100644 --- a/qtruby/rubylib/examples/testcases/opoverloading.rb +++ b/tqtruby/rubylib/examples/testcases/opoverloading.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class TQt::Point def to_s diff --git a/qtruby/rubylib/examples/textedit/textedit.rb b/tqtruby/rubylib/examples/textedit/textedit.rb similarity index 99% rename from qtruby/rubylib/examples/textedit/textedit.rb rename to tqtruby/rubylib/examples/textedit/textedit.rb index 1f80cb7a..2d40adf9 100644 --- a/qtruby/rubylib/examples/textedit/textedit.rb +++ b/tqtruby/rubylib/examples/textedit/textedit.rb @@ -1,6 +1,6 @@ #!/usr/bin/ruby -w -require 'Qt' +require 'TQt' require 'rexml/document' require '../base/rui.rb' diff --git a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb b/tqtruby/rubylib/examples/tqt-examples/aclock/aclock.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/aclock/aclock.rb rename to tqtruby/rubylib/examples/tqt-examples/aclock/aclock.rb index 618b7d76..3bcecb73 100644 --- a/qtruby/rubylib/examples/qt-examples/aclock/aclock.rb +++ b/tqtruby/rubylib/examples/tqt-examples/aclock/aclock.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -w -require 'Qt' +require 'TQt' # an analog clock widget using an internal TQTimer class AnalogClock < TQt::Widget diff --git a/qtruby/rubylib/examples/qt-examples/aclock/main.rb b/tqtruby/rubylib/examples/tqt-examples/aclock/main.rb similarity index 77% rename from qtruby/rubylib/examples/qt-examples/aclock/main.rb rename to tqtruby/rubylib/examples/tqt-examples/aclock/main.rb index 030fe15f..513b077f 100755 --- a/qtruby/rubylib/examples/qt-examples/aclock/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/aclock/main.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'aclock' a = TQt::Application.new(ARGV) @@ -10,6 +10,6 @@ ARGV.each {|arg| } clock.resize(100, 100) a.setMainWidget(clock) -clock.setCaption('QtRuby example - Analog Clock') +clock.setCaption('TQtRuby example - Analog Clock') clock.show a.exec diff --git a/qtruby/rubylib/examples/qt-examples/chart/README b/tqtruby/rubylib/examples/tqt-examples/chart/README similarity index 80% rename from qtruby/rubylib/examples/qt-examples/chart/README rename to tqtruby/rubylib/examples/tqt-examples/chart/README index b1cf673c..aa624542 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/README +++ b/tqtruby/rubylib/examples/tqt-examples/chart/README @@ -5,4 +5,4 @@ This is a complete example program with a main window, menus and toolbars. The main widget is a TQt::Canvas, and this example demonstrates basic canvas usage. -This example is the subject of Qt Tutorial #2 +This example is the subject of TQt Tutorial #2 diff --git a/qtruby/rubylib/examples/qt-examples/chart/canvastext.rb b/tqtruby/rubylib/examples/tqt-examples/chart/canvastext.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/canvastext.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/canvastext.rb diff --git a/qtruby/rubylib/examples/qt-examples/chart/canvasview.rb b/tqtruby/rubylib/examples/tqt-examples/chart/canvasview.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/canvasview.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/canvasview.rb diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb b/tqtruby/rubylib/examples/tqt-examples/chart/chartform.rb similarity index 98% rename from qtruby/rubylib/examples/qt-examples/chart/chartform.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/chartform.rb index 0ebff47e..88c82f5b 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/chartform.rb +++ b/tqtruby/rubylib/examples/tqt-examples/chart/chartform.rb @@ -14,7 +14,7 @@ class ChartForm < TQt::MainWindow 'optionsSetOptions()', 'helpHelp()', 'helpAbout()', - 'helpAboutQt()', + 'helpAboutTQt()', 'saveOptions()' attr_accessor :changed @@ -31,7 +31,7 @@ class ChartForm < TQt::MainWindow YES = 1 AS_PERCENTAGE = 2 - WINDOWS_REGISTRY = "/Trolltech/QtExamples" + WINDOWS_REGISTRY = "/Trolltech/TQtExamples" APP_KEY = "/Chart/" def initialize( filename ) @@ -166,7 +166,7 @@ class ChartForm < TQt::MainWindow menuBar().insertItem( "&Help", helpMenu ) helpMenu.insertItem( "&Help", self, SLOT('helpHelp()'), TQt::KeySequence.new(Key_F1) ) helpMenu.insertItem( "&About", self, SLOT('helpAbout()') ) - helpMenu.insertItem( "About &Qt", self, SLOT('helpAboutQt()') ) + helpMenu.insertItem( "About &TQt", self, SLOT('helpAboutTQt()') ) @printer = nil @@ -480,8 +480,8 @@ class ChartForm < TQt::MainWindow end - def helpAboutQt() - TQt::MessageBox.aboutTQt( self, "Chart -- About Qt" ) + def helpAboutTQt() + TQt::MessageBox.aboutTQt( self, "Chart -- About TQt" ) end end diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform_canvas.rb b/tqtruby/rubylib/examples/tqt-examples/chart/chartform_canvas.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/chart/chartform_canvas.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/chartform_canvas.rb index e97d542f..c5776d04 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/chartform_canvas.rb +++ b/tqtruby/rubylib/examples/tqt-examples/chart/chartform_canvas.rb @@ -6,7 +6,7 @@ class ChartForm it.dispose end - # 360 * 16 for pies Qt works with 16ths of degrees + # 360 * 16 for pies TQt works with 16ths of degrees scaleFactor = @chartType == PIE ? 5760 : @chartType == VERTICAL_BAR ? @canvas.height() : @canvas.width() diff --git a/qtruby/rubylib/examples/qt-examples/chart/chartform_files.rb b/tqtruby/rubylib/examples/tqt-examples/chart/chartform_files.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/chartform_files.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/chartform_files.rb diff --git a/qtruby/rubylib/examples/qt-examples/chart/element.rb b/tqtruby/rubylib/examples/tqt-examples/chart/element.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/element.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/element.rb diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/chart-forms.sk b/tqtruby/rubylib/examples/tqt-examples/chart/images/chart-forms.sk similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/chart-forms.sk rename to tqtruby/rubylib/examples/tqt-examples/chart/images/chart-forms.sk diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/file_new.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/file_new.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/file_new.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/file_new.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/file_open.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/file_open.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/file_open.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/file_open.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/file_print.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/file_print.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/file_print.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/file_print.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/file_save.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/file_save.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/file_save.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/file_save.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/file_saveaspostscript.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/file_saveaspostscript.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/file_saveaspostscript.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/file_saveaspostscript.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_horizontalbarchart.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_horizontalbarchart.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_horizontalbarchart.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_horizontalbarchart.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_piechart.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_piechart.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_piechart.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_piechart.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_setdata.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_setdata.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_setdata.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_setdata.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_setfont.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_setfont.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_setfont.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_setfont.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_setoptions.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_setoptions.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_setoptions.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_setoptions.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/options_verticalbarchart.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/options_verticalbarchart.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/options_verticalbarchart.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/options_verticalbarchart.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern01.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern01.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern01.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern01.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern02.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern02.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern02.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern02.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern03.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern03.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern03.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern03.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern04.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern04.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern04.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern04.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern05.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern05.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern05.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern05.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern06.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern06.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern06.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern06.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern07.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern07.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern07.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern07.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern08.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern08.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern08.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern08.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern09.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern09.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern09.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern09.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern10.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern10.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern10.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern10.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern11.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern11.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern11.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern11.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern12.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern12.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern12.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern12.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern13.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern13.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern13.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern13.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/images/pattern14.xpm b/tqtruby/rubylib/examples/tqt-examples/chart/images/pattern14.xpm similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/images/pattern14.xpm rename to tqtruby/rubylib/examples/tqt-examples/chart/images/pattern14.xpm diff --git a/qtruby/rubylib/examples/qt-examples/chart/main.rb b/tqtruby/rubylib/examples/tqt-examples/chart/main.rb similarity index 96% rename from qtruby/rubylib/examples/qt-examples/chart/main.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/main.rb index 74492b0f..1ae287bf 100644 --- a/qtruby/rubylib/examples/qt-examples/chart/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/chart/main.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' require 'canvasview.rb' require 'canvastext.rb' diff --git a/qtruby/rubylib/examples/qt-examples/chart/optionsform.rb b/tqtruby/rubylib/examples/tqt-examples/chart/optionsform.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/optionsform.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/optionsform.rb diff --git a/qtruby/rubylib/examples/qt-examples/chart/setdataform.rb b/tqtruby/rubylib/examples/tqt-examples/chart/setdataform.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/chart/setdataform.rb rename to tqtruby/rubylib/examples/tqt-examples/chart/setdataform.rb diff --git a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb b/tqtruby/rubylib/examples/tqt-examples/checklists/checklists.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/checklists/checklists.rb rename to tqtruby/rubylib/examples/tqt-examples/checklists/checklists.rb index 458dc127..e1eaedc0 100644 --- a/qtruby/rubylib/examples/qt-examples/checklists/checklists.rb +++ b/tqtruby/rubylib/examples/tqt-examples/checklists/checklists.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class CheckLists < TQt::Widget slots 'copy1to2()', 'copy2to3()' diff --git a/qtruby/rubylib/examples/qt-examples/checklists/main.rb b/tqtruby/rubylib/examples/tqt-examples/checklists/main.rb similarity index 73% rename from qtruby/rubylib/examples/qt-examples/checklists/main.rb rename to tqtruby/rubylib/examples/tqt-examples/checklists/main.rb index 364f5cb7..8591df21 100755 --- a/qtruby/rubylib/examples/qt-examples/checklists/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/checklists/main.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'checklists' @@ -8,7 +8,7 @@ a = TQt::Application.new(ARGV) checklists = CheckLists.new checklists.resize(650, 350) -checklists.setCaption('QtRuby Example - CheckLists') +checklists.setCaption('TQtRuby Example - CheckLists') a.setMainWidget(checklists) checklists.show diff --git a/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb b/tqtruby/rubylib/examples/tqt-examples/dclock/dclock.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/dclock/dclock.rb rename to tqtruby/rubylib/examples/tqt-examples/dclock/dclock.rb index a3cc69fc..e76d2647 100644 --- a/qtruby/rubylib/examples/qt-examples/dclock/dclock.rb +++ b/tqtruby/rubylib/examples/tqt-examples/dclock/dclock.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class DigitalClock < TQt::LCDNumber diff --git a/qtruby/rubylib/examples/qt-examples/dclock/main.rb b/tqtruby/rubylib/examples/tqt-examples/dclock/main.rb similarity index 70% rename from qtruby/rubylib/examples/qt-examples/dclock/main.rb rename to tqtruby/rubylib/examples/tqt-examples/dclock/main.rb index 13e52ab7..a7822a33 100755 --- a/qtruby/rubylib/examples/qt-examples/dclock/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/dclock/main.rb @@ -1,12 +1,12 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'dclock' a = TQt::Application.new(ARGV) clock = DigitalClock.new clock.resize(170,80) a.setMainWidget(clock) -clock.setCaption('QtRuby Example - Digital Clock') +clock.setCaption('TQtRuby Example - Digital Clock') clock.show a.exec diff --git a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb b/tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/main.rb similarity index 67% rename from qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb rename to tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/main.rb index 5f751b82..fba2ef05 100755 --- a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/main.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'viewer' $KCODE='u' @@ -8,7 +8,7 @@ $KCODE='u' a = TQt::Application.new(ARGV) textViewer = Viewer.new -textViewer.setCaption('QtRuby Example - Simple TQFont Demo') +textViewer.setCaption('TQtRuby Example - Simple TQFont Demo') a.setMainWidget(textViewer) textViewer.show a.exec() diff --git a/qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb b/tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/viewer.rb similarity index 100% rename from qtruby/rubylib/examples/qt-examples/fonts/simple-qfont-demo/viewer.rb rename to tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/viewer.rb diff --git a/qtruby/rubylib/examples/qt-examples/forever/forever.rb b/tqtruby/rubylib/examples/tqt-examples/forever/forever.rb similarity index 91% rename from qtruby/rubylib/examples/qt-examples/forever/forever.rb rename to tqtruby/rubylib/examples/tqt-examples/forever/forever.rb index 8cbf9754..515c728c 100755 --- a/qtruby/rubylib/examples/qt-examples/forever/forever.rb +++ b/tqtruby/rubylib/examples/tqt-examples/forever/forever.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -w -require 'Qt' +require 'TQt' # # Forever - a widget that draws rectangles forever. @@ -33,7 +33,7 @@ class Forever < TQt::Widget def updateCaption() - s = "Qt Example - Forever - " + @rectangles.to_s + " rectangles/second" + s = "TQt Example - Forever - " + @rectangles.to_s + " rectangles/second" @rectangles = 0 self.caption = s end @@ -79,6 +79,6 @@ a = TQt::Application.new(ARGV) always = Forever.new always.resize( 400, 250 ) # start up with size 400x250 a.mainWidget = always # set as main widget -always.caption = "QtRuby Example - Forever" +always.caption = "TQtRuby Example - Forever" always.show a.exec diff --git a/qtruby/rubylib/examples/qt-examples/hello/hello.rb b/tqtruby/rubylib/examples/tqt-examples/hello/hello.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/hello/hello.rb rename to tqtruby/rubylib/examples/tqt-examples/hello/hello.rb index ef70154f..89c950d4 100644 --- a/qtruby/rubylib/examples/qt-examples/hello/hello.rb +++ b/tqtruby/rubylib/examples/tqt-examples/hello/hello.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class Hello < TQt::Widget diff --git a/qtruby/rubylib/examples/qt-examples/hello/main.rb b/tqtruby/rubylib/examples/tqt-examples/hello/main.rb similarity index 88% rename from qtruby/rubylib/examples/qt-examples/hello/main.rb rename to tqtruby/rubylib/examples/tqt-examples/hello/main.rb index 5be3ce68..630f8c5e 100755 --- a/qtruby/rubylib/examples/qt-examples/hello/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/hello/main.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'hello' a = TQt::Application.new(ARGV) @@ -13,7 +13,7 @@ if (s.empty?) end h = Hello.new(s) -h.setCaption('QtRuby says hello') +h.setCaption('TQtRuby says hello') h.connect(h, SIGNAL('clicked()'), a, SLOT('quit()')) h.setFont(TQt::Font.new('times', 32, TQt::Font.Bold)) # default font h.setBackgroundColor(TQt::white) # default bg color diff --git a/qtruby/rubylib/examples/qt-examples/progress/progress.rb b/tqtruby/rubylib/examples/tqt-examples/progress/progress.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/progress/progress.rb rename to tqtruby/rubylib/examples/tqt-examples/progress/progress.rb index 1ec02614..fbc1ebf7 100644 --- a/qtruby/rubylib/examples/qt-examples/progress/progress.rb +++ b/tqtruby/rubylib/examples/tqt-examples/progress/progress.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -w -require 'Qt' +require 'TQt' class AnimatedThingy < TQt::Label attr_accessor :label, :step diff --git a/qtruby/rubylib/examples/qt-examples/tictac/main.rb b/tqtruby/rubylib/examples/tqt-examples/tictac/main.rb similarity index 74% rename from qtruby/rubylib/examples/qt-examples/tictac/main.rb rename to tqtruby/rubylib/examples/tqt-examples/tictac/main.rb index 67e28a93..93cd76ba 100755 --- a/qtruby/rubylib/examples/qt-examples/tictac/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/tictac/main.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -w -require 'Qt' +require 'TQt' require 'tictac' a = TQt::Application.new(ARGV) @@ -8,6 +8,6 @@ n = 3 # get board size n ttt = TicTacToe.new(n) a.setMainWidget(ttt) -ttt.setCaption('QtRuby Example - TicTac') +ttt.setCaption('TQtRuby Example - TicTac') ttt.show() a.exec() diff --git a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb b/tqtruby/rubylib/examples/tqt-examples/tictac/tictac.rb similarity index 99% rename from qtruby/rubylib/examples/qt-examples/tictac/tictac.rb rename to tqtruby/rubylib/examples/tqt-examples/tictac/tictac.rb index 1b8bbe35..5376b581 100644 --- a/qtruby/rubylib/examples/qt-examples/tictac/tictac.rb +++ b/tqtruby/rubylib/examples/tqt-examples/tictac/tictac.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class TicTacButton < TQt::PushButton diff --git a/qtruby/rubylib/examples/qt-examples/tooltip/main.rb b/tqtruby/rubylib/examples/tqt-examples/tooltip/main.rb similarity index 64% rename from qtruby/rubylib/examples/qt-examples/tooltip/main.rb rename to tqtruby/rubylib/examples/tqt-examples/tooltip/main.rb index 14642075..a3d91fb7 100755 --- a/qtruby/rubylib/examples/qt-examples/tooltip/main.rb +++ b/tqtruby/rubylib/examples/tqt-examples/tooltip/main.rb @@ -1,12 +1,12 @@ #!/usr/bin/env ruby -require 'Qt' +require 'TQt' require 'tooltip' a = TQt::Application.new(ARGV) mw = TellMe.new -mw.setCaption('QtRuby Example - Dynamic Tool Tips') +mw.setCaption('TQtRuby Example - Dynamic Tool Tips') a.setMainWidget(mw) mw.show a.exec diff --git a/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb b/tqtruby/rubylib/examples/tqt-examples/tooltip/tooltip.rb similarity index 98% rename from qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb rename to tqtruby/rubylib/examples/tqt-examples/tooltip/tooltip.rb index 3c5b2843..d5bf3c49 100644 --- a/qtruby/rubylib/examples/qt-examples/tooltip/tooltip.rb +++ b/tqtruby/rubylib/examples/tqt-examples/tooltip/tooltip.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class DynamicTip < TQt::ToolTip def initialize(p) diff --git a/qtruby/rubylib/examples/qtscribble/scribble.rb b/tqtruby/rubylib/examples/tqtscribble/scribble.rb similarity index 95% rename from qtruby/rubylib/examples/qtscribble/scribble.rb rename to tqtruby/rubylib/examples/tqtscribble/scribble.rb index 0ba2a4b4..03795fc6 100644 --- a/qtruby/rubylib/examples/qtscribble/scribble.rb +++ b/tqtruby/rubylib/examples/tqtscribble/scribble.rb @@ -5,7 +5,7 @@ # window knows how to redraw itself. # -require 'Qt' +require 'TQt' class ScribbleArea < TQt::Widget @@ -145,7 +145,7 @@ require 'Qt' class ScribbleWindow < TQt::Widget - slots "slotAbout()", "slotAboutQt()", "slotColorMenu(int)", "slotLoad()", "slotSave()" + slots "slotAbout()", "slotAboutTQt()", "slotColorMenu(int)", "slotLoad()", "slotSave()" signals "colorChanged(TQColor)", "load(const TQString&)", "save(const TQString&)" COLOR_MENU_ID_BLACK = 0 @@ -174,8 +174,8 @@ class ScribbleWindow < TQt::Widget self, SLOT( "slotColorMenu( int )" ) ) @_helpmenu = TQt::PopupMenu.new() # create a help menu - @_helpmenu.insertItem( "&About QtScribble", self, SLOT( "slotAbout()" ) ) - @_helpmenu.insertItem( "&About Qt", self, SLOT( "slotAboutQt()" ) ) + @_helpmenu.insertItem( "&About TQtScribble", self, SLOT( "slotAbout()" ) ) + @_helpmenu.insertItem( "&About TQt", self, SLOT( "slotAboutTQt()" ) ) @_menubar = TQt::MenuBar.new( self, "" ) # create a menu bar @_menubar.insertItem( "&File", @_filemenu ) @@ -209,13 +209,13 @@ class ScribbleWindow < TQt::Widget def slotAbout() - TQt::MessageBox.information( self, "About QtScribble 5", + TQt::MessageBox.information( self, "About TQtScribble 5", "This is the Scribble 5 application\n" + "Copyright 1998 by Mathias Kalle Dalheimer\n") end - def slotAboutQt() - TQt::MessageBox.aboutTQt( self, "About Qt" ) + def slotAboutTQt() + TQt::MessageBox.aboutTQt( self, "About TQt" ) end def slotColorMenu( item ) diff --git a/tqtruby/rubylib/tqtruby/Makefile.am b/tqtruby/rubylib/tqtruby/Makefile.am new file mode 100644 index 00000000..fb8aca37 --- /dev/null +++ b/tqtruby/rubylib/tqtruby/Makefile.am @@ -0,0 +1,15 @@ +INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) + +noinst_HEADERS = tqtruby.h marshall.h smokeruby.h extconf.rb + +noinst_LTLIBRARIES = libtqtrubyinternal.la +libtqtrubyinternal_la_SOURCES = TQt.cpp handlers.cpp +libtqtrubyinternal_la_METASOURCES = AUTO + +rubylibdir = $(RUBY_ARCHDIR) +rubylib_LTLIBRARIES = tqtruby.la +tqtruby_la_SOURCES = +tqtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 +tqtruby_la_LIBADD = libtqtrubyinternal.la $(LIB_TQT) $(top_builddir)/smoke/tqt/libsmoketqt.la $(LIB_TDECORE) $(RUBY_LIBRUBYARG) -lstdc++ + +SUBDIRS = lib diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/tqtruby/rubylib/tqtruby/TQt.cpp similarity index 82% rename from qtruby/rubylib/qtruby/Qt.cpp rename to tqtruby/rubylib/tqtruby/TQt.cpp index 715110f2..95f01377 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/tqtruby/rubylib/tqtruby/TQt.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - Qt.cpp - description + TQt.cpp - description ------------------- begin : Fri Jul 4 2003 copyright : (C) 2003-2004 by Richard Dale @@ -56,7 +56,7 @@ #undef malloc #include "marshall.h" -#include "qtruby.h" +#include "tqtruby.h" #include "smokeruby.h" #include "smoke.h" @@ -74,16 +74,16 @@ #define TQTRUBY_VERSION "1.0.13" -extern Smoke *qt_Smoke; -extern void init_qt_Smoke(); +extern Smoke *tqt_Smoke; +extern void init_tqt_Smoke(); extern void smokeruby_mark(void * ptr); extern void smokeruby_free(void * ptr); extern VALUE qchar_to_s(VALUE self); #ifdef DEBUG -int do_debug = qtdb_gc; +int do_debug = tqtdb_gc; #else -int do_debug = qtdb_none; +int do_debug = tqtdb_none; #endif TQPtrDict pointer_map(2179); @@ -95,7 +95,7 @@ TQAsciiDict classcache(2179); TQIntDict classname(2179); extern "C" { -VALUE qt_module = Qnil; +VALUE tqt_module = Qnil; VALUE qext_scintilla_module = Qnil; VALUE kde_module = Qnil; VALUE tdeparts_module = Qnil; @@ -106,8 +106,8 @@ VALUE kontact_module = Qnil; VALUE kate_module = Qnil; VALUE tdetexteditor_module = Qnil; VALUE koffice_module = Qnil; -VALUE qt_internal_module = Qnil; -VALUE qt_base_class = Qnil; +VALUE tqt_internal_module = Qnil; +VALUE tqt_base_class = Qnil; VALUE qmetaobject_class = Qnil; VALUE qvariant_class = Qnil; VALUE tdeconfigskeleton_class = Qnil; @@ -127,7 +127,7 @@ static VALUE (*_tdeconfigskeletonitem_immutable)(VALUE) = 0; Smoke::Index _current_method = 0; -extern TypeHandler Qt_handlers[]; +extern TypeHandler TQt_handlers[]; void install_handlers(TypeHandler *); smokeruby_object *value_obj_info(VALUE ruby_value) { // ptr on success, null on fail @@ -196,7 +196,7 @@ void unmapPointer(smokeruby_object *o, Smoke::Index classId, void *lastptr) { if (pointer_map[ptr] != 0) { VALUE * obj_ptr = pointer_map[ptr]; - if (do_debug & qtdb_gc) { + if (do_debug & tqtdb_gc) { const char *className = o->smoke->classes[o->classId].className; tqWarning("unmapPointer (%s*)%p -> %p", className, ptr, obj_ptr); } @@ -212,7 +212,7 @@ void unmapPointer(smokeruby_object *o, Smoke::Index classId, void *lastptr) { } } -// Store pointer in pointer_map hash : "pointer_to_Qt_object" => weak ref to associated Ruby object +// Store pointer in pointer_map hash : "pointer_to_TQt_object" => weak ref to associated Ruby object // Recurse to store it also as casted to its parent classes. void mapPointer(VALUE obj, smokeruby_object *o, Smoke::Index classId, void *lastptr) { @@ -223,7 +223,7 @@ void mapPointer(VALUE obj, smokeruby_object *o, Smoke::Index classId, void *last VALUE * obj_ptr = (VALUE *) malloc(sizeof(VALUE)); memcpy(obj_ptr, &obj, sizeof(VALUE)); - if (do_debug & qtdb_gc) { + if (do_debug & tqtdb_gc) { const char *className = o->smoke->classes[o->classId].className; tqWarning("mapPointer (%s*)%p -> %p", className, ptr, (void*)obj); } @@ -765,14 +765,14 @@ public: } }; -class QtRubySmokeBinding : public SmokeBinding { +class TQtRubySmokeBinding : public SmokeBinding { public: - QtRubySmokeBinding(Smoke *s) : SmokeBinding(s) {} + TQtRubySmokeBinding(Smoke *s) : SmokeBinding(s) {} void deleted(Smoke::Index classId, void *ptr) { VALUE obj = getPointerObject(ptr); smokeruby_object *o = value_obj_info(obj); - if(do_debug & qtdb_gc) { + if(do_debug & tqtdb_gc) { tqWarning("%p->~%s()", ptr, smoke->className(classId)); } if(!o || !o->ptr) { @@ -786,7 +786,7 @@ public: VALUE obj = getPointerObject(ptr); smokeruby_object *o = value_obj_info(obj); - if (do_debug & qtdb_virtual) { + if (do_debug & tqtdb_virtual) { Smoke::Method & meth = smoke->methods[method]; TQCString signature(smoke->methodNames[meth.name]); signature += "("; @@ -808,7 +808,7 @@ public: } if(!o) { - if( do_debug & qtdb_virtual ) // if not in global destruction + if( do_debug & tqtdb_virtual ) // if not in global destruction tqWarning("Cannot find object for virtual method %p -> %p", ptr, &obj); return false; } @@ -876,7 +876,7 @@ static VALUE kde_package_to_class(const char * package, VALUE base_class); VALUE set_obj_info(const char * className, smokeruby_object * o) { - VALUE klass = rb_funcall(qt_internal_module, + VALUE klass = rb_funcall(tqt_internal_module, rb_intern("find_class"), 1, rb_str_new2(className) ); @@ -906,7 +906,7 @@ set_obj_info(const char * className, smokeruby_object * o) } else if (className.startsWith("Q")) { className.replace("Q", ""); className = className.mid(0, 1).upper() + className.mid(1); - new_klass = rb_define_class_under(qt_module, className.latin1(), klass); + new_klass = rb_define_class_under(tqt_module, className.latin1(), klass); } else if (kde_module == Qnil) { new_klass = rb_define_class(className.latin1(), klass); } else { @@ -973,7 +973,7 @@ get_VALUEtype(VALUE ruby_value) else if(ruby_value == Qtrue || ruby_value == Qfalse || tqstrcmp(classname, "TQt::Boolean") == 0) r = "B"; else if(tqstrcmp(classname, "TQt::Enum") == 0) { - VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qenum_type"), 1, ruby_value); + VALUE temp = rb_funcall(tqt_internal_module, rb_intern("get_qenum_type"), 1, ruby_value); r = StringValuePtr(temp); } else if(TYPE(ruby_value) == T_DATA) { smokeruby_object *o = value_obj_info(ruby_value); @@ -993,14 +993,14 @@ get_VALUEtype(VALUE ruby_value) VALUE prettyPrintMethod(Smoke::Index id) { VALUE r = rb_str_new2(""); - Smoke::Method &meth = qt_Smoke->methods[id]; - const char *tname = qt_Smoke->types[meth.ret].name; + Smoke::Method &meth = tqt_Smoke->methods[id]; + const char *tname = tqt_Smoke->types[meth.ret].name; if(meth.flags & Smoke::mf_static) rb_str_catf_1(r, "static "); rb_str_catf_1(r, "%s ", (tname ? tname:"void")); - rb_str_catf_1(r, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]); + rb_str_catf_1(r, "%s::%s(", tqt_Smoke->classes[meth.classId].className, tqt_Smoke->methodNames[meth.name]); for(int i = 0; i < meth.numArgs; i++) { if(i) rb_str_catf_1(r, ", "); - tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name; + tname = tqt_Smoke->types[tqt_Smoke->argumentList[meth.args+i]].name; rb_str_catf_1(r, "%s", (tname ? tname:"void")); } rb_str_catf_1(r, ")"); @@ -1337,7 +1337,7 @@ pretty_print_qobject(VALUE self, VALUE pp) static VALUE metaObject(VALUE self) { - VALUE metaObject = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self); + VALUE metaObject = rb_funcall(tqt_internal_module, rb_intern("getMetaObject"), 1, self); return metaObject; } @@ -1368,17 +1368,17 @@ static Smoke::Index new_qvariant_qlist = 0; static Smoke::Index new_qvariant_qmap = 0; if (new_qvariant_qlist == 0) { - Smoke::Index nameId = qt_Smoke->idMethodName("TQVariant?"); - Smoke::Index meth = qt_Smoke->findMethod(qt_Smoke->idClass("TQVariant"), nameId); - Smoke::Index i = qt_Smoke->methodMaps[meth].method; + Smoke::Index nameId = tqt_Smoke->idMethodName("TQVariant?"); + Smoke::Index meth = tqt_Smoke->findMethod(tqt_Smoke->idClass("TQVariant"), nameId); + Smoke::Index i = tqt_Smoke->methodMaps[meth].method; i = -i; // turn into ambiguousMethodList index - while (qt_Smoke->ambiguousMethodList[i] != 0) { - const char * argType = qt_Smoke->types[qt_Smoke->argumentList[qt_Smoke->methods[qt_Smoke->ambiguousMethodList[i]].args]].name; + while (tqt_Smoke->ambiguousMethodList[i] != 0) { + const char * argType = tqt_Smoke->types[tqt_Smoke->argumentList[tqt_Smoke->methods[tqt_Smoke->ambiguousMethodList[i]].args]].name; if (tqstrcmp(argType, "const TQValueList&" ) == 0) { - new_qvariant_qlist = qt_Smoke->ambiguousMethodList[i]; + new_qvariant_qlist = tqt_Smoke->ambiguousMethodList[i]; } else if (tqstrcmp(argType, "const TQMap&" ) == 0) { - new_qvariant_qmap = qt_Smoke->ambiguousMethodList[i]; + new_qvariant_qmap = tqt_Smoke->ambiguousMethodList[i]; } i++; @@ -1387,7 +1387,7 @@ static Smoke::Index new_qvariant_qmap = 0; if (argc == 1 && TYPE(argv[0]) == T_HASH) { _current_method = new_qvariant_qmap; - MethodCall c(qt_Smoke, _current_method, self, argv, argc-1); + MethodCall c(tqt_Smoke, _current_method, self, argv, argc-1); c.next(); return *(c.var()); } else if ( argc == 1 @@ -1396,7 +1396,7 @@ static Smoke::Index new_qvariant_qmap = 0; && TYPE(rb_ary_entry(argv[0], 0)) != T_STRING ) { _current_method = new_qvariant_qlist; - MethodCall c(qt_Smoke, _current_method, self, argv, argc-1); + MethodCall c(tqt_Smoke, _current_method, self, argv, argc-1); c.next(); return *(c.var()); } @@ -1423,13 +1423,13 @@ static TQCString * mcid = 0; Smoke::Index *rcid = methcache.find((const char *)*mcid); #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("method_missing mcid: %s", (const char *) *mcid); + if (do_debug & tqtdb_calls) tqWarning("method_missing mcid: %s", (const char *) *mcid); #endif if (rcid) { // Got a hit #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("method_missing cache hit, mcid: %s", (const char *) *mcid); + if (do_debug & tqtdb_calls) tqWarning("method_missing cache hit, mcid: %s", (const char *) *mcid); #endif _current_method = *rcid; } else { @@ -1476,7 +1476,7 @@ static TQString * pred = 0; } VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE)); - temp_stack[0] = rb_str_new2("Qt"); + temp_stack[0] = rb_str_new2("TQt"); temp_stack[1] = rb_str_new2(methodName); temp_stack[2] = klass; temp_stack[3] = self; @@ -1490,7 +1490,7 @@ static TQString * pred = 0; if (_current_method == -1) { // Find the C++ method to call. Do that from Ruby for now - VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); + VALUE retval = rb_funcall2(tqt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); if (_current_method == -1) { const char * op = rb_id2name(SYM2ID(argv[0])); if ( tqstrcmp(op, "-") == 0 @@ -1505,7 +1505,7 @@ static TQString * pred = 0; op1[1] = '='; op1[2] = '\0'; temp_stack[1] = rb_str_new2(op1); - retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); + retval = rb_funcall2(tqt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); } if (_current_method == -1) { @@ -1555,7 +1555,7 @@ static TQString * prop = 0; } } - MethodCall c(qt_Smoke, _current_method, self, temp_stack+4, argc-1); + MethodCall c(tqt_Smoke, _current_method, self, temp_stack+4, argc-1); c.next(); VALUE result = *(c.var()); free(temp_stack); @@ -1569,7 +1569,7 @@ class_method_missing(int argc, VALUE * argv, VALUE klass) VALUE result = Qnil; const char * methodName = rb_id2name(SYM2ID(argv[0])); VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE)); - temp_stack[0] = rb_str_new2("Qt"); + temp_stack[0] = rb_str_new2("TQt"); temp_stack[1] = rb_str_new2(methodName); temp_stack[2] = klass; temp_stack[3] = Qnil; @@ -1581,7 +1581,7 @@ class_method_missing(int argc, VALUE * argv, VALUE klass) TQCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName); if (_current_method == -1) { - VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); + VALUE retval = rb_funcall2(tqt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack); Q_UNUSED(retval); if (_current_method != -1) { // Success. Cache result. @@ -1613,7 +1613,7 @@ static TQRegExp * rx = 0; } } - MethodCall c(qt_Smoke, _current_method, Qnil, temp_stack+4, argc-1); + MethodCall c(tqt_Smoke, _current_method, Qnil, temp_stack+4, argc-1); c.next(); result = *(c.var()); free(temp_stack); @@ -1622,7 +1622,7 @@ static TQRegExp * rx = 0; static VALUE module_method_missing(int argc, VALUE * argv, VALUE /*klass*/) { - return class_method_missing(argc, argv, qt_module); + return class_method_missing(argc, argv, tqt_module); } static VALUE kde_module_method_missing(int argc, VALUE * argv, VALUE klass) @@ -1648,14 +1648,14 @@ instance. The solution is to run the initialize code twice. First, only up to the 'super(parent, name)' call, where the TQWidget would get instantiated in -initialize_qt(). And then rb_throw() jumps out of the +initialize_tqt(). And then rb_throw() jumps out of the initializer returning the wrapped object as a result. The second time round 'self' will be the wrapped instance of type T_DATA, so initialize() can be allowed to proceed to the end. */ static VALUE -initialize_qt(int argc, VALUE * argv, VALUE self) +initialize_tqt(int argc, VALUE * argv, VALUE self) { VALUE retval; VALUE temp_obj; @@ -1663,7 +1663,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self) if (TYPE(self) == T_DATA) { // If a ruby block was passed then run that now if (rb_block_given_p()) { - rb_funcall(qt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc()); + rb_funcall(tqt_internal_module, rb_intern("run_initializer_block"), 2, self, rb_block_proc()); } return self; @@ -1673,7 +1673,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self) VALUE constructor_name = rb_str_new2("new"); VALUE * temp_stack = (VALUE *) calloc(argc+4, sizeof(VALUE)); - temp_stack[0] = rb_str_new2("Qt"); + temp_stack[0] = rb_str_new2("TQt"); temp_stack[1] = constructor_name; temp_stack[2] = klass; temp_stack[3] = self; @@ -1687,7 +1687,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self) TQCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass)); if (_current_method == -1) { - retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack); + retval = rb_funcall2(tqt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack); if (_current_method != -1) { // Success. Cache result. methcache.insert((const char *)*mcid, new Smoke::Index(_current_method)); @@ -1704,7 +1704,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self) { // Allocate the MethodCall within a C block. Otherwise, because the continue_new_instance() // call below will longjmp out, it wouldn't give C++ an opportunity to clean up - MethodCall c(qt_Smoke, _current_method, self, temp_stack+4, argc); + MethodCall c(tqt_Smoke, _current_method, self, temp_stack+4, argc); c.next(); temp_obj = *(c.var()); } @@ -1720,13 +1720,13 @@ initialize_qt(int argc, VALUE * argv, VALUE self) mapObject(result, result); free(temp_stack); // Off with a longjmp, never to return.. - rb_throw("newqt", result); + rb_throw("newtqt", result); /*NOTREACHED*/ return self; } VALUE -new_qt(int argc, VALUE * argv, VALUE klass) +new_tqt(int argc, VALUE * argv, VALUE klass) { VALUE * temp_stack = (VALUE *) calloc(argc + 1, sizeof(VALUE)); temp_stack[0] = rb_obj_alloc(klass); @@ -1734,7 +1734,7 @@ new_qt(int argc, VALUE * argv, VALUE klass) temp_stack[count+1] = argv[count]; } - VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack); + VALUE result = rb_funcall2(tqt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack); rb_obj_call_init(result, argc, argv); free(temp_stack); @@ -1753,17 +1753,17 @@ new_qapplication(int argc, VALUE * argv, VALUE klass) rb_ary_unshift(temp, rb_gv_get("$0")); local_argv[0] = INT2NUM(RARRAY_LEN(temp)); local_argv[1] = temp; - result = new_qt(2, local_argv, klass); + result = new_tqt(2, local_argv, klass); free(local_argv); } else { - result = new_qt(argc, argv, klass); + result = new_tqt(argc, argv, klass); } rb_gv_set("$qApp", result); return result; } -// Returns $qApp.ARGV() - the original ARGV array with Qt command line options removed +// Returns $qApp.ARGV() - the original ARGV array with TQt command line options removed static VALUE qapplication_argv(VALUE /*self*/) { @@ -1783,7 +1783,7 @@ VALUE getmetainfo(VALUE self, int &offset, int &index) { const char * signalname = rb_id2name(rb_frame_this_func()); - VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self); + VALUE metaObject_value = rb_funcall(tqt_internal_module, rb_intern("getMetaObject"), 1, self); smokeruby_object *ometa = value_obj_info(metaObject_value); if(!ometa) return 0; @@ -1791,10 +1791,10 @@ getmetainfo(VALUE self, int &offset, int &index) offset = metaobject->signalOffset(); - VALUE signalInfo = rb_funcall(qt_internal_module, rb_intern("signalInfo"), 2, self, rb_str_new2(signalname)); + VALUE signalInfo = rb_funcall(tqt_internal_module, rb_intern("signalInfo"), 2, self, rb_str_new2(signalname)); VALUE member = rb_ary_entry(signalInfo, 0); index = NUM2INT(rb_ary_entry(signalInfo, 1)); - return rb_funcall(qt_internal_module, rb_intern("getMocArguments"), 1, member); + return rb_funcall(tqt_internal_module, rb_intern("getMocArguments"), 1, member); } VALUE @@ -1802,7 +1802,7 @@ getslotinfo(VALUE self, int id, char *&slotname, int &index, bool isSignal = fal { VALUE member; - VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self); + VALUE metaObject_value = rb_funcall(tqt_internal_module, rb_intern("getMetaObject"), 1, self); smokeruby_object *ometa = value_obj_info(metaObject_value); if(!ometa) return Qnil; @@ -1814,19 +1814,19 @@ getslotinfo(VALUE self, int id, char *&slotname, int &index, bool isSignal = fal if(index < 0) return Qnil; if (isSignal) { - member = rb_funcall(qt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index)); + member = rb_funcall(tqt_internal_module, rb_intern("signalAt"), 2, self, INT2NUM(index)); } else { - member = rb_funcall(qt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index)); + member = rb_funcall(tqt_internal_module, rb_intern("slotAt"), 2, self, INT2NUM(index)); } - VALUE mocArgs = rb_funcall(qt_internal_module, rb_intern("getMocArguments"), 1, member); + VALUE mocArgs = rb_funcall(tqt_internal_module, rb_intern("getMocArguments"), 1, member); slotname = StringValuePtr(member); return mocArgs; } static VALUE -qt_signal(int argc, VALUE * argv, VALUE self) +tqt_signal(int argc, VALUE * argv, VALUE self) { smokeruby_object *o = value_obj_info(self); TQObject *qobj = (TQObject*)o->smoke->cast( @@ -1872,11 +1872,11 @@ tqt_invoke(int /*argc*/, VALUE * argv, VALUE self) // Now, I need to find out if this means me int index; char *slotname; - bool isSignal = tqstrcmp(rb_id2name(rb_frame_this_func()), "qt_emit") == 0; + bool isSignal = tqstrcmp(rb_id2name(rb_frame_this_func()), "tqt_emit") == 0; VALUE mocArgs = getslotinfo(self, id, slotname, index, isSignal); if(mocArgs == Qnil) { // No ruby slot/signal found, assume the target is a C++ one - Smoke::Index nameId = o->smoke->idMethodName(isSignal ? "qt_emit$?" : "qt_invoke$?"); + Smoke::Index nameId = o->smoke->idMethodName(isSignal ? "tqt_emit$?" : "tqt_invoke$?"); Smoke::Index meth = o->smoke->findMethod(o->classId, nameId); if(meth > 0) { Smoke::Method &m = o->smoke->methods[o->smoke->methodMaps[meth].method]; @@ -1911,11 +1911,11 @@ qobject_connect(int argc, VALUE * argv, VALUE self) { if (rb_block_given_p()) { if (argc == 1) { - return rb_funcall(qt_internal_module, rb_intern("signal_connect"), 3, self, argv[0], rb_block_proc()); + return rb_funcall(tqt_internal_module, rb_intern("signal_connect"), 3, self, argv[0], rb_block_proc()); } else if (argc == 2) { - return rb_funcall(qt_internal_module, rb_intern("connect"), 4, argv[0], argv[1], self, rb_block_proc()); + return rb_funcall(tqt_internal_module, rb_intern("connect"), 4, argv[0], argv[1], self, rb_block_proc()); } else if (argc == 3) { - return rb_funcall(qt_internal_module, rb_intern("connect"), 4, argv[0], argv[1], argv[2], rb_block_proc()); + return rb_funcall(tqt_internal_module, rb_intern("connect"), 4, argv[0], argv[1], argv[2], rb_block_proc()); } else { rb_raise(rb_eArgError, "Invalid argument list"); } @@ -1951,12 +1951,12 @@ getIsa(VALUE /*self*/, VALUE classId) VALUE parents_list = rb_ary_new(); Smoke::Index *parents = - qt_Smoke->inheritanceList + - qt_Smoke->classes[NUM2INT(classId)].parents; + tqt_Smoke->inheritanceList + + tqt_Smoke->classes[NUM2INT(classId)].parents; while(*parents) { - //tqWarning("\tparent: %s", qt_Smoke->classes[*parents].className); - rb_ary_push(parents_list, rb_str_new2(qt_Smoke->classes[*parents++].className)); + //tqWarning("\tparent: %s", tqt_Smoke->classes[*parents].className); + rb_ary_push(parents_list, rb_str_new2(tqt_Smoke->classes[*parents++].className)); } return parents_list; } @@ -1984,7 +1984,7 @@ inherits_qobject(int argc, VALUE * argv, VALUE /*self*/) if (classId == 0) { return rb_call_super(argc, argv); } else { - VALUE super_class = rb_str_new2(qt_Smoke->classes[*classId].className); + VALUE super_class = rb_str_new2(tqt_Smoke->classes[*classId].className); return rb_call_super(argc, &super_class); } } @@ -2045,11 +2045,11 @@ setMocType(VALUE /*self*/, VALUE ptr, VALUE idx_value, VALUE name_value, VALUE s int idx = NUM2INT(idx_value); char *name = StringValuePtr(name_value); char *static_type = StringValuePtr(static_type_value); - Smoke::Index typeId = qt_Smoke->idType(name); + Smoke::Index typeId = tqt_Smoke->idType(name); if(!typeId) return Qfalse; MocArgument *arg = 0; Data_Get_Struct(ptr, MocArgument, arg); - arg[idx].st.set(qt_Smoke, typeId); + arg[idx].st.set(tqt_Smoke, typeId); if(tqstrcmp(static_type, "ptr") == 0) arg[idx].argType = xmoc_ptr; else if(tqstrcmp(static_type, "bool") == 0) @@ -2084,9 +2084,9 @@ getTypeNameOfArg(VALUE /*self*/, VALUE method_value, VALUE idx_value) { int method = NUM2INT(method_value); int idx = NUM2INT(idx_value); - Smoke::Method &m = qt_Smoke->methods[method]; - Smoke::Index *args = qt_Smoke->argumentList + m.args; - return rb_str_new2((char*)qt_Smoke->types[args[idx]].name); + Smoke::Method &m = tqt_Smoke->methods[method]; + Smoke::Index *args = tqt_Smoke->argumentList + m.args; + return rb_str_new2((char*)tqt_Smoke->types[args[idx]].name); } static VALUE @@ -2094,20 +2094,20 @@ classIsa(VALUE /*self*/, VALUE className_value, VALUE base_value) { char *className = StringValuePtr(className_value); char *base = StringValuePtr(base_value); - return isDerivedFromByName(qt_Smoke, className, base) ? Qtrue : Qfalse; + return isDerivedFromByName(tqt_Smoke, className, base) ? Qtrue : Qfalse; } static VALUE isEnum(VALUE /*self*/, VALUE enumName_value) { char *enumName = StringValuePtr(enumName_value); - Smoke::Index typeId = qt_Smoke->idType(enumName); + Smoke::Index typeId = tqt_Smoke->idType(enumName); return typeId > 0 - && ( (qt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_enum - || (qt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_ulong - || (qt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_long - || (qt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_uint - || (qt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_int ) ? Qtrue : Qfalse; + && ( (tqt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_enum + || (tqt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_ulong + || (tqt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_long + || (tqt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_uint + || (tqt_Smoke->types[typeId].flags & Smoke::tf_elem) == Smoke::t_int ) ? Qtrue : Qfalse; } static VALUE @@ -2271,8 +2271,8 @@ make_metaObject(VALUE /*self*/, VALUE className_value, VALUE parent, VALUE slot_ 0, 0); smokeruby_object * o = (smokeruby_object *) malloc(sizeof(smokeruby_object)); - o->smoke = qt_Smoke; - o->classId = qt_Smoke->idClass("TQMetaObject"); + o->smoke = tqt_Smoke; + o->classId = tqt_Smoke->idClass("TQMetaObject"); o->ptr = meta; o->allocated = true; @@ -2282,8 +2282,8 @@ make_metaObject(VALUE /*self*/, VALUE className_value, VALUE parent, VALUE slot_ static VALUE add_metaobject_methods(VALUE self, VALUE klass) { - rb_define_method(klass, "qt_invoke", (VALUE (*) (...)) tqt_invoke, -1); - rb_define_method(klass, "qt_emit", (VALUE (*) (...)) tqt_invoke, -1); + rb_define_method(klass, "tqt_invoke", (VALUE (*) (...)) tqt_invoke, -1); + rb_define_method(klass, "tqt_emit", (VALUE (*) (...)) tqt_invoke, -1); rb_define_method(klass, "metaObject", (VALUE (*) (...)) metaObject, 0); return self; } @@ -2293,7 +2293,7 @@ add_signal_methods(VALUE self, VALUE klass, VALUE signalNames) { for (long index = 0; index < RARRAY_LEN(signalNames); index++) { VALUE signal = rb_ary_entry(signalNames, index); - rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) qt_signal, -1); + rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) tqt_signal, -1); } return self; } @@ -2305,7 +2305,7 @@ dispose(VALUE self) if(!o || !o->ptr) { return Qnil; } const char *className = o->smoke->classes[o->classId].className; - if(do_debug & qtdb_gc) printf("Deleting (%s*)%p\n", className, o->ptr); + if(do_debug & tqtdb_gc) printf("Deleting (%s*)%p\n", className, o->ptr); unmapPointer(o, o->classId, 0); object_count--; @@ -2350,7 +2350,7 @@ static VALUE isaTQObject(VALUE /*self*/, VALUE classid) { int classid_value = NUM2INT(classid); - return isTQObject(qt_Smoke, classid_value) ? Qtrue : Qfalse; + return isTQObject(tqt_Smoke, classid_value) ? Qtrue : Qfalse; } // Returns the Smoke classId of a ruby instance @@ -2368,14 +2368,14 @@ static VALUE idClass(VALUE /*self*/, VALUE name_value) { char *name = StringValuePtr(name_value); - return INT2NUM(qt_Smoke->idClass(name)); + return INT2NUM(tqt_Smoke->idClass(name)); } static VALUE idMethodName(VALUE /*self*/, VALUE name_value) { char *name = StringValuePtr(name_value); - return INT2NUM(qt_Smoke->idMethodName(name)); + return INT2NUM(tqt_Smoke->idMethodName(name)); } static VALUE @@ -2383,7 +2383,7 @@ idMethod(VALUE /*self*/, VALUE idclass_value, VALUE idmethodname_value) { int idclass = NUM2INT(idclass_value); int idmethodname = NUM2INT(idmethodname_value); - return INT2NUM(qt_Smoke->idMethod(idclass, idmethodname)); + return INT2NUM(tqt_Smoke->idMethod(idclass, idmethodname)); } static VALUE @@ -2392,14 +2392,14 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value) char *c = StringValuePtr(c_value); char *name = StringValuePtr(name_value); VALUE result = rb_ary_new(); - Smoke::Index meth = qt_Smoke->findMethod(c, name); + Smoke::Index meth = tqt_Smoke->findMethod(c, name); #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("DAMNIT on %s::%s => %d", c, name, meth); + if (do_debug & tqtdb_calls) tqWarning("DAMNIT on %s::%s => %d", c, name, meth); #endif if(!meth) { - meth = qt_Smoke->findMethod("TQGlobalSpace", name); + meth = tqt_Smoke->findMethod("TQGlobalSpace", name); #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("DAMNIT on TQGlobalSpace::%s => %d", name, meth); + if (do_debug & tqtdb_calls) tqWarning("DAMNIT on TQGlobalSpace::%s => %d", name, meth); #endif } @@ -2407,22 +2407,22 @@ findMethod(VALUE /*self*/, VALUE c_value, VALUE name_value) return result; // empty list } else if(meth > 0) { - Smoke::Index i = qt_Smoke->methodMaps[meth].method; + Smoke::Index i = tqt_Smoke->methodMaps[meth].method; if(!i) { // shouldn't happen rb_raise(rb_eArgError, "Corrupt method %s::%s", c, name); } else if(i > 0) { // single match - Smoke::Method &methodRef = qt_Smoke->methods[i]; + Smoke::Method &methodRef = tqt_Smoke->methods[i]; if ((methodRef.flags & Smoke::mf_internal) == 0) { rb_ary_push(result, INT2NUM(i)); } } else { // multiple match i = -i; // turn into ambiguousMethodList index - while(qt_Smoke->ambiguousMethodList[i]) { - Smoke::Method &methodRef = qt_Smoke->methods[qt_Smoke->ambiguousMethodList[i]]; + while(tqt_Smoke->ambiguousMethodList[i]) { + Smoke::Method &methodRef = tqt_Smoke->methods[tqt_Smoke->ambiguousMethodList[i]]; if ((methodRef.flags & Smoke::mf_internal) == 0) { - rb_ary_push(result, INT2NUM(qt_Smoke->ambiguousMethodList[i])); + rb_ary_push(result, INT2NUM(tqt_Smoke->ambiguousMethodList[i])); #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("Ambiguous Method %s::%s => %d", c, name, qt_Smoke->ambiguousMethodList[i]); + if (do_debug & tqtdb_calls) tqWarning("Ambiguous Method %s::%s => %d", c, name, tqt_Smoke->ambiguousMethodList[i]); #endif } @@ -2442,29 +2442,29 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) VALUE result = rb_hash_new(); if(classid != Qnil) { Smoke::Index c = (Smoke::Index) NUM2INT(classid); - if (c > qt_Smoke->numClasses) { + if (c > tqt_Smoke->numClasses) { return Qnil; } char * pat = 0L; if(argc > 1 && TYPE(argv[1]) == T_STRING) pat = StringValuePtr(argv[1]); #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("findAllMethods called with classid = %d, pat == %s", c, pat); + if (do_debug & tqtdb_calls) tqWarning("findAllMethods called with classid = %d, pat == %s", c, pat); #endif - Smoke::Index imax = qt_Smoke->numMethodMaps; + Smoke::Index imax = tqt_Smoke->numMethodMaps; Smoke::Index imin = 0, icur = -1, methmin, methmax; methmin = -1; methmax = -1; // kill warnings int icmp = -1; while(imax >= imin) { icur = (imin + imax) / 2; - icmp = qt_Smoke->leg(qt_Smoke->methodMaps[icur].classId, c); + icmp = tqt_Smoke->leg(tqt_Smoke->methodMaps[icur].classId, c); if(!icmp) { Smoke::Index pos = icur; - while(icur && qt_Smoke->methodMaps[icur-1].classId == c) + while(icur && tqt_Smoke->methodMaps[icur-1].classId == c) icur --; methmin = icur; icur = pos; - while(icur < imax && qt_Smoke->methodMaps[icur+1].classId == c) + while(icur < imax && tqt_Smoke->methodMaps[icur+1].classId == c) icur ++; methmax = icur; break; @@ -2476,26 +2476,26 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) } if(!icmp) { for(Smoke::Index i=methmin ; i <= methmax ; i++) { - Smoke::Index m = qt_Smoke->methodMaps[i].name; - if(!pat || !tqstrncmp(qt_Smoke->methodNames[m], pat, strlen(pat))) { - Smoke::Index ix= qt_Smoke->methodMaps[i].method; + Smoke::Index m = tqt_Smoke->methodMaps[i].name; + if(!pat || !tqstrncmp(tqt_Smoke->methodNames[m], pat, strlen(pat))) { + Smoke::Index ix= tqt_Smoke->methodMaps[i].method; VALUE meths = rb_ary_new(); if(ix >= 0) { // single match - Smoke::Method &methodRef = qt_Smoke->methods[ix]; + Smoke::Method &methodRef = tqt_Smoke->methods[ix]; if ((methodRef.flags & Smoke::mf_internal) == 0) { rb_ary_push(meths, INT2NUM((int)ix)); } } else { // multiple match ix = -ix; // turn into ambiguousMethodList index - while(qt_Smoke->ambiguousMethodList[ix]) { - Smoke::Method &methodRef = qt_Smoke->methods[qt_Smoke->ambiguousMethodList[ix]]; + while(tqt_Smoke->ambiguousMethodList[ix]) { + Smoke::Method &methodRef = tqt_Smoke->methods[tqt_Smoke->ambiguousMethodList[ix]]; if ((methodRef.flags & Smoke::mf_internal) == 0) { - rb_ary_push(meths, INT2NUM((int)qt_Smoke->ambiguousMethodList[ix])); + rb_ary_push(meths, INT2NUM((int)tqt_Smoke->ambiguousMethodList[ix])); } ix++; } } - rb_hash_aset(result, rb_str_new2(qt_Smoke->methodNames[m]), meths); + rb_hash_aset(result, rb_str_new2(tqt_Smoke->methodNames[m]), meths); } } } @@ -2511,13 +2511,13 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) mf_protected Protected non-static methods only */ -#define PUSH_QTRUBY_METHOD \ +#define PUSH_TQTRUBY_METHOD \ if ( (methodRef.flags & (Smoke::mf_internal|Smoke::mf_ctor|Smoke::mf_dtor)) == 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator=") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator--") != 0 \ - && tqstrcmp(qt_Smoke->methodNames[methodRef.name], "operator++") != 0 \ - && tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \ + && tqstrcmp(tqt_Smoke->methodNames[methodRef.name], "operator=") != 0 \ + && tqstrcmp(tqt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \ + && tqstrcmp(tqt_Smoke->methodNames[methodRef.name], "operator--") != 0 \ + && tqstrcmp(tqt_Smoke->methodNames[methodRef.name], "operator++") != 0 \ + && tqstrncmp(tqt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \ && ( (flags == 0 && (methodRef.flags & (Smoke::mf_static|Smoke::mf_enum|Smoke::mf_protected)) == 0) \ || ( flags == Smoke::mf_static \ && (methodRef.flags & Smoke::mf_enum) == 0 \ @@ -2526,18 +2526,18 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) || ( flags == Smoke::mf_protected \ && (methodRef.flags & Smoke::mf_static) == 0 \ && (methodRef.flags & Smoke::mf_protected) == Smoke::mf_protected ) ) ) { \ - if (tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \ - if (op_re.search(qt_Smoke->methodNames[methodRef.name]) != -1) { \ + if (tqstrncmp(tqt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \ + if (op_re.search(tqt_Smoke->methodNames[methodRef.name]) != -1) { \ rb_ary_push(result, rb_str_new2(op_re.cap(1) + op_re.cap(2))); \ } else { \ - rb_ary_push(result, rb_str_new2(qt_Smoke->methodNames[methodRef.name] + strlen("operator"))); \ + rb_ary_push(result, rb_str_new2(tqt_Smoke->methodNames[methodRef.name] + strlen("operator"))); \ } \ - } else if (predicate_re.search(qt_Smoke->methodNames[methodRef.name]) != -1 && methodRef.numArgs == 0) { \ + } else if (predicate_re.search(tqt_Smoke->methodNames[methodRef.name]) != -1 && methodRef.numArgs == 0) { \ rb_ary_push(result, rb_str_new2(predicate_re.cap(2).lower() + predicate_re.cap(3) + "?")); \ - } else if (set_re.search(qt_Smoke->methodNames[methodRef.name]) != -1 && methodRef.numArgs == 1) { \ + } else if (set_re.search(tqt_Smoke->methodNames[methodRef.name]) != -1 && methodRef.numArgs == 1) { \ rb_ary_push(result, rb_str_new2(set_re.cap(2).lower() + set_re.cap(3) + "=")); \ } else { \ - rb_ary_push(result, rb_str_new2(qt_Smoke->methodNames[methodRef.name])); \ + rb_ary_push(result, rb_str_new2(tqt_Smoke->methodNames[methodRef.name])); \ } \ } @@ -2551,27 +2551,27 @@ findAllMethodNames(VALUE /*self*/, VALUE result, VALUE classid, VALUE flags_valu unsigned short flags = (unsigned short) NUM2UINT(flags_value); if (classid != Qnil) { Smoke::Index c = (Smoke::Index) NUM2INT(classid); - if (c > qt_Smoke->numClasses) { + if (c > tqt_Smoke->numClasses) { return Qnil; } #ifdef DEBUG - if (do_debug & qtdb_calls) tqWarning("findAllMethodNames called with classid = %d", c); + if (do_debug & tqtdb_calls) tqWarning("findAllMethodNames called with classid = %d", c); #endif - Smoke::Index imax = qt_Smoke->numMethodMaps; + Smoke::Index imax = tqt_Smoke->numMethodMaps; Smoke::Index imin = 0, icur = -1, methmin, methmax; methmin = -1; methmax = -1; // kill warnings int icmp = -1; while (imax >= imin) { icur = (imin + imax) / 2; - icmp = qt_Smoke->leg(qt_Smoke->methodMaps[icur].classId, c); + icmp = tqt_Smoke->leg(tqt_Smoke->methodMaps[icur].classId, c); if (icmp == 0) { Smoke::Index pos = icur; - while(icur && qt_Smoke->methodMaps[icur-1].classId == c) + while(icur && tqt_Smoke->methodMaps[icur-1].classId == c) icur --; methmin = icur; icur = pos; - while(icur < imax && qt_Smoke->methodMaps[icur+1].classId == c) + while(icur < imax && tqt_Smoke->methodMaps[icur+1].classId == c) icur ++; methmax = icur; break; @@ -2584,15 +2584,15 @@ findAllMethodNames(VALUE /*self*/, VALUE result, VALUE classid, VALUE flags_valu if (icmp == 0) { for (Smoke::Index i=methmin ; i <= methmax ; i++) { - Smoke::Index ix= qt_Smoke->methodMaps[i].method; + Smoke::Index ix= tqt_Smoke->methodMaps[i].method; if (ix >= 0) { // single match - Smoke::Method &methodRef = qt_Smoke->methods[ix]; - PUSH_QTRUBY_METHOD + Smoke::Method &methodRef = tqt_Smoke->methods[ix]; + PUSH_TQTRUBY_METHOD } else { // multiple match ix = -ix; // turn into ambiguousMethodList index - while (qt_Smoke->ambiguousMethodList[ix]) { - Smoke::Method &methodRef = qt_Smoke->methods[qt_Smoke->ambiguousMethodList[ix]]; - PUSH_QTRUBY_METHOD + while (tqt_Smoke->ambiguousMethodList[ix]) { + Smoke::Method &methodRef = tqt_Smoke->methods[tqt_Smoke->ambiguousMethodList[ix]]; + PUSH_TQTRUBY_METHOD ix++; } } @@ -2611,19 +2611,19 @@ dumpCandidates(VALUE /*self*/, VALUE rmeths) for(int i = 0; i < count; i++) { rb_str_catf_1(errmsg, "\t"); int id = NUM2INT(rb_ary_entry(rmeths, i)); - Smoke::Method &meth = qt_Smoke->methods[id]; - const char *tname = qt_Smoke->types[meth.ret].name; + Smoke::Method &meth = tqt_Smoke->methods[id]; + const char *tname = tqt_Smoke->types[meth.ret].name; if(meth.flags & Smoke::mf_enum) { rb_str_catf_1(errmsg, "enum "); - rb_str_catf_1(errmsg, "%s::%s", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]); + rb_str_catf_1(errmsg, "%s::%s", tqt_Smoke->classes[meth.classId].className, tqt_Smoke->methodNames[meth.name]); rb_str_catf_1(errmsg, "\n"); } else { if(meth.flags & Smoke::mf_static) rb_str_catf(errmsg, "static "); rb_str_catf_1(errmsg, "%s ", (tname ? tname:"void")); - rb_str_catf_1(errmsg, "%s::%s(", qt_Smoke->classes[meth.classId].className, qt_Smoke->methodNames[meth.name]); + rb_str_catf_1(errmsg, "%s::%s(", tqt_Smoke->classes[meth.classId].className, tqt_Smoke->methodNames[meth.name]); for(int i = 0; i < meth.numArgs; i++) { if(i) rb_str_catf_1(errmsg, ", "); - tname = qt_Smoke->types[qt_Smoke->argumentList[meth.args+i]].name; + tname = tqt_Smoke->types[tqt_Smoke->argumentList[meth.args+i]].name; rb_str_catf_1(errmsg, "%s", (tname ? tname:"void")); } rb_str_catf_1(errmsg, ")"); @@ -2648,7 +2648,7 @@ setCurrentMethod(VALUE self, VALUE meth_value) { int meth = NUM2INT(meth_value); // FIXME: damn, this is lame, and it doesn't handle ambiguous methods - _current_method = meth; //qt_Smoke->methodMaps[meth].method; + _current_method = meth; //tqt_Smoke->methodMaps[meth].method; return self; } @@ -2657,8 +2657,8 @@ getClassList(VALUE /*self*/) { VALUE class_list = rb_ary_new(); - for(int i = 1; i <= qt_Smoke->numClasses; i++) { - rb_ary_push(class_list, rb_str_new2(qt_Smoke->classes[i].className)); + for(int i = 1; i <= tqt_Smoke->numClasses; i++) { + rb_ary_push(class_list, rb_str_new2(tqt_Smoke->classes[i].className)); } return class_list; @@ -2746,7 +2746,7 @@ create_qobject_class(VALUE /*self*/, VALUE package_value) VALUE klass; if (TQString(package).startsWith("TQt::")) { - klass = rb_define_class_under(qt_module, package+strlen("TQt::"), qt_base_class); + klass = rb_define_class_under(tqt_module, package+strlen("TQt::"), tqt_base_class); if (tqstrcmp(package, "TQt::Application") == 0) { rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qapplication, -1); rb_define_method(klass, "ARGV", (VALUE (*) (...)) qapplication_argv, 0); @@ -2755,9 +2755,9 @@ create_qobject_class(VALUE /*self*/, VALUE package_value) if (qext_scintilla_module == Qnil) { qext_scintilla_module = rb_define_module("Qext"); } - klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), qt_base_class); + klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), tqt_base_class); } else { - klass = kde_package_to_class(package, qt_base_class); + klass = kde_package_to_class(package, tqt_base_class); } rb_define_method(klass, "inspect", (VALUE (*) (...)) inspect_qobject, 0); @@ -2772,20 +2772,20 @@ create_qobject_class(VALUE /*self*/, VALUE package_value) } static VALUE -create_qt_class(VALUE /*self*/, VALUE package_value) +create_tqt_class(VALUE /*self*/, VALUE package_value) { const char *package = StringValuePtr(package_value); VALUE klass; if (TQString(package).startsWith("TQt::")) { - klass = rb_define_class_under(qt_module, package+strlen("TQt::"), qt_base_class); + klass = rb_define_class_under(tqt_module, package+strlen("TQt::"), tqt_base_class); } else if (TQString(package).startsWith("Qext::")) { if (qext_scintilla_module == Qnil) { qext_scintilla_module = rb_define_module("Qext"); } - klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), qt_base_class); + klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), tqt_base_class); } else { - klass = kde_package_to_class(package, qt_base_class); + klass = kde_package_to_class(package, tqt_base_class); } if (tqstrcmp(package, "TQt::MetaObject") == 0) { @@ -2811,7 +2811,7 @@ version(VALUE /*self*/) } static VALUE -qtruby_version(VALUE /*self*/) +tqtruby_version(VALUE /*self*/) { return rb_str_new2(TQTRUBY_VERSION); } @@ -2821,10 +2821,10 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) { _new_kde = new_kde; - if (qt_module == Qnil) { - qt_module = rb_define_module("Qt"); - qt_internal_module = rb_define_module_under(qt_module, "Internal"); - qt_base_class = rb_define_class_under(qt_module, "Base", rb_cObject); + if (tqt_module == Qnil) { + tqt_module = rb_define_module("TQt"); + tqt_internal_module = rb_define_module_under(tqt_module, "Internal"); + tqt_base_class = rb_define_class_under(tqt_module, "Base", rb_cObject); } kde_module = rb_define_module("KDE"); @@ -2855,7 +2855,7 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) rb_define_singleton_method(tdetexteditor_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); rb_define_singleton_method(tdetexteditor_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - twin_class = rb_define_class_under(kde_module, "Win", qt_base_class); + twin_class = rb_define_class_under(kde_module, "Win", tqt_base_class); kate_module = rb_define_module("Kate"); rb_define_singleton_method(kate_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); @@ -2871,8 +2871,8 @@ set_tdeconfigskeletonitem_immutable(VALUE (*tdeconfigskeletonitem_immutable) (VA { _tdeconfigskeletonitem_immutable = tdeconfigskeletonitem_immutable; - tdeconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", qt_base_class); - tdeconfigskeleton_itemenum_class = rb_define_class_under(tdeconfigskeleton_class, "ItemEnum", qt_base_class); + tdeconfigskeleton_class = rb_define_class_under(kde_module, "ConfigSkeleton", tqt_base_class); + tdeconfigskeleton_itemenum_class = rb_define_class_under(tdeconfigskeleton_class, "ItemEnum", tqt_base_class); } static VALUE @@ -2883,95 +2883,95 @@ set_application_terminated(VALUE /*self*/, VALUE yn) } void -Init_qtruby() +Init_tqtruby() { - if (qt_Smoke != 0L) { + if (tqt_Smoke != 0L) { // This function must have been called twice because both - // 'require Qt' and 'require Korundum' statements have + // 'require TQt' and 'require Korundum' statements have // been included in a ruby program - rb_fatal("require 'Qt' must not follow require 'Korundum'\n"); + rb_fatal("require 'TQt' must not follow require 'Korundum'\n"); return; } - init_qt_Smoke(); - qt_Smoke->binding = new QtRubySmokeBinding(qt_Smoke); - install_handlers(Qt_handlers); + init_tqt_Smoke(); + tqt_Smoke->binding = new TQtRubySmokeBinding(tqt_Smoke); + install_handlers(TQt_handlers); methcache.setAutoDelete(true); classcache.setAutoDelete(true); - if (qt_module == Qnil) { - qt_module = rb_define_module("Qt"); - qt_internal_module = rb_define_module_under(qt_module, "Internal"); - qt_base_class = rb_define_class_under(qt_module, "Base", rb_cObject); + if (tqt_module == Qnil) { + tqt_module = rb_define_module("TQt"); + tqt_internal_module = rb_define_module_under(tqt_module, "Internal"); + tqt_base_class = rb_define_class_under(tqt_module, "Base", rb_cObject); } - rb_define_singleton_method(qt_base_class, "new", (VALUE (*) (...)) new_qt, -1); - rb_define_method(qt_base_class, "initialize", (VALUE (*) (...)) initialize_qt, -1); - rb_define_singleton_method(qt_base_class, "method_missing", (VALUE (*) (...)) class_method_missing, -1); - rb_define_singleton_method(qt_module, "method_missing", (VALUE (*) (...)) module_method_missing, -1); - rb_define_method(qt_base_class, "method_missing", (VALUE (*) (...)) method_missing, -1); + rb_define_singleton_method(tqt_base_class, "new", (VALUE (*) (...)) new_tqt, -1); + rb_define_method(tqt_base_class, "initialize", (VALUE (*) (...)) initialize_tqt, -1); + rb_define_singleton_method(tqt_base_class, "method_missing", (VALUE (*) (...)) class_method_missing, -1); + rb_define_singleton_method(tqt_module, "method_missing", (VALUE (*) (...)) module_method_missing, -1); + rb_define_method(tqt_base_class, "method_missing", (VALUE (*) (...)) method_missing, -1); - rb_define_singleton_method(qt_base_class, "const_missing", (VALUE (*) (...)) class_method_missing, -1); - rb_define_singleton_method(qt_module, "const_missing", (VALUE (*) (...)) module_method_missing, -1); - rb_define_method(qt_base_class, "const_missing", (VALUE (*) (...)) method_missing, -1); + rb_define_singleton_method(tqt_base_class, "const_missing", (VALUE (*) (...)) class_method_missing, -1); + rb_define_singleton_method(tqt_module, "const_missing", (VALUE (*) (...)) module_method_missing, -1); + rb_define_method(tqt_base_class, "const_missing", (VALUE (*) (...)) method_missing, -1); - rb_define_method(qt_base_class, "dispose", (VALUE (*) (...)) dispose, 0); - rb_define_method(qt_base_class, "isDisposed", (VALUE (*) (...)) is_disposed, 0); - rb_define_method(qt_base_class, "disposed?", (VALUE (*) (...)) is_disposed, 0); + rb_define_method(tqt_base_class, "dispose", (VALUE (*) (...)) dispose, 0); + rb_define_method(tqt_base_class, "isDisposed", (VALUE (*) (...)) is_disposed, 0); + rb_define_method(tqt_base_class, "disposed?", (VALUE (*) (...)) is_disposed, 0); rb_define_method(rb_cObject, "qDebug", (VALUE (*) (...)) qdebug, 1); rb_define_method(rb_cObject, "qFatal", (VALUE (*) (...)) qfatal, 1); rb_define_method(rb_cObject, "qWarning", (VALUE (*) (...)) qwarning, 1); - rb_define_module_function(qt_internal_module, "getMethStat", (VALUE (*) (...)) getMethStat, 0); - rb_define_module_function(qt_internal_module, "getClassStat", (VALUE (*) (...)) getClassStat, 0); - rb_define_module_function(qt_internal_module, "getIsa", (VALUE (*) (...)) getIsa, 1); - rb_define_module_function(qt_internal_module, "allocateMocArguments", (VALUE (*) (...)) allocateMocArguments, 1); - rb_define_module_function(qt_internal_module, "setMocType", (VALUE (*) (...)) setMocType, 4); - rb_define_module_function(qt_internal_module, "setDebug", (VALUE (*) (...)) setDebug, 1); - rb_define_module_function(qt_internal_module, "debug", (VALUE (*) (...)) debugging, 0); - rb_define_module_function(qt_internal_module, "getTypeNameOfArg", (VALUE (*) (...)) getTypeNameOfArg, 2); - rb_define_module_function(qt_internal_module, "classIsa", (VALUE (*) (...)) classIsa, 2); - rb_define_module_function(qt_internal_module, "isEnum", (VALUE (*) (...)) isEnum, 1); - rb_define_module_function(qt_internal_module, "insert_pclassid", (VALUE (*) (...)) insert_pclassid, 2); - rb_define_module_function(qt_internal_module, "find_pclassid", (VALUE (*) (...)) find_pclassid, 1); - rb_define_module_function(qt_internal_module, "insert_mcid", (VALUE (*) (...)) insert_mcid, 2); - rb_define_module_function(qt_internal_module, "find_mcid", (VALUE (*) (...)) find_mcid, 1); - rb_define_module_function(qt_internal_module, "getVALUEtype", (VALUE (*) (...)) getVALUEtype, 1); - rb_define_module_function(qt_internal_module, "make_QUParameter", (VALUE (*) (...)) make_QUParameter, 4); - rb_define_module_function(qt_internal_module, "make_QMetaData", (VALUE (*) (...)) make_QMetaData, 2); - rb_define_module_function(qt_internal_module, "make_QUMethod", (VALUE (*) (...)) make_QUMethod, 2); - rb_define_module_function(qt_internal_module, "make_QMetaData_tbl", (VALUE (*) (...)) make_QMetaData_tbl, 1); - rb_define_module_function(qt_internal_module, "make_metaObject", (VALUE (*) (...)) make_metaObject, 6); - rb_define_module_function(qt_internal_module, "addMetaObjectMethods", (VALUE (*) (...)) add_metaobject_methods, 1); - rb_define_module_function(qt_internal_module, "addSignalMethods", (VALUE (*) (...)) add_signal_methods, 2); - rb_define_module_function(qt_internal_module, "mapObject", (VALUE (*) (...)) mapObject, 1); + rb_define_module_function(tqt_internal_module, "getMethStat", (VALUE (*) (...)) getMethStat, 0); + rb_define_module_function(tqt_internal_module, "getClassStat", (VALUE (*) (...)) getClassStat, 0); + rb_define_module_function(tqt_internal_module, "getIsa", (VALUE (*) (...)) getIsa, 1); + rb_define_module_function(tqt_internal_module, "allocateMocArguments", (VALUE (*) (...)) allocateMocArguments, 1); + rb_define_module_function(tqt_internal_module, "setMocType", (VALUE (*) (...)) setMocType, 4); + rb_define_module_function(tqt_internal_module, "setDebug", (VALUE (*) (...)) setDebug, 1); + rb_define_module_function(tqt_internal_module, "debug", (VALUE (*) (...)) debugging, 0); + rb_define_module_function(tqt_internal_module, "getTypeNameOfArg", (VALUE (*) (...)) getTypeNameOfArg, 2); + rb_define_module_function(tqt_internal_module, "classIsa", (VALUE (*) (...)) classIsa, 2); + rb_define_module_function(tqt_internal_module, "isEnum", (VALUE (*) (...)) isEnum, 1); + rb_define_module_function(tqt_internal_module, "insert_pclassid", (VALUE (*) (...)) insert_pclassid, 2); + rb_define_module_function(tqt_internal_module, "find_pclassid", (VALUE (*) (...)) find_pclassid, 1); + rb_define_module_function(tqt_internal_module, "insert_mcid", (VALUE (*) (...)) insert_mcid, 2); + rb_define_module_function(tqt_internal_module, "find_mcid", (VALUE (*) (...)) find_mcid, 1); + rb_define_module_function(tqt_internal_module, "getVALUEtype", (VALUE (*) (...)) getVALUEtype, 1); + rb_define_module_function(tqt_internal_module, "make_QUParameter", (VALUE (*) (...)) make_QUParameter, 4); + rb_define_module_function(tqt_internal_module, "make_QMetaData", (VALUE (*) (...)) make_QMetaData, 2); + rb_define_module_function(tqt_internal_module, "make_QUMethod", (VALUE (*) (...)) make_QUMethod, 2); + rb_define_module_function(tqt_internal_module, "make_QMetaData_tbl", (VALUE (*) (...)) make_QMetaData_tbl, 1); + rb_define_module_function(tqt_internal_module, "make_metaObject", (VALUE (*) (...)) make_metaObject, 6); + rb_define_module_function(tqt_internal_module, "addMetaObjectMethods", (VALUE (*) (...)) add_metaobject_methods, 1); + rb_define_module_function(tqt_internal_module, "addSignalMethods", (VALUE (*) (...)) add_signal_methods, 2); + rb_define_module_function(tqt_internal_module, "mapObject", (VALUE (*) (...)) mapObject, 1); // isTQOjbect => isaTQObject - rb_define_module_function(qt_internal_module, "isTQObject", (VALUE (*) (...)) isaTQObject, 1); - rb_define_module_function(qt_internal_module, "idInstance", (VALUE (*) (...)) idInstance, 1); - rb_define_module_function(qt_internal_module, "idClass", (VALUE (*) (...)) idClass, 1); - rb_define_module_function(qt_internal_module, "idMethodName", (VALUE (*) (...)) idMethodName, 1); - rb_define_module_function(qt_internal_module, "idMethod", (VALUE (*) (...)) idMethod, 2); - rb_define_module_function(qt_internal_module, "findMethod", (VALUE (*) (...)) findMethod, 2); - rb_define_module_function(qt_internal_module, "findAllMethods", (VALUE (*) (...)) findAllMethods, -1); - rb_define_module_function(qt_internal_module, "findAllMethodNames", (VALUE (*) (...)) findAllMethodNames, 3); - rb_define_module_function(qt_internal_module, "dumpCandidates", (VALUE (*) (...)) dumpCandidates, 1); - rb_define_module_function(qt_internal_module, "isObject", (VALUE (*) (...)) isObject, 1); - rb_define_module_function(qt_internal_module, "setCurrentMethod", (VALUE (*) (...)) setCurrentMethod, 1); - rb_define_module_function(qt_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0); - rb_define_module_function(qt_internal_module, "create_qt_class", (VALUE (*) (...)) create_qt_class, 1); - rb_define_module_function(qt_internal_module, "create_qobject_class", (VALUE (*) (...)) create_qobject_class, 1); - rb_define_module_function(qt_internal_module, "cast_object_to", (VALUE (*) (...)) cast_object_to, 2); - rb_define_module_function(qt_internal_module, "application_terminated=", (VALUE (*) (...)) set_application_terminated, 1); + rb_define_module_function(tqt_internal_module, "isTQObject", (VALUE (*) (...)) isaTQObject, 1); + rb_define_module_function(tqt_internal_module, "idInstance", (VALUE (*) (...)) idInstance, 1); + rb_define_module_function(tqt_internal_module, "idClass", (VALUE (*) (...)) idClass, 1); + rb_define_module_function(tqt_internal_module, "idMethodName", (VALUE (*) (...)) idMethodName, 1); + rb_define_module_function(tqt_internal_module, "idMethod", (VALUE (*) (...)) idMethod, 2); + rb_define_module_function(tqt_internal_module, "findMethod", (VALUE (*) (...)) findMethod, 2); + rb_define_module_function(tqt_internal_module, "findAllMethods", (VALUE (*) (...)) findAllMethods, -1); + rb_define_module_function(tqt_internal_module, "findAllMethodNames", (VALUE (*) (...)) findAllMethodNames, 3); + rb_define_module_function(tqt_internal_module, "dumpCandidates", (VALUE (*) (...)) dumpCandidates, 1); + rb_define_module_function(tqt_internal_module, "isObject", (VALUE (*) (...)) isObject, 1); + rb_define_module_function(tqt_internal_module, "setCurrentMethod", (VALUE (*) (...)) setCurrentMethod, 1); + rb_define_module_function(tqt_internal_module, "getClassList", (VALUE (*) (...)) getClassList, 0); + rb_define_module_function(tqt_internal_module, "create_tqt_class", (VALUE (*) (...)) create_tqt_class, 1); + rb_define_module_function(tqt_internal_module, "create_qobject_class", (VALUE (*) (...)) create_qobject_class, 1); + rb_define_module_function(tqt_internal_module, "cast_object_to", (VALUE (*) (...)) cast_object_to, 2); + rb_define_module_function(tqt_internal_module, "application_terminated=", (VALUE (*) (...)) set_application_terminated, 1); - rb_define_module_function(qt_module, "version", (VALUE (*) (...)) version, 0); - rb_define_module_function(qt_module, "qtruby_version", (VALUE (*) (...)) qtruby_version, 0); + rb_define_module_function(tqt_module, "version", (VALUE (*) (...)) version, 0); + rb_define_module_function(tqt_module, "tqtruby_version", (VALUE (*) (...)) tqtruby_version, 0); - rb_require("Qt/qtruby.rb"); + rb_require("TQt/tqtruby.rb"); // Do package initialization - rb_funcall(qt_internal_module, rb_intern("init_all_classes"), 0); + rb_funcall(tqt_internal_module, rb_intern("init_all_classes"), 0); } }; diff --git a/qtruby/rubylib/qtruby/configure.in.in b/tqtruby/rubylib/tqtruby/configure.in.in similarity index 98% rename from qtruby/rubylib/qtruby/configure.in.in rename to tqtruby/rubylib/tqtruby/configure.in.in index ed1519cb..e9b117de 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/tqtruby/rubylib/tqtruby/configure.in.in @@ -5,7 +5,7 @@ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin AC_CHECK_PROG(RUBY, ruby, ruby) if test -z "$RUBY"; then - DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" + DO_NOT_COMPILE="$DO_NOT_COMPILE tqtruby" else AC_MSG_CHECKING(for ruby dirs) # Note: pkgconfig file exists only for ruby >= 1.9.3 diff --git a/qtruby/rubylib/qtruby/extconf.rb b/tqtruby/rubylib/tqtruby/extconf.rb similarity index 64% rename from qtruby/rubylib/qtruby/extconf.rb rename to tqtruby/rubylib/tqtruby/extconf.rb index 9e2f9f96..7c865c06 100644 --- a/qtruby/rubylib/qtruby/extconf.rb +++ b/tqtruby/rubylib/tqtruby/extconf.rb @@ -1,5 +1,5 @@ require 'mkmf' dir_config('smoke') -dir_config('qt') +dir_config('tqt') $LOCAL_LIBS += '-lsmoketqt -ltqt-mt -lstdc++' -create_makefile("qtruby") +create_makefile("tqtruby") diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/tqtruby/rubylib/tqtruby/handlers.cpp similarity index 95% rename from qtruby/rubylib/qtruby/handlers.cpp rename to tqtruby/rubylib/tqtruby/handlers.cpp index fa789e9e..a3c8c805 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/tqtruby/rubylib/tqtruby/handlers.cpp @@ -40,7 +40,7 @@ #include #include "marshall.h" -#include "qtruby.h" +#include "tqtruby.h" #include "smokeruby.h" #ifndef HINT_BYTES @@ -59,7 +59,7 @@ extern "C" { extern VALUE set_obj_info(const char * className, smokeruby_object * o); -extern VALUE qt_internal_module; +extern VALUE tqt_internal_module; extern VALUE qvariant_class; extern bool application_terminated; }; @@ -95,7 +95,7 @@ mark_qobject_children(TQObject * qobject) ++it; obj = getPointerObject(child); if (obj != Qnil) { - if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", child->className(), child, (void*)obj); + if(do_debug & tqtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", child->className(), child, (void*)obj); rb_gc_mark(obj); } @@ -110,7 +110,7 @@ smokeruby_mark(void * p) smokeruby_object * o = (smokeruby_object *) p; const char *className = o->smoke->classes[o->classId].className; - if(do_debug & qtdb_gc) tqWarning("Checking for mark (%s*)%p\n", className, o->ptr); + if(do_debug & tqtdb_gc) tqWarning("Checking for mark (%s*)%p\n", className, o->ptr); if(o->ptr && o->allocated) { if (isDerivedFromByName(o->smoke, className, "TQListView")) { @@ -122,7 +122,7 @@ smokeruby_mark(void * p) ++it; obj = getPointerObject(item); if (obj != Qnil) { - if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); + if(do_debug & tqtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); rb_gc_mark(obj); } } @@ -138,7 +138,7 @@ smokeruby_mark(void * p) item = table->item(row, col); obj = getPointerObject(item); if (obj != Qnil) { - if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); + if(do_debug & tqtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, item, (void*)obj); rb_gc_mark(obj); } } @@ -152,7 +152,7 @@ smokeruby_mark(void * p) for ( TQCanvasItemList::iterator it = list.begin(); it != list.end(); ++it ) { obj = getPointerObject(*it); if (obj != Qnil) { - if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, *it, (void*)obj); + if(do_debug & tqtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", className, *it, (void*)obj); rb_gc_mark(obj); } } @@ -164,7 +164,7 @@ smokeruby_mark(void * p) TQCanvas * canvas = item->canvas(); obj = getPointerObject(canvas); if (obj != Qnil) { - if(do_debug & qtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj); + if(do_debug & tqtdb_gc) tqWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj); rb_gc_mark(obj); } return; @@ -184,7 +184,7 @@ smokeruby_free(void * p) smokeruby_object *o = (smokeruby_object*)p; const char *className = o->smoke->classes[o->classId].className; - if(do_debug & qtdb_gc) tqWarning("Checking for delete (%s*)%p allocated: %s\n", className, o->ptr, o->allocated ? "true" : "false"); + if(do_debug & tqtdb_gc) tqWarning("Checking for delete (%s*)%p allocated: %s\n", className, o->ptr, o->allocated ? "true" : "false"); if(application_terminated || !o->allocated || o->ptr == 0) { free(o); @@ -257,7 +257,7 @@ smokeruby_free(void * p) } } - if(do_debug & qtdb_gc) tqWarning("Deleting (%s*)%p\n", className, o->ptr); + if(do_debug & tqtdb_gc) tqWarning("Deleting (%s*)%p\n", className, o->ptr); char *methodName = new char[strlen(className) + 2]; methodName[0] = '~'; @@ -277,8 +277,8 @@ smokeruby_free(void * p) } /* - * Given an approximate classname and a qt instance, try to improve the resolution of the name - * by using the various Qt rtti mechanisms for TQObjects, TQEvents and TQCanvasItems + * Given an approximate classname and a tqt instance, try to improve the resolution of the name + * by using the various TQt rtti mechanisms for TQObjects, TQEvents and TQCanvasItems */ static const char * resolve_classname(Smoke* smoke, int classId, void * ptr) @@ -475,7 +475,7 @@ marshall_basetype(Marshall *m) case Marshall::FromVALUE: if (TYPE(*(m->var())) == T_OBJECT) { // A TQt::Boolean has been passed as a value - VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qboolean"), 1, *(m->var())); + VALUE temp = rb_funcall(tqt_internal_module, rb_intern("get_qboolean"), 1, *(m->var())); m->item().s_bool = (temp == Qtrue ? true : false); } else { m->item().s_bool = (*(m->var()) == Qtrue ? true : false); @@ -545,7 +545,7 @@ marshall_basetype(Marshall *m) switch(m->action()) { case Marshall::FromVALUE: if (TYPE(*(m->var())) == T_OBJECT) { - m->item().s_int = (int) NUM2INT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); + m->item().s_int = (int) NUM2INT(rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); } else { m->item().s_int = (int) NUM2INT(*(m->var())); } @@ -562,7 +562,7 @@ marshall_basetype(Marshall *m) switch(m->action()) { case Marshall::FromVALUE: if (TYPE(*(m->var())) == T_OBJECT) { - m->item().s_int = (unsigned int) NUM2UINT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); + m->item().s_int = (unsigned int) NUM2UINT(rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); } else { m->item().s_uint = (unsigned int) NUM2UINT(*(m->var())); } @@ -579,7 +579,7 @@ marshall_basetype(Marshall *m) switch(m->action()) { case Marshall::FromVALUE: if (TYPE(*(m->var())) == T_OBJECT) { - m->item().s_int = (long) NUM2LONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); + m->item().s_int = (long) NUM2LONG(rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); } else { m->item().s_long = (long) NUM2LONG(*(m->var())); } @@ -596,7 +596,7 @@ marshall_basetype(Marshall *m) switch(m->action()) { case Marshall::FromVALUE: if (TYPE(*(m->var())) == T_OBJECT) { - m->item().s_int = (unsigned long) NUM2ULONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); + m->item().s_int = (unsigned long) NUM2ULONG(rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, *(m->var()))); } else { m->item().s_ulong = (unsigned long) NUM2ULONG(*(m->var())); } @@ -641,7 +641,7 @@ marshall_basetype(Marshall *m) { if (TYPE(*(m->var())) == T_OBJECT) { // A TQt::Enum is a subclass of TQt::Integer, so 'get_qinteger()' can be called ok - VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, *(m->var())); + VALUE temp = rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, *(m->var())); m->item().s_enum = (long) NUM2LONG(temp); } else { m->item().s_enum = (long) NUM2LONG(*(m->var())); @@ -649,7 +649,7 @@ marshall_basetype(Marshall *m) } break; case Marshall::ToVALUE: - *(m->var()) = rb_funcall( qt_internal_module, + *(m->var()) = rb_funcall( tqt_internal_module, rb_intern("create_qenum"), 2, INT2NUM(m->item().s_enum), rb_str_new2(m->type().name()) ); @@ -726,7 +726,7 @@ marshall_basetype(Marshall *m) } obj = set_obj_info(classname, o); - if (do_debug & qtdb_calls) { + if (do_debug & tqtdb_calls) { tqWarning("allocating %s %p -> %p\n", classname, o->ptr, (void*)obj); } @@ -914,7 +914,7 @@ static void marshall_TQString(Marshall *m) { // The only way to convert a TQChar to a TQString is to // pass a TQChar to a TQString constructor. However, -// TQStrings aren't in the QtRuby api, so add this +// TQStrings aren't in the TQtRuby api, so add this // convenience method 'TQt::Char.to_s' to get a ruby // string from a TQt::Char. VALUE @@ -1090,11 +1090,11 @@ static void marshall_intR(Marshall *m) { int * i = new int; if (TYPE(rv) == T_OBJECT) { // A TQt::Integer has been passed as an integer value - VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, rv); + VALUE temp = rb_funcall(tqt_internal_module, rb_intern("get_qinteger"), 1, rv); *i = NUM2INT(temp); m->item().s_voidp = i; m->next(); - rb_funcall(qt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i)); + rb_funcall(tqt_internal_module, rb_intern("set_qinteger"), 2, rv, INT2NUM(*i)); rv = temp; } else { *i = NUM2INT(rv); @@ -1136,11 +1136,11 @@ static void marshall_boolR(Marshall *m) { bool * b = new bool; if (TYPE(rv) == T_OBJECT) { // A TQt::Boolean has been passed as a value - VALUE temp = rb_funcall(qt_internal_module, rb_intern("get_qboolean"), 1, rv); + VALUE temp = rb_funcall(tqt_internal_module, rb_intern("get_qboolean"), 1, rv); *b = (temp == Qtrue ? true : false); m->item().s_voidp = b; m->next(); - rb_funcall(qt_internal_module, rb_intern("set_qboolean"), 2, rv, (*b ? Qtrue : Qfalse)); + rb_funcall(tqt_internal_module, rb_intern("set_qboolean"), 2, rv, (*b ? Qtrue : Qfalse)); } else { *b = (rv == Qtrue ? true : false); m->item().s_voidp = b; @@ -1889,7 +1889,7 @@ DEF_VALUELIST_MARSHALLER( TQUrlInfoList, TQValueList, TQUrlInfo, TQVa DEF_VALUELIST_MARSHALLER( TQTranslatorMessageList, TQValueList, TQTranslatorMessage, TQValueList::Iterator ) DEF_VALUELIST_MARSHALLER( TQHostAddressList, TQValueList, TQHostAddress, TQValueList::Iterator ) -TypeHandler Qt_handlers[] = { +TypeHandler TQt_handlers[] = { { "TQString", marshall_TQString }, { "TQString&", marshall_TQString }, { "TQString*", marshall_TQString }, diff --git a/tqtruby/rubylib/tqtruby/lib/Makefile.am b/tqtruby/rubylib/tqtruby/lib/Makefile.am new file mode 100644 index 00000000..a8c7c562 --- /dev/null +++ b/tqtruby/rubylib/tqtruby/lib/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = TQt + +rubylibdir = $(RUBY_RUBYLIBDIR) +rubylib_DATA = TQt.rb diff --git a/tqtruby/rubylib/tqtruby/lib/TQt.rb b/tqtruby/rubylib/tqtruby/lib/TQt.rb new file mode 100644 index 00000000..c4d68032 --- /dev/null +++ b/tqtruby/rubylib/tqtruby/lib/TQt.rb @@ -0,0 +1 @@ +require 'tqtruby' diff --git a/tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am b/tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am new file mode 100644 index 00000000..17eadf26 --- /dev/null +++ b/tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am @@ -0,0 +1,2 @@ +tqtrubylibdir = $(RUBY_RUBYLIBDIR)/TQt +tqtrubylib_DATA = tqtruby.rb diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb similarity index 97% rename from qtruby/rubylib/qtruby/lib/Qt/qtruby.rb rename to tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb index 4197e9f6..a7489820 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb @@ -1,6 +1,6 @@ =begin /*************************************************************************** - qtruby.rb - description + tqtruby.rb - description ------------------- begin : Fri Jul 4 2003 copyright : (C) 2003 by Richard Dale @@ -22,7 +22,7 @@ module TQt Off, Minimal, High, Extensive = 0, 1, 2, 3 end - module QtDebugChannel + module TQtDebugChannel TQTDB_NONE = 0x00 TQTDB_AMBIGUOUS = 0x01 TQTDB_METHOD_MISSING = 0x02 @@ -36,7 +36,7 @@ module TQt @@debug_level = DebugLevel::Off def TQt.debug_level=(level) @@debug_level = level - Internal::setDebug TQt::QtDebugChannel::TQTDB_ALL if level >= DebugLevel::Extensive + Internal::setDebug TQt::TQtDebugChannel::TQTDB_ALL if level >= DebugLevel::Extensive end def TQt.debug_level @@ -145,12 +145,12 @@ module TQt return singleton_methods end - qt_methods(super, 0x0) + tqt_methods(super, 0x0) end def protected_methods # From smoke.h, Smoke::mf_protected 0x80 - qt_methods(super, 0x80) + tqt_methods(super, 0x80) end def public_methods @@ -159,11 +159,11 @@ module TQt def singleton_methods # From smoke.h, Smoke::mf_static 0x01 - qt_methods(super, 0x01) + tqt_methods(super, 0x01) end private - def qt_methods(meths, flags) + def tqt_methods(meths, flags) ids = [] # These methods are all defined in TQt::Base, even if they aren't supported by a particular # subclass, so remove them to avoid confusion @@ -1371,12 +1371,12 @@ module TQt @@idclass[classId] = classname @@cpp_names[classname] = c klass = isTQObject(classId) ? create_qobject_class(classname) \ - : create_qt_class(classname) + : create_tqt_class(classname) @@classes[classname] = klass unless klass.nil? end def Internal.debug_level - Qt.debug_level + TQt.debug_level end def Internal.checkarg(argtype, typename) @@ -1471,12 +1471,12 @@ module TQt @@classes[classname] end - # Runs the initializer as far as allocating the Qt C++ instance. + # Runs the initializer as far as allocating the TQt C++ instance. # Then use a throw to jump back to here with the C++ instance # wrapped in a new ruby variable of type T_DATA def Internal.try_initialize(instance, *args) initializer = instance.method(:initialize) - catch "newqt" do + catch "newtqt" do initializer.call(*args) end end @@ -1501,7 +1501,7 @@ module TQt else classname = @@cpp_names[klass.name] if classname.nil? - if klass != Object and klass != Qt + if klass != Object and klass != TQt return do_method_missing(package, method, klass.superclass, this, *args) else return nil @@ -1611,9 +1611,9 @@ module TQt def Internal.init_all_classes() TQt::Internal::getClassList().each do |c| - if c == "Qt" - # Don't change Qt to TQt::t, just leave as is - @@cpp_names["Qt"] = c + if c == "TQt" + # Don't change TQt to TQt::t, just leave as is + @@cpp_names["TQt"] = c elsif c != "TQInternal" TQt::Internal::init_class(c) end @@ -1875,7 +1875,7 @@ module TQt IO_TimeOutError = 7 IO_UnspecifiedError= 8 -end # Qt +end # TQt class Object def SIGNAL(signal) @@ -1901,7 +1901,7 @@ class Object # See the discussion here: http://eigenclass.org/hiki.rb?instance_exec # about implementations of the ruby 1.9 method instance_exec(). This # version is the one from Rails. It isn't thread safe, but that doesn't - # matter for the intended use in invoking blocks as Qt slots. + # matter for the intended use in invoking blocks as TQt slots. def instance_exec(*arguments, &block) block.bind(self)[*arguments] end @@ -1931,23 +1931,23 @@ class Module private :_protected_instance_methods, :_public_instance_methods def constants - qt_methods(_constants, 0x10, true) + tqt_methods(_constants, 0x10, true) end def instance_methods(inc_super=true) - qt_methods(_instance_methods(inc_super), 0x0, inc_super) + tqt_methods(_instance_methods(inc_super), 0x0, inc_super) end def protected_instance_methods(inc_super=true) - qt_methods(_protected_instance_methods(inc_super), 0x80, inc_super) + tqt_methods(_protected_instance_methods(inc_super), 0x80, inc_super) end def public_instance_methods(inc_super=true) - qt_methods(_public_instance_methods(inc_super), 0x0, inc_super) + tqt_methods(_public_instance_methods(inc_super), 0x0, inc_super) end private - def qt_methods(meths, flags, inc_super=true) + def tqt_methods(meths, flags, inc_super=true) if !self.kind_of? Class return meths end diff --git a/qtruby/rubylib/qtruby/marshall.h b/tqtruby/rubylib/tqtruby/marshall.h similarity index 100% rename from qtruby/rubylib/qtruby/marshall.h rename to tqtruby/rubylib/tqtruby/marshall.h diff --git a/qtruby/rubylib/qtruby/smokeruby.h b/tqtruby/rubylib/tqtruby/smokeruby.h similarity index 99% rename from qtruby/rubylib/qtruby/smokeruby.h rename to tqtruby/rubylib/tqtruby/smokeruby.h index a24aa0dc..c3a8209b 100644 --- a/qtruby/rubylib/qtruby/smokeruby.h +++ b/tqtruby/rubylib/tqtruby/smokeruby.h @@ -17,7 +17,7 @@ #include -#include "qtruby.h" +#include "tqtruby.h" #include "marshall.h" diff --git a/qtruby/rubylib/qtruby/qtruby.h b/tqtruby/rubylib/tqtruby/tqtruby.h similarity index 82% rename from qtruby/rubylib/qtruby/qtruby.h rename to tqtruby/rubylib/tqtruby/tqtruby.h index e3bab45c..a7644c68 100644 --- a/qtruby/rubylib/qtruby/qtruby.h +++ b/tqtruby/rubylib/tqtruby/tqtruby.h @@ -1,5 +1,5 @@ /*************************************************************************** - qtruby.h - description + tqtruby.h - description ------------------- begin : Fri Jul 4 2003 copyright : (C) 2003 by Richard Dale @@ -36,16 +36,16 @@ extern int do_debug; // evil extern VALUE rv_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 { - qtdb_none = 0x00, - qtdb_ambiguous = 0x01, - qtdb_method_missing = 0x02, - qtdb_calls = 0x04, - qtdb_gc = 0x08, - qtdb_virtual = 0x10, - qtdb_verbose = 0x20 +enum TQtDebugChannel { + tqtdb_none = 0x00, + tqtdb_ambiguous = 0x01, + tqtdb_method_missing = 0x02, + tqtdb_calls = 0x04, + tqtdb_gc = 0x08, + tqtdb_virtual = 0x10, + tqtdb_verbose = 0x20 }; void unmapPointer(smokeruby_object *, Smoke::Index, void*); diff --git a/qtruby/rubylib/tutorial/t1/t1.rb b/tqtruby/rubylib/tutorial/t1/t1.rb similarity index 93% rename from qtruby/rubylib/tutorial/t1/t1.rb rename to tqtruby/rubylib/tutorial/t1/t1.rb index 70f1bfeb..53a1eaa5 100755 --- a/qtruby/rubylib/tutorial/t1/t1.rb +++ b/tqtruby/rubylib/tutorial/t1/t1.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' a = TQt::Application.new(ARGV) hello = TQt::PushButton.new('Hello World!', nil) diff --git a/qtruby/rubylib/tutorial/t10/cannon.rb b/tqtruby/rubylib/tutorial/t10/cannon.rb similarity index 99% rename from qtruby/rubylib/tutorial/t10/cannon.rb rename to tqtruby/rubylib/tutorial/t10/cannon.rb index 38559741..6c43908e 100644 --- a/qtruby/rubylib/tutorial/t10/cannon.rb +++ b/tqtruby/rubylib/tutorial/t10/cannon.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class CannonField < TQt::Widget signals 'angleChanged(int)', 'forceChanged(int)' diff --git a/qtruby/rubylib/tutorial/t10/lcdrange.rb b/tqtruby/rubylib/tutorial/t10/lcdrange.rb similarity index 98% rename from qtruby/rubylib/tutorial/t10/lcdrange.rb rename to tqtruby/rubylib/tutorial/t10/lcdrange.rb index 85ed3c0b..aab1eab6 100644 --- a/qtruby/rubylib/tutorial/t10/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t10/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t10/t10.rb b/tqtruby/rubylib/tutorial/t10/t10.rb similarity index 99% rename from qtruby/rubylib/tutorial/t10/t10.rb rename to tqtruby/rubylib/tutorial/t10/t10.rb index b86c9e1b..2f631f5f 100755 --- a/qtruby/rubylib/tutorial/t10/t10.rb +++ b/tqtruby/rubylib/tutorial/t10/t10.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' diff --git a/qtruby/rubylib/tutorial/t11/cannon.rb b/tqtruby/rubylib/tutorial/t11/cannon.rb similarity index 99% rename from qtruby/rubylib/tutorial/t11/cannon.rb rename to tqtruby/rubylib/tutorial/t11/cannon.rb index 89a2ca24..26c8b751 100644 --- a/qtruby/rubylib/tutorial/t11/cannon.rb +++ b/tqtruby/rubylib/tutorial/t11/cannon.rb @@ -1,5 +1,5 @@ include Math -require 'Qt' +require 'TQt' class CannonField < TQt::Widget diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/tqtruby/rubylib/tutorial/t11/lcdrange.rb similarity index 98% rename from qtruby/rubylib/tutorial/t11/lcdrange.rb rename to tqtruby/rubylib/tutorial/t11/lcdrange.rb index 85ed3c0b..aab1eab6 100644 --- a/qtruby/rubylib/tutorial/t11/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t11/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t11/t11.rb b/tqtruby/rubylib/tutorial/t11/t11.rb similarity index 99% rename from qtruby/rubylib/tutorial/t11/t11.rb rename to tqtruby/rubylib/tutorial/t11/t11.rb index 4b400026..bd9f4a8e 100755 --- a/qtruby/rubylib/tutorial/t11/t11.rb +++ b/tqtruby/rubylib/tutorial/t11/t11.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' diff --git a/qtruby/rubylib/tutorial/t12/cannon.rb b/tqtruby/rubylib/tutorial/t12/cannon.rb similarity index 99% rename from qtruby/rubylib/tutorial/t12/cannon.rb rename to tqtruby/rubylib/tutorial/t12/cannon.rb index 0d17f880..526af38a 100644 --- a/qtruby/rubylib/tutorial/t12/cannon.rb +++ b/tqtruby/rubylib/tutorial/t12/cannon.rb @@ -1,5 +1,5 @@ include Math -require 'Qt' +require 'TQt' class CannonField < TQt::Widget diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/tqtruby/rubylib/tutorial/t12/lcdrange.rb similarity index 98% rename from qtruby/rubylib/tutorial/t12/lcdrange.rb rename to tqtruby/rubylib/tutorial/t12/lcdrange.rb index 54654165..dcfbdf16 100644 --- a/qtruby/rubylib/tutorial/t12/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t12/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t12/t12.rb b/tqtruby/rubylib/tutorial/t12/t12.rb similarity index 99% rename from qtruby/rubylib/tutorial/t12/t12.rb rename to tqtruby/rubylib/tutorial/t12/t12.rb index 47f81f3b..be678951 100755 --- a/qtruby/rubylib/tutorial/t12/t12.rb +++ b/tqtruby/rubylib/tutorial/t12/t12.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' diff --git a/qtruby/rubylib/tutorial/t13/cannon.rb b/tqtruby/rubylib/tutorial/t13/cannon.rb similarity index 99% rename from qtruby/rubylib/tutorial/t13/cannon.rb rename to tqtruby/rubylib/tutorial/t13/cannon.rb index 315760f0..64c62a46 100644 --- a/qtruby/rubylib/tutorial/t13/cannon.rb +++ b/tqtruby/rubylib/tutorial/t13/cannon.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' include Math class CannonField < TQt::Widget diff --git a/qtruby/rubylib/tutorial/t13/gamebrd.rb b/tqtruby/rubylib/tutorial/t13/gamebrd.rb similarity index 99% rename from qtruby/rubylib/tutorial/t13/gamebrd.rb rename to tqtruby/rubylib/tutorial/t13/gamebrd.rb index 938dfd49..5873c021 100644 --- a/qtruby/rubylib/tutorial/t13/gamebrd.rb +++ b/tqtruby/rubylib/tutorial/t13/gamebrd.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' diff --git a/qtruby/rubylib/tutorial/t13/lcdrange.rb b/tqtruby/rubylib/tutorial/t13/lcdrange.rb similarity index 99% rename from qtruby/rubylib/tutorial/t13/lcdrange.rb rename to tqtruby/rubylib/tutorial/t13/lcdrange.rb index 39eb9b1d..747e9054 100644 --- a/qtruby/rubylib/tutorial/t13/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t13/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::Widget signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t13/t13.rb b/tqtruby/rubylib/tutorial/t13/t13.rb similarity index 95% rename from qtruby/rubylib/tutorial/t13/t13.rb rename to tqtruby/rubylib/tutorial/t13/t13.rb index 3ce6f8a6..75523a98 100755 --- a/qtruby/rubylib/tutorial/t13/t13.rb +++ b/tqtruby/rubylib/tutorial/t13/t13.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'gamebrd.rb' TQt::Application.setColorSpec( TQt::Application::CustomColor ) diff --git a/qtruby/rubylib/tutorial/t14/cannon.rb b/tqtruby/rubylib/tutorial/t14/cannon.rb similarity index 99% rename from qtruby/rubylib/tutorial/t14/cannon.rb rename to tqtruby/rubylib/tutorial/t14/cannon.rb index c2147714..c4a21161 100644 --- a/qtruby/rubylib/tutorial/t14/cannon.rb +++ b/tqtruby/rubylib/tutorial/t14/cannon.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' include Math class CannonField < TQt::Widget diff --git a/qtruby/rubylib/tutorial/t14/gamebrd.rb b/tqtruby/rubylib/tutorial/t14/gamebrd.rb similarity index 100% rename from qtruby/rubylib/tutorial/t14/gamebrd.rb rename to tqtruby/rubylib/tutorial/t14/gamebrd.rb diff --git a/qtruby/rubylib/tutorial/t14/lcdrange.rb b/tqtruby/rubylib/tutorial/t14/lcdrange.rb similarity index 99% rename from qtruby/rubylib/tutorial/t14/lcdrange.rb rename to tqtruby/rubylib/tutorial/t14/lcdrange.rb index 9cb54b39..2084d53b 100644 --- a/qtruby/rubylib/tutorial/t14/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t14/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::Widget signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t14/t14.rb b/tqtruby/rubylib/tutorial/t14/t14.rb similarity index 95% rename from qtruby/rubylib/tutorial/t14/t14.rb rename to tqtruby/rubylib/tutorial/t14/t14.rb index 3ce6f8a6..75523a98 100755 --- a/qtruby/rubylib/tutorial/t14/t14.rb +++ b/tqtruby/rubylib/tutorial/t14/t14.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'gamebrd.rb' TQt::Application.setColorSpec( TQt::Application::CustomColor ) diff --git a/qtruby/rubylib/tutorial/t2/t2.rb b/tqtruby/rubylib/tutorial/t2/t2.rb similarity index 95% rename from qtruby/rubylib/tutorial/t2/t2.rb rename to tqtruby/rubylib/tutorial/t2/t2.rb index b5e62bca..aa0402b3 100755 --- a/qtruby/rubylib/tutorial/t2/t2.rb +++ b/tqtruby/rubylib/tutorial/t2/t2.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt'; +require 'TQt'; a = TQt::Application.new(ARGV) diff --git a/qtruby/rubylib/tutorial/t3/t3.rb b/tqtruby/rubylib/tutorial/t3/t3.rb similarity index 96% rename from qtruby/rubylib/tutorial/t3/t3.rb rename to tqtruby/rubylib/tutorial/t3/t3.rb index 9a6b32d2..e5cbbe41 100755 --- a/qtruby/rubylib/tutorial/t3/t3.rb +++ b/tqtruby/rubylib/tutorial/t3/t3.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' a = TQt::Application.new(ARGV) diff --git a/qtruby/rubylib/tutorial/t4/t4.rb b/tqtruby/rubylib/tutorial/t4/t4.rb similarity index 97% rename from qtruby/rubylib/tutorial/t4/t4.rb rename to tqtruby/rubylib/tutorial/t4/t4.rb index dc254a8d..edc19595 100755 --- a/qtruby/rubylib/tutorial/t4/t4.rb +++ b/tqtruby/rubylib/tutorial/t4/t4.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' class MyWidget < TQt::Widget diff --git a/qtruby/rubylib/tutorial/t5/t5.rb b/tqtruby/rubylib/tutorial/t5/t5.rb similarity index 97% rename from qtruby/rubylib/tutorial/t5/t5.rb rename to tqtruby/rubylib/tutorial/t5/t5.rb index 56b50d17..eac38bc2 100755 --- a/qtruby/rubylib/tutorial/t5/t5.rb +++ b/tqtruby/rubylib/tutorial/t5/t5.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' class MyWidget < TQt::VBox diff --git a/qtruby/rubylib/tutorial/t6/t6.rb b/tqtruby/rubylib/tutorial/t6/t6.rb similarity index 98% rename from qtruby/rubylib/tutorial/t6/t6.rb rename to tqtruby/rubylib/tutorial/t6/t6.rb index 7d6b4b42..521fff78 100755 --- a/qtruby/rubylib/tutorial/t6/t6.rb +++ b/tqtruby/rubylib/tutorial/t6/t6.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox diff --git a/qtruby/rubylib/tutorial/t7/lcdrange.rb b/tqtruby/rubylib/tutorial/t7/lcdrange.rb similarity index 97% rename from qtruby/rubylib/tutorial/t7/lcdrange.rb rename to tqtruby/rubylib/tutorial/t7/lcdrange.rb index 0c673284..4832f439 100644 --- a/qtruby/rubylib/tutorial/t7/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t7/lcdrange.rb @@ -1,5 +1,5 @@ #!/usr/bin/ruby -w -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t7/t7.rb b/tqtruby/rubylib/tutorial/t7/t7.rb similarity index 97% rename from qtruby/rubylib/tutorial/t7/t7.rb rename to tqtruby/rubylib/tutorial/t7/t7.rb index f1d56b20..4d27d217 100755 --- a/qtruby/rubylib/tutorial/t7/t7.rb +++ b/tqtruby/rubylib/tutorial/t7/t7.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' class MyWidget < TQt::VBox diff --git a/qtruby/rubylib/tutorial/t8/cannon.rb b/tqtruby/rubylib/tutorial/t8/cannon.rb similarity index 97% rename from qtruby/rubylib/tutorial/t8/cannon.rb rename to tqtruby/rubylib/tutorial/t8/cannon.rb index a240a7ff..02eaa9d8 100644 --- a/qtruby/rubylib/tutorial/t8/cannon.rb +++ b/tqtruby/rubylib/tutorial/t8/cannon.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class CannonField < TQt::Widget signals 'angleChanged(int)' diff --git a/qtruby/rubylib/tutorial/t8/lcdrange.rb b/tqtruby/rubylib/tutorial/t8/lcdrange.rb similarity index 98% rename from qtruby/rubylib/tutorial/t8/lcdrange.rb rename to tqtruby/rubylib/tutorial/t8/lcdrange.rb index 4e3d856f..a1f550df 100644 --- a/qtruby/rubylib/tutorial/t8/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t8/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t8/t8.rb b/tqtruby/rubylib/tutorial/t8/t8.rb similarity index 94% rename from qtruby/rubylib/tutorial/t8/t8.rb rename to tqtruby/rubylib/tutorial/t8/t8.rb index fad11dd0..e3e05dab 100755 --- a/qtruby/rubylib/tutorial/t8/t8.rb +++ b/tqtruby/rubylib/tutorial/t8/t8.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' @@ -26,7 +26,7 @@ class MyWidget < TQt::Widget # 2x2, 10 pixel border grid.addWidget( quit, 0, 0 ) - grid.addWidget( angle, 1, 0, Qt.AlignTop ) + grid.addWidget( angle, 1, 0, TQt.AlignTop ) grid.addWidget( cannonField, 1, 1 ) grid.setColStretch( 1, 10 ) diff --git a/qtruby/rubylib/tutorial/t9/cannon.rb b/tqtruby/rubylib/tutorial/t9/cannon.rb similarity index 98% rename from qtruby/rubylib/tutorial/t9/cannon.rb rename to tqtruby/rubylib/tutorial/t9/cannon.rb index 24649916..31d393c4 100644 --- a/qtruby/rubylib/tutorial/t9/cannon.rb +++ b/tqtruby/rubylib/tutorial/t9/cannon.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class CannonField < TQt::Widget signals 'angleChanged(int)' diff --git a/qtruby/rubylib/tutorial/t9/lcdrange.rb b/tqtruby/rubylib/tutorial/t9/lcdrange.rb similarity index 98% rename from qtruby/rubylib/tutorial/t9/lcdrange.rb rename to tqtruby/rubylib/tutorial/t9/lcdrange.rb index 208650f3..09543c05 100644 --- a/qtruby/rubylib/tutorial/t9/lcdrange.rb +++ b/tqtruby/rubylib/tutorial/t9/lcdrange.rb @@ -1,4 +1,4 @@ -require 'Qt' +require 'TQt' class LCDRange < TQt::VBox signals 'valueChanged(int)' diff --git a/qtruby/rubylib/tutorial/t9/t9.rb b/tqtruby/rubylib/tutorial/t9/t9.rb similarity index 98% rename from qtruby/rubylib/tutorial/t9/t9.rb rename to tqtruby/rubylib/tutorial/t9/t9.rb index 8a9cf81d..0a800405 100755 --- a/qtruby/rubylib/tutorial/t9/t9.rb +++ b/tqtruby/rubylib/tutorial/t9/t9.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby $VERBOSE = true; $:.unshift File.dirname($0) -require 'Qt' +require 'TQt' require 'lcdrange.rb' require 'cannon.rb' -- 2.20.1 From 1db9e19a98953a08ec3409afa310383d3432c0c7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 18 Oct 2018 16:02:34 +0900 Subject: [PATCH 3/4] smoke's qt -> tqt renaming. This relates to bug 266. Signed-off-by: Michele Calgaro --- kalyptus/kalyptusCxxToJNI.pm | 4 +- kalyptus/kalyptusCxxToJava.pm | 4 +- kalyptus/kalyptusCxxToKimono.pm | 4 +- kalyptus/kalyptusCxxToSmoke.pm | 6 +- smoke/README | 2 +- smoke/tde/Makefile.am | 6 +- smoke/tde/configure.in.in | 4 +- smoke/tde/generate.pl.in | 34 ++++---- smoke/tde/hint_header_list.pl | 2 +- smoke/tde/qt_smoke.h | 9 -- smoke/tde/tqt_smoke.h | 9 ++ .../{tqt/qtguess.pl.in => tde/tqtguess.pl.in} | 86 +++++++++---------- smoke/tqt/Makefile.am | 4 +- smoke/tqt/configure.in.in | 20 ++--- smoke/tqt/generate.pl.in | 36 ++++---- smoke/tqt/hint_header_list.pl | 2 +- smoke/tqt/qt_smoke.h | 9 -- smoke/tqt/{smokeqt.pro => smoketqt.pro} | 2 +- ...la_header_list => tqscintilla_header_list} | 0 smoke/tqt/tqt_smoke.h | 9 ++ .../{tde/qtguess.pl.in => tqt/tqtguess.pl.in} | 86 +++++++++---------- 21 files changed, 169 insertions(+), 169 deletions(-) delete mode 100644 smoke/tde/qt_smoke.h create mode 100644 smoke/tde/tqt_smoke.h rename smoke/{tqt/qtguess.pl.in => tde/tqtguess.pl.in} (84%) delete mode 100644 smoke/tqt/qt_smoke.h rename smoke/tqt/{smokeqt.pro => smoketqt.pro} (96%) rename smoke/tqt/{qscintilla_header_list => tqscintilla_header_list} (100%) create mode 100644 smoke/tqt/tqt_smoke.h rename smoke/{tde/qtguess.pl.in => tqt/tqtguess.pl.in} (84%) diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 7d57f377..d646e286 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -5405,11 +5405,11 @@ sub writeSmokeDataFile($) { # print OUT " void init_${libname}_Smoke();\n"; # print OUT "}\n"; # print OUT "\n"; -# print OUT "Smoke* qt_Smoke = 0L;\n"; +# print OUT "Smoke* tqt_Smoke = 0L;\n"; # print OUT "\n"; # print OUT "// Create the Smoke instance encapsulating all the above.\n"; # print OUT "void init_${libname}_Smoke() {\n"; -# print OUT " qt_Smoke = new Smoke(\n"; +# print OUT " tqt_Smoke = new Smoke(\n"; # print OUT " ${libname}_classes, ".$#classlist.",\n"; # print OUT " ${libname}_methods, $methodCount,\n"; # print OUT " ${libname}_methodMaps, $methodMapCount,\n"; diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 59a5444d..09b342d8 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -3244,11 +3244,11 @@ sub writeSmokeDataFile($) { # print OUT " void init_${libname}_Smoke();\n"; # print OUT "}\n"; # print OUT "\n"; -# print OUT "Smoke* qt_Smoke = 0L;\n"; +# print OUT "Smoke* tqt_Smoke = 0L;\n"; # print OUT "\n"; # print OUT "// Create the Smoke instance encapsulating all the above.\n"; # print OUT "void init_${libname}_Smoke() {\n"; -# print OUT " qt_Smoke = new Smoke(\n"; +# print OUT " tqt_Smoke = new Smoke(\n"; # print OUT " ${libname}_classes, ".$#classlist.",\n"; # print OUT " ${libname}_methods, $methodCount,\n"; # print OUT " ${libname}_methodMaps, $methodMapCount,\n"; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 089cec92..87de1d59 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -3438,11 +3438,11 @@ sub writeSmokeDataFile($) { # print OUT " void init_${libname}_Smoke();\n"; # print OUT "}\n"; # print OUT "\n"; -# print OUT "Smoke* qt_Smoke = 0L;\n"; +# print OUT "Smoke* tqt_Smoke = 0L;\n"; # print OUT "\n"; # print OUT "// Create the Smoke instance encapsulating all the above.\n"; # print OUT "void init_${libname}_Smoke() {\n"; -# print OUT " qt_Smoke = new Smoke(\n"; +# print OUT " tqt_Smoke = new Smoke(\n"; # print OUT " ${libname}_classes, ".$#classlist.",\n"; # print OUT " ${libname}_methods, $methodCount,\n"; # print OUT " ${libname}_methodMaps, $methodMapCount,\n"; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index a33f74a7..952b7f4b 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -2092,7 +2092,7 @@ sub writeSmokeDataFile($) { print OUT "\n"; print OUT "#include \n\n"; - print OUT "#include \n\n"; + print OUT "#include \n\n"; # gcc optimizes this method like crazy. switch() is godly print OUT "static void *${libname}_cast(void *xptr, Smoke::Index from, Smoke::Index to) {\n"; @@ -2736,11 +2736,11 @@ sub writeSmokeDataFile($) { # print OUT " void init_${libname}_Smoke();\n"; # print OUT "}\n"; print OUT "\n"; - print OUT "Smoke* qt_Smoke = 0L;\n"; + print OUT "Smoke* tqt_Smoke = 0L;\n"; print OUT "\n"; print OUT "// Create the Smoke instance encapsulating all the above.\n"; print OUT "void init_${libname}_Smoke() {\n"; - print OUT " qt_Smoke = new Smoke(\n"; + print OUT " tqt_Smoke = new Smoke(\n"; print OUT " ${libname}_classes, ".$#classlist.",\n"; print OUT " ${libname}_methods, $methodCount,\n"; print OUT " ${libname}_methodMaps, $methodMapCount,\n"; diff --git a/smoke/README b/smoke/README index f521a02b..ecf74210 100644 --- a/smoke/README +++ b/smoke/README @@ -15,7 +15,7 @@ Regenerating For SmokeTQt: cd tqt - ./qtguess.pl + ./tqtguess.pl ./generate.pl make diff --git a/smoke/tde/Makefile.am b/smoke/tde/Makefile.am index 9963c424..d2fdddf1 100644 --- a/smoke/tde/Makefile.am +++ b/smoke/tde/Makefile.am @@ -1,9 +1,9 @@ lib_LTLIBRARIES = libsmoketde.la -# set the include path for X, qt and KDE +# set the include path for X, tqt and KDE INCLUDES = -I$(srcdir)/.. $(all_includes) -EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am +EXTRA_DIST=generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am # the library search path. libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) @@ -15,7 +15,7 @@ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \ x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp -# which sources should be compiled for perlqttde +# which sources should be compiled for perltqttde libsmoketde_la_SOURCES = $(x_sources) smokedata.cpp $(x_sources) smokedata.cpp: diff --git a/smoke/tde/configure.in.in b/smoke/tde/configure.in.in index 1999a9ee..266d25d5 100644 --- a/smoke/tde/configure.in.in +++ b/smoke/tde/configure.in.in @@ -12,9 +12,9 @@ AC_SUBST(KDE_PREFIX) if test "X$kde_build_libsmoke" = "Xtde" -o "X$kde_build_libsmoke" = "Xtqt tde"; then - AC_CONFIG_FILES([ smoke/tde/qtguess.pl ], [ + AC_CONFIG_FILES([ smoke/tde/tqtguess.pl ], [ cd smoke/tde - perl qtguess.pl + perl tqtguess.pl cd ../.. ]) AC_CONFIG_FILES([ smoke/tde/generate.pl ], [ diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index d5d8416d..1cb9c33f 100644 --- a/smoke/tde/generate.pl.in +++ b/smoke/tde/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 = "@srcdir@/../../kalyptus"; @@ -14,7 +14,7 @@ use Cwd; my $here = getcwd; my $outdir = $here . "/generate.pl.tmpdir"; my $finaloutdir = $here; -my $defines = "qtdefines"; +my $defines = "tqtdefines"; my $headerlist = "@srcdir@/header_list"; my $kdeheaderlist = "@srcdir@/tde_header_list"; my $definespath = "$here/$defines"; @@ -34,7 +34,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; } mkdir $finaloutdir unless (-d $finaloutdir); -# Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus +# Load the TQT_NO_* macros found in "tqtdefines". They'll be passed to kalyptus my $macros=""; if ( -e $definespath ){ print "Found '$defines'. Reading preprocessor symbols from there...\n"; @@ -48,9 +48,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 = ( 'ntqaccessible.h' => 1, # Accessibility support is not compiled by defaut - 'ntqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1) + 'ntqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1) 'ntqmotif.h' => 1, # - 'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1) + 'ntqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1) 'ntqmotifdialog.h' => 1, # 'ntqxt.h' => 1, # Xt 'ntqxtwidget.h' => 1, # Xt @@ -58,11 +58,11 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... + 'ntqttableview.h' => 1, # Not in TQt anymore... + 'ntqtmultilineedit.h' => 1, # Not in TQt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface - 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say - 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin + 'ntqsharedmemory.h' => 1, # "not part of the TQt API" they say + 'ntqwindowsstyle.h' => 1, # TQt windowsstyle, plugin 'ntqmotifstyle.h' => 1, 'ntqcompactstyle.h' => 1, 'ntqinterlacestyle.h' => 1, @@ -138,17 +138,17 @@ if("@KDE_HAVE_GL@" eq "yes") } else { - print STDERR "Qt was not compiled with OpenGL support...\n Skipping TQGL 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= '@tqt_includes@'; -opendir (QT, $qtinc) or die "Couldn't find $qtinc"; -foreach $filename (readdir(QT)) { - $entry = $qtinc."/".$filename; +$tqtinc= '@tqt_includes@'; +opendir (TQT, $tqtinc) or die "Couldn't find $tqtinc"; +foreach $filename (readdir(TQT)) { + $entry = $tqtinc."/".$filename; if ( ( -e $entry or -l $entry ) # A real file or a symlink && ( ! -d _ ) ) # Not a symlink to a dir though { @@ -159,7 +159,7 @@ foreach $filename (readdir(QT)) { undef $includes{$filename} } } -closedir QT; +closedir TQT; my @kdeheaders = (); $kdeprefix = "@KDE_PREFIX@"; @@ -185,7 +185,7 @@ find( ); # Launch kalyptus -system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders"; +system "perl kalyptus @ARGV --globspace -fsmoke --name=tqt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders"; my $exit = $? >> 8; exit $exit if ($exit); diff --git a/smoke/tde/hint_header_list.pl b/smoke/tde/hint_header_list.pl index efc0c544..1eae638d 100644 --- a/smoke/tde/hint_header_list.pl +++ b/smoke/tde/hint_header_list.pl @@ -1,5 +1,5 @@ -# CVS admin : run this script to compare the set of Qt headers to +# CVS admin : run this script to compare the set of TQt headers to # the actual content of header_list $l = "header_list"; diff --git a/smoke/tde/qt_smoke.h b/smoke/tde/qt_smoke.h deleted file mode 100644 index 8859c243..00000000 --- a/smoke/tde/qt_smoke.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef QT_SMOKE_H -#define QT_SMOKE_H - -// Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files -extern Smoke* qt_Smoke; - -class TQGlobalSpace { }; - -#endif diff --git a/smoke/tde/tqt_smoke.h b/smoke/tde/tqt_smoke.h new file mode 100644 index 00000000..8a818049 --- /dev/null +++ b/smoke/tde/tqt_smoke.h @@ -0,0 +1,9 @@ +#ifndef TQT_SMOKE_H +#define TQT_SMOKE_H + +// Defined in smokedata.cpp, initialized by init_tqt_Smoke(), used by all .cpp files +extern Smoke* tqt_Smoke; + +class TQGlobalSpace { }; + +#endif diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tde/tqtguess.pl.in similarity index 84% rename from smoke/tqt/qtguess.pl.in rename to smoke/tde/tqtguess.pl.in index bf115fdc..77533f37 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tde/tqtguess.pl.in @@ -1,12 +1,12 @@ #!/usr/bin/perl -# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line. +# tqtguess.pl : check how TQt was compiled. Issue a list of all defined TQT_NO_* macros, one per line. # # author: germain Garand # licence: GPL v.2 # options: -q: be quieter -# -o file: redirect output to "file". (default: ./qtdefines) +# -o file: redirect output to "file". (default: ./tqtdefines) # -t [0..15]: set the testing threshold (see below) # -f "flags": additional compiler flags/parameters @@ -17,7 +17,7 @@ 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: TQT_NO_IMAGE_SMOOTHSCALE) # 10 - test basic widgets @@ -25,20 +25,20 @@ getopts('qo:f:t:'); # 13 - test widgets inheriting composite widgets # 15 - test goodies (default) -my $default_threshold = @qt_test_threshold@; +my $default_threshold = @tqt_test_threshold@; my $cc = "@CXX@"; my $ccflags = $opt_f || "@CXXFLAGS@"; my $nspaces = 50; -my %qtdefs=(); -my %qtundefs=(); +my %tqtdefs=(); +my %tqtundefs=(); my $tmp = gettmpfile(); -my $qtinc = '@tqt_includes@'; +my $tqtinc = '@tqt_includes@'; my $allinc = '@all_includes@'; my $alllib = '@all_libraries@'; -my $qtflags ='@LIB_TQT@'; +my $tqtflags ='@LIB_TQT@'; my %x; $x{'LIBPNG'} = '@LIBPNG@'; $x{'LIBJPEG'} = '@LIBJPEG@'; @@ -50,31 +50,31 @@ $x{'LIB_X11'} = '@LIB_X11@'; $x{'X_PRE_LIBS'} = '@X_PRE_LIBS@'; $x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g; -$qtflags =~ s/\$\((.*?)\)/$x{$1}/g; +$tqtflags =~ s/\$\((.*?)\)/$x{$1}/g; - -e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n"; + -e "$tqtinc/qglobal.h" or die "Invalid TQt directory.\n"; -my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags"; +my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $tqtflags"; 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( TQTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n"; +open( TQTDEFS, ">".($opt_o || "tqtdefines") ) or die "Can't open output file: $!\n"; grab_qglobal_symbols(); preliminary_test(); perform_all_tests(); -print +scalar(keys %qtdefs) . " defines found.\n"; +print +scalar(keys %tqtdefs) . " defines found.\n"; -print TQTDEFS join("\n", keys %qtdefs), "\n"; +print TQTDEFS join("\n", keys %tqtdefs), "\n"; close; #--------------------------------------------------------------# @@ -82,7 +82,7 @@ close; sub gettmpfile { my $tmpdir = $ENV{'TMP'} || "."; - my $tmpname = $$."-qtguess"; + my $tmpname = $$."-tqtguess"; while( -e "$tmpdir/$tmpname" || -e "$tmpdir/${tmpname}.cpp" ) { $tmpname .= int (rand * 9); @@ -94,28 +94,28 @@ sub gettmpfile sub grab_qglobal_symbols { - my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null"; + my $cmd = "$cc -E -D__cplusplus -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null"; my $symbols = `$cmd`; for(0..1) { if( check_exit_status($?) ) { - while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm ) + while( $symbols =~/^#\s*define\s*(TQT_\S+)\s*$/gm ) { - $qtdefs{$1} = 1; + $tqtdefs{$1} = 1; } - print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs)); + print "Found ". scalar( keys %tqtdefs )." predefined symbol".((scalar( keys %tqtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtdefs)); while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm ) { - $qtundefs{"TQT_NO_$1"} = 1; + $tqtundefs{"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)); + print "Found ". scalar( keys %tqtundefs )." undefined symbol".((scalar( keys %tqtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtundefs)); last; } elsif(! $_) # first try { print "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n"; - $cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null"; + $cmd = "$cc -E -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null"; $symbols = `$cmd`; next; } @@ -166,14 +166,14 @@ sub perform_all_tests foreach ( sort { $tests{$a}->[2] <=> $tests{$b}->[2]} keys %tests) { $tests{$_}->[2] < $threshold and next; - ($qtdefs{$_} || $qtundefs{$_}) and do + ($tqtdefs{$_} || $tqtundefs{$_}) and do { - print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n"); + print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($tqtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n"); next }; print "\rTesting $_".( " " x ($nspaces - length($_)) ); open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n"; - foreach $def(keys %qtdefs) + foreach $def(keys %tqtdefs) { print OUT "#define $def\n"; } @@ -198,7 +198,7 @@ sub perform_all_tests my $ok = check_exit_status($?); if( !$ok ) { - $qtdefs{$_} = 1; + $tqtdefs{$_} = 1; } print +$opt_q ? ++$count."/$used" : ( $ok ? "*Undefined*\n" : " [Defined]\n" ); } @@ -398,9 +398,9 @@ our %tests = ( "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_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView +# "TQT_NO_TQTMULTILINEEDIT" => ["tqtmultilineedit.h", "TQtMultiLineEdit foo;", 15], +# "TQT_NO_TQTTABLEVIEW" => ["tqttableview.h", "TQFoo foo;", 16, q£ +# class TQFoo: public TQtTableView # { # public: # TQFoo() {}; @@ -458,13 +458,13 @@ our %tests = ( # "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£ + "TQT_NO_TABBAR" => ["tqtabbar.h", "TQTabBar foo;", 10], + "TQT_NO_TABDIALOG" => ["tqtabdialog.h", "TQTabDialog foo;", 12], + "TQT_NO_TABLE" => ["tqtable.h", "TQTable foo;", 10], + "TQT_NO_TABWIDGET" => ["tqtabwidget.h", "TQTabWidget foo;", 10], + "TQT_NO_TEXTBROWSER" => ["tqtextbrowser.h", "TQTextBrowser foo;", 14], + "TQT_NO_TEXTCODEC" => ["tqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5], + "TQT_NO_TEXTCODECPLUGIN" => ["tqtextcodecplugin.h, qstringlist.h, qvaluelist.h, tqtextcodec.h", "TQFoo foo;", 6, q£ class TQFoo: public TQTextCodecPlugin { @@ -478,12 +478,12 @@ our %tests = ( }; Q_EXPORT_PLUGIN( TQFoo ) £], - "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], + "TQT_NO_TEXTEDIT" => ["tqtextedit.h", "TQTextEdit foo;", 13], + "TQT_NO_TEXTSTREAM" => ["tqtextstream.h", "TQTextStream foo;", 5], + "TQT_NO_TEXTVIEW" => ["tqtextview.h", "TQTextView foo;", 14], #Obsolete + "TQT_NO_TOOLBAR" => ["tqtoolbar.h", "TQToolBar foo;", 10], + "TQT_NO_TOOLBUTTON" => ["tqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12], + "TQT_NO_TOOLTIP" => ["tqtooltip.h", "TQToolTip::hide();", 10], "TQT_NO_TRANSFORMATIONS" => ["qpainter.h", q£ TQPainter *foo= new TQPainter(); diff --git a/smoke/tqt/Makefile.am b/smoke/tqt/Makefile.am index a7e0e3a7..a4cead21 100644 --- a/smoke/tqt/Makefile.am +++ b/smoke/tqt/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libsmoketqt.la # set the include path for X, tqt and TDE INCLUDES = -I$(srcdir)/.. $(all_includes) -EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am +EXTRA_DIST=generate.pl.in tqtguess.pl.in tqt_smoke.h Makefile.am # the library search path. libsmoketqt_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) @@ -15,7 +15,7 @@ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \ x_16.cpp x_17.cpp x_18.cpp x_19.cpp x_20.cpp -# which sources should be compiled for perlqttde +# which sources should be compiled for perltqttde libsmoketqt_la_SOURCES = $(x_sources) smokedata.cpp $(x_sources) smokedata.cpp: diff --git a/smoke/tqt/configure.in.in b/smoke/tqt/configure.in.in index d571b95b..fce66d83 100644 --- a/smoke/tqt/configure.in.in +++ b/smoke/tqt/configure.in.in @@ -10,16 +10,16 @@ AC_SUBST(KDE_HAVE_GL) AC_ARG_WITH( threshold, [ --with-threshold@<:@=0..15@:>@ Smoke: TQt tests threshold Default:15 Lower=more tests], - [ qt_test_threshold="$withval" ], - [ qt_test_threshold=15 ] + [ tqt_test_threshold="$withval" ], + [ tqt_test_threshold=15 ] ) -AC_SUBST(qt_test_threshold) +AC_SUBST(tqt_test_threshold) if test "X$kde_build_libsmoke" = "Xtqt" -o "X$kde_build_libsmoke" = "Xtqt tde"; then - AC_CONFIG_FILES([ smoke/tqt/qtguess.pl ], [ + AC_CONFIG_FILES([ smoke/tqt/tqtguess.pl ], [ cd smoke/tqt - perl qtguess.pl + perl tqtguess.pl cd ../.. ]) AC_CONFIG_FILES([ smoke/tqt/generate.pl ], [ @@ -32,11 +32,11 @@ dnl ------- AC_ARG_ENABLE( qscintilla, - [ --enable-qscintilla@<:@=yes|no@:>@ Smoke: build Smoke with TQScintilla extention for qt @<:@default:no@:>@], - [ qtextscintilla="$enableval" ], - [ qtextscintilla="no" ] + [ --enable-qscintilla@<:@=yes|no@:>@ Smoke: build Smoke with TQScintilla extention for tqt @<:@default:no@:>@], + [ tqtextscintilla="$enableval" ], + [ tqtextscintilla="no" ] ) -AC_SUBST(qtextscintilla) +AC_SUBST(tqtextscintilla) AC_DEFUN([AC_FIND_QSCINTILLA], [ @@ -77,6 +77,6 @@ fi AC_SUBST(LIBTQSCINTILLA) ]) -if test "X$qtextscintilla" = "Xyes" ; then +if test "X$tqtextscintilla" = "Xyes" ; then AC_FIND_QSCINTILLA fi diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index f1629222..efcd9d3f 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -13,14 +13,14 @@ use Cwd; my $here = getcwd; my $outdir = $here . "/generate.pl.tmpdir"; my $finaloutdir = $here; -my $defines = "qtdefines"; +my $defines = "tqtdefines"; my $headerlist = "@srcdir@/header_list"; my $definespath = "$here/$defines"; my $headerlistpath = "$here/$headerlist"; my $qscintilla_headerlist = ""; my $qscintilla_headerlistpath = ""; -if("@qtextscintilla@" eq "yes") +if("@tqtextscintilla@" eq "yes") { $qscintilla_headerlist = "./qscintilla_header_list"; $qscintilla_headerlistpath = "$here/$qscintilla_headerlist"; @@ -28,7 +28,7 @@ if("@qtextscintilla@" eq "yes") ## If srcdir != builddir, use headerlist from src $headerlistpath = $headerlist if ($headerlist =~ /^\//); -if("@qtextscintilla@" eq "yes") +if("@tqtextscintilla@" eq "yes") { $qscintilla_headerlistpath = $qscintilla_headerlist if ($qscintilla_headerlist =~ /^\//); } @@ -39,7 +39,7 @@ if (-d $outdir) { system "rm -f $outdir/x_*.cpp"; } else { mkdir $outdir; } mkdir $finaloutdir unless (-d $finaloutdir); -# Load the TQT_NO_* macros found in "qtdefines". They'll be passed to kalyptus +# Load the TQT_NO_* macros found in "tqtdefines". They'll be passed to kalyptus my $macros=""; if ( -e $definespath ){ print "Found '$defines'. Reading preprocessor symbols from there...\n"; @@ -54,9 +54,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 = ( 'ntqaccessible.h' => 1, # Accessibility support is not compiled by defaut - 'ntqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1) + 'ntqassistantclient.h' => 1, # Not part of TQt (introduced in TQt-3.1) 'ntqmotif.h' => 1, # - 'ntqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1) + 'ntqmotifwidget.h' => 1, # Motif extension (introduced in TQt-3.1) 'ntqmotifdialog.h' => 1, # 'ntqxt.h' => 1, # Xt 'ntqxtwidget.h' => 1, # Xt @@ -64,11 +64,11 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... + 'ntqttableview.h' => 1, # Not in TQt anymore... + 'ntqtmultilineedit.h' => 1, # Not in TQt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface - 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say - 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin + 'ntqsharedmemory.h' => 1, # "not part of the TQt API" they say + 'ntqwindowsstyle.h' => 1, # TQt windowsstyle, plugin 'ntqmotifstyle.h' => 1, 'ntqcompactstyle.h' => 1, 'ntqinterlacestyle.h' => 1, @@ -88,7 +88,7 @@ open(HEADERS, $headerlistpath) or die "Couldn't open $headerlistpath: $!\n"; map { chomp ; $includes{$_} = 1 } ; close HEADERS; -if("@qtextscintilla@" eq "yes") +if("@tqtextscintilla@" eq "yes") { open(HEADERS, $qscintilla_headerlistpath) or die "Couldn't open $qscintilla_headerlistpath: $!\n"; map { chomp ; $includes{$_} = 1 } ; @@ -112,13 +112,13 @@ if("@KDE_HAVE_GL@" eq "yes") } } -# List Qt headers, and exclude the ones listed above +# List TQt headers, and exclude the ones listed above my @headers = (); -$qtinc= '@tqt_includes@'; -opendir (QT, $qtinc) or die "Couldn't find $qtinc"; -foreach $filename (readdir(QT)) { - $entry = $qtinc."/".$filename; +$tqtinc= '@tqt_includes@'; +opendir (TQT, $tqtinc) or die "Couldn't find $tqtinc"; +foreach $filename (readdir(TQT)) { + $entry = $tqtinc."/".$filename; if ( ( -e $entry or -l $entry ) # A real file or a symlink && ( ! -d _ ) ) # Not a symlink to a dir though { @@ -129,11 +129,11 @@ foreach $filename (readdir(QT)) { undef $includes{$filename} } } -closedir QT; +closedir TQT; # Launch kalyptus chdir "../smoke/tqt"; -system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers"; +system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=tqt $macros --no-cache --outputdir=$outdir @headers"; my $exit = $? >> 8; exit $exit if ($exit); chdir "$kalyptusdir"; diff --git a/smoke/tqt/hint_header_list.pl b/smoke/tqt/hint_header_list.pl index efc0c544..1eae638d 100644 --- a/smoke/tqt/hint_header_list.pl +++ b/smoke/tqt/hint_header_list.pl @@ -1,5 +1,5 @@ -# CVS admin : run this script to compare the set of Qt headers to +# CVS admin : run this script to compare the set of TQt headers to # the actual content of header_list $l = "header_list"; diff --git a/smoke/tqt/qt_smoke.h b/smoke/tqt/qt_smoke.h deleted file mode 100644 index 8859c243..00000000 --- a/smoke/tqt/qt_smoke.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef QT_SMOKE_H -#define QT_SMOKE_H - -// Defined in smokedata.cpp, initialized by init_qt_Smoke(), used by all .cpp files -extern Smoke* qt_Smoke; - -class TQGlobalSpace { }; - -#endif diff --git a/smoke/tqt/smokeqt.pro b/smoke/tqt/smoketqt.pro similarity index 96% rename from smoke/tqt/smokeqt.pro rename to smoke/tqt/smoketqt.pro index f49fc61b..09b7dbe3 100644 --- a/smoke/tqt/smokeqt.pro +++ b/smoke/tqt/smoketqt.pro @@ -6,7 +6,7 @@ TEMPLATE = lib INCLUDEPATH += . .. # Input -HEADERS += qt_smoke.h +HEADERS += tqt_smoke.h SOURCES += smokedata.cpp \ x_1.cpp \ x_10.cpp \ diff --git a/smoke/tqt/qscintilla_header_list b/smoke/tqt/tqscintilla_header_list similarity index 100% rename from smoke/tqt/qscintilla_header_list rename to smoke/tqt/tqscintilla_header_list diff --git a/smoke/tqt/tqt_smoke.h b/smoke/tqt/tqt_smoke.h new file mode 100644 index 00000000..8a818049 --- /dev/null +++ b/smoke/tqt/tqt_smoke.h @@ -0,0 +1,9 @@ +#ifndef TQT_SMOKE_H +#define TQT_SMOKE_H + +// Defined in smokedata.cpp, initialized by init_tqt_Smoke(), used by all .cpp files +extern Smoke* tqt_Smoke; + +class TQGlobalSpace { }; + +#endif diff --git a/smoke/tde/qtguess.pl.in b/smoke/tqt/tqtguess.pl.in similarity index 84% rename from smoke/tde/qtguess.pl.in rename to smoke/tqt/tqtguess.pl.in index bf115fdc..77533f37 100644 --- a/smoke/tde/qtguess.pl.in +++ b/smoke/tqt/tqtguess.pl.in @@ -1,12 +1,12 @@ #!/usr/bin/perl -# qtguess.pl : check how Qt was compiled. Issue a list of all defined TQT_NO_* macros, one per line. +# tqtguess.pl : check how TQt was compiled. Issue a list of all defined TQT_NO_* macros, one per line. # # author: germain Garand # licence: GPL v.2 # options: -q: be quieter -# -o file: redirect output to "file". (default: ./qtdefines) +# -o file: redirect output to "file". (default: ./tqtdefines) # -t [0..15]: set the testing threshold (see below) # -f "flags": additional compiler flags/parameters @@ -17,7 +17,7 @@ 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: TQT_NO_IMAGE_SMOOTHSCALE) # 10 - test basic widgets @@ -25,20 +25,20 @@ getopts('qo:f:t:'); # 13 - test widgets inheriting composite widgets # 15 - test goodies (default) -my $default_threshold = @qt_test_threshold@; +my $default_threshold = @tqt_test_threshold@; my $cc = "@CXX@"; my $ccflags = $opt_f || "@CXXFLAGS@"; my $nspaces = 50; -my %qtdefs=(); -my %qtundefs=(); +my %tqtdefs=(); +my %tqtundefs=(); my $tmp = gettmpfile(); -my $qtinc = '@tqt_includes@'; +my $tqtinc = '@tqt_includes@'; my $allinc = '@all_includes@'; my $alllib = '@all_libraries@'; -my $qtflags ='@LIB_TQT@'; +my $tqtflags ='@LIB_TQT@'; my %x; $x{'LIBPNG'} = '@LIBPNG@'; $x{'LIBJPEG'} = '@LIBJPEG@'; @@ -50,31 +50,31 @@ $x{'LIB_X11'} = '@LIB_X11@'; $x{'X_PRE_LIBS'} = '@X_PRE_LIBS@'; $x{'LIB_X11'} =~ s/\$\((.*?)\)/$x{$1}/g; -$qtflags =~ s/\$\((.*?)\)/$x{$1}/g; +$tqtflags =~ s/\$\((.*?)\)/$x{$1}/g; - -e "$qtinc/qglobal.h" or die "Invalid Qt directory.\n"; + -e "$tqtinc/qglobal.h" or die "Invalid TQt directory.\n"; -my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags"; +my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $tqtflags"; 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( TQTDEFS, ">".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n"; +open( TQTDEFS, ">".($opt_o || "tqtdefines") ) or die "Can't open output file: $!\n"; grab_qglobal_symbols(); preliminary_test(); perform_all_tests(); -print +scalar(keys %qtdefs) . " defines found.\n"; +print +scalar(keys %tqtdefs) . " defines found.\n"; -print TQTDEFS join("\n", keys %qtdefs), "\n"; +print TQTDEFS join("\n", keys %tqtdefs), "\n"; close; #--------------------------------------------------------------# @@ -82,7 +82,7 @@ close; sub gettmpfile { my $tmpdir = $ENV{'TMP'} || "."; - my $tmpname = $$."-qtguess"; + my $tmpname = $$."-tqtguess"; while( -e "$tmpdir/$tmpname" || -e "$tmpdir/${tmpname}.cpp" ) { $tmpname .= int (rand * 9); @@ -94,28 +94,28 @@ sub gettmpfile sub grab_qglobal_symbols { - my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null"; + my $cmd = "$cc -E -D__cplusplus -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null"; my $symbols = `$cmd`; for(0..1) { if( check_exit_status($?) ) { - while( $symbols =~/^#\s*define\s*(QT_\S+)\s*$/gm ) + while( $symbols =~/^#\s*define\s*(TQT_\S+)\s*$/gm ) { - $qtdefs{$1} = 1; + $tqtdefs{$1} = 1; } - print "Found ". scalar( keys %qtdefs )." predefined symbol".((scalar( keys %qtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %qtdefs)); + print "Found ". scalar( keys %tqtdefs )." predefined symbol".((scalar( keys %tqtdefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtdefs)); while( $symbols =~/^#\s*define\s*TQT_MODULE_(\S+)\s*$/gm ) { - $qtundefs{"TQT_NO_$1"} = 1; + $tqtundefs{"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)); + print "Found ". scalar( keys %tqtundefs )." undefined symbol".((scalar( keys %tqtundefs ) -1)?"s":"")." in qglobal.h\n" unless ($opt_q or !(keys %tqtundefs)); last; } elsif(! $_) # first try { print "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n"; - $cmd = "$cc -E -dM -I$qtinc $qtinc/qglobal.h 2>/dev/null"; + $cmd = "$cc -E -dM -I$tqtinc $tqtinc/qglobal.h 2>/dev/null"; $symbols = `$cmd`; next; } @@ -166,14 +166,14 @@ sub perform_all_tests foreach ( sort { $tests{$a}->[2] <=> $tests{$b}->[2]} keys %tests) { $tests{$_}->[2] < $threshold and next; - ($qtdefs{$_} || $qtundefs{$_}) and do + ($tqtdefs{$_} || $tqtundefs{$_}) and do { - print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($qtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n"); + print "\rSkipping $_ (in qglobal.h)".( " " x (($nspaces-16) - length($_)) ).($tqtundefs{$_}?"*Undefined*":" [Defined]").($opt_q?"":"\n"); next }; print "\rTesting $_".( " " x ($nspaces - length($_)) ); open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n"; - foreach $def(keys %qtdefs) + foreach $def(keys %tqtdefs) { print OUT "#define $def\n"; } @@ -198,7 +198,7 @@ sub perform_all_tests my $ok = check_exit_status($?); if( !$ok ) { - $qtdefs{$_} = 1; + $tqtdefs{$_} = 1; } print +$opt_q ? ++$count."/$used" : ( $ok ? "*Undefined*\n" : " [Defined]\n" ); } @@ -398,9 +398,9 @@ our %tests = ( "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_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView +# "TQT_NO_TQTMULTILINEEDIT" => ["tqtmultilineedit.h", "TQtMultiLineEdit foo;", 15], +# "TQT_NO_TQTTABLEVIEW" => ["tqttableview.h", "TQFoo foo;", 16, q£ +# class TQFoo: public TQtTableView # { # public: # TQFoo() {}; @@ -458,13 +458,13 @@ our %tests = ( # "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£ + "TQT_NO_TABBAR" => ["tqtabbar.h", "TQTabBar foo;", 10], + "TQT_NO_TABDIALOG" => ["tqtabdialog.h", "TQTabDialog foo;", 12], + "TQT_NO_TABLE" => ["tqtable.h", "TQTable foo;", 10], + "TQT_NO_TABWIDGET" => ["tqtabwidget.h", "TQTabWidget foo;", 10], + "TQT_NO_TEXTBROWSER" => ["tqtextbrowser.h", "TQTextBrowser foo;", 14], + "TQT_NO_TEXTCODEC" => ["tqtextcodec.h", "TQTextCodec::codecForIndex(1);", 5], + "TQT_NO_TEXTCODECPLUGIN" => ["tqtextcodecplugin.h, qstringlist.h, qvaluelist.h, tqtextcodec.h", "TQFoo foo;", 6, q£ class TQFoo: public TQTextCodecPlugin { @@ -478,12 +478,12 @@ our %tests = ( }; Q_EXPORT_PLUGIN( TQFoo ) £], - "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], + "TQT_NO_TEXTEDIT" => ["tqtextedit.h", "TQTextEdit foo;", 13], + "TQT_NO_TEXTSTREAM" => ["tqtextstream.h", "TQTextStream foo;", 5], + "TQT_NO_TEXTVIEW" => ["tqtextview.h", "TQTextView foo;", 14], #Obsolete + "TQT_NO_TOOLBAR" => ["tqtoolbar.h", "TQToolBar foo;", 10], + "TQT_NO_TOOLBUTTON" => ["tqtoolbutton.h", "TQToolButton foo((TQWidget *) NULL );", 12], + "TQT_NO_TOOLTIP" => ["tqtooltip.h", "TQToolTip::hide();", 10], "TQT_NO_TRANSFORMATIONS" => ["qpainter.h", q£ TQPainter *foo= new TQPainter(); -- 2.20.1 From f8f7e1d6ec62741c25c60ebdd71f7222db8af92c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 26 Oct 2018 22:49:45 +0900 Subject: [PATCH 4/4] Fixed SEGFAULT when using ruby bindings. Signed-off-by: Michele Calgaro --- tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb b/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb index a7489820..4788d01b 100644 --- a/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb +++ b/tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb @@ -1349,14 +1349,14 @@ module TQt @@idclass = [] def Internal.normalize_classname(classname) - if classname =~ /^Qext/ - now = classname.sub(/^Qext(?=[A-Z])/,'Qext::') - elsif classname =~ /^Q/ - now = classname.sub(/^Q(?=[A-Z])/,'TQt::') + if classname =~ /^TQext/ + now = classname.sub(/^TQext(?=[A-Z])/,'TQext::') + elsif classname =~ /^TQ/ + now = classname.sub(/^TQ(?=[A-Z])/,'TQt::') elsif classname =~ /^(TDEConfigSkeleton|KWin)::/ - now = classname.sub(/^K?(?=[A-Z])/,'KDE::') + now = classname.sub(/^T?(?=[A-Z])/,'TDE::') elsif classname !~ /::/ - now = classname.sub(/^K?(?=[A-Z])/,'KDE::') + now = classname.sub(/^T?(?=[A-Z])/,'TDE::') else now = classname end @@ -1416,7 +1416,7 @@ module TQt elsif argtype == 's' if typename =~ /^(const )?((TQChar)[*&]?)$/ return 1 - elsif typename =~ /^(?:u?char\*|const u?char\*|(?:const )?(Q(C?)String)[*&]?)$/ + elsif typename =~ /^(?:u?char\*|const u?char\*|(?:const )?(TQ(C?)String)[*&]?)$/ qstring = !$1.nil? c = ("C" == $2) return c ? 2 : (qstring ? 3 : 0) @@ -1437,7 +1437,7 @@ module TQt end elsif argtype == 'u' # Give nil matched against string types a higher score than anything else - if typename =~ /^(?:u?char\*|const u?char\*|(?:const )?((Q(C?)String))[*&]?)$/ + if typename =~ /^(?:u?char\*|const u?char\*|(?:const )?((TQ(C?)String))[*&]?)$/ return 1 # Numerics will give a runtime conversion error, so they fail the match elsif typename =~ /^(?:short|ushort|uint|long|ulong|signed|unsigned|int)$/ -- 2.20.1