Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 11 years ago
parent dcb06497ea
commit 96698e12d1
  1. 2
      kalzium/src/kalzium.cpp
  2. 12
      kalzium/src/kalziumdataobject.cpp
  3. 24
      kalzium/src/kalziumtip.cpp
  4. 2
      kalzium/src/kalziumtip.h
  5. 2
      kalzium/src/molcalcwidgetbase.ui
  6. 2
      kalzium/src/moleculeparser.cpp
  7. 2
      kalzium/src/periodictableview.cpp
  8. 2
      kalzium/src/plotsetupwidget.ui
  9. 2
      kalzium/src/settings_colors.ui
  10. 2
      kalzium/src/settings_misc.ui
  11. 2
      kalzium/src/settings_units.ui
  12. 2
      kalzium/src/somwidget.ui
  13. 2
      kalzium/src/spectrum.h
  14. 2
      kalzium/src/spectrumview.ui
  15. 4
      kalzium/src/spectrumwidget.cpp
  16. 2
      kalzium/src/timewidget.ui
  17. 2
      kanagram/src/mainsettingswidget.ui
  18. 2
      kanagram/src/newstuffwidget.ui
  19. 2
      kanagram/src/vocabedit.cpp
  20. 2
      kanagram/src/vocabeditwidget.ui
  21. 2
      kanagram/src/vocabsettingswidget.ui
  22. 2
      kbruch/src/taskvieweroptionsbase.ui
  23. 2
      keduca/keduca/configdialogbase.ui
  24. 4
      keduca/keduca/keduca_part.cpp
  25. 2
      keduca/keduca/keduca_part.h
  26. 2
      keduca/keducabuilder/kcontroladdeditbase.ui
  27. 2
      keduca/keducabuilder/kcontrolheaderbase.ui
  28. 2
      keduca/keducabuilder/keducaeditorstartdialogbase.ui
  29. 2
      keduca/libkeduca/kgallerydialogbase.ui
  30. 2
      kgeography/Changelog
  31. 2
      khangman/khangman/advanced.ui
  32. 2
      khangman/khangman/normal.ui
  33. 2
      khangman/khangman/timerdlg.ui
  34. 6
      kig/ChangeLog
  35. 24
      kig/DESIGN
  36. 4
      kig/TODO
  37. 12
      kig/examples/figure_angle.fgeo
  38. 32
      kig/examples/figure_manyobjects.fgeo
  39. 64
      kig/examples/session_alotofthings.fgeo
  40. 24
      kig/filters/cabri-filter.cc
  41. 2
      kig/filters/drgeo-filter-chooserbase.ui
  42. 202
      kig/filters/drgeo-filter.cc
  43. 2
      kig/filters/imageexporteroptionsbase.ui
  44. 132
      kig/filters/kgeo-filter.cc
  45. 174
      kig/filters/kseg-filter.cc
  46. 2
      kig/filters/kseg-filter.h
  47. 2
      kig/filters/latexexporteroptions.ui
  48. 56
      kig/filters/native-filter.cc
  49. 2
      kig/filters/svgexporteroptions.ui
  50. 2
      kig/filters/tests/locus.fgeo
  51. 30
      kig/kig/kig_commands.cpp
  52. 6
      kig/kig/kig_commands.h
  53. 4
      kig/kig/kig_part.cpp
  54. 2
      kig/kig/kig_part.h
  55. 2
      kig/kig/kig_view.h
  56. 14
      kig/misc/argsparser.cpp
  57. 14
      kig/misc/argsparser.h
  58. 30
      kig/misc/calcpaths.cc
  59. 2
      kig/misc/calcpaths.h
  60. 2
      kig/misc/cubic-common.cc
  61. 20
      kig/misc/object_constructor.cc
  62. 8
      kig/misc/object_constructor.h
  63. 80
      kig/misc/object_hierarchy.cc
  64. 2
      kig/misc/object_hierarchy.h
  65. 148
      kig/misc/special_constructors.cc
  66. 18
      kig/misc/special_constructors.h
  67. 2
      kig/modes/base_mode.cc
  68. 60
      kig/modes/construct_mode.cc
  69. 2
      kig/modes/construct_mode.h
  70. 2
      kig/modes/edittypebase.ui
  71. 22
      kig/modes/label.cc
  72. 2
      kig/modes/macrowizardbase.ui
  73. 32
      kig/modes/moving.cc
  74. 2
      kig/modes/moving.h
  75. 2
      kig/modes/textlabelwizard.cc
  76. 2
      kig/modes/textlabelwizard.h
  77. 2
      kig/modes/textlabelwizardbase.ui
  78. 2
      kig/modes/typesdialogbase.ui
  79. 30
      kig/objects/angle_type.cc
  80. 4
      kig/objects/arc_type.h
  81. 42
      kig/objects/base_type.cc
  82. 104
      kig/objects/conic_types.cc
  83. 22
      kig/objects/conic_types.h
  84. 12
      kig/objects/cubic_type.cc
  85. 6
      kig/objects/cubic_type.h
  86. 70
      kig/objects/intersection_types.cc
  87. 12
      kig/objects/intersection_types.h
  88. 12
      kig/objects/line_type.cc
  89. 4
      kig/objects/locus_imp.h
  90. 34
      kig/objects/object_calcer.cc
  91. 44
      kig/objects/object_calcer.h
  92. 88
      kig/objects/object_factory.cc
  93. 10
      kig/objects/object_factory.h
  94. 8
      kig/objects/object_type.cc
  95. 18
      kig/objects/object_type.h
  96. 18
      kig/objects/other_type.cc
  97. 8
      kig/objects/other_type.h
  98. 104
      kig/objects/point_type.cc
  99. 20
      kig/objects/point_type.h
  100. 184
      kig/objects/polygon_type.cc
  101. 22
      kig/objects/polygon_type.h
  102. 4
      kig/objects/special_calcers.cc
  103. 2
      kig/objects/special_calcers.h
  104. 66
      kig/objects/tests_type.cc
  105. 16
      kig/objects/tests_type.h
  106. 28
      kig/objects/text_type.cc
  107. 6
      kig/objects/text_type.h
  108. 2
      kig/scripting/newscriptwizardbase.ui
  109. 22
      kig/scripting/python_type.cc
  110. 12
      kig/scripting/python_type.h
  111. 4
      kig/scripting/script_mode.cc
  112. 2
      kiten/configdictionariesbase.ui
  113. 2
      kiten/configfont.ui
  114. 2
      kiten/configlearn.ui
  115. 2
      kiten/configsearching.ui
  116. 158
      kiten/edict
  117. 2
      kiten/edict_doc.html
  118. 4
      kiten/learn.cpp
  119. 2
      klatin/klatin/klatinchoose.ui
  120. 2
      klatin/klatin/klatingrammarwidget.ui
  121. 2
      klatin/klatin/klatinresultsdialog.ui
  122. 2
      klatin/klatin/klatinsettings_vocabpage.ui
  123. 2
      klatin/klatin/klatinverbswidget.ui
  124. 2
      klatin/klatin/klatinvocabwidget.ui
  125. 2
      klettres/klettres/fontsdlg.ui
  126. 14
      klettres/klettres/klettres.cpp
  127. 4
      klettres/klettres/klettres.h
  128. 4
      klettres/klettres/soundfactory.cpp
  129. 2
      klettres/klettres/soundfactory.h
  130. 2
      klettres/klettres/timerdlg.ui
  131. 2
      kmplot/kmplot/FktDlgData.ui
  132. 18
      kmplot/kmplot/MainDlg.cpp
  133. 6
      kmplot/kmplot/MainDlg.h
  134. 2
      kmplot/kmplot/editderivativespage.ui
  135. 2
      kmplot/kmplot/editfunctionpage.ui
  136. 2
      kmplot/kmplot/editintegralpage.ui
  137. 4
      kmplot/kmplot/kmplotio.cpp
  138. 4
      kmplot/kmplot/kmplotio.h
  139. 2
      kmplot/kmplot/parser.cpp
  140. 2
      kmplot/kmplot/qconstanteditor.ui
  141. 2
      kmplot/kmplot/qeditconstant.ui
  142. 2
      kmplot/kmplot/qeditparametric.ui
  143. 2
      kmplot/kmplot/qeditpolar.ui
  144. 2
      kmplot/kmplot/qminmax.ui
  145. 2
      kmplot/kmplot/qparametereditor.ui
  146. 2
      kmplot/kmplot/settingspagecolor.ui
  147. 2
      kmplot/kmplot/settingspagecoords.ui
  148. 2
      kmplot/kmplot/settingspagefonts.ui
  149. 2
      kmplot/kmplot/settingspageprecision.ui
  150. 2
      kmplot/kmplot/settingspagescaling.ui
  151. 2
      kmplot/kmplot/sliderwindow.ui
  152. 4
      kpercentage/kpercentage/kanswer.cpp
  153. 4
      kpercentage/kpercentage/kpercentage.cpp
  154. 2
      kpercentage/kpercentage/kpercentmain.cpp
  155. 2
      kstars/kstars/addcatdialogui.ui
  156. 2
      kstars/kstars/addlinkdialogui.ui
  157. 2
      kstars/kstars/ccdpreviewui.ui
  158. 2
      kstars/kstars/contrastbrightnessgui.ui
  159. 2
      kstars/kstars/detaildialog.cpp
  160. 2
      kstars/kstars/details_data.ui
  161. 2
      kstars/kstars/details_database.ui
  162. 2
      kstars/kstars/details_links.ui
  163. 2
      kstars/kstars/details_log.ui
  164. 2
      kstars/kstars/details_position.ui
  165. 2
      kstars/kstars/devmanager.ui
  166. 2
      kstars/kstars/fitsheaderdialog.ui
  167. 2
      kstars/kstars/focusdialog.cpp
  168. 2
      kstars/kstars/focusdialogdlg.ui
  169. 2
      kstars/kstars/fovdialogui.ui
  170. 2
      kstars/kstars/histdialog.ui
  171. 2
      kstars/kstars/imagereductionui.ui
  172. 2
      kstars/kstars/imgsequencedlgui.ui
  173. 2
      kstars/kstars/indi/LICENSE
  174. 4
      kstars/kstars/indi/apogee/CameraIO_Linux.cpp
  175. 4
      kstars/kstars/indi/apogee/CameraIO_Linux.h
  176. 6
      kstars/kstars/indi/celestrongps.cpp
  177. 4
      kstars/kstars/indi/indicom.c
  178. 2
      kstars/kstars/indi/indicom.h
  179. 4
      kstars/kstars/indi/lilxml.c
  180. 4
      kstars/kstars/indi/lilxml.h
  181. 4
      kstars/kstars/indi/lx200generic.cpp
  182. 2
      kstars/kstars/indiconf.ui
  183. 8
      kstars/kstars/indidevice.cpp
  184. 4
      kstars/kstars/indidevice.h
  185. 4
      kstars/kstars/indielement.cpp
  186. 2
      kstars/kstars/indielement.h
  187. 4
      kstars/kstars/indigroup.cpp
  188. 2
      kstars/kstars/indigroup.h
  189. 2
      kstars/kstars/indihostconf.ui
  190. 16
      kstars/kstars/indiproperty.cpp
  191. 4
      kstars/kstars/indiproperty.h
  192. 10
      kstars/kstars/indistd.cpp
  193. 2
      kstars/kstars/kswizardui.ui
  194. 2
      kstars/kstars/locationdialog.cpp
  195. 2
      kstars/kstars/newfovui.ui
  196. 2
      kstars/kstars/opsadvancedui.ui
  197. 2
      kstars/kstars/opscatalogui.ui
  198. 2
      kstars/kstars/opscolorsui.ui
  199. 2
      kstars/kstars/opsguidesui.ui
  200. 2
      kstars/kstars/opssolarsystemui.ui
  201. 2
      kstars/kstars/skymapdraw.cpp
  202. 2
      kstars/kstars/skypoint.cpp
  203. 2
      kstars/kstars/skypoint.h
  204. 2
      kstars/kstars/statform.ui
  205. 2
      kstars/kstars/streamformui.ui
  206. 2
      kstars/kstars/telescopepropui.ui
  207. 2
      kstars/kstars/telescopewizard.ui
  208. 2
      kstars/kstars/thumbnaileditorui.ui
  209. 2
      kstars/kstars/thumbnailpickerui.ui
  210. 2
      kstars/kstars/tools/altvstimeui.ui
  211. 2
      kstars/kstars/tools/argchangeviewoption.ui
  212. 2
      kstars/kstars/tools/argexportimage.ui
  213. 2
      kstars/kstars/tools/argloadcolorscheme.ui
  214. 2
      kstars/kstars/tools/arglooktoward.ui
  215. 2
      kstars/kstars/tools/argprintimage.ui
  216. 2
      kstars/kstars/tools/argsetactionindi.ui
  217. 2
      kstars/kstars/tools/argsetaltaz.ui
  218. 2
      kstars/kstars/tools/argsetccdtempindi.ui
  219. 2
      kstars/kstars/tools/argsetcolor.ui
  220. 2
      kstars/kstars/tools/argsetfilternumindi.ui
  221. 2
      kstars/kstars/tools/argsetfocusspeedindi.ui
  222. 2
      kstars/kstars/tools/argsetfocustimeoutindi.ui
  223. 2
      kstars/kstars/tools/argsetframetypeindi.ui
  224. 2
      kstars/kstars/tools/argsetgeolocation.ui
  225. 2
      kstars/kstars/tools/argsetgeolocationindi.ui
  226. 2
      kstars/kstars/tools/argsetlocaltime.ui
  227. 2
      kstars/kstars/tools/argsetportindi.ui
  228. 2
      kstars/kstars/tools/argsetradec.ui
  229. 2
      kstars/kstars/tools/argsetscopeactionindi.ui
  230. 2
      kstars/kstars/tools/argsettargetcoordindi.ui
  231. 2
      kstars/kstars/tools/argsettargetnameindi.ui
  232. 2
      kstars/kstars/tools/argsettrack.ui
  233. 2
      kstars/kstars/tools/argsetutcindi.ui
  234. 2
      kstars/kstars/tools/argshutdownindi.ui
  235. 2
      kstars/kstars/tools/argstartexposureindi.ui
  236. 2
      kstars/kstars/tools/argstartfocusindi.ui
  237. 2
      kstars/kstars/tools/argstartindi.ui
  238. 2
      kstars/kstars/tools/argswitchindi.ui
  239. 2
      kstars/kstars/tools/argtimescale.ui
  240. 2
      kstars/kstars/tools/argwaitfor.ui
  241. 2
      kstars/kstars/tools/argwaitforkey.ui
  242. 2
      kstars/kstars/tools/argzoom.ui
  243. 2
      kstars/kstars/tools/modcalcangdist.cpp
  244. 2
      kstars/kstars/tools/modcalcangdistdlg.ui
  245. 6
      kstars/kstars/tools/modcalcapcoord.cpp
  246. 2
      kstars/kstars/tools/modcalcapcoord.h
  247. 2
      kstars/kstars/tools/modcalcapcoorddlg.ui
  248. 6
      kstars/kstars/tools/modcalcazel.cpp
  249. 2
      kstars/kstars/tools/modcalcazeldlg.ui
  250. 2
      kstars/kstars/tools/modcalcdaylength.cpp
  251. 2
      kstars/kstars/tools/modcalcdaylengthdlg.ui
  252. 2
      kstars/kstars/tools/modcalceclipticcoords.cpp
  253. 2
      kstars/kstars/tools/modcalceclipticcoordsdlg.ui
  254. 4
      kstars/kstars/tools/modcalcequinox.cpp
  255. 2
      kstars/kstars/tools/modcalcequinoxdlg.ui
  256. 2
      kstars/kstars/tools/modcalcgalcoord.cpp
  257. 2
      kstars/kstars/tools/modcalcgalcoorddlg.ui
  258. 2
      kstars/kstars/tools/modcalcgeodcoord.cpp
  259. 2
      kstars/kstars/tools/modcalcgeoddlg.ui
  260. 2
      kstars/kstars/tools/modcalcjd.cpp
  261. 2
      kstars/kstars/tools/modcalcjddlg.ui
  262. 2
      kstars/kstars/tools/modcalcplanets.cpp
  263. 2
      kstars/kstars/tools/modcalcplanetsdlg.ui
  264. 2
      kstars/kstars/tools/modcalcprec.cpp
  265. 2
      kstars/kstars/tools/modcalcprecdlg.ui
  266. 2
      kstars/kstars/tools/modcalcsidtime.cpp
  267. 2
      kstars/kstars/tools/modcalcsidtimedlg.ui
  268. 2
      kstars/kstars/tools/modcalcvlsr.cpp
  269. 2
      kstars/kstars/tools/modcalcvlsrdlg.ui
  270. 2
      kstars/kstars/tools/observinglist.cpp
  271. 2
      kstars/kstars/tools/observinglistui.ui
  272. 2
      kstars/kstars/tools/obslistwizardui.ui
  273. 2
      kstars/kstars/tools/optionstreeview.ui
  274. 2
      kstars/kstars/tools/planetviewerui.ui
  275. 2
      kstars/kstars/tools/scriptbuilderui.ui
  276. 2
      kstars/kstars/tools/scriptnamedialog.ui
  277. 2
      kstars/kstars/tools/wutdialogui.ui
  278. 8
      ktouch/ChangeLog
  279. 2
      ktouch/ktouch.lsm
  280. 6
      ktouch/src/ktouch.cpp
  281. 2
      ktouch/src/ktouchcoloreditor_dlg.ui
  282. 2
      ktouch/src/ktouchkeyboardeditor_dlg.ui
  283. 2
      ktouch/src/ktouchkeys.cpp
  284. 2
      ktouch/src/ktouchkeys.h
  285. 2
      ktouch/src/ktouchlectureeditor_dlg.ui
  286. 2
      ktouch/src/ktouchopenrequest_dlg.ui
  287. 2
      ktouch/src/ktouchprefcolorslayout.ui
  288. 2
      ktouch/src/ktouchprefgenerallayout.ui
  289. 2
      ktouch/src/ktouchprefkeyboardlayout.ui
  290. 2
      ktouch/src/ktouchpreftraininglayout.ui
  291. 2
      ktouch/src/ktouchslideline.cpp
  292. 2
      ktouch/src/ktouchstatistics_dlg.ui
  293. 2
      ktouch/src/ktouchstatuslayout.ui
  294. 2
      kverbos/kverbos/kverbosview.cpp
  295. 2
      kverbos/kverbos/qerfassen.ui
  296. 2
      kverbos/kverbos/qlernen.ui
  297. 2
      kverbos/kverbos/qresult.ui
  298. 2
      kverbos/kverbos/qverbedit.ui
  299. 2
      kverbos/kverbos/qverbosoptions.ui
  300. 2
      kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
  301. 2
      kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
  302. 2
      kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
  303. 2
      kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
  304. 8
      kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
  305. 2
      kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
  306. 2
      kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
  307. 2
      kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
  308. 2
      kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
  309. 2
      kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
  310. 2
      kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui
  311. 2
      kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
  312. 2
      kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
  313. 2
      kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
  314. 2
      kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
  315. 2
      kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
  316. 2
      kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
  317. 2
      kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui
  318. 2
      kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
  319. 2
      kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
  320. 2
      kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
  321. 2
      kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui
  322. 2
      kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
  323. 10
      kvoctrain/kvoctrain/kva_io.cpp
  324. 2
      kvoctrain/kvoctrain/kvt-core/langset.h
  325. 4
      kvoctrain/kvoctrain/kvtnewstuff.cpp
  326. 2
      kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
  327. 4
      kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
  328. 2
      kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
  329. 2
      kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
  330. 2
      kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
  331. 2
      kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
  332. 2
      kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
  333. 2
      kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
  334. 2
      kwordquiz/src/dlglanguagebase.ui
  335. 2
      kwordquiz/src/dlgrcbase.ui
  336. 2
      kwordquiz/src/dlgsortbase.ui
  337. 2
      kwordquiz/src/flashviewbase.ui
  338. 2
      kwordquiz/src/kwordquiz.h
  339. 2
      kwordquiz/src/kwordquizview.cpp
  340. 4
      kwordquiz/src/kwqnewstuff.cpp
  341. 2
      kwordquiz/src/multipleviewbase.ui
  342. 2
      kwordquiz/src/prefcardappearancebase.ui
  343. 2
      kwordquiz/src/prefcharacterbase.ui
  344. 2
      kwordquiz/src/prefeditorbase.ui
  345. 2
      kwordquiz/src/prefquizbase.ui
  346. 2
      kwordquiz/src/qaview.cpp
  347. 2
      kwordquiz/src/qaviewbase.ui
  348. 4
      kwordquiz/src/wqquiz.cpp
  349. 6
      libkdeedu/extdate/extdatetimeedit.cpp
  350. 14
      libkdeedu/kdeeduui/kdeeduglossary.cpp
  351. 2
      libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui

@ -77,7 +77,7 @@ Kalzium::Kalzium()
connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) ));
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) ));
// tqlayouting
// layouting
setCentralWidget( centralWidget );
centralWidget->show();

@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject()
KURL url;
url.setPath( locate("data", "kalzium/data/"));
url.setFileName( "data.xml" );
TQFile tqlayoutFile( url.path() );
TQFile layoutFile( url.path() );
if (!tqlayoutFile.exists())
if (!layoutFile.exists())
{
kdDebug() << "data.xml not found, exiting" << endl;
kapp->exit(0);
return;
}
if (!tqlayoutFile.open(IO_ReadOnly))
if (!layoutFile.open(IO_ReadOnly))
{
kdDebug() << "data.xml IO-error" << endl;
return;
}
// Check if the document is well-formed
if (!doc.setContent(&tqlayoutFile))
if (!doc.setContent(&layoutFile))
{
kdDebug() << "wrong xml" << endl;
tqlayoutFile.close();
layoutFile.close();
return;
}
tqlayoutFile.close();
layoutFile.close();
ElementList = readData( doc );
m_numOfElements = ElementList.count();

@ -139,7 +139,7 @@ void KalziumTip::display()
m_richText->setWidth(400);
m_tqmaskEffect = isVisible() ? Plain : Dissolve;
m_maskEffect = isVisible() ? Plain : Dissolve;
m_dissolveSize = 24;
m_dissolveDelta = -1;
@ -178,7 +178,7 @@ void KalziumTip::displayInternal()
resize(width, height);
// create and set transparency tqmask
switch(m_tqmaskEffect)
switch(m_maskEffect)
{
case Plain:
plainMask();
@ -218,20 +218,20 @@ void KalziumTip::displayInternal()
void KalziumTip::dissolveMask()
{
TQPainter tqmaskPainter(&m_tqmask);
TQPainter maskPainter(&m_tqmask);
m_tqmask.fill(TQt::black);
tqmaskPainter.setBrush(TQt::white);
tqmaskPainter.setPen(TQt::white);
tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
maskPainter.setBrush(TQt::white);
maskPainter.setPen(TQt::white);
maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
1600 / m_tqmask.rect().height());
m_dissolveSize += m_dissolveDelta;
if (m_dissolveSize > 0)
{
tqmaskPainter.setRasterOp(TQt::EraseROP);
maskPainter.setRasterOp(TQt::EraseROP);
int x, y, s;
const int size = 16;
@ -247,7 +247,7 @@ void KalziumTip::dissolveMask()
{
s = 0;
}
tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s);
}
}
}
@ -269,13 +269,13 @@ void KalziumTip::hide()
void KalziumTip::plainMask()
{
TQPainter tqmaskPainter(&m_tqmask);
TQPainter maskPainter(&m_tqmask);
m_tqmask.fill(TQt::black);
tqmaskPainter.setBrush(TQt::white);
tqmaskPainter.setPen(TQt::white);
tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
maskPainter.setBrush(TQt::white);
maskPainter.setPen(TQt::white);
maskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(),
1600 / m_tqmask.rect().height());
setMask(m_tqmask);
m_frameTimer.stop();

@ -73,7 +73,7 @@ class KalziumTip : public TQWidget
TQPixmap m_icon; //icon shown on the tip
TQPixmap m_noElemIcon; //icon for element wich have no image
MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain
MaskEffect m_maskEffect; //inidicates to show tqmask effect or plain
TQSimpleRichText* m_richText;
int m_dissolveSize;

@ -127,7 +127,7 @@
<Q_SLOTS>
<slot access="protected">slotCalcButtonClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -172,7 +172,7 @@ MoleculeParser::parseSubmolecule(double *_resultMass,
// Parse a term within the molecule, i.e. a single atom or a
// submolecule within tqparenthesis followed by an optional number.
// submolecule within parenthesis followed by an optional number.
// Examples: Bk, Mn2, (COOH)2
//
// Return true if correct, otherwise return false.

@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ )
//JH: only update() if we were showing a tooltip
if ( m_tooltipElementNumber || m_showLegendTooltip )
{
//this tqinvalidates the number. If the mouse
//this invalidates the number. If the mouse
//is moved, the number is invalid.
m_tooltipElementNumber = 0;
m_showLegendTooltip = false;

@ -248,7 +248,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>kcombobox.h</includehint>

@ -901,7 +901,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>

@ -67,5 +67,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -163,5 +163,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -178,7 +178,7 @@ the state of matter</string>
</customwidgets>
<connections>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>

@ -145,7 +145,7 @@ class Spectrum
/**
* @return the tqparent element of this spectrum
*/
Element* tqparentElement()
Element* parentElement()
{ return m_parentElement; }
private:

@ -216,7 +216,7 @@
<Q_SLOTS>
<slot access="protected">slotExportAsImage()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>spectrumwidget.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -415,9 +415,9 @@ TQPixmap SpectrumWidget::pixmap()
TQString text;
if( m_type == EmissionSpectrum )
text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() );
text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
else
text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->tqparentElement()->elname() );
text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
TQPainter p( &tmp );
p.setPen( TQt::black );

@ -194,7 +194,7 @@ of the elements</string>
<slot>setValue(int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>

@ -178,5 +178,5 @@
<tabstop>kcfg_hintHideTime</tabstop>
<tabstop>kcfg_useSounds</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -58,5 +58,5 @@ the button to get new vocabulary files.</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -102,7 +102,7 @@ void VocabEdit::slotSave()
}
doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram");
VocabSettings *settings = (VocabSettings*)this->tqparentWidget();
VocabSettings *settings = (VocabSettings*)this->parentWidget();
settings->refreshView();
if(m_textChanged)

@ -224,5 +224,5 @@
<tabstop>btnClose</tabstop>
<tabstop>lboxWords</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -113,5 +113,5 @@
<Q_SLOTS>
<slot>createNew()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -214,7 +214,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontdialog.h</includehint>
<includehint>kcolorbutton.h</includehint>

@ -96,5 +96,5 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -34,14 +34,14 @@
typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory )
KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName,
KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQStringList &/*args*/ )
: KParts::ReadOnlyPart( tqparent, name )
{
setInstance( KEducaPartFactory::instance() );
m_view = new KEducaView( tqparentWidget, widgetName );
m_view = new KEducaView( parentWidget, widgetName );
m_view->show();
setWidget( m_view );

@ -41,7 +41,7 @@ class KEducaPart : public KParts::ReadOnlyPart
/*
* Constructor.
*/
KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList &args );
/*

@ -860,7 +860,7 @@
<slot access="private" specifier="pure virtual">slotDataChanged()</slot>
<slot access="private" specifier="pure virtual">slotAnswerSelected(TQListViewItem *)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

@ -459,7 +459,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

@ -312,7 +312,7 @@
<tabstop>openDocumentRB</tabstop>
<tabstop>openRecentDocumentRB</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -366,5 +366,5 @@
<slot>slotButtonAdd()</slot>
<slot>slotServerSelected(TQListViewItem*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -88,7 +88,7 @@
* RightWidget is really LeftWidget ¬.¬
* There is no need to store p_rightWidget as a class member
* Bump version to 0.2.1
* Improve tqlayouting of mapasker
* Improve layouting of mapasker
* Make the scrollbar work also when clicking on the arrows
(sliderMoved -> valueChanged)
* Fix resizing bug in mapWidget that showed a inexistant part of the

@ -91,5 +91,5 @@ For example, in Catalan, if this is unchecked and you type "o", the o and ò wil
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -90,5 +90,5 @@ Default is no sound.</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

@ -221,7 +221,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>

@ -1142,7 +1142,7 @@
* Fix the moving system again, it now only redraws exactly those
objects that need to be redrawn. E.g. when a constrained point
was moved, before it was assumed that all of its tqparents, and
was moved, before it was assumed that all of its parents, and
their tqchildren would move, whereas in reality, a constrained point
does not move the curve it is constrained to. This is now taken
into account for. This much optimizes the case where we move the
@ -1200,7 +1200,7 @@
could not open.. I'm backporting this into Kig 0.6.0 and
informing the packager..
* clean up: Objects now store their tqparents in order, so that no
* clean up: Objects now store their parents in order, so that no
parsing has to be done in the calc() function.. Also some more
modifications making that function a bit simpler are included.
Specifically, ArgsParser now does the checking of the arguments,
@ -1218,7 +1218,7 @@
2003-09-01 Dominique Devriese <devriese@kde.org>
* only move an object if its tqparents are not yet moving.. This
* only move an object if its parents are not yet moving.. This
fixes bug #63250.
* remove the defective operator| and operator& implementations for

@ -19,7 +19,7 @@ An ObjectImp represents the current state of an object in Kig. It
keeps information about what type of object it is ( e.g. a line, a
point, a circle etc. ), and its exact data ( e.g. the center and
radius of the circle ). It is *not* in any way aware of how the
object was calculated from its tqparents (e.g. is this a line that is
object was calculated from its parents (e.g. is this a line that is
constructed as the parallel of another line, or as the line going
through two given points ? ) or how it is drawn on the window (
e.g. the thickness of the line, its color etc. ).
@ -50,21 +50,21 @@ calculating an ObjectImp from other ObjectImp's. It is also a node in
the dependency graph of a certain document. E.g. a LineImp can be
calculated from the two PointImp's it has to go through; every time
either of them moves, this calculation is redone. In this case, there
would be an ObjectCalcer that keeps a reference to its two tqparents (
would be an ObjectCalcer that keeps a reference to its two parents (
the ObjectCalcer's representing the points ), and that will calculate
its ObjectImp value every time it is asked to do so ( i.e. every time
one of its tqparents moves.. ).
one of its parents moves.. ).
Because of the complex relations that ObjectCalcer's hold to other
ObjectCalcer's and to other classes, they have been made
reference-counted. This means that they keep a count internally of
how much times a pointer to them is held. If this count reaches 0,
this means that nobody needs them anymore, and they delete themselves.
E.g. an ObjectCalcer always keeps a reference to its tqparents, to
E.g. an ObjectCalcer always keeps a reference to its parents, to
ensure that those aren't deleted before it is deleted.
In the inheritance graph of a document, the lowermost objects keep
references to their tqparents and those keep reference to their tqparents,
references to their parents and those keep reference to their parents,
so that all of the top of the graph is kept alive. Of course, someone
needs to keep a reference to the bottommost objects in the graph,
because otherwise, the entire graph would be deleted. As we will see
@ -76,7 +76,7 @@ At the end of the program, this reference is released, and all the
objects are deleted.
A special case of an ObjectCalcer is the ObjectConstCalcer. This is
an ObjectCalcer that has no tqparents, and only holds some data. The
an ObjectCalcer that has no parents, and only holds some data. The
data is held as an ObjectImp of some type, and it will remain
constant, and no calculation needs to be done to get it, it is just
returned every time it is needed.
@ -159,9 +159,9 @@ Most of this is handled by the TextType class.
2.1.2 TextType
The TextType class is an implementation of an ObjectType. It tqcontains
code specifying how to calculate a TextImp from its tqparents, and for
code specifying how to calculate a TextImp from its parents, and for
how it behaves on user input. A text object has at least three
tqparents, and can handle any number of optional arguments. The three
parents, and can handle any number of optional arguments. The three
mandatory arguments are an int, which is set to 1 or 0 depending on
whether the label needs a surrounding box, a PointImp, containing the
location of the text label, and a string containing the text of the
@ -170,7 +170,7 @@ additional argument is used to replace the lowest-numbered of those
tokens, with its string representation. The function
ObjectImp::fillInNextEscape is used for this.
For example, if a TextType has the following tqparents:
For example, if a TextType has the following parents:
a IntImp with value 0
a PointImp with value (0,0)
a String with value "This segment is %1 units long."
@ -197,7 +197,7 @@ proud of this design.
In the implementation of this, we use the concept of constrained
points. This is a point that is attached to a certain curve. It is
implemented in Kig by the ConstrainedPointType, which takes a CurveImp
and a DoubleImp as tqparents and calculates a Point from these by using
and a DoubleImp as parents and calculates a Point from these by using
the CurveImp::getPoint function.
2.2.2 The Implementation
@ -213,7 +213,7 @@ smallest part of the hierarchy that contains all paths from the first
point to the second point. We then determine all objects that are not
*on* one of those paths ( meaning that they are not calculated from
the first point, or another object that is on one of those paths ),
but that are tqparents of one or more objects that are on those paths.
but that are parents of one or more objects that are on those paths.
I call this set of objects the "side of the path" sometimes in the
code. The function that finds them is called sideOfTreePath.
@ -260,7 +260,7 @@ does by definition not change. Also, if the constrained point is
redefined so that it is no longer constrained to any curve, this is a
major problem, because it would tqinvalidate the locus. Another point
is that in practice, the locus depends on more objects than its
tqparents alone. This is not a good thing, because it makes it
parents alone. This is not a good thing, because it makes it
impossible to optimise drawing of the objects, using the information
about which objects depend on which others, because this information
is invalid.

@ -102,8 +102,8 @@
- extend ObjectFactory::sensiblePointCalcer to also construct
intersection points of stuff... (pino: done for lines)
- when moving an object that wants to move its tqparents, try to check if
it is itself not an indirect child of one of the tqparents it is
- when moving an object that wants to move its parents, try to check if
it is itself not an indirect child of one of the parents it is
trying to move, and forbid the move in that case, as it will lead
to chaotic behaviour. I am not sure if this is really well
possible, but I have to look at it.

@ -1,27 +1,27 @@
<?xml version="1.0"?>
<drgenius>
<drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
<point id="827A5C0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="827A5C0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-5.833333</x>
<y>2.950000</y>
</point>
<point id="8248660" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8248660" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-4.666666</x>
<y>-0.783334</y>
</point>
<point id="822A6B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="822A6B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>2.333334</x>
<y>-0.216667</y>
</point>
<line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="827A5C0"/>
<tqparent ref="8248660"/>
</line>
<line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="822A6B0"/>
<tqparent ref="8248660"/>
</line>
<angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="822A6B0"/>
<tqparent ref="8248660"/>
<tqparent ref="827A5C0"/>

@ -1,69 +1,69 @@
<?xml version="1.0"?>
<drgenius>
<drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
<point id="82257B8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82257B8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-6.700000</x>
<y>2.250000</y>
</point>
<point id="8250458" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8250458" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>0.266667</x>
<y>2.083333</y>
</point>
<point id="8250D30" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8250D30" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-0.800000</x>
<y>-2.516667</y>
</point>
<point id="8255158" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8255158" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-2.766667</x>
<y>1.883333</y>
</point>
<point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<tqparent ref="82257B8"/>
<tqparent ref="8255158"/>
</point>
<halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="8250D30"/>
<tqparent ref="8250458"/>
</halfLine>
<point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-2.833333</x>
<y>-0.983334</y>
</point>
<point id="8115668" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8115668" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>1.500000</x>
<y>1.883333</y>
</point>
<point id="82AED28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82AED28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-0.566667</x>
<y>3.983333</y>
</point>
<segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82257B8"/>
<tqparent ref="82AED28"/>
</segment>
<line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82043A0"/>
<tqparent ref="8115668"/>
</line>
<point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-5.533333</x>
<y>-0.383333</y>
</point>
<vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<Ox>-2.800000</Ox>
<Oy>1.883333</Oy>
<tqparent ref="8255158"/>
<tqparent ref="82B26F0"/>
</vector>
<point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>3.166667</x>
<y>-0.683333</y>
</point>
<circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82B4358"/>
<tqparent ref="8115668"/>
</circle>
<arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82257B8"/>
<tqparent ref="82B26F0"/>
<tqparent ref="8250D30"/>

@ -1,64 +1,64 @@
<?xml version="1.0"?>
<drgenius>
<drgeo name="Figure 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
<point id="82076B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82076B0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>0.766667</x>
<y>2.450000</y>
</point>
<point id="8281F08" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8281F08" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-3.300000</x>
<y>2.650000</y>
</point>
<point id="82535F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82535F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-7.900000</x>
<y>-2.583333</y>
</point>
<point id="822F448" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="822F448" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-7.800000</x>
<y>0.116667</y>
</point>
<point id="8208228" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8208228" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-4.533333</x>
<y>1.216667</y>
</point>
<point id="822FB88" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="822FB88" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-8.566667</x>
<y>3.116667</y>
</point>
<point id="82B08A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82B08A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-7.066667</x>
<y>1.783334</y>
</point>
<line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="8281F08"/>
<tqparent ref="82076B0"/>
</line>
<arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="8208228"/>
<tqparent ref="822F448"/>
<tqparent ref="82535F0"/>
</arcCircle>
<halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="822FB88"/>
<tqparent ref="82B08A0"/>
</halfLine>
<point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-1.066667</x>
<y>-0.416667</y>
</point>
<point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0">
<point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
<tqparent ref="82A86B8"/>
<tqparent ref="82C2F40"/>
</point>
<point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="1">
<point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="1">
<tqparent ref="82A86B8"/>
<tqparent ref="82C2F40"/>
</point>
<line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82C8738"/>
<tqparent ref="82C3C40"/>
</line>
<point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<tqparent ref="82C4DC8"/>
<tqparent ref="82BF640"/>
</point>
@ -86,75 +86,75 @@ Figure 3 tqcontains:
- a moved circle;
</text>
<drgeo name="Figure 2" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
<point id="831A340" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="831A340" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-5.200000</x>
<y>0.216667</y>
</point>
<point id="82D1958" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82D1958" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>1.200000</x>
<y>3.116667</y>
</point>
<point id="82EB588" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82EB588" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-7.666667</x>
<y>1.650000</y>
</point>
<line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82EB588"/>
<tqparent ref="831A340"/>
</line>
<point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<tqparent ref="831A340"/>
<tqparent ref="82D1958"/>
</point>
<line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="8339778"/>
<tqparent ref="8337158"/>
</line>
<point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-6.200000</x>
<y>-1.483334</y>
</point>
<line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="8322E28"/>
<tqparent ref="82D1958"/>
</line>
<point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0">
<point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
<tqparent ref="831E530"/>
<tqparent ref="8337158"/>
</point>
<point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="" extra="0">
<point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0">
<tqparent ref="8322C38"/>
<tqparent ref="831E530"/>
</point>
</drgeo>
<drgeo name="Figure 3" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False">
<point id="837C5E0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="837C5E0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-6.433334</x>
<y>2.050000</y>
</point>
<point id="83380E8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="83380E8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-1.400000</x>
<y>2.583333</y>
</point>
<point id="83565C8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="83565C8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-1.300000</x>
<y>-0.350000</y>
</point>
<point id="82FBCC8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" tqmasked="False" name="">
<point id="82FBCC8" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="">
<x>-3.433333</x>
<y>-0.883333</y>
</point>
<vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<Ox>-6.433334</Ox>
<Oy>2.050000</Oy>
<tqparent ref="837C5E0"/>
<tqparent ref="83380E8"/>
</vector>
<circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="82FBCC8"/>
<tqparent ref="83565C8"/>
</circle>
<circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" tqmasked="False" name="">
<circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name="">
<tqparent ref="83A2B10"/>
<tqparent ref="8108B10"/>
</circle>

@ -56,7 +56,7 @@
*
* Nr: Simple sequential numbering of the objects in a file.
* Type: seen so far: Pt, Axes, Line, Cir
* NumberOfParents: The number of tqparents that will be specified in
* NumberOfParents: The number of parents that will be specified in
* Parents
* Color:
* R -> red
@ -96,7 +96,7 @@
* Visible:
* V means visible, I means invisible
* Fixed:
* St means fix this object ( if you move one of its tqparents, it
* St means fix this object ( if you move one of its parents, it
* won't move ), nSt ( the default ) means don't fix this object.
* Parents:
* The numbers of the objects this object depends on
@ -118,7 +118,7 @@ struct CabriObject
int specialAppearanceSwitch;
bool visible;
bool fixed;
std::vector<int> tqparents;
std::vector<int> parents;
std::vector<double> data;
};
@ -246,14 +246,14 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj )
KIG_FILTER_PARSE_ERROR;
tmp = thirdlinere.cap( 2 );
TQStringList tqparentsids = TQStringList::split( ' ', tmp );
for ( TQStringList::iterator i = tqparentsids.begin();
i != tqparentsids.end(); ++i )
TQStringList parentsids = TQStringList::split( ' ', tmp );
for ( TQStringList::iterator i = parentsids.begin();
i != parentsids.end(); ++i )
{
myobj.tqparents.push_back( ( *i ).toInt( &ok ) );
myobj.parents.push_back( ( *i ).toInt( &ok ) );
if ( ! ok ) KIG_FILTER_PARSE_ERROR;
}
if ( myobj.tqparents.size() != myobj.numberOfParents )
if ( myobj.parents.size() != myobj.numberOfParents )
KIG_FILTER_PARSE_ERROR;
tmp = thirdlinere.cap( 4 );
@ -277,8 +277,8 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj )
// << "specialAppearanceSwitch = " << myobj.specialAppearanceSwitch << endl
// << "visible = " << visible << endl
// << "fixed = " << myobj.fixed << endl
// << "tqparents =" << endl;
// for ( std::vector<int>::iterator i = myobj.tqparents.begin(); i != myobj.tqparents.end(); ++i )
// << "parents =" << endl;
// for ( std::vector<int>::iterator i = myobj.parents.begin(); i != myobj.parents.end(); ++i )
// kdDebug() << " " << *i << endl;
// kdDebug() << "vals = " << endl;
// for ( std::vector<double>::iterator i = myobj.data.begin(); i != myobj.data.end(); ++i )
@ -352,8 +352,8 @@ KigDocument* KigFilterCabri::load( const TQString& file )
int ps = 0;
args.clear();
for ( std::vector<int>::iterator i = obj.tqparents.begin();
i != obj.tqparents.end(); ++i )
for ( std::vector<int>::iterator i = obj.parents.begin();
i != obj.parents.end(); ++i )
args.push_back( calcers[*i-3] );
// two fake objects at the start ( origin and axes.. )

@ -131,7 +131,7 @@ Please select which to import:</string>
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -62,7 +62,7 @@
struct DrGeoHierarchyElement
{
TQString id;
std::vector<TQString> tqparents;
std::vector<TQString> parents;
};
KigFilterDrgeo::KigFilterDrgeo()
@ -202,7 +202,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
TQDomElement ce = c.toElement();
if ( ce.isNull() ) continue;
else if ( ce.tagName() == "tqparent" )
elem.tqparents.push_back( ce.attribute( "ref" ) );
elem.parents.push_back( ce.attribute( "ref" ) );
}
TQString curid = domelem.attribute( "id" );
elem.id = !curid.isNull() ? curid : TQString::number( withoutid++ ) ;
@ -216,9 +216,9 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
for ( uint i = 0; i < elems.size(); ++i )
{
x = "";
for ( uint j = 0; j < elems[i].tqparents.size(); ++j )
for ( uint j = 0; j < elems[i].parents.size(); ++j )
{
x += elems[i].tqparents[j] + "_";
x += elems[i].parents[j] + "_";
}
kdDebug() << " --> " << i << " - " << elems[i].id << " - " << x << endl;
}
@ -241,25 +241,25 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
kdDebug() << "+++ id: " << curid << endl;
#endif
const DrGeoHierarchyElement& el = elems[curid];
std::vector<ObjectCalcer*> tqparents;
for ( uint j = 0; j < el.tqparents.size(); ++j )
std::vector<ObjectCalcer*> parents;
for ( uint j = 0; j < el.parents.size(); ++j )
{
int tqparentid = convertDrgeoIndex( elems, el.tqparents[j] );
if ( tqparentid == -1 )