Move to /usr folder. #1

Open
MicheleC wants to merge 4 commits from bug/266/move-to-usr into master
  1. 2
      ChangeLog
  2. 6
      Makefile.am.in
  3. 4
      README
  4. 4
      dcopperl/Makefile.PL
  5. 2
      kalyptus/kalyptus.spec.in
  6. 4
      kalyptus/kalyptusCxxToJNI.pm
  7. 4
      kalyptus/kalyptusCxxToJava.pm
  8. 4
      kalyptus/kalyptusCxxToKimono.pm
  9. 6
      kalyptus/kalyptusCxxToSmoke.pm
  10. 2
      kjsembed/docs/examples/imageinfo/imagescale.js
  11. 2
      korundum/AUTHORS
  12. 12
      korundum/ChangeLog
  13. 2
      korundum/README
  14. 6
      korundum/bin/Makefile.am
  15. 8
      korundum/rubylib/korundum/Korundum.cpp
  16. 4
      korundum/rubylib/korundum/Makefile.am
  17. 2
      korundum/rubylib/korundum/tdehandlers.cpp
  18. 9
      qtruby/bin/Makefile.am
  19. 1
      qtruby/rubylib/Makefile.am
  20. 6
      qtruby/rubylib/designer/uilib/extconf.rb
  21. 15
      qtruby/rubylib/qtruby/Makefile.am
  22. 4
      qtruby/rubylib/qtruby/lib/Makefile.am
  23. 1
      qtruby/rubylib/qtruby/lib/Qt.rb
  24. 2
      qtruby/rubylib/qtruby/lib/Qt/Makefile.am
  25. 2
      smoke/README
  26. 6
      smoke/tde/Makefile.am
  27. 4
      smoke/tde/configure.in.in
  28. 34
      smoke/tde/generate.pl.in
  29. 2
      smoke/tde/hint_header_list.pl
  30. 9
      smoke/tde/qt_smoke.h
  31. 9
      smoke/tde/tqt_smoke.h
  32. 86
      smoke/tde/tqtguess.pl.in
  33. 4
      smoke/tqt/Makefile.am
  34. 20
      smoke/tqt/configure.in.in
  35. 36
      smoke/tqt/generate.pl.in
  36. 2
      smoke/tqt/hint_header_list.pl
  37. 9
      smoke/tqt/qt_smoke.h
  38. 2
      smoke/tqt/smoketqt.pro
  39. 0
      smoke/tqt/tqscintilla_header_list
  40. 9
      smoke/tqt/tqt_smoke.h
  41. 86
      smoke/tqt/tqtguess.pl.in
  42. 2
      tdejava/koala.kdevprj
  43. 4
      tqtruby/AUTHORS
  44. 4
      tqtruby/COPYING
  45. 172
      tqtruby/ChangeLog
  46. 58
      tqtruby/INSTALL
  47. 0
      tqtruby/Makefile.am
  48. 50
      tqtruby/README
  49. 0
      tqtruby/README.1st
  50. 6
      tqtruby/TODO
  51. 9
      tqtruby/bin/Makefile.am
  52. 14
      tqtruby/bin/rbtqtapi
  53. 26
      tqtruby/bin/rbtqtsh
  54. 0
      tqtruby/bin/tqtrubyinit.cpp
  55. 1
      tqtruby/rubylib/Makefile.am
  56. 0
      tqtruby/rubylib/designer/Makefile.am
  57. 0
      tqtruby/rubylib/designer/examples/colortool/Makefile
  58. 2
      tqtruby/rubylib/designer/examples/colortool/README
  59. 0
      tqtruby/rubylib/designer/examples/colortool/colornameform.ui
  60. 0
      tqtruby/rubylib/designer/examples/colortool/colornameform.ui.rb
  61. 0
      tqtruby/rubylib/designer/examples/colortool/findform.ui
  62. 0
      tqtruby/rubylib/designer/examples/colortool/findform.ui.rb
  63. 0
      tqtruby/rubylib/designer/examples/colortool/images/editcopy
  64. 0
      tqtruby/rubylib/designer/examples/colortool/images/editcopy.png
  65. 0
      tqtruby/rubylib/designer/examples/colortool/images/editcut
  66. 0
      tqtruby/rubylib/designer/examples/colortool/images/editcut.png
  67. 0
      tqtruby/rubylib/designer/examples/colortool/images/editraise.png
  68. 0
      tqtruby/rubylib/designer/examples/colortool/images/filenew
  69. 0
      tqtruby/rubylib/designer/examples/colortool/images/filenew.png
  70. 0
      tqtruby/rubylib/designer/examples/colortool/images/fileopen
  71. 0
      tqtruby/rubylib/designer/examples/colortool/images/fileopen.png
  72. 0
      tqtruby/rubylib/designer/examples/colortool/images/filesave
  73. 0
      tqtruby/rubylib/designer/examples/colortool/images/filesave.png
  74. 0
      tqtruby/rubylib/designer/examples/colortool/images/iconview.png
  75. 0
      tqtruby/rubylib/designer/examples/colortool/images/richtextedit.png
  76. 0
      tqtruby/rubylib/designer/examples/colortool/images/searchfind
  77. 0
      tqtruby/rubylib/designer/examples/colortool/images/searchfind.png
  78. 0
      tqtruby/rubylib/designer/examples/colortool/images/table.png
  79. 0
      tqtruby/rubylib/designer/examples/colortool/images/tabwidget.png
  80. 0
      tqtruby/rubylib/designer/examples/colortool/images/widgetstack.png
  81. 2
      tqtruby/rubylib/designer/examples/colortool/main.rb
  82. 0
      tqtruby/rubylib/designer/examples/colortool/mainform.ui
  83. 2
      tqtruby/rubylib/designer/examples/colortool/mainform.ui.rb
  84. 0
      tqtruby/rubylib/designer/examples/colortool/optionsform.ui
  85. 0
      tqtruby/rubylib/designer/rbuic/LICENSE.GPL
  86. 0
      tqtruby/rubylib/designer/rbuic/Makefile.am
  87. 0
      tqtruby/rubylib/designer/rbuic/TODO
  88. 10
      tqtruby/rubylib/designer/rbuic/domtool.cpp
  89. 10
      tqtruby/rubylib/designer/rbuic/domtool.h
  90. 16
      tqtruby/rubylib/designer/rbuic/embed.cpp
  91. 18
      tqtruby/rubylib/designer/rbuic/form.cpp
  92. 2
      tqtruby/rubylib/designer/rbuic/globaldefs.h
  93. 18
      tqtruby/rubylib/designer/rbuic/main.cpp
  94. 12
      tqtruby/rubylib/designer/rbuic/object.cpp
  95. 6
      tqtruby/rubylib/designer/rbuic/parser.cpp
  96. 2
      tqtruby/rubylib/designer/rbuic/parser.h
  97. 2
      tqtruby/rubylib/designer/rbuic/rbuic.pro
  98. 4
      tqtruby/rubylib/designer/rbuic/subclassing.cpp
  99. 14
      tqtruby/rubylib/designer/rbuic/uic.cpp
  100. 4
      tqtruby/rubylib/designer/rbuic/uic.h
  101. 2
      tqtruby/rubylib/designer/rbuic/widgetdatabase.cpp
  102. 4
      tqtruby/rubylib/designer/rbuic/widgetdatabase.h
  103. 2
      tqtruby/rubylib/designer/rbuic/widgetinterface.h
  104. 4
      tqtruby/rubylib/designer/uilib/Makefile.am
  105. 6
      tqtruby/rubylib/designer/uilib/extconf.rb
  106. 2
      tqtruby/rubylib/designer/uilib/test/test.rb
  107. 12
      tqtruby/rubylib/designer/uilib/tqui.cpp
  108. 2
      tqtruby/rubylib/examples/base/kicons.rb
  109. 8
      tqtruby/rubylib/examples/base/rui.rb
  110. 2
      tqtruby/rubylib/examples/canvastest/canvastest.rb
  111. 4
      tqtruby/rubylib/examples/killerfilter/killerfilter.rb
  112. 2
      tqtruby/rubylib/examples/network/clientserver/client/client.rb
  113. 2
      tqtruby/rubylib/examples/network/clientserver/server/server.rb
  114. 2
      tqtruby/rubylib/examples/passivepopup/passivepopup.rb
  115. 0
      tqtruby/rubylib/examples/ruboids/Manifest
  116. 4
      tqtruby/rubylib/examples/ruboids/README
  117. 0
      tqtruby/rubylib/examples/ruboids/TODO
  118. 0
      tqtruby/rubylib/examples/ruboids/boids.properties
  119. 0
      tqtruby/rubylib/examples/ruboids/generateManifest.rb
  120. 4
      tqtruby/rubylib/examples/ruboids/index.html
  121. 0
      tqtruby/rubylib/examples/ruboids/release.rb
  122. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Boid.rb
  123. 0
      tqtruby/rubylib/examples/ruboids/ruboids/BoidView.rb
  124. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Camera.rb
  125. 2
      tqtruby/rubylib/examples/ruboids/ruboids/CameraDialog.rb
  126. 2
      tqtruby/rubylib/examples/ruboids/ruboids/Canvas.rb
  127. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Cloud.rb
  128. 2
      tqtruby/rubylib/examples/ruboids/ruboids/CloudView.rb
  129. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Flock.rb
  130. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Graphics.rb
  131. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Params.rb
  132. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Point.rb
  133. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Thing.rb
  134. 0
      tqtruby/rubylib/examples/ruboids/ruboids/Triangle.rb
  135. 0
      tqtruby/rubylib/examples/ruboids/ruboids/View.rb
  136. 2
      tqtruby/rubylib/examples/ruboids/ruboids/World.rb
  137. 2
      tqtruby/rubylib/examples/ruboids/ruboids/WorldWindow.rb
  138. 0
      tqtruby/rubylib/examples/ruboids/ruboids/info.rb
  139. 2
      tqtruby/rubylib/examples/ruboids/ruboids/ruboids.rb
  140. 2
      tqtruby/rubylib/examples/testcases/bugs.rb
  141. 2
      tqtruby/rubylib/examples/testcases/error_reporting.rb
  142. 2
      tqtruby/rubylib/examples/testcases/opoverloading.rb
  143. 2
      tqtruby/rubylib/examples/textedit/textedit.rb
  144. 2
      tqtruby/rubylib/examples/tqt-examples/aclock/aclock.rb
  145. 4
      tqtruby/rubylib/examples/tqt-examples/aclock/main.rb
  146. 2
      tqtruby/rubylib/examples/tqt-examples/chart/README
  147. 0
      tqtruby/rubylib/examples/tqt-examples/chart/canvastext.rb
  148. 0
      tqtruby/rubylib/examples/tqt-examples/chart/canvasview.rb
  149. 10
      tqtruby/rubylib/examples/tqt-examples/chart/chartform.rb
  150. 2
      tqtruby/rubylib/examples/tqt-examples/chart/chartform_canvas.rb
  151. 0
      tqtruby/rubylib/examples/tqt-examples/chart/chartform_files.rb
  152. 0
      tqtruby/rubylib/examples/tqt-examples/chart/element.rb
  153. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/chart-forms.sk
  154. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/file_new.xpm
  155. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/file_open.xpm
  156. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/file_print.xpm
  157. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/file_save.xpm
  158. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/file_saveaspostscript.xpm
  159. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_horizontalbarchart.xpm
  160. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_piechart.xpm
  161. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_setdata.xpm
  162. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_setfont.xpm
  163. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_setoptions.xpm
  164. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/options_verticalbarchart.xpm
  165. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern01.xpm
  166. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern02.xpm
  167. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern03.xpm
  168. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern04.xpm
  169. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern05.xpm
  170. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern06.xpm
  171. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern07.xpm
  172. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern08.xpm
  173. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern09.xpm
  174. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern10.xpm
  175. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern11.xpm
  176. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern12.xpm
  177. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern13.xpm
  178. 0
      tqtruby/rubylib/examples/tqt-examples/chart/images/pattern14.xpm
  179. 2
      tqtruby/rubylib/examples/tqt-examples/chart/main.rb
  180. 0
      tqtruby/rubylib/examples/tqt-examples/chart/optionsform.rb
  181. 0
      tqtruby/rubylib/examples/tqt-examples/chart/setdataform.rb
  182. 2
      tqtruby/rubylib/examples/tqt-examples/checklists/checklists.rb
  183. 4
      tqtruby/rubylib/examples/tqt-examples/checklists/main.rb
  184. 2
      tqtruby/rubylib/examples/tqt-examples/dclock/dclock.rb
  185. 4
      tqtruby/rubylib/examples/tqt-examples/dclock/main.rb
  186. 4
      tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/main.rb
  187. 0
      tqtruby/rubylib/examples/tqt-examples/fonts/simple-qfont-demo/viewer.rb
  188. 6
      tqtruby/rubylib/examples/tqt-examples/forever/forever.rb
  189. 2
      tqtruby/rubylib/examples/tqt-examples/hello/hello.rb
  190. 4
      tqtruby/rubylib/examples/tqt-examples/hello/main.rb
  191. 2
      tqtruby/rubylib/examples/tqt-examples/progress/progress.rb
  192. 4
      tqtruby/rubylib/examples/tqt-examples/tictac/main.rb
  193. 2
      tqtruby/rubylib/examples/tqt-examples/tictac/tictac.rb
  194. 4
      tqtruby/rubylib/examples/tqt-examples/tooltip/main.rb
  195. 2
      tqtruby/rubylib/examples/tqt-examples/tooltip/tooltip.rb
  196. 14
      tqtruby/rubylib/examples/tqtscribble/scribble.rb
  197. 15
      tqtruby/rubylib/tqtruby/Makefile.am
  198. 466
      tqtruby/rubylib/tqtruby/TQt.cpp
  199. 2
      tqtruby/rubylib/tqtruby/configure.in.in
  200. 4
      tqtruby/rubylib/tqtruby/extconf.rb
  201. 52
      tqtruby/rubylib/tqtruby/handlers.cpp
  202. 4
      tqtruby/rubylib/tqtruby/lib/Makefile.am
  203. 1
      tqtruby/rubylib/tqtruby/lib/TQt.rb
  204. 2
      tqtruby/rubylib/tqtruby/lib/TQt/Makefile.am
  205. 60
      tqtruby/rubylib/tqtruby/lib/TQt/tqtruby.rb
  206. 0
      tqtruby/rubylib/tqtruby/marshall.h
  207. 2
      tqtruby/rubylib/tqtruby/smokeruby.h
  208. 20
      tqtruby/rubylib/tqtruby/tqtruby.h
  209. 2
      tqtruby/rubylib/tutorial/t1/t1.rb
  210. 2
      tqtruby/rubylib/tutorial/t10/cannon.rb
  211. 2
      tqtruby/rubylib/tutorial/t10/lcdrange.rb
  212. 2
      tqtruby/rubylib/tutorial/t10/t10.rb
  213. 2
      tqtruby/rubylib/tutorial/t11/cannon.rb
  214. 2
      tqtruby/rubylib/tutorial/t11/lcdrange.rb
  215. 2
      tqtruby/rubylib/tutorial/t11/t11.rb
  216. 2
      tqtruby/rubylib/tutorial/t12/cannon.rb
  217. 2
      tqtruby/rubylib/tutorial/t12/lcdrange.rb
  218. 2
      tqtruby/rubylib/tutorial/t12/t12.rb
  219. 2
      tqtruby/rubylib/tutorial/t13/cannon.rb
  220. 2
      tqtruby/rubylib/tutorial/t13/gamebrd.rb
  221. 2
      tqtruby/rubylib/tutorial/t13/lcdrange.rb
  222. 2
      tqtruby/rubylib/tutorial/t13/t13.rb
  223. 2
      tqtruby/rubylib/tutorial/t14/cannon.rb
  224. 0
      tqtruby/rubylib/tutorial/t14/gamebrd.rb
  225. 2
      tqtruby/rubylib/tutorial/t14/lcdrange.rb
  226. 2
      tqtruby/rubylib/tutorial/t14/t14.rb
  227. 2
      tqtruby/rubylib/tutorial/t2/t2.rb
  228. 2
      tqtruby/rubylib/tutorial/t3/t3.rb
  229. 2
      tqtruby/rubylib/tutorial/t4/t4.rb
  230. 2
      tqtruby/rubylib/tutorial/t5/t5.rb
  231. 2
      tqtruby/rubylib/tutorial/t6/t6.rb
  232. 2
      tqtruby/rubylib/tutorial/t7/lcdrange.rb
  233. 2
      tqtruby/rubylib/tutorial/t7/t7.rb
  234. 2
      tqtruby/rubylib/tutorial/t8/cannon.rb
  235. 2
      tqtruby/rubylib/tutorial/t8/lcdrange.rb
  236. 4
      tqtruby/rubylib/tutorial/t8/t8.rb
  237. 2
      tqtruby/rubylib/tutorial/t9/cannon.rb
  238. 2
      tqtruby/rubylib/tutorial/t9/lcdrange.rb
  239. 2
      tqtruby/rubylib/tutorial/t9/t9.rb

@ -1,6 +1,6 @@
2004-06-27 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* 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 <murban@mylinuxisp.com>

@ -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

@ -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.

@ -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";

@ -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

@ -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";

@ -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";

@ -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";

@ -2092,7 +2092,7 @@ sub writeSmokeDataFile($) {
print OUT "\n";
print OUT "#include <smoke.h>\n\n";
print OUT "#include <qt_smoke.h>\n\n";
print OUT "#include <tqt_smoke.h>\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";

@ -1,4 +1,4 @@
#!/opt/trinity/bin/kjscmd
#!/usr/bin/kjscmd
//
// Load an image, scale it, and save it in the specified format.

@ -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

@ -1,6 +1,6 @@
2007-03-05 Richard Dale <rdale@foton.es>
* Added a marshaller for TQValueList<WId>& as requested by volty on #qtruby
* Added a marshaller for TQValueList<WId>& as requested by volty on #tqtruby
2007-07-06 Richard Dale <rdale@foton.es>
@ -41,7 +41,7 @@
2006-08-18 Richard Dale <rdale@foton.es>
* 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 <rdale@foton.es>
@ -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 <Richard_Dale@tipitina.demon.co.uk>
@ -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 <Richard_Dale@tipitina.demon.co.uk>
@ -223,7 +223,7 @@
2004-10-11 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
* 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 <Richard_Dale@tipitina.demon.co.uk>
* 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.

@ -1,4 +1,4 @@
Please see tdebindings/qtruby/README
Please see tdebindings/tqtruby/README
KDE Specific Infomation:

@ -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

@ -36,7 +36,7 @@
#include <ruby.h>
#include <marshall.h>
#include <qtruby.h>
#include <tqtruby.h>
#include <smokeruby.h>
#include <smoke.h>
@ -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");

@ -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

@ -15,7 +15,7 @@
* *
***************************************************************************/
#include <qtruby.h>
#include <tqtruby.h>
#include <smokeruby.h>
#include <tdeversion.h>

@ -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

@ -1 +0,0 @@
SUBDIRS = qtruby designer

@ -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")

@ -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

@ -1,4 +0,0 @@
SUBDIRS = Qt
rubylibdir = $(RUBY_RUBYLIBDIR)
rubylib_DATA = Qt.rb

@ -1,2 +0,0 @@
qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
qtrubylib_DATA = qtruby.rb

@ -15,7 +15,7 @@ Regenerating
For SmokeTQt:
cd tqt
./qtguess.pl
./tqtguess.pl
./generate.pl
make

@ -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:

@ -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 ], [

@ -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);

@ -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";

@ -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

@ -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

@ -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 <germain@ebooksfrance.com>
# 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();

@ -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:

@ -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

@ -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 } <HEADERS>;
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 } <HEADERS>;
@ -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";

@ -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";

@ -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

@ -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 \

@ -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

@ -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 <germain@ebooksfrance.com>
# 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";